fix(#4594): one canonical dispatch-identity owner — the emitted format and the parser that reads it back (#4693)
* fix(#4594): give dispatch identity one owner for the emitted format and its parser The isolation guards decided whether a run-scoped sentinel applied to a dispatch by regex-scraping model-authored prose. The scrape returned values in a different namespace from the ones the sentinel records, so the comparison could never succeed: sentinel { phase: "03", plan: "03-02-hardening" } <- $PHASE_NUMBER / $plan_id prose "Execute plan 02 of phase 03-auth." scraped { phase: "03-auth.", plan: "02" } <- greedy (\S+), both wrong #4594 reports only the phase half. Measured against a real phase-plan-index run, plans[].id is phase-prefixed, plan-numbered AND slugged, while the prose carries a bare in-phase plan number — so the plan field mismatches too, and the Claude path is dead rather than latent. A fresh sentinel was therefore discarded on every executor dispatch and every legitimate ISOLATION=none degrade was denied, leaving the work unrun. hooks/lib/dispatch-identity.js is now the single owner of both halves. The two prompt-body producers emit a canonical marker carrying the same shell values the sentinel records, so producer and consumer agree by construction. The prose frame stays as a fallback, bounded by the phase-token grammar ADR-2121 owns and deliberately reporting no plan — an absent identifier means "cannot compare" and is safe; a wrong one is a false mismatch and is not. The prose sentence itself is byte-identical: the executor agent reads it too, so the marker is purely additive (Hyrum's Law). An inapplicable sentinel is now named in the guards' deny reason instead of being dropped silently — the silence is why this survived three producers and two consumers unnoticed. Interpolated values come from a sentinel file and from prompt text, so both are length-bounded and stripped of control characters. ADR-4630 locks the seam and maps the epic's three phases. Refs #4630 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(#4594): resolve eight review findings across the dispatch-identity seam Three orthogonal review engines ran on 43418af144 — the code-review skill's Standards and Spec axes, and an isolated adversarial security pass — plus a self-review of the committed diff. Every finding is fixed here; none deferred. F1 (major, reproduced). A keyless or unknown-key-only marker — the literal "[gsd:dispatch]" or "[gsd:dispatch run=..]" — matched the marker grammar and returned source:'marker' with both fields null, suppressing the prose fallback entirely. Any prompt text containing that literal silently disabled identity narrowing, so a fresh sentinel applied to a dispatch it was never scoped to, defeating #3045 SECURITY F2. Prompt text is attacker-influenceable. A marker that yields neither recognized key is no longer a marker: the scan continues to later markers, then later texts, then prose. Forward-compatible tolerance of unknown keys is unchanged. F2/F3 (major). The first cut duplicated sanitizeForReason, describeSentinelDiscard and REASON_INTERPOLATION_MAX_LEN byte-for-byte across both guards — the exact defect class this epic exists to delete, and with no cold-load justification, since both hooks already require hooks/lib/. They now live in hooks/lib/isolation-deny-reason.js, and buildSentinelDiscard lives in isolation-sentinel.js beside the comparison it mirrors, returning the nested {sentinel:{phase,plan}, dispatch:{phase,plan}} shape instead of a bespoke four-field bag that renamed the pairs already flowing through the seam. F4 (hard violation). The visibility test asserted on the deny reason's prose. CONTRIBUTING.md prohibits raw text matching on hook output, which is why every deny carries a stable reason_code. The discard is now a structured sentinel_discarded field on each hook's stdout JSON, and the test asserts that; the sentence stays for the operator but is no longer the contract. F5 (hard violation). The 64-character truncation limit had no boundary coverage. 63/64/65 are now exercised against the single consolidated helper. F6 (minor). sanitizeForReason stripped C0/C1 controls but not U+2028/U+2029 or the bidi overrides, so a crafted value could still reflow or reverse the message. Both classes are stripped, with a test each. F7 (major). The producer/template parity test was vacuous — it rendered a marker and re-parsed its own output, and would have passed with both templates deleted. It now reads the two workflow templates, extracts each marker line, substitutes the measured values and asserts the owner's parser returns them. Proven red by deleting one template's marker line before being proven green. F8 (doc). ADR-4630 and the design notes claimed the marker is guaranteed on the orchestrator-worktree path because that prompt is built in shell. It is not: executor-isolation-dispatch.md:131 says plainly that those are template placeholders, not shell variables, so {plan_id} is model-substituted there too. A false guarantee in a design lock is worse than a stated limit. Both documents now say the marker is model-substituted on both paths and that the prose fallback is the real floor everywhere. The "3 workflow templates" count was also wrong — 3 prose sites across 2 files, 2 of which carry the marker. Refs #4630 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * chore(#4594): refresh the compact-content baseline and acknowledge execute-phase.md growth Refs #4630. The dispatch-identity marker and its substitution note grew gsd-core/workflows/execute-phase.md by 525 bytes (91846 -> 92371), which drifts two real-tree guards that lint:ci does not run: - tests/benchmark-compact-content.test.cjs asserts the committed baseline is "up to date"; the split for execute-phase.md moved off 25827 -> 25952 and on 23576 -> 23701, taking its compaction reduction 8.72% -> 8.67%. Baseline regenerated with scripts/benchmark-compact-content.cjs --write. - tests/emitted-attribution.test.cjs requires a growth acknowledgment trailer for any emitted file that grows, keyed on the bare filename. Added below. The growth is two additions and no rewrites: the [gsd:dispatch ...] marker line inside the Agent() prompt's <objective>, and the note telling the orchestrator to substitute {plan_id} with the plan's id verbatim. Both are load-bearing -- the marker is what lets a guard hook match a dispatch to the sentinel the per-plan gate wrote, and without the note the orchestrator has no instruction telling it the value must not be paraphrased. Emitted-Drift-Ack-Growth: execute-phase.md — adds the canonical [gsd:dispatch] identity marker and its {plan_id} substitution note, which the isolation guards compare verbatim against the run-scoped sentinel (#4594) Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * chore(#4594): set changeset fragment pr to 4693 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> --------- Co-authored-by: sim <sim@local> Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -63,8 +63,8 @@
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const os = require('os');
|
||||
const { readSentinel, VALID_ISOLATION, extractDispatchIdentifiers, sentinelAppliesToDispatch } = require('./lib/isolation-sentinel.js');
|
||||
const { REASON_CODE } = require('./lib/isolation-deny-reason.js');
|
||||
const { readSentinel, VALID_ISOLATION, extractDispatchIdentifiers, sentinelAppliesToDispatch, buildSentinelDiscard } = require('./lib/isolation-sentinel.js');
|
||||
const { REASON_CODE, describeSentinelDiscard } = require('./lib/isolation-deny-reason.js');
|
||||
const { HOOK_ON_CRASH, allow, deny, crash } = require('./lib/hook-exit.js');
|
||||
|
||||
// Required at module top, alongside the other ./lib requires — NOT behind
|
||||
@@ -385,16 +385,20 @@ function resolveIsolationState(cwd, { clock = Date, dispatchIds = null } = {}) {
|
||||
projectExists = false;
|
||||
}
|
||||
if (!projectExists) {
|
||||
return { gsdProject: false, isolation: null, harnessFlag: null, error: null };
|
||||
return { gsdProject: false, isolation: null, harnessFlag: null, error: null, sentinelDiscarded: null };
|
||||
}
|
||||
|
||||
const sentinel = readSentinel(cwd, { clock });
|
||||
if (sentinel.present && !sentinel.stale && sentinelAppliesToDispatch(sentinel, dispatchIds)) {
|
||||
// Hoisted so the "sentinel was present/fresh but did not apply" case below
|
||||
// (#4594 row 15 — Postel's-Law finding) can distinguish itself from
|
||||
// "absent"/"stale" without re-deriving applicability.
|
||||
const applies = sentinelAppliesToDispatch(sentinel, dispatchIds);
|
||||
if (sentinel.present && !sentinel.stale && applies) {
|
||||
if (sentinel.isolation !== 'harness-worktree') {
|
||||
return { gsdProject: true, isolation: sentinel.isolation, harnessFlag: null, error: null };
|
||||
return { gsdProject: true, isolation: sentinel.isolation, harnessFlag: null, error: null, sentinelDiscarded: null };
|
||||
}
|
||||
if (sentinel.harnessFlag) {
|
||||
return { gsdProject: true, isolation: 'harness-worktree', harnessFlag: sentinel.harnessFlag, error: null };
|
||||
return { gsdProject: true, isolation: 'harness-worktree', harnessFlag: sentinel.harnessFlag, error: null, sentinelDiscarded: null };
|
||||
}
|
||||
// #3045 BLOCKER 2 fix: the sentinel already PROVED this dispatch requires
|
||||
// isolation (it resolved harness-worktree) but carries no usable flag —
|
||||
@@ -423,6 +427,7 @@ function resolveIsolationState(cwd, { clock = Date, dispatchIds = null } = {}) {
|
||||
'dispatch-isolation sentinel resolved "harness-worktree" but recorded no harness_flag — ' +
|
||||
'cannot verify what parameter the dispatch must carry.'
|
||||
),
|
||||
sentinelDiscarded: null,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -430,11 +435,19 @@ function resolveIsolationState(cwd, { clock = Date, dispatchIds = null } = {}) {
|
||||
// conservative fallback (#3045 finding — must still cover fail-closed case
|
||||
// (a): a project that opted out of worktrees entirely via
|
||||
// workflow.use_worktrees).
|
||||
//
|
||||
// #4594 row 15: a PRESENT, FRESH sentinel that simply does not apply to
|
||||
// THIS dispatch (identifiers disagree) is a distinct case from "absent" or
|
||||
// "stale" — record what was discarded so evaluateDispatch can name it in a
|
||||
// block reason instead of silently falling through to a registry-resolution
|
||||
// message that never mentions the sentinel existed.
|
||||
const sentinelDiscarded = buildSentinelDiscard(sentinel, dispatchIds);
|
||||
|
||||
try {
|
||||
const { isolation, harnessFlag } = resolveRegistryIsolation(cwd, configPath);
|
||||
return { gsdProject: true, isolation, harnessFlag, error: null };
|
||||
return { gsdProject: true, isolation, harnessFlag, error: null, sentinelDiscarded };
|
||||
} catch (err) {
|
||||
return { gsdProject: true, isolation: null, harnessFlag: null, error: err };
|
||||
return { gsdProject: true, isolation: null, harnessFlag: null, error: err, sentinelDiscarded };
|
||||
}
|
||||
}
|
||||
|
||||
@@ -464,10 +477,16 @@ function evaluateDispatch(data, { clock = Date } = {}) {
|
||||
}
|
||||
|
||||
const cwd = data.cwd || process.cwd();
|
||||
// #3045 SECURITY F2: best-effort plan/phase extraction from this
|
||||
// dispatch's own description text, so a fresh sentinel that disagrees
|
||||
// with THIS dispatch is treated as inapplicable rather than trusted.
|
||||
const dispatchIds = extractDispatchIdentifiers(toolInput.description);
|
||||
// #3045 SECURITY F2 / #4594: best-effort plan/phase extraction from this
|
||||
// dispatch's own text, so a fresh sentinel that disagrees with THIS
|
||||
// dispatch is treated as inapplicable rather than trusted. PROMPT FIRST:
|
||||
// `description` is short, model-authored free text that only carries usable
|
||||
// identity when the model happens to reproduce the dispatch template
|
||||
// verbatim, while the canonical `[gsd:dispatch phase="…" plan="…"]` marker
|
||||
// (or, failing that, the prose fallback) lives in the prompt body itself —
|
||||
// `description` is kept only as a fallback for a marker/prose match that
|
||||
// exists solely in it.
|
||||
const dispatchIds = extractDispatchIdentifiers(toolInput.prompt, toolInput.description);
|
||||
const state = resolveIsolationState(cwd, { clock, dispatchIds });
|
||||
|
||||
if (!state.gsdProject) return { action: 'allow' };
|
||||
@@ -493,7 +512,8 @@ function evaluateDispatch(data, { clock = Date } = {}) {
|
||||
`required — a guard that cannot verify must not answer "safe" (#3050). Retry once the ` +
|
||||
`project configuration is readable.`;
|
||||
const reasonCode = isBuildFailure ? REASON_CODE.RUNTIME_BUILD_FAILED : REASON_CODE.CONFIG_UNREADABLE;
|
||||
return { action: 'block', reason, reasonCode };
|
||||
const fullReason = state.sentinelDiscarded ? reason + describeSentinelDiscard(state.sentinelDiscarded) : reason;
|
||||
return { action: 'block', reason: fullReason, reasonCode, sentinelDiscarded: state.sentinelDiscarded };
|
||||
}
|
||||
|
||||
if (state.isolation !== 'harness-worktree') return { action: 'allow' };
|
||||
@@ -503,13 +523,14 @@ function evaluateDispatch(data, { clock = Date } = {}) {
|
||||
|
||||
if (toolInput[parsed.param] === parsed.value) return { action: 'allow' };
|
||||
|
||||
const reason =
|
||||
let reason =
|
||||
`Agent isolation guard: this project's dispatch isolation resolves to "harness-worktree", ` +
|
||||
`but the Agent() dispatch for subagent_type="${subagentType}" is missing ` +
|
||||
`${parsed.param}="${parsed.value}". Add ${parsed.param}="${parsed.value}" to the Agent() ` +
|
||||
`call so the executor runs in an isolated worktree instead of the primary checkout ` +
|
||||
`(gsd-core/workflows/execute-phase/steps/executor-isolation-dispatch.md).`;
|
||||
return { action: 'block', reason, reasonCode: REASON_CODE.HARNESS_FLAG_MISSING };
|
||||
if (state.sentinelDiscarded) reason += describeSentinelDiscard(state.sentinelDiscarded);
|
||||
return { action: 'block', reason, reasonCode: REASON_CODE.HARNESS_FLAG_MISSING, sentinelDiscarded: state.sentinelDiscarded };
|
||||
}
|
||||
|
||||
/* istanbul ignore next -- stdin adapter, exercised via spawnSync in tests */
|
||||
@@ -524,7 +545,12 @@ function main() {
|
||||
const data = JSON.parse(input);
|
||||
const decision = evaluateDispatch(data);
|
||||
if (decision.action === 'block') {
|
||||
const out = { decision: 'block', reason: decision.reason, reason_code: decision.reasonCode };
|
||||
const out = {
|
||||
decision: 'block',
|
||||
reason: decision.reason,
|
||||
reason_code: decision.reasonCode,
|
||||
sentinel_discarded: decision.sentinelDiscarded ?? null,
|
||||
};
|
||||
// Kimi feeds stderr (not stdout) back to the model on exit 2.
|
||||
deny(out, decision.reason);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user