@generacy-ai/orchestrator 0.6.0 → 0.8.0

package/dist/worker/config.js

@@ -1,4 +1,11 @@
 import { z } from 'zod';
+import { AgentsConfigSchema } from '@generacy-ai/config';
+/**
+ * Built-in provider fallback used by `resolveAgentForPhase` when no tier of
+ * the precedence chain (config, repo `defaults.agent`, or env) supplies a
+ * provider name.
+ */
+export const DEFAULT_PROVIDER = 'claude-code';
 /**
  * Gate definition schema for pausing workflow at review checkpoints
  */
@@ -8,7 +15,7 @@ export const GateDefinitionSchema = z.object({
     /** Label to add when gate is active */
     gateLabel: z.string(),
     /** When to activate the gate */
-    condition: z.enum(['always', 'on-request', 'on-questions', 'on-failure', 'on-sibling-review']),
+    condition: z.enum(['always', 'on-request', 'on-questions', 'on-failure', 'on-sibling-review', 'on-merge-conflict']),
 });
 /**
  * Per-phase wall-clock timeout overrides (milliseconds).
@@ -50,21 +57,39 @@ export const WorkerConfigSchema = z.object({
     /** Command to run during the validate phase */
     validateCommand: z.string().default('pnpm test && pnpm build'),
     /** Command to run before validation to install dependencies (empty string to skip) */
-    preValidateCommand: z.string().default("pnpm install && pnpm -r --filter './packages/*' build"),
+    preValidateCommand: z
+        .string()
+        .default("pnpm install && if [ -f pnpm-workspace.yaml ] && ls packages/*/package.json >/dev/null 2>&1; then pnpm -r --filter './packages/*' build; fi"),
     /** Maximum retries for implement phase when partial progress is detected */
     maxImplementRetries: z.number().int().min(0).max(5).default(2),
     /** Credential role from .generacy/config.yaml defaults.role — when set, credentials are populated on launch requests */
     credentialRole: z.string().optional(),
+    /**
+     * Per-workflow-phase `{ provider, model }` selection. See `AgentsConfigSchema`
+     * for the shape. Repo-level overrides from `.generacy/config.yaml` are merged
+     * onto this via `applyRepoAgentOverrides`.
+     */
+    agents: AgentsConfigSchema.optional(),
+    /**
+     * Repo-level default provider from `.generacy/config.yaml` `defaults.agent`.
+     * Provider-only — `defaults.agent` is a single string, not an `AgentEntry`.
+     * Consumed by `resolveAgentForPhase` as the tier below `agents.default`.
+     */
+    defaultsAgent: z.string().min(1).optional(),
     /** Gate definitions keyed by issue label */
     gates: z.record(z.string(), z.array(GateDefinitionSchema)).default({
         'speckit-feature': [
             { phase: 'clarify', gateLabel: 'waiting-for:clarification', condition: 'on-questions' },
             { phase: 'implement', gateLabel: 'waiting-for:implementation-review', condition: 'always' },
             { phase: 'implement', gateLabel: 'waiting-for:sibling-review', condition: 'on-sibling-review' },
+            { phase: 'implement', gateLabel: 'waiting-for:merge-conflicts', condition: 'on-merge-conflict' },
+            { phase: 'validate', gateLabel: 'waiting-for:merge-conflicts', condition: 'on-merge-conflict' },
         ],
         'speckit-bugfix': [
             { phase: 'clarify', gateLabel: 'waiting-for:clarification', condition: 'on-questions' },
             { phase: 'implement', gateLabel: 'waiting-for:implementation-review', condition: 'on-request' },
+            { phase: 'implement', gateLabel: 'waiting-for:merge-conflicts', condition: 'on-merge-conflict' },
+            { phase: 'validate', gateLabel: 'waiting-for:merge-conflicts', condition: 'on-merge-conflict' },
         ],
         'speckit-epic': [
             { phase: 'clarify', gateLabel: 'waiting-for:clarification', condition: 'on-questions' },
@@ -72,6 +97,35 @@ export const WorkerConfigSchema = z.object({
         ],
     }),
 });
