mirror of
https://github.com/garrytan/gstack.git
synced 2026-05-07 22:16:52 +02:00
merge: resolve conflicts with origin/main, bump to v1.22.0.0
Main shipped v1.21.0.0 (browser-skills) and v1.21.1.0 (plan-ceo smoke
tightening + classifyVisible extraction) while this branch was in flight.
Resolves all four merge conflicts:
- VERSION 1.22.0.0 (was claiming v1.21.0.0; queue advanced past v1.21.1.0;
MINOR scale on top per scale-aware bumps)
- package.json synced to 1.22.0.0
- claude-pty-runner.ts: integrated 'auto_decided' outcome into main's new
classifyVisible() pure function. Branch order is now silent_write →
auto_decided → plan_ready → asked. Kept BOTH new options on the runner
(`extraArgs` from this branch, `env` from main). isPlanReadyVisible and
isAutoDecidedVisible remain whitespace-tolerant.
- touchfiles.test.ts: count of plan-ceo-review/SKILL.md selections updates
to 21 (main added plan-ceo-finding-count; this branch added
autoplan-auto-mode + auto-decide-preserved).
- CHANGELOG.md: dropped this branch's stale v1.21.0.0 draft, kept main's
v1.21.1.0 entry intact, wrote v1.22.0.0 entry on top covering the
AskUserQuestion-blocked regression fix.
plan-ceo-plan-mode test auto-merged: main's stricter baseline ('asked'
only) + this branch's AskUserQuestion-blocked regression case both
present and run sequentially. SKILL.md goldens regenerated via
`bun run gen:skill-docs --host all` and the 3 host-ship goldens copied
into test/fixtures/golden/.
Free test suite: 470/470 pass post-merge.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -97,12 +97,14 @@ describe('selectTests', () => {
|
||||
expect(result.selected).toContain('ask-user-question-format-pty');
|
||||
expect(result.selected).toContain('plan-ceo-mode-routing');
|
||||
expect(result.selected).toContain('autoplan-chain-pty');
|
||||
// v1.21+ regression: autoplan-auto-mode + auto-decide-preserved also
|
||||
// depend on plan-ceo-review/**
|
||||
// Per-finding count + review-report-at-bottom (v1.21.x)
|
||||
expect(result.selected).toContain('plan-ceo-finding-count');
|
||||
// v1.22+ AskUserQuestion-blocked regression: autoplan-auto-mode +
|
||||
// auto-decide-preserved also depend on plan-ceo-review/**
|
||||
expect(result.selected).toContain('autoplan-auto-mode');
|
||||
expect(result.selected).toContain('auto-decide-preserved');
|
||||
expect(result.selected.length).toBe(20);
|
||||
expect(result.skipped.length).toBe(Object.keys(E2E_TOUCHFILES).length - 20);
|
||||
expect(result.selected.length).toBe(21);
|
||||
expect(result.skipped.length).toBe(Object.keys(E2E_TOUCHFILES).length - 21);
|
||||
});
|
||||
|
||||
test('global touchfile triggers ALL tests', () => {
|
||||
|
||||
Reference in New Issue
Block a user