@winspan/claude-forge 8.54.4 → 9.12.0

package/dist/daemon/services/outcome-nudge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"outcome-nudge.d.ts","sourceRoot":"","sources":["../../../src/daemon/services/outcome-nudge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAGlE,uEAAuE;AACvE,eAAO,MAAM,2BAA2B,4BAA4B,CAAC;AAErE,kFAAkF;AAClF,eAAO,MAAM,+BAA+B,IAAI,CAAC;AAEjD,+DAA+D;AAC/D,eAAO,MAAM,0BAA0B,mCAAmC,CAAC;AAE3E,kEAAkE;AAClE,eAAO,MAAM,sCAAsC,QAAQ,CAAC;AAQ5D;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,GAAG,MAAM,CAWnF;AAED;;;GAGG;AACH,wBAAgB,kCAAkC,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,GAAG,MAAM,CAazF;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EAAE,EACb,MAAM,EAAE,YAAY,GAAG,WAAW,GACjC,MAAM,CA4BR;AAaD;;;;GAIG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAmC;IAEzD,OAAO,CAAC,GAAG;IAIX;;;;;;OAMG;IACH,eAAe,CACb,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,aAAa,GAAG,IAAI,GAC5B,IAAI;IAkBP;;;;;;;;;;;OAWG;IACH,QAAQ,CACN,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,aAAa,GAAG,IAAI,EAC7B,KAAK,GAAE,MAAmB,GACzB,MAAM,GAAG,IAAI;IAkEhB;;yDAEqD;IACrD,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;CAG3D"}

package/dist/daemon/services/outcome-nudge.js