+/**
+ * Merge per-repo validate-command overrides onto the global worker config.
+ *
+ * The target repo's `.generacy/config.yaml` `orchestrator` block may set
+ * `validateCommand` / `preValidateCommand`. The global defaults are
+ * monorepo-shaped (`pnpm test && pnpm build`); single-package repos (e.g. an
+ * Astro site with only a `build` script) override them so the validate phase
+ * doesn't fail on a missing `test` script before it can reach the build.
+ *
+ * Only those two fields are overridable per-repo. An explicit empty
+ * `preValidateCommand` is preserved (it means "skip the install step"). Returns
+ * the original config object unchanged when there are no applicable overrides,
+ * so callers can cheaply detect "no override" via reference equality.
+ */
+export function applyRepoValidateOverrides(config, settings) {
+    if (settings == null ||
+        (settings.validateCommand === undefined && settings.preValidateCommand === undefined)) {
+        return config;
+    }
+    return {
+        ...config,
+        ...(settings.validateCommand !== undefined
+            ? { validateCommand: settings.validateCommand }
+            : {}),
+        ...(settings.preValidateCommand !== undefined
+            ? { preValidateCommand: settings.preValidateCommand }
+            : {}),
+    };
+}
 /**
  * Resolve the wall-clock timeout (ms) for a CLI phase: the per-phase override
  * if one is configured, otherwise the flat `phaseTimeoutMs` fallback.
@@ -81,4 +135,127 @@ export function resolvePhaseTimeoutMs(config, phase) {
     // Zod and may omit phaseTimeoutOverrides entirely.
     return config.phaseTimeoutOverrides?.[phase] ?? config.phaseTimeoutMs;
 }
+/**
+ * Field-by-field merge of two `AgentEntry` objects. Target-repo values overlay
+ * cluster-default values; missing fields on the target preserve the cluster
+ * default (`{ provider: 'X' }` on target keeps cluster's `model`).
+ */
+function mergeAgentEntry(base, override) {
+    if (base === undefined)
+        return override;
+    if (override === undefined)
+        return base;
+    return {
+        ...(base.provider !== undefined || override.provider !== undefined
+            ? { provider: override.provider ?? base.provider }
+            : {}),
+        ...(base.model !== undefined || override.model !== undefined
+            ? { model: override.model ?? base.model }
+            : {}),
+    };
+}
+/**
+ * Deep merge two `AgentsConfig` values. Merge semantics:
+ * - `agents.default`: field-by-field on `{ provider, model }`.
+ * - `agents.workflows.<name>.default`: same field-by-field merge.
+ * - `agents.workflows.<name>.phases.<phase>`: same field-by-field merge.
+ * - Workflow names present only on the target pass through untouched; workflow
+ *   names present only on the base survive when the target adds new ones.
+ */
+function mergeAgentsConfig(base, override) {
+    if (base === undefined)
+        return override;
+    if (override === undefined)
+        return base;
+    const merged = {};
+    const mergedDefault = mergeAgentEntry(base.default, override.default);
+    if (mergedDefault !== undefined)
+        merged.default = mergedDefault;
+    const baseWorkflows = base.workflows ?? {};
+    const overrideWorkflows = override.workflows ?? {};
+    const workflowNames = new Set([
+        ...Object.keys(baseWorkflows),
+        ...Object.keys(overrideWorkflows),
+    ]);
+    if (workflowNames.size > 0) {
+        const workflows = {};
+        for (const name of workflowNames) {
+            const b = baseWorkflows[name];
+            const o = overrideWorkflows[name];
+            if (b === undefined && o !== undefined) {
+                workflows[name] = o;
+                continue;
+            }
+            if (o === undefined && b !== undefined) {
+                workflows[name] = b;
+                continue;
+            }
+            // Both defined — merge default + phases field-by-field
+            const mergedWorkflowDefault = mergeAgentEntry(b?.default, o?.default);
+            const phaseKeys = ['specify', 'clarify', 'plan', 'tasks', 'implement', 'validate'];
+            const mergedPhases = {};
+            let anyPhase = false;
+            for (const phase of phaseKeys) {
+                const bp = b?.phases?.[phase];
+                const op = o?.phases?.[phase];
+                const mp = mergeAgentEntry(bp, op);
+                if (mp !== undefined) {
+                    mergedPhases[phase] = mp;
+                    anyPhase = true;
+                }
+            }
+            const entry = {};
+            if (mergedWorkflowDefault !== undefined)
+                entry.default = mergedWorkflowDefault;
+            if (anyPhase)
+                entry.phases = mergedPhases;
+            workflows[name] = entry;
+        }
+        merged.workflows = workflows;
+    }
+    return merged;
+}
+/**
+ * Sibling of `applyRepoValidateOverrides` — merges the target repo's
+ * `orchestrator.agents` block onto the cluster-default `agents` block on
+ * `WorkerConfig`. Field-by-field so partial `{ provider }`-only or
+ * `{ model }`-only overrides preserve missing sibling fields from the base.
+ *
+ * Returns the original config unchanged when `settings.agents` is absent so
+ * callers can cheaply detect "no override" via reference equality.
+ */
+export function applyRepoAgentOverrides(config, settings) {
+    if (settings == null || settings.agents === undefined) {
+        return config;
+    }
+    const merged = mergeAgentsConfig(config.agents, settings.agents);
+    return { ...config, agents: merged };
+}
+/**
+ * Resolve `{ provider, model }` for a phase within a workflow. Provider and
+ * model resolve INDEPENDENTLY over the same tier list — a phase override may
+ * set only `model` while `provider` falls through from a lower tier.
+ *
+ * Precedence:
+ *   1. `config.agents.workflows[workflowName].phases[phase]`
+ *   2. `config.agents.workflows[workflowName].default`
+ *   3. `config.agents.default`  (cluster env folds into this tier via loader)
+ *   4. `config.defaultsAgent`   (**provider only** — `defaults.agent` is a bare string)
+ *   5. Built-in `DEFAULT_PROVIDER = 'claude-code'` (**provider only**)
+ *
+ * The `model` walk terminates at tier 3 returning `undefined` (no built-in
+ * model default). The `provider` walk always returns a value.
+ */
+export function resolveAgentForPhase(config, workflowName, phase) {
+    const workflowEntry = config.agents?.workflows?.[workflowName];
+    const tiers = [
+        workflowEntry?.phases?.[phase],
+        workflowEntry?.default,
+        config.agents?.default,
+    ];
+    const providerFromTiers = tiers.find((t) => t?.provider !== undefined)?.provider;
+    const provider = providerFromTiers ?? config.defaultsAgent ?? DEFAULT_PROVIDER;
+    const model = tiers.find((t) => t?.model !== undefined)?.model;
+    return model !== undefined ? { provider, model } : { provider };
+}
 //# sourceMappingURL=config.js.map

