Merge remote-tracking branch 'origin/main' into garrytan/workspace-aware-ship

Rebumped v1.8.0.0 -> v1.11.0.0 (minor-past main's v1.10.1.0) using bin/gstack-next-version — the same queue-aware path this branch introduces. CHANGELOG repositioned so v1.11.0.0 sits above main's new entries (v1.10.1.0 / v1.10.0.0 / v1.9.0.0). Conflicts resolved: - VERSION, package.json: rebumped to v1.11.0.0 (util-picked) - bin/gstack-config: merged both lists (workspace_root + gbrain keys) - CHANGELOG.md: hoisted v1.11.0.0 entry above main's new entries Pre-existing failures in main (4) documented but not fixed in this PR: 1. gstack-brain-sync secret scan > blocks bearer-json (brain-sync tests) 2. no files larger than 2MB (security-bench fixture, already TODO'd) 3. selectTests > skill-specific change (touchfiles scoping) 4. Opus 4.7 overlay pacing directive (expectation stale after v1.10.1.0 removed the Fan out nudge) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-08 06:26:45 +02:00 · 2026-04-23 21:20:25 -07:00
parent 416a56a5c8
commit a64d70ba35
87 changed files with 14392 additions and 788 deletions
@@ -0,0 +1,72 @@
+/**
+ * Preamble composition order — gate-tier test.
+ *
+ * Asserts that the AskUserQuestion Format section renders BEFORE the
+ * Model-Specific Behavioral Patch section in tier-≥2 preamble output.
+ * This order is load-bearing: Opus 4.7 reads top-to-bottom and absorbs
+ * the first pacing directive it hits. v1.6.4.0 regressed plan-review
+ * cadence because the overlay rendered first with "Batch your questions"
+ * as the ambient default.
+ *
+ * If someone later reorders `scripts/resolvers/preamble.ts` so Overlay
+ * comes before Format, this test catches it before the next model
+ * migration can silently re-break the plan-review pacing.
+ */
+import { describe, test, expect } from 'bun:test';
+import type { TemplateContext } from '../scripts/resolvers/types';
+import { HOST_PATHS } from '../scripts/resolvers/types';
+import { generatePreamble } from '../scripts/resolvers/preamble';
+
+function makeCtx(
+  host: 'claude' | 'codex',
+  tier: 1 | 2 | 3 | 4,
+  model?: string,
+): TemplateContext {
+  return {
+    skillName: 'test-skill',
+    tmplPath: 'test.tmpl',
+    host,
+    paths: HOST_PATHS[host],
+    preambleTier: tier,
+    ...(model ? { model } : {}),
+  };
+}
+
+describe('Preamble composition order', () => {
+  test('AskUserQuestion Format renders before Model-Specific Behavioral Patch (tier 2, claude)', () => {
+    const out = generatePreamble(makeCtx('claude', 2, 'claude'));
+    const formatIdx = out.indexOf('## AskUserQuestion Format');
+    const overlayIdx = out.indexOf('## Model-Specific Behavioral Patch');
+    expect(formatIdx).toBeGreaterThan(-1);
+    expect(overlayIdx).toBeGreaterThan(-1);
+    expect(formatIdx).toBeLessThan(overlayIdx);
+  });
+
+  test('AskUserQuestion Format renders before Model-Specific Behavioral Patch (tier 2, opus-4-7)', () => {
+    const out = generatePreamble(makeCtx('claude', 2, 'opus-4-7'));
+    const formatIdx = out.indexOf('## AskUserQuestion Format');
+    const overlayIdx = out.indexOf('## Model-Specific Behavioral Patch');
+    expect(formatIdx).toBeGreaterThan(-1);
+    expect(overlayIdx).toBeGreaterThan(-1);
+    expect(formatIdx).toBeLessThan(overlayIdx);
+  });
+
+  test('AskUserQuestion Format renders before Model-Specific Behavioral Patch (tier 3)', () => {
+    const out = generatePreamble(makeCtx('claude', 3, 'opus-4-7'));
+    const formatIdx = out.indexOf('## AskUserQuestion Format');
+    const overlayIdx = out.indexOf('## Model-Specific Behavioral Patch');
+    expect(formatIdx).toBeLessThan(overlayIdx);
+  });
+
+  test('AskUserQuestion Format renders before Model-Specific Behavioral Patch (codex host)', () => {
+    const out = generatePreamble(makeCtx('codex', 2, 'opus-4-7'));
+    const formatIdx = out.indexOf('## AskUserQuestion Format');
+    const overlayIdx = out.indexOf('## Model-Specific Behavioral Patch');
+    expect(formatIdx).toBeLessThan(overlayIdx);
+  });
+
+  test('tier 1 preamble does NOT include AskUserQuestion Format (but MAY include overlay)', () => {
+    const out = generatePreamble(makeCtx('claude', 1));
+    expect(out).not.toContain('## AskUserQuestion Format');
+  });
+});