mirror of
https://github.com/garrytan/gstack.git
synced 2026-09-02 11:20:52 +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>
218 lines
8.3 KiB
TypeScript
Executable File
218 lines
8.3 KiB
TypeScript
Executable File
#!/usr/bin/env bun
|
|
/**
|
|
* PostToolUse hook for AskUserQuestion — runtime reliability layer for the
|
|
* AUQ-failure prose fallback (OV3:B).
|
|
*
|
|
* When an AskUserQuestion call comes back as an ERROR / missing result (the
|
|
* Conductor MCP bug returns `[Tool result missing due to internal error]`), this
|
|
* hook injects `additionalContext` reminding the model of the failure-fallback
|
|
* rule, tailored to the session kind. It does NOT render the prose itself — the
|
|
* model still emits it. The hook only guarantees the reminder fires at the moment
|
|
* of failure, instead of relying on the model noticing the error result and
|
|
* recalling the echoed SESSION_KIND.
|
|
*
|
|
* DEFENSIVE / INERT-IF-UNSUPPORTED: it is unverified whether Claude Code invokes
|
|
* PostToolUse hooks when an MCP tool returns a transport/missing-result error (we
|
|
* could not force that Conductor-internal failure in a harness — see
|
|
* docs/spikes/claude-code-hook-mutation.md §"PostToolUse on tool error"). If the
|
|
* platform does NOT fire the hook on that path, this is simply never invoked — no
|
|
* harm; the prompt-level fallback in generate-ask-user-format.ts still covers it.
|
|
* On a SUCCESSFUL AskUserQuestion (a real answer), the hook defers (no output).
|
|
*
|
|
* Triggered by ~/.claude/settings.json (registered by `setup` next to
|
|
* question-log-hook):
|
|
* PostToolUse matcher "(AskUserQuestion|mcp__.*__AskUserQuestion)"
|
|
*
|
|
* Invariants:
|
|
* - Always exits 0. A failing hook MUST NOT block the user's session.
|
|
* - Never triggers on a successful answer (would corrupt a normal AUQ).
|
|
* - Errors land in ~/.gstack/hook-errors.log.
|
|
*/
|
|
import * as fs from 'fs';
|
|
import * as path from 'path';
|
|
import * as os from 'os';
|
|
import { runBin } from './spawn-bin';
|
|
import { SPAWNED_ESCAPE_SENTENCE } from './spawned-directive';
|
|
|
|
interface HookStdin {
|
|
tool_name?: string;
|
|
tool_response?: unknown;
|
|
cwd?: string;
|
|
}
|
|
|
|
function stateRoot(): string {
|
|
return (
|
|
process.env.GSTACK_STATE_ROOT ||
|
|
process.env.GSTACK_HOME ||
|
|
path.join(os.homedir(), '.gstack')
|
|
);
|
|
}
|
|
|
|
function logHookError(msg: string): void {
|
|
try {
|
|
const sr = stateRoot();
|
|
fs.mkdirSync(sr, { recursive: true });
|
|
fs.appendFileSync(
|
|
path.join(sr, 'hook-errors.log'),
|
|
`${new Date().toISOString()} auq-error-fallback-hook: ${msg}\n`,
|
|
);
|
|
} catch {
|
|
// last-resort swallow
|
|
}
|
|
}
|
|
|
|
function readStdin(): Promise<string> {
|
|
return new Promise((resolve) => {
|
|
let buf = '';
|
|
process.stdin.setEncoding('utf-8');
|
|
process.stdin.on('data', (chunk) => (buf += chunk));
|
|
process.stdin.on('end', () => resolve(buf));
|
|
process.stdin.on('error', () => resolve(buf));
|
|
setTimeout(() => resolve(buf), 2000);
|
|
});
|
|
}
|
|
|
|
/** No-op output — let the tool result stand untouched. */
|
|
function defer(): void {
|
|
process.stdout.write(
|
|
JSON.stringify({ hookSpecificOutput: { hookEventName: 'PostToolUse' } }),
|
|
);
|
|
process.exit(0);
|
|
}
|
|
|
|
function inject(additionalContext: string): void {
|
|
process.stdout.write(
|
|
JSON.stringify({
|
|
hookSpecificOutput: { hookEventName: 'PostToolUse', additionalContext },
|
|
}),
|
|
);
|
|
process.exit(0);
|
|
}
|
|
|
|
/**
|
|
* Decide whether the tool_response is an ERROR / missing result rather than a
|
|
* real answer. Conservative: only flag clear failure shapes, so a successful
|
|
* AskUserQuestion (which carries the user's choice) is never misread as failure.
|
|
*/
|
|
export function isErrorResponse(response: unknown): boolean {
|
|
if (response === null || response === undefined) return true;
|
|
if (typeof response === 'string') {
|
|
const s = response.trim();
|
|
if (s === '') return true;
|
|
// Match ONLY the specific missing-result sentinel phrase, not any string that
|
|
// merely contains "error" — a real answer like "Investigate the internal error"
|
|
// must NOT trigger the fallback. (Codex review finding.)
|
|
return /tool result missing/i.test(s);
|
|
}
|
|
if (typeof response === 'object') {
|
|
const rec = response as Record<string, unknown>;
|
|
// Structured flag must be the boolean true — not the substring "is_error" inside
|
|
// a serialized success payload like '{"is_error": false}'.
|
|
if (rec.is_error === true || rec.isError === true) return true;
|
|
if (typeof rec.error === 'string' && rec.error.trim() !== '') return true;
|
|
// Some hosts wrap the payload as { content: "..." } or { content: [{text}] }.
|
|
const content = rec.content;
|
|
if (typeof content === 'string') return /tool result missing/i.test(content);
|
|
if (Array.isArray(content)) {
|
|
const text = content
|
|
.map((c) => (typeof c === 'string' ? c : (c as Record<string, unknown>)?.text ?? ''))
|
|
.join(' ');
|
|
return /tool result missing/i.test(text);
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/** Resolve SESSION_KIND via the shared helper (same classification the preamble
|
|
* echoes). Falls back to 'interactive' (degrade-safe) on any failure. */
|
|
export function sessionKind(cwd?: string): 'spawned' | 'headless' | 'interactive' {
|
|
try {
|
|
const res = runBin('gstack-session-kind', [], {
|
|
encoding: 'utf-8',
|
|
timeout: 3000,
|
|
cwd: cwd && fs.existsSync(cwd) ? cwd : undefined,
|
|
});
|
|
const out = (res.stdout || '').trim();
|
|
if (out === 'spawned' || out === 'headless' || out === 'interactive') return out;
|
|
} catch (e) {
|
|
logHookError(`sessionKind failed: ${(e as Error).message}`);
|
|
}
|
|
return 'interactive';
|
|
}
|
|
|
|
/** The directive injected per session kind. Exported for unit testing. */
|
|
export function directiveFor(kind: 'spawned' | 'headless' | 'interactive'): string {
|
|
const lead =
|
|
'The AskUserQuestion call did not return a usable answer (error / missing result). ' +
|
|
'Per the AskUserQuestion failure-fallback rule: ';
|
|
switch (kind) {
|
|
case 'spawned':
|
|
// Self-contained carve-out (#2733 review): the "Spawned session block"
|
|
// exists in context only when a gstack preamble ran; an AUQ error
|
|
// outside a skill must still carry the destructive exception here.
|
|
return (
|
|
lead +
|
|
'SESSION_KIND=spawned — auto-choose the recommended option per the Spawned session block. ' +
|
|
'Do not emit prose, do not BLOCK. Exception: never auto-choose a destructive or ' +
|
|
'irreversible option — take the conservative non-destructive choice (skip/defer), ' +
|
|
'record it, and continue.'
|
|
);
|
|
case 'headless':
|
|
// #2733 review (multi-specialist): a spawned-marked subagent under a
|
|
// HEADLESS-classified parent env (CI/eval-hosted /ship) hits this branch
|
|
// — the shell-out sees the harness env, never the per-command marker.
|
|
// The self-gating escape sentence keeps the JSON contract alive there;
|
|
// plain headless sessions read its condition as false and still BLOCK.
|
|
return (
|
|
lead +
|
|
'SESSION_KIND=headless — report `BLOCKED — AskUserQuestion unavailable` and stop; no human can answer. ' +
|
|
SPAWNED_ESCAPE_SENTENCE
|
|
);
|
|
case 'interactive':
|
|
default:
|
|
// #2733: the shell-out above runs in the HARNESS env, so a subagent
|
|
// marked spawned via a per-command env prefix still classifies as
|
|
// interactive here — the escape sentence is the only lever for that
|
|
// topology (see spawned-directive.ts).
|
|
return (
|
|
lead +
|
|
'SESSION_KIND=interactive — render the decision as a PROSE message now: a clear ELI10 of the issue, ' +
|
|
'then a Recommendation line, then ONE paragraph per choice carrying its `(recommended)` marker, its ' +
|
|
'`Completeness: X/10`, and 2-4 sentences of reasoning. Tell the user to reply with a letter, then STOP. ' +
|
|
'(Retry the call once first only if no answer could have surfaced.) ' +
|
|
SPAWNED_ESCAPE_SENTENCE
|
|
);
|
|
}
|
|
}
|
|
|
|
async function main(): Promise<void> {
|
|
const raw = await readStdin();
|
|
if (!raw.trim()) return defer();
|
|
|
|
let stdin: HookStdin;
|
|
try {
|
|
stdin = JSON.parse(raw);
|
|
} catch (e) {
|
|
logHookError(`stdin parse failed: ${(e as Error).message}`);
|
|
return defer();
|
|
}
|
|
|
|
const toolName = stdin.tool_name || '';
|
|
if (toolName !== 'AskUserQuestion' && !/^mcp__.+__AskUserQuestion$/.test(toolName)) {
|
|
return defer();
|
|
}
|
|
|
|
if (!isErrorResponse(stdin.tool_response)) return defer();
|
|
|
|
inject(directiveFor(sessionKind(stdin.cwd)));
|
|
}
|
|
|
|
// Only run the stdin→stdout pipeline when executed as a hook, not when imported
|
|
// by the unit test (which exercises the exported pure functions).
|
|
if (import.meta.main) {
|
|
main().catch((e) => {
|
|
logHookError(`main crash: ${(e as Error).message}`);
|
|
defer();
|
|
});
|
|
}
|