package/dist/worker/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/worker/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,qCAAqC;IACrC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,CAA6C,CAAC;IAC3H,uCAAuC;IACvC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,gCAAgC;IAChC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,mBAAmB,CAAC,CAAC;CAC/F,CAAC,CAAC;AAEH;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC;KACzC,MAAM,CAAC;IACN,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;IAChD,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;IAChD,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IACrD,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;IAC9C,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;CAC3D,CAAC;KACD,OAAO,CAAC,EAAE,CAAC,CAAC;AAGf;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,2FAA2F;IAC3F,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IAC/D,sDAAsD;IACtD,qBAAqB,EAAE,2BAA2B;IAClD,wCAAwC;IACxC,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,8BAA8B,CAAC;IAChE,gDAAgD;IAChD,qBAAqB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IAC/D,+CAA+C;IAC/C,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,yBAAyB,CAAC;IAC9D,sFAAsF;IACtF,kBAAkB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,uDAAuD,CAAC;IAC/F,4EAA4E;IAC5E,mBAAmB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9D,wHAAwH;IACxH,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACrC,4CAA4C;IAC5C,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC;QACjE,iBAAiB,EAAE;YACjB,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,2BAA2B,EAAE,SAAS,EAAE,cAAc,EAAE;YACvF,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,mCAAmC,EAAE,SAAS,EAAE,QAAQ,EAAE;YAC3F,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,4BAA4B,EAAE,SAAS,EAAE,mBAAmB,EAAE;SAChG;QACD,gBAAgB,EAAE;YAChB,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,2BAA2B,EAAE,SAAS,EAAE,cAAc,EAAE;YACvF,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,mCAAmC,EAAE,SAAS,EAAE,YAAY,EAAE;SAChG;QACD,cAAc,EAAE;YACd,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,2BAA2B,EAAE,SAAS,EAAE,cAAc,EAAE;YACvF,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,0BAA0B,EAAE,SAAS,EAAE,QAAQ,EAAE;SAC/E;KACF,CAAC;CACH,CAAC,CAAC;AAIH;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CACnC,MAAoB,EACpB,KAAyC;IAEzC,8EAA8E;IAC9E,mDAAmD;IACnD,OAAO,MAAM,CAAC,qBAAqB,EAAE,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,cAAc,CAAC;AACxE,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/worker/config.ts"],"names":[],"mappings":"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"}