@@ -0,0 +1,242 @@
+/**
+ * OutcomeNudge — outcome-backfill soft-gate (decision 1ac6fc31, 2026-06-04).
+ *
+ * Closes the last gap in the harness learning loop: of ~12 resolved decisions,
+ * only 3 had their `outcome` back-filled (75% miss), so decision-maker's
+ * Step 1.5 precedent weighting ran empty. CLAUDE.md already mandates the
+ * implementing agent back-fill via `cf decisions outcome <id> --result ...`,
+ * but the document constraint alone failed.
+ *
+ * This is a PURE SOFT-GATE. It ONLY emits a `[OUTCOME NUDGE]` systemMessage
+ * reminding the human/agent to run `cf decisions outcome`. It NEVER:
+ *   - writes / infers an outcome value (precedent f4614f7f deleted auto-
+ *     attribution twice — this gate produces text only, never touches
+ *     writeDecisionOutcome),
+ *   - denies / blocks any tool (no `allow:false`, no PreToolUse rule).
+ *
+ * Two delivery paths, both surfacing at UserPromptSubmit (the only hook whose
+ * systemMessage Claude Code actually consumes — see OQ1 below):
+ *
+ *   Option A (threshold, primary backstop): when a session/project has
+ *   accumulated >= N (`outcome_nudge_threshold`, default 2) resolved-but-
+ *   unfilled decisions, inject the nudge on the next UserPromptSubmit, subject
+ *   to cooldown.
+ *
+ *   Option B (completion nudge, DEGRADED): the Stop hook is the natural "just
+ *   finished" moment, but OQ1 found that `stop.sh` only parses `allow`/`reason`
+ *   from the daemon response — it never echoes systemMessage back to Claude
+ *   Code. So Option B cannot deliver text at Stop. Degraded path: StopHandler
+ *   calls `markStopPending()` to set an in-memory per-session flag; the next
+ *   UserPromptSubmit consumes it and injects the nudge regardless of the
+ *   threshold (completion timing is high-signal). The flag is transient (lost
+ *   on daemon restart) — acceptable because Option A's threshold still catches
+ *   the same backlog on the next prompt.
+ *
+ * Cooldown (anti-nag): per-session in-memory timestamp + the global
+ * `outcome_nudge_cooldown_seconds` (default 86400 = 24h). Within the cooldown
+ * window we do not re-nudge the same session. The cooldown is NOT applied to
+ * the degraded Option B path's first fire after a Stop — completion is the
+ * moment we most want the reminder — but it IS recorded so a follow-up prompt
+ * seconds later doesn't double-nudge.
+ *
+ * Fail-safe: every public method catches and degrades to "no nudge". The soft-
+ * gate must never break the prompt pipeline.
+ */
+import { logger } from '../../core/utils/logger.js';
+/** forge_config key for the resolved-unfilled threshold (Option A). */
+export const OUTCOME_NUDGE_THRESHOLD_KEY = 'outcome_nudge_threshold';
+/** Default Option A threshold — nudge once 2 decisions are awaiting back-fill. */
+export const DEFAULT_OUTCOME_NUDGE_THRESHOLD = 2;
+/** forge_config key for the per-session cooldown (seconds). */
+export const OUTCOME_NUDGE_COOLDOWN_KEY = 'outcome_nudge_cooldown_seconds';
+/** Default cooldown — 24h between nudges for the same session. */
+export const DEFAULT_OUTCOME_NUDGE_COOLDOWN_SECONDS = 86400;
+/** Hard upper bound for the cooldown override (7 days). */
+const MAX_OUTCOME_NUDGE_COOLDOWN_SECONDS = 7 * 86400;
+/** Max ids to list inline in the nudge message (keeps it readable). */
+const MAX_IDS_IN_MESSAGE = 8;
+/**
+ * Resolve the Option A threshold from forge_config, falling back to the
+ * default for missing / non-finite / < 1 values.
+ */
+export function resolveOutcomeNudgeThreshold(storage) {
+    if (!storage)
+        return DEFAULT_OUTCOME_NUDGE_THRESHOLD;
+    try {
+        const raw = storage.readConfig(OUTCOME_NUDGE_THRESHOLD_KEY);
+        if (raw === undefined || raw === null)
+            return DEFAULT_OUTCOME_NUDGE_THRESHOLD;
+        const n = Number(raw);
+        if (Number.isFinite(n) && n >= 1)
+            return Math.floor(n);
+    }
+    catch {
+        // fail-silent
+    }
+    return DEFAULT_OUTCOME_NUDGE_THRESHOLD;
+}
+/**
+ * Resolve the cooldown (seconds) from forge_config. Values <= 0 or above the
+ * hard bound fall back to the default.
+ */
+export function resolveOutcomeNudgeCooldownSeconds(storage) {
+    if (!storage)
+        return DEFAULT_OUTCOME_NUDGE_COOLDOWN_SECONDS;
+    try {
+        const raw = storage.readConfig(OUTCOME_NUDGE_COOLDOWN_KEY);
+        if (raw === undefined || raw === null)
+            return DEFAULT_OUTCOME_NUDGE_COOLDOWN_SECONDS;
+        const n = Number(raw);
+        if (!Number.isFinite(n))
+            return DEFAULT_OUTCOME_NUDGE_COOLDOWN_SECONDS;
+        if (n <= 0)
+            return DEFAULT_OUTCOME_NUDGE_COOLDOWN_SECONDS;
+        if (n > MAX_OUTCOME_NUDGE_COOLDOWN_SECONDS)
+            return DEFAULT_OUTCOME_NUDGE_COOLDOWN_SECONDS;
+        return Math.floor(n);
+    }
+    catch {
+        return DEFAULT_OUTCOME_NUDGE_COOLDOWN_SECONDS;
+    }
+}
+/**
+ * Format the `[OUTCOME NUDGE]` systemMessage. Independent `[OUTCOME NUDGE]`
+ * prefix (parallel to `[DECISION HINT]`) so the two never visually merge when
+ * both appear in the same systemMessage (OQ4). Pure / exported for tests.
+ *
+ * `reason` distinguishes the trigger purely for the leading line; the body
+ * (id list + command) is identical either way.
+ */
+export function formatOutcomeNudge(ids, reason) {
+    const shown = ids.slice(0, MAX_IDS_IN_MESSAGE);
+    const extra = ids.length - shown.length;
+    const idList = shown.join(' ') + (extra > 0 ? ` (+${extra} more)` : '');
+    const lead = reason === 'completion'
+        ? `刚完工 — 有 ${ids.length} 个已批准(resolved)的决策还没回填实施结果(outcome)。`
+        : `已攒到 ${ids.length} 个已批准(resolved)但未回填 outcome 的决策。`;
+    const lines = [
+        '[OUTCOME NUDGE]',
+        '',
+        lead,
+        `回填能让 decision-maker 的历史先例加权(成功加权/失败警示)不空转。请就近回填：`,
+        '',
+        ...shown.map((id) => `cf decisions outcome ${id} --result success|failed|partial [--note ...]`),
+    ];
+    if (extra > 0) {
+        lines.push(`# 还有 ${extra} 个：cf decisions outcome --list-pending 查看全部`);
+    }
+    lines.push('');
+    lines.push(`(仅提示，不阻断；outcome 永不自动推断——必须你/实施 agent 明确回填)`);
+    lines.push(`<!-- outcome-nudge: ${idList} -->`);
+    return lines.join('\n');
+}
+/**
+ * OutcomeNudgeService — owns the cooldown / Stop-pending state and computes the
+ * nudge message. One instance lives on UserPromptHandler; StopHandler reaches
+ * it through the existing userPromptHandler reference to set the Stop flag.
+ */
+export class OutcomeNudgeService {
+    state = new Map();
+    key(sessionId, projectPath) {
+        return `${sessionId}:${projectPath}`;
+    }
+    /**
+     * Degraded Option B entry point. Called by StopHandler at completion. Sets an
+     * in-memory flag iff the session/project has resolved-unfilled decisions, so
+     * the NEXT UserPromptSubmit injects the nudge regardless of the threshold.
+     *
+     * Pure read of storage + flag set; NEVER writes an outcome. Fail-silent.
+     */
+    markStopPending(sessionId, projectPath, storage) {
+        if (!storage || !sessionId)
+            return;
+        try {
+            const pending = storage.listResolvedUnfilledDecisions(sessionId, projectPath);
+            if (pending.length === 0)
+                return;
+            const k = this.key(sessionId, projectPath);
+            const s = this.state.get(k) ?? { lastNudgedMs: 0, stopPending: false };
+            s.stopPending = true;
+            this.state.set(k, s);
+            logger.debug(`[OutcomeNudge] Stop-pending flag set for ${sessionId} ` +
+                `(${pending.length} resolved-unfilled)`);
+        }
+        catch (err) {
+            logger.debug(`[OutcomeNudge] markStopPending failed (skipped): ${err}`);
+        }
+    }
+    /**
+     * UserPromptSubmit entry point. Returns the `[OUTCOME NUDGE]` message to
+     * append to systemMessage, or null when no nudge is warranted.
+     *
+     * Fires when EITHER:
+     *   - the Stop-pending flag is set (degraded Option B, completion timing), OR
+     *   - resolved-unfilled count >= threshold (Option A backstop)
+     * AND the per-session cooldown has elapsed.
+     *
+     * Side effects: clears the Stop-pending flag (consumed once) and records the
+     * nudge timestamp for cooldown. NEVER writes an outcome. Fail-silent → null.
+     */
+    evaluate(sessionId, projectPath, storage, nowMs = Date.now()) {
+        if (!storage || !sessionId)
+            return null;
+        try {
+            const k = this.key(sessionId, projectPath);
+            const s = this.state.get(k) ?? { lastNudgedMs: 0, stopPending: false };
+            const pending = storage.listResolvedUnfilledDecisions(sessionId, projectPath);
+            // Always clear a stale Stop flag when nothing is actually pending — keeps
+            // the flag from lingering if outcomes got filled out-of-band.
+            if (pending.length === 0) {
+                if (s.stopPending) {
+                    s.stopPending = false;
+                    this.state.set(k, s);
+                }
+                return null;
+            }
+            const threshold = resolveOutcomeNudgeThreshold(storage);
+            const reason = s.stopPending
+                ? 'completion'
+                : pending.length >= threshold
+                    ? 'threshold'
+                    : null;
+            if (reason === null)
+                return null;
+            // Cooldown gate (applies to BOTH paths — a Stop followed by an immediate
+            // prompt should not double-nudge). The Stop flag is consumed regardless,
+            // so a cooled-down completion still clears the flag (the threshold path
+            // will re-surface it later if the backlog persists).
+            const cooldownSeconds = resolveOutcomeNudgeCooldownSeconds(storage);
+            const elapsedMs = nowMs - s.lastNudgedMs;
+            const cooledDown = s.lastNudgedMs === 0 || elapsedMs >= cooldownSeconds * 1000;
+            if (!cooledDown) {
+                if (s.stopPending) {
+                    s.stopPending = false; // consume — don't let it fire after cooldown stale
+                    this.state.set(k, s);
+                }
+                logger.debug(`[OutcomeNudge] suppressed by cooldown (session=${sessionId}, ` +
+                    `elapsed=${Math.round(elapsedMs / 1000)}s < ${cooldownSeconds}s)`);
+                return null;
+            }
+            const ids = pending.map((r) => r.id);
+            const message = formatOutcomeNudge(ids, reason);
+            // Record + consume.
+            s.lastNudgedMs = nowMs;
+            s.stopPending = false;
+            this.state.set(k, s);
+            logger.info(`[OutcomeNudge] emitted (reason=${reason}, count=${ids.length}, ` +
+                `session=${sessionId})`);
+            return message;
+        }
+        catch (err) {
+            logger.debug(`[OutcomeNudge] evaluate failed (skipped): ${err}`);
+            return null;
+        }
+    }
+    /** Clear per-session state. Called by StopHandler.clearSession path is NOT
+     * used (we need the flag to survive into the next prompt); exposed for tests
+     * and for symmetry with other per-session caches. */
+    clearSession(sessionId, projectPath) {
+        this.state.delete(this.key(sessionId, projectPath));
+    }
+}
+//# sourceMappingURL=outcome-nudge.js.map

