Capstone recovery + M11 lab honesty (#8,#14,#15,#30) #60

2026-06-22T16:15:52-04:00

claude commented

2026-06-22 16:15:52 -04:00

Final P1 batch — capstone recovery mechanics + M11 lab honesty.

#8 Capstone Part F: sync local main after the forge squash-merge, then plain git revert <squash-sha> (drops the wrong -m 1, which is only for true --no-ff merges). Module 12 untouched — it still teaches -m 1 for real merges; the capstone now references that distinction instead of contradicting it. Break-then-recover finale preserved.
#30 Capstone hardcoded due date 2026-07-15 → relative-date guidance (+ Verify-before-publish note).
#14 M11 Part C uses list-then-shown-index instead of hardcoded done 1.
#15 M11 Part E is honest that 'agent opens a PR' needs forge integration: host-CLI path or push-then-human-opens fallback, with an M20 MCP forward-pointer. Provider-neutral throughout.

Verified a squash-merge + plain revert end-to-end on /tmp clones.

Closes #8
Closes #14
Closes #15
Closes #30

🤖 Generated with Claude Code

Final P1 batch — capstone recovery mechanics + M11 lab honesty. - **#8** Capstone Part F: sync local `main` after the forge squash-merge, then plain `git revert <squash-sha>` (drops the wrong `-m 1`, which is only for true `--no-ff` merges). **Module 12 untouched** — it still teaches `-m 1` for real merges; the capstone now references that distinction instead of contradicting it. Break-then-recover finale preserved. - **#30** Capstone hardcoded due date `2026-07-15` → relative-date guidance (+ Verify-before-publish note). - **#14** M11 Part C uses list-then-shown-index instead of hardcoded `done 1`. - **#15** M11 Part E is honest that 'agent opens a PR' needs forge integration: host-CLI path or push-then-human-opens fallback, with an M20 MCP forward-pointer. Provider-neutral throughout. Verified a squash-merge + plain revert end-to-end on /tmp clones. Closes #8 Closes #14 Closes #15 Closes #30 🤖 Generated with [Claude Code](https://claude.com/claude-code)

claude added 1 commit 2026-06-22 16:15:53 -04:00

fix(capstone,module-11): correct squash-revert recovery, M11 lab honesty, relative dates 1ae199d31f

- Capstone Part F: sync local main after the forge squash-merge, then plain
  `git revert <squash-sha>` (NOT `-m 1`, which is only for true --no-ff merge
  commits — Module 12, left untouched). Break-then-recover finale preserved.
- Capstone: replace hardcoded due date 2026-07-15 with relative-date guidance.
- M11 Part C: list-then-use-shown-index instead of hardcoded `done 1` (breaks on
  a carried-forward tasks.json).
- M11 Part E: be honest that "agent opens a PR" needs forge integration — host
  CLI path or push-then-human-opens fallback; MCP forward-pointer (M20).

Closes #8
Closes #14
Closes #15
Closes #30

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_01TfzV5QvtPDz8LJS3Pu5VLT

claude merged commit 8830e91846 into main

2026-06-22 16:16:09 -04:00

claude deleted branch fix/p1-capstone-collaboration

2026-06-22 16:16:09 -04:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: justin/ai-workflow-course#60