Commit Graph

2 Commits

Author SHA1 Message Date
Garry Tan
1a2e92278d merge: integrate origin/main (v1.1.2.0) — mode-posture energy
Main shipped v1.1.2.0, restoring mode-posture energy to /plan-ceo-review
EXPANSION and /office-hours forcing + builder modes. V1's writing-style
rules 2-4 collapsed every outcome into diagnostic-pain framing; models
follow concrete examples over abstract taxonomies, so cathedral-mode
output was flattening even when the template said "dream big."

Conflicts:
- VERSION / package.json: kept 1.2.0.0 (branch higher than main's 1.1.2.0)
- CHANGELOG: preserved 1.2.0.0 at top, inserted main's 1.1.2.0 below it,
  and added a short note under 1.2.0.0's Changed section documenting
  that the mode-posture examples are included here too (via the port)
- scripts/resolvers/preamble.ts: main edited inline writing-style
  examples in the old monolithic preamble file; my submodule refactor
  landed the same file as an 80-line composition root. Resolution:
  kept my submodule structure (dropped main's 800 lines of inline code)
  and ported main's new rule 2/3/4 examples into
  scripts/resolvers/preamble/generate-writing-style.ts — same behavior,
  just in the right place for the submodule shape.

Ship SKILL.md, golden fixtures, office-hours/plan-ceo-review templates,
new test/fixtures/mode-posture/** fixtures, new judgePosture helper,
and touchfiles entries for three new gate-tier E2E tests (plan-ceo-
review-expansion-energy, office-hours-forcing-energy, office-hours-
builder-wildness) all auto-merged cleanly.

Regenerated all SKILL.md files and ship goldens. 423 tests pass.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-19 05:57:27 +08:00
Garry Tan
70d045d4d9 merge: integrate origin/main (v1.1.0.0) — V1 + Puppeteer parity + /plan-tune
Big merge. Main shipped three releases while this branch was in flight:
- v0.19.0.0 /plan-tune skill (observational layer; dual-track dev profile)
- v1.0.0.0 V1 prompts (simpler, outcome-framed, jargon-glossed) + LOC receipts
- v1.1.0.0 browse Puppeteer parity (load-html, file://, --selector, --scale)

This branch bumps to v1.2.0.0 (above main's v1.1.0.0) per the
branch-scoped-version rule in CLAUDE.md. My "0.19.0.0" CHANGELOG entry
is renamed to "1.2.0.0" and dated 2026-04-18 to land above main's trail.

Conflicts resolved:
- VERSION / package.json: 1.2.0.0
- CHANGELOG.md: preserved my entry at top (renamed), kept main's 1.1.0.0
  / 1.0.0.0 / 0.19.0.0 / 0.18.4.0 trail below in correct order
- .github/docker/Dockerfile.ci: kept my xz-utils + nodejs.org tarball
  fix (real CI bug fix main didn't have); absorbed main's retry loop
  structure for both apt and the tarball curl
- bin/gstack-config: kept both my checkpoint_mode/push section and
  main's explain_level writing-style section
- scripts/resolvers/preamble.ts: kept my submodule refactor as the
  file shape; extracted main's new generateWritingStyle and
  generateWritingStyleMigration into scripts/resolvers/preamble/
  submodules; absorbed main's generateQuestionTuning import
- All generated SKILL.md files: resolved by regen via
  bun run gen:skill-docs --host all (per CLAUDE.md: never hand-merge
  generated files — resolve templates and regen)
- Ship golden fixtures (claude/codex/factory): refreshed

Tier 2 preamble composition now includes all 8 sections: context
recovery, ask-user-format, writing-style, completeness, confusion,
continuous checkpoint, context health, question tuning.

Main also brought new test files from /plan-tune: skill-e2e-plan-tune,
upgrade-migration-v1, v0-dormancy, writing-style-resolver. All absorbed.
468 tests pass.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 23:35:36 +08:00