package/dist/worker/evidence-hash.d.ts

@@ -0,0 +1,32 @@
+/**
+ * Structured extract from failing validate CLI stdout.
+ * Sorted by `id` (lexicographic) for hash stability.
+ * See specs/892-found-during-cockpit-v1/contracts/evidence-hash.md.
+ */
+export interface EvidenceExtract {
+    failures: Array<{
+        id: string;
+        firstError: string;
+    }>;
+}
+/**
+ * Result of hashing validate CLI stdout — SHA-256 hex identity plus the
+ * canonical `extract` that was hashed (surfaces in prompt + logs).
+ */
+export interface EvidenceHashResult {
+    /** 64-character lower-case hex SHA-256. */
+    hash: string;
+    /** Canonical input to the hash; included in the fix prompt for debuggability. */
+    extract: EvidenceExtract;
+}
+/**
+ * Hash validate CLI stdout into a stable identity (#892).
+ *
+ * Extract categories are tried in order: next-build missing-module, next-build
+ * type-error, vitest failures. If none match, falls back to a whole-transcript
+ * hash so every stdout produces a well-defined result.
+ *
+ * See specs/892-found-during-cockpit-v1/contracts/evidence-hash.md.
+ */
+export declare function hashValidationEvidence(stdout: string): EvidenceHashResult;
+//# sourceMappingURL=evidence-hash.d.ts.map

package/dist/worker/evidence-hash.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"evidence-hash.d.ts","sourceRoot":"","sources":["../../src/worker/evidence-hash.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACrD;AAED;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,iFAAiF;IACjF,OAAO,EAAE,eAAe,CAAC;CAC1B;AA+HD;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,kBAAkB,CAmBzE"}

package/dist/worker/evidence-hash.js

