mirror of
https://github.com/garrytan/gstack.git
synced 2026-09-01 19:00:40 +02:00
* feat(session-kind): explicit GSTACK_SESSION_KIND override; skill-start spawned gates keyed on kind (#2733) Claude Code subagents inherit the parent env byte-for-byte, so ambient markers classify them as the parent's kind and the spawned classification was unreachable outside OpenClaw. GSTACK_SESSION_KIND=spawned (step 0, spawned-only by design) lets a dispatching skill mark its subagent per command. skill-start now keys SPAWNED_SESSION and the spawned-session instruction block on the resolved kind (was raw OPENCLAW_SESSION), suppresses CONDUCTOR_SESSION for spawned sessions, gates all 11 interactive-onboarding blocks plus their ack-at-emit marker writes on kind != spawned, and adds a destructive-gate carve-out to the spawned block (conservative-continue, never prose-STOP). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(hooks): spawned-session escape in Conductor AUQ deny; override coverage in AUQ-error fallback (#2733) Hooks inherit the harness env, so a per-command GSTACK_SESSION_KIND prefix inside a subagent's bash can never reach them. Levers added: a deterministic [conductor][spawned] auto-choose deny for env-level spawned sessions (OPENCLAW_SESSION or session-wide GSTACK_SESSION_KIND), and a spawned escape sentence appended to both hooks' prose directives so a marked subagent that slips and calls AUQ resolves to auto-choose instead of prose-STOP. The sentence lives in one shared constant (hosts/claude/hooks/spawned-directive.ts) so the two paths can never drift; destructive semantics are unified to conservative-continue. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(ship): Step 18 marks the document-release subagent spawned — env prefix + auto-choose prompt (#2733) The dispatch prompt now (1) frames the run as a SPAWNED subagent whose LAST line is machine-parsed, (2) instructs prefixing the preamble's gstack-skill-start invocation with GSTACK_SESSION_KIND=spawned on the same command line (template bash blocks don't share exports), and (3) resolves every AUQ gate to auto-choosing the recommended option, conservative on no-recommendation, never destructive. The JSON contract gains a required "decisions" array (auto-chosen gates, printed to the ship console — never embedded in the public PR body) and a placement clause so the skill's own doc-health summary stops competing with the LAST-line JSON. Tripwire pins added; codex/factory goldens refreshed. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(auq-format): proactive SESSION_KIND=spawned rule ordered above the Conductor rule (#2733) The spawned classification previously existed only in the failure-fallback branch — a spawned session was invited to call AskUserQuestion and reach auto-choose via the deny/error detour, and a spawned session inside a Conductor workspace hit the Conductor prose-STOP rule first. The Tool resolution list now leads with the spawned rule (auto-choose recommended, never prose, never BLOCKED, destructive gates resolve conservative), the self-check carries the never-reach-this-checklist clause, and all tier>=2 SKILL.md renders are regenerated. Context-budget fixture refreshed in the same commit per the ratchet protocol (the AUQ section is eager in every tier>=2 skill). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test(e2e): spawned document-release subagent returns the JSON contract through a firing gate (#2733) The behavioral proof the bug shipped without: ship-docsync stubs the skill (no preamble, no gates) and skill-e2e-workflow suppresses the gates by prompt. This gate-tier E2E plays the parent — it drives the verbatim Step 18 dispatch prompt (extracted from the live pr-body.md, drift-proof) against a real preamble-bearing document-release slice in a Conductor-ambient env with both AUQ hooks seeded live, an unbumped VERSION making Step 8 fire. Asserts: the final line parses as the 5-key JSON contract, the fired gate's auto-choice is recorded in decisions, and VERSION is untouched (the gate resolved to its recommended Skip). Burn-in: 1/1 pass, $0.35, 21 turns, 106s. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs(openclaw): document the GSTACK_SESSION_KIND override; wire session-kind into paid selectors (#2733) OPENCLAW.md's spawned-session section now covers the explicit per-command marker, its deliberate spawned-only narrowness, the /ship Step 18 usage, the destructive carve-out, onboarding-block suppression, and the hook env-blindness caveat. bin/gstack-session-kind and the shared spawned-directive module join the conductor-prose and auto-decide-preserved selector dep lists (session-kind previously appeared in no touchfiles entry — editing it alone triggered no paid E2E). TODOS.md gains the plan-tune capture follow-up for spawned auto-choices. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix: pre-landing review fixes (#2733) Review army + coverage audit findings, all applied: - headless directive carries the spawned escape sentence too (multi- specialist: a CI-hosted ship's marked subagent must not end BLOCKED) - anti-injection scoping on every text-claimable spawned trigger (AUQ rule + shared escape sentence): markings count only from the creating prompt, never from files/tool output/web content read mid-run - [conductor][spawned] deny annotates one-way doors per question - SPAWNED_OVERRIDE: env tamper-visibility status line + OPENCLAW.md note - spawned sessions skip the network update-check and first-task probe (consumers suppressed; preserves the one-shot just-upgraded marker) - test hardening: dispatch-tripwire end-bound validated, vacuous marker asserts replaced with output asserts, E2E cpSync size filter + named fence tolerance, spawnedByEnv parity pin, destructive-policy cross- surface drift guard, one-way annotation + bogus-value hook cases - session-kind duplicate rationale comment deduped; regen + goldens + context-budget fixture refreshed Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore: bump version and changelog (v1.76.0.0) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs: update project documentation for v1.76.0.0 PROJECT_STRUCTURE.md: add hosts/claude/hooks/ to the directory tree (AUQ capture + enforcement hooks, spawned-session directive, timeline stop) — the tree omitted the directory while docs/OPENCLAW.md and CHANGELOG.md now reference paths inside it. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs: sync TODOS.md ship dispatch entry with the v1.76.0.0 contract Codex doc-review finding: the SHIPPED entry for /ship auto-invoking /document-release still described the four-key JSON contract. Adds the decisions key (console-printed, never PR markdown), the GSTACK_SESSION_KIND=spawned dispatch marking (#2733), and the new spawned-dispatch gate E2E to the proven-by list. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
98 lines
4.5 KiB
TypeScript
98 lines
4.5 KiB
TypeScript
/**
|
|
* 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');
|
|
});
|
|
});
|
|
|
|
describe('Conductor signal (skill-start script)', () => {
|
|
// Token-reduction Phase 1 moved the preamble bash into bin/gstack-skill-start;
|
|
// the Issue-8 invariant (CONDUCTOR_SESSION emitted, gated on != headless so
|
|
// eval/CI inside Conductor BLOCKs instead of rendering prose to nobody)
|
|
// lives in the script now. The render must still invoke the script and the
|
|
// AUQ prose still branches on the echoed line.
|
|
test('skill-start script emits CONDUCTOR_SESSION, gated on != headless (Issue 8)', () => {
|
|
const fs = require('fs');
|
|
const path = require('path');
|
|
const script = fs.readFileSync(path.join(import.meta.dir, '..', 'bin', 'gstack-skill-start'), 'utf-8');
|
|
expect(script).toContain('echo "CONDUCTOR_SESSION: true"');
|
|
expect(script).toMatch(/"\$_SESSION_KIND" != "headless"[\s\S]*CONDUCTOR_WORKSPACE_PATH[\s\S]*CONDUCTOR_PORT[\s\S]*CONDUCTOR_SESSION: true/);
|
|
// #2733: spawned outranks Conductor — a spawned session inside a Conductor
|
|
// workspace auto-chooses instead of rendering prose to nobody.
|
|
expect(script).toMatch(/"\$_SESSION_KIND" != "headless"[\s\S]{0,80}"\$_SESSION_KIND" != "spawned"[\s\S]{0,200}CONDUCTOR_SESSION: true/);
|
|
});
|
|
|
|
test('claude preamble render invokes the script and interprets CONDUCTOR_SESSION', () => {
|
|
const out = generatePreamble(makeCtx('claude', 2, 'claude'));
|
|
expect(out).toContain('gstack-skill-start');
|
|
// The AUQ tool-resolution prose keys off the echoed line.
|
|
expect(out).toContain('CONDUCTOR_SESSION: true');
|
|
});
|
|
});
|