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>
102 lines
4.5 KiB
TypeScript
102 lines
4.5 KiB
TypeScript
/**
|
|
* gstack-session-kind — classifies the session so skills know whether a human can
|
|
* answer an AskUserQuestion. Drives the AUQ-failure fallback branch:
|
|
* spawned → auto-choose (orchestrator)
|
|
* headless → BLOCK on AUQ failure
|
|
* interactive → prose fallback on AUQ failure
|
|
*
|
|
* These permutations are the contract the resolver rule depends on. Run with a
|
|
* SCRUBBED env (the test process itself runs inside Conductor, so CONDUCTOR_* /
|
|
* CLAUDE_CODE_* would leak in and contaminate the classification).
|
|
*
|
|
* Free, deterministic, gate-tier.
|
|
*/
|
|
import { describe, test, expect } from 'bun:test';
|
|
import { execFileSync } from 'child_process';
|
|
import * as path from 'path';
|
|
|
|
const BIN = path.resolve(__dirname, '..', 'bin', 'gstack-session-kind');
|
|
|
|
/** Run the helper with ONLY the supplied env (plus PATH so bash resolves). */
|
|
function kind(env: Record<string, string>): string {
|
|
return execFileSync(BIN, [], {
|
|
env: { PATH: process.env.PATH ?? '/usr/bin:/bin', ...env },
|
|
encoding: 'utf-8',
|
|
}).trim();
|
|
}
|
|
|
|
describe('gstack-session-kind', () => {
|
|
test('OPENCLAW_SESSION → spawned (highest precedence)', () => {
|
|
expect(kind({ OPENCLAW_SESSION: '1' })).toBe('spawned');
|
|
// spawned wins even when other markers are also present
|
|
expect(kind({ OPENCLAW_SESSION: '1', GSTACK_HEADLESS: '1', CONDUCTOR_PORT: '5' })).toBe('spawned');
|
|
});
|
|
|
|
test('GSTACK_HEADLESS → headless', () => {
|
|
expect(kind({ GSTACK_HEADLESS: '1' })).toBe('headless');
|
|
});
|
|
|
|
test('CONDUCTOR_* → interactive (a human host is present)', () => {
|
|
expect(kind({ CONDUCTOR_WORKSPACE_PATH: '/tmp/ws' })).toBe('interactive');
|
|
expect(kind({ CONDUCTOR_PORT: '55010' })).toBe('interactive');
|
|
});
|
|
|
|
test('CLAUDE_CODE_ENTRYPOINT=cli → interactive', () => {
|
|
expect(kind({ CLAUDE_CODE_ENTRYPOINT: 'cli' })).toBe('interactive');
|
|
});
|
|
|
|
test('interactive host beats CI markers', () => {
|
|
expect(kind({ CONDUCTOR_PORT: '5', CI: '1' })).toBe('interactive');
|
|
});
|
|
|
|
test('CI / GITHUB_ACTIONS with no host → headless', () => {
|
|
expect(kind({ CI: '1' })).toBe('headless');
|
|
expect(kind({ GITHUB_ACTIONS: 'true' })).toBe('headless');
|
|
});
|
|
|
|
test('GSTACK_HEADLESS beats CONDUCTOR (explicit override wins)', () => {
|
|
expect(kind({ GSTACK_HEADLESS: '1', CONDUCTOR_PORT: '5' })).toBe('headless');
|
|
});
|
|
|
|
test('bare env → interactive (degrade-safe default)', () => {
|
|
expect(kind({})).toBe('interactive');
|
|
});
|
|
|
|
test('empty GSTACK_HEADLESS is treated as unset (interactive)', () => {
|
|
// The resolver/helper guard on -n, so an empty string must NOT mean headless —
|
|
// this is the opt-out path harness suites use to exercise the interactive branch.
|
|
expect(kind({ GSTACK_HEADLESS: '' })).toBe('interactive');
|
|
});
|
|
});
|
|
|
|
describe('GSTACK_SESSION_KIND explicit override (#2733)', () => {
|
|
test('spawned wins over every ambient marker (step 0, explicit beats ambient)', () => {
|
|
// Claude Code subagents inherit the parent env byte-for-byte, so the
|
|
// per-command marker must outrank whatever the parent session looks like.
|
|
expect(kind({ GSTACK_SESSION_KIND: 'spawned' })).toBe('spawned');
|
|
expect(kind({ GSTACK_SESSION_KIND: 'spawned', CONDUCTOR_PORT: '5' })).toBe('spawned');
|
|
expect(kind({ GSTACK_SESSION_KIND: 'spawned', CONDUCTOR_WORKSPACE_PATH: '/x', CI: '1' })).toBe('spawned');
|
|
expect(kind({ GSTACK_SESSION_KIND: 'spawned', GSTACK_HEADLESS: '1' })).toBe('spawned');
|
|
expect(kind({ GSTACK_SESSION_KIND: 'spawned', CLAUDE_CODE_ENTRYPOINT: 'cli' })).toBe('spawned');
|
|
});
|
|
|
|
test('only "spawned" is honored — reserved values fall through to detection', () => {
|
|
// Deliberately narrow: "headless" already has GSTACK_HEADLESS, and letting
|
|
// an env var force "interactive" over CI markers would be a footgun.
|
|
expect(kind({ GSTACK_SESSION_KIND: 'headless' })).toBe('interactive');
|
|
expect(kind({ GSTACK_SESSION_KIND: 'headless', OPENCLAW_SESSION: '1' })).toBe('spawned');
|
|
expect(kind({ GSTACK_SESSION_KIND: 'interactive', CI: '1' })).toBe('headless');
|
|
});
|
|
|
|
test('invalid values are ignored (case-sensitive)', () => {
|
|
expect(kind({ GSTACK_SESSION_KIND: 'bogus' })).toBe('interactive');
|
|
expect(kind({ GSTACK_SESSION_KIND: 'bogus', CI: '1' })).toBe('headless');
|
|
expect(kind({ GSTACK_SESSION_KIND: 'SPAWNED' })).toBe('interactive');
|
|
});
|
|
|
|
test('empty GSTACK_SESSION_KIND is treated as unset', () => {
|
|
expect(kind({ GSTACK_SESSION_KIND: '' })).toBe('interactive');
|
|
expect(kind({ GSTACK_SESSION_KIND: '', OPENCLAW_SESSION: '1' })).toBe('spawned');
|
|
});
|
|
});
|