@@ -0,0 +1,139 @@
+import { createHash } from 'node:crypto';
+/**
+ * Normalization pipeline applied to raw stdout before extraction (#892).
+ *
+ * Idempotent by construction — running the pipeline on already-normalized
+ * text yields the same output. Ordering matters: ANSI first (so downstream
+ * regexes see clean text), timestamps before paths (so ISO-8601 doesn't
+ * partially match path regex), paths before PIDs (so bracket sequences in
+ * paths aren't mistaken for PIDs).
+ */
+function normalize(stdout) {
+    let out = stdout;
+    // 1. ANSI escapes (CSI + OSC). Matching the ESC/BEL control chars is the
+    // whole point here, so the no-control-regex rule is intentionally disabled.
+    // eslint-disable-next-line no-control-regex
+    out = out.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, '');
+    // eslint-disable-next-line no-control-regex
+    out = out.replace(/\x1b\][^\x07]*\x07/g, '');
+    // 2. ISO-8601 timestamps → <TS>.
+    out = out.replace(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})?/g, '<TS>');
+    // 3. Absolute paths → <PATH>. Only strip paths whose leading '/' is at a
+    // non-alphanumeric boundary — this preserves import specifiers like
+    // `@/components/CopyButton` and relative paths like `src/app/foo.ts` /
+    // `./src/foo.ts` while normalizing true absolute paths like
+    // `/home/node/workspaces/sniplink/src/app/foo.ts`.
+    out = out.replace(/(?<![\w@.])(\/[a-zA-Z0-9._-]+)+/g, '<PATH>');
+    // 4. PIDs → <PID>. Three forms: pid=<n>, PID: <n>, [<n>] where n >= 4 digits.
+    out = out.replace(/\bpid=\d+\b/g, 'pid=<PID>');
+    out = out.replace(/\bPID:\s*\d+\b/g, 'PID: <PID>');
+    out = out.replace(/\[\d{4,}\]/g, '[<PID>]');
+    // 5. Test-runner tmp identifiers → <TMP>. Absolute /tmp/... already
+    // reduced by step 3; T-<hex>{8+} form is the vitest/jest one.
+    out = out.replace(/T-[a-zA-Z0-9]{8,}/g, '<TMP>');
+    // 6. Ports on localhost/127.0.0.1 → <PORT>.
+    out = out.replace(/\b(localhost|127\.0\.0\.1):\d+\b/g, '$1:<PORT>');
+    return out;
+}
+/**
+ * Extract next-build "Cannot find module" failures.
+ */
+function extractNextBuildMissingModule(normalized) {
+    const failures = [];
+    const re = /Cannot find module '([^']+)'/g;
+    let m;
+    while ((m = re.exec(normalized)) !== null) {
+        const modulePath = m[1];
+        failures.push({
+            id: `module:${modulePath}`,
+            firstError: m[0],
+        });
+    }
+    return failures;
+}
+/**
+ * Extract next-build "Type error" failures.
+ */
+function extractNextBuildTypeError(normalized) {
+    const failures = [];
+    // Type error line followed (within the same block) by a File: <path> line.
+    const re = /Type error: (.+?)(?:\r?\n)[\s\S]{0,200}?File: (\S+)/g;
+    let m;
+    while ((m = re.exec(normalized)) !== null) {
+        const summary = m[1].trim();
+        const filePath = m[2];
+        failures.push({
+            id: `type:${filePath}:${summary.slice(0, 80)}`,
+            firstError: `Type error: ${summary}`,
+        });
+    }
+    return failures;
+}
+/**
+ * Extract vitest failing test lines (` × <name>`).
+ * `firstError` is the first indented (≥2 space) line following the × line.
+ */
+function extractVitestFailures(normalized) {
+    const failures = [];
+    const lines = normalized.split('\n');
+    const failedLineRe = /^\s*×\s+(.+?)(?:\s+\d+ms)?$/;
+    for (let i = 0; i < lines.length; i++) {
+        const m = failedLineRe.exec(lines[i]);
+        if (!m)
+            continue;
+        const testName = m[1].trim();
+        let firstError = '';
+        for (let j = i + 1; j < Math.min(lines.length, i + 11); j++) {
+            const l = lines[j];
+            if (/^\s{2,}\S/.test(l)) {
+                firstError = l.trim();
+                break;
+            }
+        }
+        failures.push({
+            id: `test:${testName}`,
+            firstError,
+        });
+    }
+    return failures;
+}
+/**
+ * Fallback path when no known pattern matches.
+ * `id` = `hash:<first 16 hex of SHA-256 of full normalized transcript>`.
+ * `firstError` = first non-empty line of normalized transcript.
+ */
+function fallbackExtract(normalized) {
+    const digest = createHash('sha256').update(normalized, 'utf8').digest('hex');
+    const firstLine = normalized.split('\n').find((l) => l.length > 0) ?? '';
+    return [
+        {
+            id: `hash:${digest.slice(0, 16)}`,
+            firstError: firstLine,
+        },
+    ];
+}
+/**
+ * Hash validate CLI stdout into a stable identity (#892).
+ *
+ * Extract categories are tried in order: next-build missing-module, next-build
+ * type-error, vitest failures. If none match, falls back to a whole-transcript
+ * hash so every stdout produces a well-defined result.
+ *
+ * See specs/892-found-during-cockpit-v1/contracts/evidence-hash.md.
+ */
+export function hashValidationEvidence(stdout) {
+    const normalized = normalize(stdout);
+    const raw = [
+        ...extractNextBuildMissingModule(normalized),
+        ...extractNextBuildTypeError(normalized),
+        ...extractVitestFailures(normalized),
+    ];
+    const failures = raw.length > 0 ? raw : fallbackExtract(normalized);
+    // Sort by id for determinism (localeCompare with 'variant' avoids locale drift).
+    failures.sort((a, b) => a.id.localeCompare(b.id, undefined, { sensitivity: 'variant' }));
+    const extract = { failures };
+    const canonical = JSON.stringify({ failures: extract.failures });
+    const hash = createHash('sha256').update(canonical, 'utf8').digest('hex');
+    return { hash, extract };
+}
+//# sourceMappingURL=evidence-hash.js.map