package/dist/daemon/services/outcome-nudge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"outcome-nudge.js","sourceRoot":"","sources":["../../../src/daemon/services/outcome-nudge.ts"],"names":[],"mappings":"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"}

package/dist/daemon/services/spec-approval.d.ts

@@ -0,0 +1,127 @@
+/**
+ * SpecApproval — v9.x Phase 2b approve-token verifier.
+ *
+ * Companion service to `SpecGenerator`. Called by `UserPromptHandler.step 2.7`
+ * when the user types `approve <token>` exactly. The handler:
+ *   1. Detects the 'approve <8-hex>' pattern
+ *   2. Asks `SpecApproval.verify(token, session_id)` for the outcome
+ *   3. Surfaces a systemMessage based on the outcome
+ *   4. Short-circuits if outcome === 'ok' (skips KB / Skill / workflow rec)
+ *
+ * Why a separate service: keeps the handler thin and makes the verifier
+ * trivially testable without spinning up the whole UserPromptHandler graph.
+ *
+ * P0 safety (doc-reviewer Sub-2 report): verify() MUST filter by session_id.
+ * A token leaked across sessions must NOT be approve-able. The underlying
+ * facade method `findSpecByTokenAndSession` enforces this.
+ *
+ * No 'modify' code path is implemented in Phase 2b (spec § 3.4 mentions it
+ * in the systemMessage hint but § 3.5 leaves it un-implemented). The
+ * handler-side messages have been adjusted to advertise only `approve` and
+ * `skip`. See changelog "modify path simplification" decision.
+ */
+import type { SQLiteStorage } from '../../core/storage/sqlite.js';
+import type { SpecLikeRow } from '../../core/storage/decisions.js';
+import type { SpecApprovalOutcome, SpecApprovalResult, SpecApprovalRowLike } from '../../core/types.js';
+/**
+ * Regex matching exactly `approve <8-hex>` with no surrounding text.
+ *
+ * Kept for backward compatibility — `extractToken` still uses it for the
+ * pure-token path. Bug 1 (2026-05-27 spec § 3.1) extends approval semantics
+ * to CJK / token-less variants via {@link APPROVAL_KEYWORD_REGEX} + the new
+ * {@link SpecApproval.extractApprovalIntent} method.
+ */
+export declare const APPROVE_REGEX: RegExp;
+/**
+ * Regex matching the WHOLE prompt as a bare approval keyword
+ * (Chinese / English) OPTIONALLY followed by an 8-hex token. Used by
+ * {@link SpecApproval.extractApprovalIntent} so any of the following short-
+ * circuit into spec-approval pipeline (Bug 1 spec § 3.1):
+ *
+ *   '批准'              → hasIntent=true, token=undefined → fallback search
+ *   '同意'              → ditto (Chinese formal)
+ *   'approve'           → ditto (English bare; legacy regex required token)
+ *   '批准 a1b2c3d4'     → hasIntent=true, token='a1b2c3d4'
+ *   '批准  A1B2C3D4  '  → tolerates whitespace + case
+ *
+ * Strict anchoring (`^…$`) prevents '我同意，但是...' from matching — a
+ * complex sentence containing the keyword is NOT an approval signal.
+ */
+export declare const APPROVAL_KEYWORD_REGEX: RegExp;
+/**
+ * Result of {@link SpecApproval.extractApprovalIntent}. `hasIntent` is the
+ * caller's short-circuit gate; `token` is set ONLY when the prompt carried
+ * an explicit 8-hex (otherwise the caller must fallback to listSessionPending).
+ */
+export interface ApprovalIntent {
+    hasIntent: boolean;
+    token?: string;
+}
+export declare class SpecApproval {
+    private readonly storage;
+    constructor(storage: SQLiteStorage);
+    /**
+     * Try to extract a token from a raw user prompt. Returns the 8-hex string
+     * (lowercase) when the WHOLE prompt is exactly `approve <token>`. Returns
+     * null otherwise — that's the signal for the handler to NOT short-circuit.
+     *
+     * Strict-format requirement (spec § 3.5 risk note): if the user mixes
+     * 'approve abc12345' with additional text, we let the prompt proceed
+     * through the normal pipeline to avoid losing their new request.
+     */
+    extractToken(prompt: string): string | null;
+    /**
+     * Bug 1 fix (2026-05-27 spec § 3.1) — generalised approval detector.
+     * Returns:
+     *   - `{ hasIntent: false }`               when prompt is NOT an approval signal
+     *   - `{ hasIntent: true, token }`         when prompt is e.g. '批准 a1b2c3d4'
+     *   - `{ hasIntent: true }` (no token)     when prompt is bare '批准' / 'approve'
+     *
+     * Caller (`SpecGate.handleApproval`) uses `hasIntent` as the short-circuit
+     * gate and `token` to decide whether to call `verify` directly or fall back
+     * to `listSessionPending` to pick the latest pending row.
+     *
+     * Strict-format anchoring prevents complex sentences like '我同意，但是…'
+     * from triggering approval — the keyword must be the WHOLE prompt.
+     */
+    extractApprovalIntent(prompt: string): ApprovalIntent;
+    /**
+     * Verify a token. C1 (spec 0854): look up the decisions table (kind='spec'),
+     * scoped by session_id (P0 safety — a leaked cross-session token must never
+     * approve someone else's spec). The legacy pending_specs table is gone.
+     *
+     * Outcomes (see SpecApprovalResult in src/core/types.ts):
+     *   • 'ok'                — found, status='generated', flipped to 'approved'
+     *   • 'not_found'         — token unknown OR session mismatch (P0 safety)
+     *   • 'expired'           — found but status='expired'
+     *   • 'already_approved'  — found but status='approved'
+     *
+     * The function COMMITS the status flip when outcome === 'ok' via
+     * markSpecApproved (decisions). Idempotent.
+     */
+    verify(token: string, sessionId: string, nowIso?: string): SpecApprovalResult;
+    /**
+     * List still-pending specs for a session (for the "unknown token" hint).
+     *
+     * C1 (spec 0854): reads decisions kind='spec' pending rows only. Returns the
+     * SpecLikeRow shape consumed by spec-gate / formatApprovalMessage.
+     */
+    listSessionPending(sessionId: string, limit?: number): SpecLikeRow[];
+    private classifyAndCommit;
+}
+/**
+ * Render the systemMessage shown to the main thread for each outcome.
+ *
+ * Centralized here so SpecGenerator / SpecApproval / the handler all agree
+ * on the wording. Format is intentionally short to keep the system message
+ * cheap (KB inject + intent + KB block already accumulate).
+ */
+export declare function formatApprovalMessage(outcome: SpecApprovalOutcome, args: {
+    token: string;
+    row?: SpecApprovalRowLike;
+    pendingList?: Array<{
+        token: string;
+        spec_path: string;
+    }>;
+}): string;
+//# sourceMappingURL=spec-approval.d.ts.map