package/dist/worker/evidence-hash.js.map

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

package/dist/worker/handler-outcome-assertion.d.ts

@@ -0,0 +1,38 @@
+/**
+ * `assertHandlerOutcomeMatchesWorld` (#902 FR-006).
+ *
+ * Post-exit runtime assertion that reads a snapshot of the *real* world
+ * (labels + queue state) and refuses to accept "the handler said X" as
+ * evidence. Load-bearing enforcement half of the terminal-outcome invariant.
+ *
+ * Compile-time exhaustiveness would have passed the broken #898 handler
+ * (which had a `void` return that ran through the success path without
+ * setting anything). The type alone cannot catch this bug class.
+ *
+ * Pure function — fixture code snapshots the world, then calls the helper.
+ * Callable from prod code as a dev-mode assertion (not enabled by default).
+ */
+import type { HandlerOutcome } from './handler-outcome.js';
+import type { QueueItem } from '../types/index.js';
+export interface QueueSnapshot {
+    readonly inFlight: boolean;
+    readonly pendingItems: readonly Pick<QueueItem, 'command' | 'metadata' | 'workflowName'>[];
+}
+export type AssertionResult = {
+    readonly ok: true;
+} | {
+    readonly ok: false;
+    readonly mismatch: string;
+};
+/**
+ * Assert the returned `HandlerOutcome` matches the real world.
+ *
+ * Rules per variant:
+ *  - `re-armed`: `queueSnapshot.pendingItems` contains an entry with
+ *    `command === 'continue'` and `metadata?.startPhase === outcome.startPhase`.
+ *  - `gated`: `labels` contains a matching `waiting-for:*` label.
+ *  - `failed`: `labels` contains a `blocked:*` or `failed:*` marker.
+ *  - `done`: `labels` contains no `waiting-for:*` and no `blocked:*` / `failed:*`.
+ */
+export declare function assertHandlerOutcomeMatchesWorld(outcome: HandlerOutcome, labels: readonly string[], queueSnapshot: QueueSnapshot): AssertionResult;
+//# sourceMappingURL=handler-outcome-assertion.d.ts.map

package/dist/worker/handler-outcome-assertion.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"handler-outcome-assertion.d.ts","sourceRoot":"","sources":["../../src/worker/handler-outcome-assertion.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAE,SAAS,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,UAAU,GAAG,cAAc,CAAC,EAAE,CAAC;CAC5F;AAED,MAAM,MAAM,eAAe,GACvB;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAA;CAAE,GACrB;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtD;;;;;;;;;GASG;AACH,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,SAAS,MAAM,EAAE,EACzB,aAAa,EAAE,aAAa,GAC3B,eAAe,CAwDjB"}

package/dist/worker/handler-outcome-assertion.js

@@ -0,0 +1,58 @@
+/**
+ * Assert the returned `HandlerOutcome` matches the real world.
+ *
+ * Rules per variant:
+ *  - `re-armed`: `queueSnapshot.pendingItems` contains an entry with
+ *    `command === 'continue'` and `metadata?.startPhase === outcome.startPhase`.
+ *  - `gated`: `labels` contains a matching `waiting-for:*` label.
+ *  - `failed`: `labels` contains a `blocked:*` or `failed:*` marker.
+ *  - `done`: `labels` contains no `waiting-for:*` and no `blocked:*` / `failed:*`.
+ */
+export function assertHandlerOutcomeMatchesWorld(outcome, labels, queueSnapshot) {
+    switch (outcome.outcome) {
+        case 're-armed': {
+            const match = queueSnapshot.pendingItems.find((i) => i.command === 'continue' &&
+                i.metadata?.startPhase === outcome.startPhase);
+            if (!match) {
+                return {
+                    ok: false,
+                    mismatch: `re-armed(${outcome.startPhase}): no matching pending item found in queue`,
+                };
+            }
+            return { ok: true };
+        }
+        case 'gated': {
+            const hasMatchingWaitingFor = labels.some((l) => l === outcome.gateLabel && l.startsWith('waiting-for:'));
+            if (!hasMatchingWaitingFor) {
+                return {
+                    ok: false,
+                    mismatch: `gated(${outcome.gateLabel}): no matching waiting-for:* label on issue`,
+                };
+            }
+            return { ok: true };
+        }
+        case 'failed': {
+            const hasBlockedOrFailed = labels.some((l) => l.startsWith('blocked:') || l.startsWith('failed:'));
+            if (!hasBlockedOrFailed) {
+                return {
+                    ok: false,
+                    mismatch: `failed: no blocked:* or failed:* marker on issue`,
+                };
+            }
+            return { ok: true };
+        }
+        case 'done': {
+            const terminalBlockers = labels.filter((l) => l.startsWith('waiting-for:') ||
+                l.startsWith('blocked:') ||
+                l.startsWith('failed:'));
+            if (terminalBlockers.length > 0) {
+                return {
+                    ok: false,
+                    mismatch: `done: unexpected terminal-blocker label(s): ${terminalBlockers.join(', ')}`,
+                };
+            }
+            return { ok: true };
+        }
+    }
+}
+//# sourceMappingURL=handler-outcome-assertion.js.map

package/dist/worker/handler-outcome-assertion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handler-outcome-assertion.js","sourceRoot":"","sources":["../../src/worker/handler-outcome-assertion.ts"],"names":[],"mappings":"AA0BA;;;;;;;;;GASG;AACH,MAAM,UAAU,gCAAgC,CAC9C,OAAuB,EACvB,MAAyB,EACzB,aAA4B;IAE5B,QAAQ,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,KAAK,UAAU,CAAC,CAAC,CAAC;YAChB,MAAM,KAAK,GAAG,aAAa,CAAC,YAAY,CAAC,IAAI,CAC3C,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,OAAO,KAAK,UAAU;gBACvB,CAAC,CAAC,QAAgD,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CACzF,CAAC;YACF,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,QAAQ,EAAE,YAAY,OAAO,CAAC,UAAU,4CAA4C;iBACrF,CAAC;YACJ,CAAC;YACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;QACtB,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,qBAAqB,GAAG,MAAM,CAAC,IAAI,CACvC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,SAAS,IAAI,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC,CAC/D,CAAC;YACF,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBAC3B,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,QAAQ,EAAE,SAAS,OAAO,CAAC,SAAS,6CAA6C;iBAClF,CAAC;YACJ,CAAC;YACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;QACtB,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CACpC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAC3D,CAAC;YACF,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACxB,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,QAAQ,EAAE,kDAAkD;iBAC7D,CAAC;YACJ,CAAC;YACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;QACtB,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CACpC,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC;gBAC5B,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;gBACxB,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAC1B,CAAC;YACF,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChC,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,QAAQ,EAAE,+CAA+C,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;iBACvF,CAAC;YACJ,CAAC;YACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;QACtB,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/worker/handler-outcome.d.ts