package/dist/daemon/services/spec-approval.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"spec-approval.d.ts","sourceRoot":"","sources":["../../../src/daemon/services/spec-approval.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAG7B;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,QAAqC,CAAC;AAEhE;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,sBAAsB,QACc,CAAC;AAElD;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,YAAY;IACX,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,aAAa;IAEnD;;;;;;;;OAQG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAM3C;;;;;;;;;;;;;OAaG;IACH,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc;IAQrD;;;;;;;;;;;;;OAaG;IACH,MAAM,CACJ,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,GACd,kBAAkB;IAcrB;;;;;OAKG;IACH,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,SAAI,GAAG,WAAW,EAAE;IAS/D,OAAO,CAAC,iBAAiB;CAkC1B;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,mBAAmB,EAC5B,IAAI,EAAE;IACJ,KAAK,EAAE,MAAM,CAAC;IAId,GAAG,CAAC,EAAE,mBAAmB,CAAC;IAC1B,WAAW,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC3D,GACA,MAAM,CAmCR"}

package/dist/daemon/services/spec-approval.js

@@ -0,0 +1,216 @@
+/**
+ * SpecApproval — v9.x Phase 2b approve-token verifier.
+ *
+ * Companion service to `SpecGenerator`. Called by `UserPromptHandler.step 2.7`
+ * when the user types `approve <token>` exactly. The handler:
+ *   1. Detects the 'approve <8-hex>' pattern
+ *   2. Asks `SpecApproval.verify(token, session_id)` for the outcome
+ *   3. Surfaces a systemMessage based on the outcome
+ *   4. Short-circuits if outcome === 'ok' (skips KB / Skill / workflow rec)
+ *
+ * Why a separate service: keeps the handler thin and makes the verifier
+ * trivially testable without spinning up the whole UserPromptHandler graph.
+ *
+ * P0 safety (doc-reviewer Sub-2 report): verify() MUST filter by session_id.
+ * A token leaked across sessions must NOT be approve-able. The underlying
+ * facade method `findSpecByTokenAndSession` enforces this.
+ *
+ * No 'modify' code path is implemented in Phase 2b (spec § 3.4 mentions it
+ * in the systemMessage hint but § 3.5 leaves it un-implemented). The
+ * handler-side messages have been adjusted to advertise only `approve` and
+ * `skip`. See changelog "modify path simplification" decision.
+ */
+import { toSpecLikeRow } from '../../core/storage/decisions.js';
+import { logger } from '../../core/utils/logger.js';
+/**
+ * Regex matching exactly `approve <8-hex>` with no surrounding text.
+ *
+ * Kept for backward compatibility — `extractToken` still uses it for the
+ * pure-token path. Bug 1 (2026-05-27 spec § 3.1) extends approval semantics
+ * to CJK / token-less variants via {@link APPROVAL_KEYWORD_REGEX} + the new
+ * {@link SpecApproval.extractApprovalIntent} method.
+ */
+export const APPROVE_REGEX = /^\s*approve\s+([a-f0-9]{8})\s*$/i;
+/**
+ * Regex matching the WHOLE prompt as a bare approval keyword
+ * (Chinese / English) OPTIONALLY followed by an 8-hex token. Used by
+ * {@link SpecApproval.extractApprovalIntent} so any of the following short-
+ * circuit into spec-approval pipeline (Bug 1 spec § 3.1):
+ *
+ *   '批准'              → hasIntent=true, token=undefined → fallback search
+ *   '同意'              → ditto (Chinese formal)
+ *   'approve'           → ditto (English bare; legacy regex required token)
+ *   '批准 a1b2c3d4'     → hasIntent=true, token='a1b2c3d4'
+ *   '批准  A1B2C3D4  '  → tolerates whitespace + case
+ *
+ * Strict anchoring (`^…$`) prevents '我同意，但是...' from matching — a
+ * complex sentence containing the keyword is NOT an approval signal.
+ */
+export const APPROVAL_KEYWORD_REGEX = /^\s*(批准|同意|approve)(?:\s+([a-f0-9]{8}))?\s*$/i;
+export class SpecApproval {
+    storage;
+    constructor(storage) {
+        this.storage = storage;
+    }
+    /**
+     * Try to extract a token from a raw user prompt. Returns the 8-hex string
+     * (lowercase) when the WHOLE prompt is exactly `approve <token>`. Returns
+     * null otherwise — that's the signal for the handler to NOT short-circuit.
+     *
+     * Strict-format requirement (spec § 3.5 risk note): if the user mixes
+     * 'approve abc12345' with additional text, we let the prompt proceed
+     * through the normal pipeline to avoid losing their new request.
+     */
+    extractToken(prompt) {
+        if (!prompt)
+            return null;
+        const m = prompt.match(APPROVE_REGEX);
+        return m ? m[1].toLowerCase() : null;
+    }
+    /**
+     * Bug 1 fix (2026-05-27 spec § 3.1) — generalised approval detector.
+     * Returns:
+     *   - `{ hasIntent: false }`               when prompt is NOT an approval signal
+     *   - `{ hasIntent: true, token }`         when prompt is e.g. '批准 a1b2c3d4'
+     *   - `{ hasIntent: true }` (no token)     when prompt is bare '批准' / 'approve'
+     *
+     * Caller (`SpecGate.handleApproval`) uses `hasIntent` as the short-circuit
+     * gate and `token` to decide whether to call `verify` directly or fall back
+     * to `listSessionPending` to pick the latest pending row.
+     *
+     * Strict-format anchoring prevents complex sentences like '我同意，但是…'
+     * from triggering approval — the keyword must be the WHOLE prompt.
+     */
+    extractApprovalIntent(prompt) {
+        if (!prompt)
+            return { hasIntent: false };
+        const m = prompt.match(APPROVAL_KEYWORD_REGEX);
+        if (!m)
+            return { hasIntent: false };
+        const token = m[2] ? m[2].toLowerCase() : undefined;
+        return { hasIntent: true, token };
+    }
+    /**
+     * Verify a token. C1 (spec 0854): look up the decisions table (kind='spec'),
+     * scoped by session_id (P0 safety — a leaked cross-session token must never
+     * approve someone else's spec). The legacy pending_specs table is gone.
+     *
+     * Outcomes (see SpecApprovalResult in src/core/types.ts):
+     *   • 'ok'                — found, status='generated', flipped to 'approved'
+     *   • 'not_found'         — token unknown OR session mismatch (P0 safety)
+     *   • 'expired'           — found but status='expired'
+     *   • 'already_approved'  — found but status='approved'
+     *
+     * The function COMMITS the status flip when outcome === 'ok' via
+     * markSpecApproved (decisions). Idempotent.
+     */
+    verify(token, sessionId, nowIso) {
+        if (!token || !sessionId) {
+            return { outcome: 'not_found' };
+        }
+        const tok = token.toLowerCase();
+        const decisionRow = this.storage.findSpecByTokenAndSession(tok, sessionId);
+        if (decisionRow) {
+            return this.classifyAndCommit(toSpecLikeRow(decisionRow), decisionRow.id, nowIso);
+        }
+        return { outcome: 'not_found' };
+    }
+    /**
+     * List still-pending specs for a session (for the "unknown token" hint).
+     *
+     * C1 (spec 0854): reads decisions kind='spec' pending rows only. Returns the
+     * SpecLikeRow shape consumed by spec-gate / formatApprovalMessage.
+     */
+    listSessionPending(sessionId, limit = 5) {
+        return this.storage
+            .listSpecsBySessionPending(sessionId, limit)
+            .map((d) => toSpecLikeRow(d))
+            .slice(0, limit);
+    }
+    // ── Internals ─────────────────────────────────────────────────────────
+    classifyAndCommit(row, rowId, nowIso) {
+        switch (row.status) {
+            case 'expired':
+                return { outcome: 'expired', row };
+            case 'approved':
+                return { outcome: 'already_approved', row };
+            case 'skipped':
+            case 'modified':
+                // Treat anything non-'generated' that isn't expired/approved as
+                // already-approved for UX simplicity. Surface row so the caller
+                // can format a useful systemMessage.
+                return { outcome: 'already_approved', row };
+            case 'generated':
+                try {
+                    this.storage.markSpecApproved(rowId, nowIso);
+                }
+                catch (err) {
+                    logger.warn(`[SpecApproval] markApproved failed for id=${rowId}: ${err}`);
+                }
+                return {
+                    outcome: 'ok',
+                    row: {
+                        ...row,
+                        status: 'approved',
+                        approved_at: nowIso ?? new Date().toISOString(),
+                    },
+                };
+            default:
+                return { outcome: 'not_found', row };
+        }
+    }
+}
+/**
+ * Render the systemMessage shown to the main thread for each outcome.
+ *
+ * Centralized here so SpecGenerator / SpecApproval / the handler all agree
+ * on the wording. Format is intentionally short to keep the system message
+ * cheap (KB inject + intent + KB block already accumulate).
+ */
+export function formatApprovalMessage(outcome, args) {
+    const { token, row, pendingList } = args;
+    switch (outcome) {
+        case 'ok': {
+            const spec = row?.spec_path ?? '(unknown spec)';
+            const intent = safeParseIntent(row?.intent_json);
+            const agent = intent?.suggested_agent ?? 'planner';
+            return [
+                '[AUTO-SPEC APPROVED]',
+                '',
+                `Spec 已批准: ${spec}`,
+                `推荐 agent: ${agent}`,
+                '',
+                `主线程请用 Task tool spawn subagent_type='${agent}'`,
+                `Task prompt 必须以 "Read ${spec} 然后..." 开头。`,
+            ].join('\n');
+        }
+        case 'not_found': {
+            const hint = pendingList && pendingList.length > 0
+                ? '\n当前 pending tokens:\n' +
+                    pendingList
+                        .map((r) => `  • ${r.token} → ${r.spec_path}`)
+                        .join('\n')
+                : '\n本 session 没有 pending spec。';
+            return `[AUTO-SPEC] 未找到 token "${token}"。可能已过期，或不属于本 session。${hint}`;
+        }
+        case 'expired':
+            return `[AUTO-SPEC] token "${token}" 已过期。请重新发起原 prompt 让 daemon 生成新 spec。`;
+        case 'already_approved':
+            return `[AUTO-SPEC] token "${token}" 已被 approve 过。请按 spec 执行；无需再次回复 approve。`;
+        case 'wrong_session':
+            return `[AUTO-SPEC] token "${token}" 不属于本 session。`;
+        default:
+            return `[AUTO-SPEC] 未识别的状态。`;
+    }
+}
+function safeParseIntent(json) {
+    if (!json)
+        return null;
+    try {
+        return JSON.parse(json);
+    }
+    catch {
+        return null;
+    }
+}
+//# sourceMappingURL=spec-approval.js.map

package/dist/daemon/services/spec-approval.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"spec-approval.js","sourceRoot":"","sources":["../../../src/daemon/services/spec-approval.ts"],"names":[],"mappings":"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"}