@@ -0,0 +1,50 @@
+/**
+ * `HandlerOutcome` discriminated union (#902 FR-005).
+ *
+ * The only legal return shape for `MergeConflictHandler.handle`. Every
+ * terminal exit path in the handler maps to exactly one variant; compile-time
+ * exhaustiveness enforces this at the type layer.
+ *
+ * The load-bearing enforcement half is the runtime helper
+ * `assertHandlerOutcomeMatchesWorld` in `./handler-outcome-assertion.ts`.
+ *
+ * Semantics:
+ *  - `re-armed` — the interrupted phase must be re-entered. Dispatcher enqueues
+ *    `{command: 'continue', startPhase}` for the same itemKey after
+ *    `queue.complete()` fires on the current handler item.
+ *  - `gated` — the issue is now sitting at a `waiting-for:*` label matching
+ *    `gateLabel`. Detector will pick it up naturally.
+ *  - `failed` — the issue is now sitting at a `blocked:*` or `failed:*` marker.
+ *    Operator intervention required.
+ *  - `done` — the issue is terminal (closed / merged / withdrawn). No detector
+ *    pickup expected.
+ */
+import type { WorkflowPhase } from './types.js';
+import type { BlockedStuckMergeConflictsEvidence } from './merge-conflict-handler.js';
+export interface ReArmedOutcome {
+    readonly outcome: 're-armed';
+    /** Phase the interrupted worker should resume at. Threaded to enqueue. */
+    readonly startPhase: WorkflowPhase;
+}
+export interface GatedOutcome {
+    readonly outcome: 'gated';
+    /**
+     * The `waiting-for:*` label that MUST be present on the issue at return.
+     * Enforced by `assertHandlerOutcomeMatchesWorld`.
+     */
+    readonly gateLabel: string;
+}
+export interface FailedOutcome {
+    readonly outcome: 'failed';
+    /**
+     * Evidence blob rendered into the operator-facing stage comment.
+     * Shape is handler-specific; `MergeConflictHandler` uses
+     * `BlockedStuckMergeConflictsEvidence`.
+     */
+    readonly evidence: BlockedStuckMergeConflictsEvidence;
+}
+export interface DoneOutcome {
+    readonly outcome: 'done';
+}
+export type HandlerOutcome = ReArmedOutcome | GatedOutcome | FailedOutcome | DoneOutcome;
+//# sourceMappingURL=handler-outcome.d.ts.map

package/dist/worker/handler-outcome.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"handler-outcome.d.ts","sourceRoot":"","sources":["../../src/worker/handler-outcome.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,6BAA6B,CAAC;AAEtF,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;IAC7B,0EAA0E;IAC1E,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC;CACpC;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAC3B;;;;OAIG;IACH,QAAQ,CAAC,QAAQ,EAAE,kCAAkC,CAAC;CACvD;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,MAAM,cAAc,GACtB,cAAc,GACd,YAAY,GACZ,aAAa,GACb,WAAW,CAAC"}

package/dist/worker/handler-outcome.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=handler-outcome.js.map

package/dist/worker/handler-outcome.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handler-outcome.js","sourceRoot":"","sources":["../../src/worker/handler-outcome.ts"],"names":[],"mappings":""}