cool-workflow 0.2.0 → 0.2.2

package/dist/shell/multi-agent-operator-ux.js

@@ -62,6 +62,7 @@ const coordinator_io_1 = require("./coordinator-io");
 const multi_agent_io_1 = require("./multi-agent-io");
 const topology_io_1 = require("./topology-io");
 const trust_audit_1 = require("./trust-audit");
+const collate_1 = require("../core/util/collate");
 function maOf(run) {
     return run.multiAgent || {};
 }
@@ -275,7 +276,7 @@ function deriveDependencies(run) {
     for (const commit of commitsOf(run)) {
         add(commit.selectionId ? `${run.id}:selection:${commit.selectionId}` : undefined, String(commit.stateNodeId || `${run.id}:commit:${commit.id}`), "commits", commit.verifierGated ? "committed" : "checkpoint");
     }
-    return rows.filter(uniqueById).sort((left, right) => left.from.localeCompare(right.from) || left.to.localeCompare(right.to));
+    return rows.filter(uniqueById).sort((left, right) => (0, collate_1.stableCompare)(left.from, right.from) || (0, collate_1.stableCompare)(left.to, right.to));
 }
 function deriveFailures(run, dependencies) {
     const rows = [];
@@ -337,7 +338,7 @@ function deriveFailures(run, dependencies) {
     const readySelection = selectionsOf(run).find((selection) => !commitsOf(run).some((commit) => commit.selectionId === selection.id && commit.verifierGated));
     if (readySelection)
         add(String(readySelection.id), "commit-gate", "not-ready", `selection ${readySelection.id} has no verifier-gated commit`, `node scripts/cw.js commit ${run.id} --selection ${readySelection.id} --reason "<verified rationale>"`, readySelection.candidateId);
-    return rows.filter(uniqueByFailure).sort((left, right) => left.kind.localeCompare(right.kind) || left.id.localeCompare(right.id));
+    return rows.filter(uniqueByFailure).sort((left, right) => (0, collate_1.stableCompare)(left.kind, right.kind) || (0, collate_1.stableCompare)(left.id, right.id));
 }
 function deriveEvidence(run) {
     const rows = new Map();
@@ -442,7 +443,7 @@ function deriveEvidence(run) {
     return [...rows.values()]
         .map(normalizeEvidenceStatus)
         .map(withDisposition)
-        .sort((left, right) => statusRank(left.status) - statusRank(right.status) || left.id.localeCompare(right.id));
+        .sort((left, right) => statusRank(left.status) - statusRank(right.status) || (0, collate_1.stableCompare)(left.id, right.id));
 }
 function formatDependencies(rows) {
     const lines = ["Dependencies"];

package/dist/shell/observability.js

@@ -66,6 +66,7 @@ const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
 const fs_atomic_1 = require("./fs-atomic");
 const telemetry_ledger_io_1 = require("./telemetry-ledger-io");
+const collate_1 = require("../core/util/collate");
 exports.METRICS_SCHEMA_VERSION = 1;
 const VERIFIER_PASS_STATUSES = new Set(["verified", "completed", "committed"]);
 const VERIFIER_FAIL_STATUSES = new Set(["failed", "rejected", "blocked"]);
@@ -105,22 +106,22 @@ function usageKey(usage) {
 }
 function fingerprintMetricsSource(run) {
     const parts = [`id:${run.id}`, `createdAt:${run.createdAt}`, `updatedAt:${run.updatedAt}`, `app:${run.workflow.app?.id || run.workflow.id}`];
-    for (const task of [...run.tasks].sort((a, b) => a.id.localeCompare(b.id))) {
+    for (const task of [...run.tasks].sort((a, b) => (0, collate_1.stableCompare)(a.id, b.id))) {
         parts.push(`task:${task.id}:${task.status}:${task.dispatchedAt || "-"}:${task.completedAt || "-"}:${usageKey(task.usage)}:${task.backendId || "-"}`);
     }
-    for (const worker of [...(run.workers || [])].sort((a, b) => a.id.localeCompare(b.id))) {
+    for (const worker of [...(run.workers || [])].sort((a, b) => (0, collate_1.stableCompare)(a.id, b.id))) {
         parts.push(`worker:${worker.id}:${worker.status}:${worker.output?.recordedAt || "-"}:${usageKey(worker.usage)}:${worker.backendId || "-"}`);
     }
-    for (const node of [...(run.nodes || [])].filter((n) => n.kind === "verifier").sort((a, b) => a.id.localeCompare(b.id))) {
+    for (const node of [...(run.nodes || [])].filter((n) => n.kind === "verifier").sort((a, b) => (0, collate_1.stableCompare)(a.id, b.id))) {
         parts.push(`verifier:${node.id}:${node.status}`);
     }
-    for (const cand of [...(run.candidates || [])].sort((a, b) => a.id.localeCompare(b.id))) {
+    for (const cand of [...(run.candidates || [])].sort((a, b) => (0, collate_1.stableCompare)(a.id, b.id))) {
         parts.push(`candidate:${cand.id}:${cand.status}`);
     }
-    for (const fb of [...(run.feedback || [])].sort((a, b) => a.id.localeCompare(b.id))) {
+    for (const fb of [...(run.feedback || [])].sort((a, b) => (0, collate_1.stableCompare)(a.id, b.id))) {
         parts.push(`feedback:${fb.id}:${fb.status}`);
     }
-    for (const m of [...(run.multiAgent?.memberships || [])].sort((a, b) => a.id.localeCompare(b.id))) {
+    for (const m of [...(run.multiAgent?.memberships || [])].sort((a, b) => (0, collate_1.stableCompare)(a.id, b.id))) {
         parts.push(`membership:${m.id}:${m.status}`);
     }
     return fingerprintStrings(parts);
@@ -148,7 +149,7 @@ function usageUnits(run) {
             units.push({ unit: task.id, kind: "task", usage: task.usage });
         }
     }
-    return units.sort((a, b) => a.unit.localeCompare(b.unit));
+    return units.sort((a, b) => (0, collate_1.stableCompare)(a.unit, b.unit));
 }
 function tokenTotal(usage) {
     if (typeof usage.totalTokens === "number")
@@ -349,12 +350,12 @@ function deriveCandidateAcceptanceRate(run) {
 function taskRows(run) {
     return run.tasks
         .map((task) => ({ id: task.id, kind: "task", status: task.status, duration: duration(task.dispatchedAt, task.completedAt) }))
-        .sort((a, b) => a.id.localeCompare(b.id));
+        .sort((a, b) => (0, collate_1.stableCompare)(a.id, b.id));
 }
 function workerRows(run) {
     return (run.workers || [])
         .map((worker) => ({ id: worker.id, kind: "worker", status: worker.status, duration: duration(worker.createdAt, workerEndAt(worker)) }))
-        .sort((a, b) => a.id.localeCompare(b.id));
+        .sort((a, b) => (0, collate_1.stableCompare)(a.id, b.id));
 }
 function targetCreatedAt(run, target) {
     if (target.kind === "candidate")
@@ -541,7 +542,7 @@ function deriveMetricsSummary(inputs, options) {
         const report = deriveMetricsReport(input.run, { now: options.now, policy: options.policy, persistedFingerprint: input.persistedFingerprint });
         perRun.push({ report, ref: { runId: report.runId, repo: input.repo, app: report.scope.app, backendIds: report.scope.backendIds, freshness: report.freshness.status, rates: report.rates, usage: report.usage, cost: report.cost } });
     }
-    perRun.sort((a, b) => a.report.runId.localeCompare(b.report.runId));
+    perRun.sort((a, b) => (0, collate_1.stableCompare)(a.report.runId, b.report.runId));
     const groupBy = (keyOf) => {
         const map = new Map();
         for (const { report } of perRun) {
@@ -552,7 +553,7 @@ function deriveMetricsSummary(inputs, options) {
             }
         }
         return [...map.entries()]
-            .sort((a, b) => a[0].localeCompare(b[0]))
+            .sort((a, b) => (0, collate_1.stableCompare)(a[0], b[0]))
             .map(([key, reports]) => ({
             key,
             runCount: reports.length,

package/dist/shell/onramp.js

@@ -294,10 +294,26 @@ function evaluateOnrampContract(files, options = {}) {
     const scriptFiles = normalized.filter((file) => file.startsWith("plugins/cool-workflow/scripts/"));
     const surfaceFiles = normalized.filter(isSurfaceFile);
     const smokeFiles = normalized.filter((file) => /^plugins\/cool-workflow\/test\/.+-smoke\.js$/.test(file));
+    // WP1.1 (#360) restored a second, parallel test layer: pure `core/`
+    // logic proven by `test/*.test.js` under `npm run test:unit`, run and
+    // gated separately from the black-box `test/*-smoke.js` suite. A cycle
+    // that proves its fix with a unit test only (no smoke touched) is a
+    // real, complete cycle — the gate must accept either kind, not just
+    // the one that existed before the unit-test layer came back.
+    const unitTestFiles = normalized.filter((file) => /^plugins\/cool-workflow\/test\/.+\.test\.js$/.test(file));
+    // The black-box conformance suite (v2/conformance/cases/*.case.js) is a
+    // third, equally real proof layer — CI-gated on every push, and the one
+    // North Star Track C leans on. A cycle proven end to end by a new or
+    // changed conformance case (with no test/*-smoke.js or test/*.test.js
+    // touched) is a real, complete cycle too.
+    const conformanceCaseFiles = normalized.filter((file) => /^v2\/conformance\/cases\/.+\.case\.js$/.test(file));
     const docFiles = normalized.filter(isDocFile);
     const iterationFiles = normalized.filter((file) => file === "ITERATION_LOG.md");
     const sourceAppOrScript = runtimeFiles.length > 0 || typeFiles.length > 0 || appFiles.length > 0 || scriptFiles.length > 0;
-    if ((runtimeFiles.length > 0 || appFiles.length > 0) && smokeFiles.length === 0) {
+    if ((runtimeFiles.length > 0 || appFiles.length > 0) &&
+        smokeFiles.length === 0 &&
+        unitTestFiles.length === 0 &&
+        conformanceCaseFiles.length === 0) {
         issues.push({
             code: "runtime-smoke-required",
             detail: "Runtime or app changes must include at least one smoke test change.",

package/dist/shell/operator-ux-text.js

@@ -24,8 +24,9 @@ exports.formatCandidateSummaryText = formatCandidateSummaryText;
 exports.formatFeedbackSummaryText = formatFeedbackSummaryText;
 const term_1 = require("./term");
 const multi_agent_operator_ux_1 = require("./multi-agent-operator-ux");
+const collate_1 = require("../core/util/collate");
 function formatCounts(counts) {
-    const entries = Object.entries(counts).sort(([a], [b]) => a.localeCompare(b));
+    const entries = Object.entries(counts).sort(([a], [b]) => (0, collate_1.stableCompare)(a, b));
     if (!entries.length)
         return "none";
     return entries.map(([k, v]) => `${k}=${v}`).join(", ");

package/dist/shell/operator-ux.js

@@ -66,6 +66,7 @@ const coordinator_io_1 = require("./coordinator-io");
 const topology_io_1 = require("./topology-io");
 const multi_agent_operator_ux_1 = require("./multi-agent-operator-ux");
 const trust_policy_io_1 = require("./trust-policy-io");
+const collate_1 = require("../core/util/collate");
 function countBy(values, key) {
     const counts = {};
     for (const value of values)
@@ -143,8 +144,8 @@ function summarizeTasks(tasks) {
  *  verb and operator panel both read. */
 function summarizeOperatorCandidates(run) {
     const counts = (0, candidate_scoring_io_1.summarizeCandidates)(run);
-    const candidates = [...(run.candidates || [])].sort((left, right) => left.id.localeCompare(right.id));
-    const selections = [...(run.candidateSelections || [])].sort((left, right) => left.id.localeCompare(right.id));
+    const candidates = [...(run.candidates || [])].sort((left, right) => (0, collate_1.stableCompare)(left.id, right.id));
+    const selections = [...(run.candidateSelections || [])].sort((left, right) => (0, collate_1.stableCompare)(left.id, right.id));
     const commits = run.commits || [];
     const selectedIds = new Set(selections.map((selection) => selection.candidateId));
     const readyForCommit = selections
@@ -190,7 +191,7 @@ function summarizeOperatorFeedback(run) {
     };
 }
 function summarizeOperatorCommits(run) {
-    const commits = [...(run.commits || [])].sort((left, right) => left.createdAt.localeCompare(right.createdAt) || left.id.localeCompare(right.id));
+    const commits = [...(run.commits || [])].sort((left, right) => (0, collate_1.stableCompare)(left.createdAt, right.createdAt) || (0, collate_1.stableCompare)(left.id, right.id));
     return {
         total: commits.length,
         verifierGated: commits.filter((c) => c.verifierGated).length,
@@ -200,7 +201,7 @@ function summarizeOperatorCommits(run) {
     };
 }
 function summarizeOperatorWorkers(run) {
-    const workers = (run.workers || []).slice().sort((a, b) => a.id.localeCompare(b.id));
+    const workers = (run.workers || []).slice().sort((a, b) => (0, collate_1.stableCompare)(a.id, b.id));
     return {
         total: workers.length,
         byStatus: countBy(workers, (w) => w.status),
@@ -425,7 +426,7 @@ function buildOperatorGraph(run) {
         addNode(node.id, node.kind, node.status, node.label, node.path);
     for (const edge of blackboardGraph.edges)
         addEdge(edge.from, edge.to, edge.label);
-    const sortedNodes = [...nodes.values()].sort((a, b) => a.kind.localeCompare(b.kind) || a.id.localeCompare(b.id));
-    const sortedEdges = edges.slice().sort((a, b) => a.from.localeCompare(b.from) || a.to.localeCompare(b.to) || (a.label || "").localeCompare(b.label || ""));
+    const sortedNodes = [...nodes.values()].sort((a, b) => (0, collate_1.stableCompare)(a.kind, b.kind) || (0, collate_1.stableCompare)(a.id, b.id));
+    const sortedEdges = edges.slice().sort((a, b) => (0, collate_1.stableCompare)(a.from, b.from) || (0, collate_1.stableCompare)(a.to, b.to) || (0, collate_1.stableCompare)(a.label || "", b.label || ""));
     return { runId: run.id, nodes: sortedNodes, edges: sortedEdges };
 }

package/dist/shell/pipeline-cli.js

@@ -552,84 +552,94 @@ function quickstartRun(args) {
 }
 function dispatchRun(args) {
     const runId = String(args.runId);
-    const run = (0, run_store_1.loadRunFromCwd)(runId, invocationCwd(args));
-    // parseArgv keys long flags in kebab-case; accept camelCase as a fallback.
-    const flag = (kebab, camel) => {
-        const v = args[kebab] ?? args[camel];
-        return typeof v === "string" && v.trim() ? v : undefined;
-    };
-    const manifest = (0, dispatch_1.createDispatchManifest)(run, args.limit !== undefined ? Number(args.limit) : undefined, {
-        sandboxProfileId: typeof args.sandbox === "string" ? args.sandbox : undefined,
-        sandbox: typeof args.sandbox === "string" ? args.sandbox : undefined,
-        backendId: typeof args.backend === "string" ? args.backend : undefined,
-        multiAgentRunId: flag("multi-agent-run", "multiAgentRun"),
-        multiAgentGroupId: flag("multi-agent-group", "multiAgentGroup"),
-        multiAgentRoleId: flag("multi-agent-role", "multiAgentRole"),
-        multiAgentFanoutId: flag("multi-agent-fanout", "multiAgentFanout"),
+    // The whole load -> change -> save cycle holds the state.json lock so a
+    // concurrent dispatch/result on the same run cannot drop this update.
+    return (0, run_store_1.withRunStateLock)(runId, invocationCwd(args), (run) => {
+        // parseArgv keys long flags in kebab-case; accept camelCase as a fallback.
+        const flag = (kebab, camel) => {
+            const v = args[kebab] ?? args[camel];
+            return typeof v === "string" && v.trim() ? v : undefined;
+        };
+        const manifest = (0, dispatch_1.createDispatchManifest)(run, args.limit !== undefined ? Number(args.limit) : undefined, {
+            sandboxProfileId: typeof args.sandbox === "string" ? args.sandbox : undefined,
+            sandbox: typeof args.sandbox === "string" ? args.sandbox : undefined,
+            backendId: typeof args.backend === "string" ? args.backend : undefined,
+            multiAgentRunId: flag("multi-agent-run", "multiAgentRun"),
+            multiAgentGroupId: flag("multi-agent-group", "multiAgentGroup"),
+            multiAgentRoleId: flag("multi-agent-role", "multiAgentRole"),
+            multiAgentFanoutId: flag("multi-agent-fanout", "multiAgentFanout"),
+        });
+        if (manifest.dispatchId) {
+            (0, commit_1.commitState)(run, `dispatch:${manifest.dispatchId}`);
+            (0, run_store_1.saveCheckpoint)(run);
+            (0, report_1.writeReport)(run);
+        }
+        return manifest;
     });
-    if (manifest.dispatchId) {
-        (0, commit_1.commitState)(run, `dispatch:${manifest.dispatchId}`);
-        (0, run_store_1.saveCheckpoint)(run);
-        (0, report_1.writeReport)(run);
-    }
-    return manifest;
 }
 function recordResultRun(args) {
     const runId = String(args.runId);
     const taskId = String(args.taskId);
     const resultPath = String(args.resultPath);
-    const run = (0, run_store_1.loadRunFromCwd)(runId, invocationCwd(args));
-    const task = run.tasks.find((t) => t.id === taskId);
-    if (!task || !task.workerId)
-        throw new Error(`Unknown task id for run ${runId}: ${taskId}`);
-    const absolute = path.resolve(resultPath);
-    // A result path inside a system directory is never accepted (POLA): the
-    // operator file gets copied into the worker's result.md, so a /etc/passwd
-    // source would smuggle system content into a run. Byte-behavior port of the
-    // old build's recordResult system-directory blacklist.
-    if (/^\/(etc|bin|sbin|usr|Library|System|Applications|boot|dev|proc|sys|root|var\/log|var\/run)\//.test(absolute)) {
-        throw new Error(`Result path must not be a system directory: ${resultPath}`);
-    }
-    if (!fs.existsSync(absolute))
-        throw new Error(`Result file does not exist: ${resultPath}`);
-    const workerId = String(task.workerId);
-    // Host-attested `cw result <run> <task> <file>` intake: the operator hands CW
-    // an EXTERNAL result file that lives OUTSIDE the worker's read-only write
-    // boundary. The old task-level recordResult (lifecycle-operations.ts:279-280)
-    // COPIED that external file into the run's results area and recorded the
-    // internal path — it never ran the external path through validateSandboxWrite.
-    // v2 collapsed the two intakes into recordWorkerOutput, which sandbox-validates
-    // its input against the worker boundary, so a bare external path is rejected
-    // ("write path is outside sandbox profile <id>"). Restore the copy-in: stage
-    // the operator file at the worker's OWN result.md (which IS inside the write
-    // boundary), then record that internal path exactly like a driven worker.
-    const manifest = (0, worker_isolation_1.showWorkerManifest)(run, workerId);
-    fs.mkdirSync(path.dirname(manifest.resultPath), { recursive: true });
-    fs.copyFileSync(absolute, manifest.resultPath);
-    const output = (0, worker_isolation_1.recordWorkerOutput)(run, workerId, manifest.resultPath);
-    // Host-attested token usage (v0.1.31): record it verbatim as provenance when
-    // the operator supplied `--usage-*` flags; CW never synthesizes usage. The old
-    // task-level recordResult set `task.usage = usage` (lifecycle-operations.ts:286)
-    // and its unit was the TASK. v2 records through recordWorkerOutput, which gives
-    // the worker an `output` record — so the observability usage UNIT becomes the
-    // WORKER (deriveUsageTotals reads worker.usage for workers with output, and
-    // EXCLUDES that task). Attach the usage to the worker scope so the report counts
-    // it as an attested unit; also stamp task.usage for byte-parity with the old
-    // task-level record.
-    const usage = (0, observability_1.parseUsageFromArgs)(args, new Date().toISOString());
-    if (usage) {
-        task.usage = usage;
-        const scope = (0, worker_isolation_1.getWorkerScope)(run, workerId);
-        if (scope)
-            scope.usage = usage;
-    }
-    // Byte-exact to the old build's orchestrator recordWorkerOutput()
-    // wrapper: an accepted result is its own checkpoint commit, not just a
-    // bare saveCheckpoint (SPEC/pipeline-run.md's persist-ordering rule).
-    (0, commit_1.commitState)(run, `worker:${workerId}:result`);
-    (0, run_store_1.saveCheckpoint)(run);
-    (0, report_1.writeReport)(run);
-    return output;
+    // Two processes recording results for two tasks of the SAME run used to
+    // race: both loaded, and the later saveCheckpoint dropped the earlier
+    // task's completion. The lock now covers the whole cycle.
+    return (0, run_store_1.withRunStateLock)(runId, invocationCwd(args), (run) => {
+        const task = run.tasks.find((t) => t.id === taskId);
+        if (!task || !task.workerId)
+            throw new Error(`Unknown task id for run ${runId}: ${taskId}`);
+        const absolute = path.resolve(resultPath);
+        // A result path inside a system directory is never accepted (POLA): the
+        // operator file gets copied into the worker's result.md, so a /etc/passwd
+        // source would smuggle system content into a run. Byte-behavior port of the
+        // old build's recordResult system-directory blacklist.
+        if (/^\/(etc|bin|sbin|usr|Library|System|Applications|boot|dev|proc|sys|root|var\/log|var\/run)\//.test(absolute)) {
+            throw new Error(`Result path must not be a system directory: ${resultPath}`);
+        }
+        if (!fs.existsSync(absolute))
+            throw new Error(`Result file does not exist: ${resultPath}`);
+        const workerId = String(task.workerId);
+        // Host-attested `cw result <run> <task> <file>` intake: the operator hands CW
+        // an EXTERNAL result file that lives OUTSIDE the worker's read-only write
+        // boundary. The old task-level recordResult (lifecycle-operations.ts:279-280)
+        // COPIED that external file into the run's results area and recorded the
+        // internal path — it never ran the external path through validateSandboxWrite.
+        // v2 collapsed the two intakes into recordWorkerOutput, which sandbox-validates
+        // its input against the worker boundary, so a bare external path is rejected
+        // ("write path is outside sandbox profile <id>"). Restore the copy-in: stage
+        // the operator file at the worker's OWN result.md (which IS inside the write
+        // boundary), then record that internal path exactly like a driven worker.
+        const manifest = (0, worker_isolation_1.showWorkerManifest)(run, workerId);
+        fs.mkdirSync(path.dirname(manifest.resultPath), { recursive: true });
+        fs.copyFileSync(absolute, manifest.resultPath);
+        const output = (0, worker_isolation_1.recordWorkerOutput)(run, workerId, manifest.resultPath, {
+            requireAttestedTelemetry: (0, agent_config_1.resolveAgentConfig)(args).requireAttestedTelemetry,
+            allowUnattested: Boolean(args.allowUnattested ?? args["allow-unattested"]),
+        });
+        // Host-attested token usage (v0.1.31): record it verbatim as provenance when
+        // the operator supplied `--usage-*` flags; CW never synthesizes usage. The old
+        // task-level recordResult set `task.usage = usage` (lifecycle-operations.ts:286)
+        // and its unit was the TASK. v2 records through recordWorkerOutput, which gives
+        // the worker an `output` record — so the observability usage UNIT becomes the
+        // WORKER (deriveUsageTotals reads worker.usage for workers with output, and
+        // EXCLUDES that task). Attach the usage to the worker scope so the report counts
+        // it as an attested unit; also stamp task.usage for byte-parity with the old
+        // task-level record.
+        const usage = (0, observability_1.parseUsageFromArgs)(args, new Date().toISOString());
+        if (usage) {
+            task.usage = usage;
+            const scope = (0, worker_isolation_1.getWorkerScope)(run, workerId);
+            if (scope)
+                scope.usage = usage;
+        }
+        // Byte-exact to the old build's orchestrator recordWorkerOutput()
+        // wrapper: an accepted result is its own checkpoint commit, not just a
+        // bare saveCheckpoint (SPEC/pipeline-run.md's persist-ordering rule).
+        (0, commit_1.commitState)(run, `worker:${workerId}:result`);
+        (0, run_store_1.saveCheckpoint)(run);
+        (0, report_1.writeReport)(run);
+        return output;
+    });
 }
 /** `cw commit <run-id>` — byte-exact port of the old build's
  *  `orchestrator/lifecycle-operations.ts`'s `commit()`: the CLI/MCP

package/dist/shell/reclamation-io.js

@@ -2,7 +2,7 @@
 // shell/reclamation-io.ts — gc plan/run/verify's write-ahead reclamation
 // transaction, plus the orphan-run sweep and the clone cache gc.
 //
-// MILESTONE 10 (v2/PLAN.md build order, step 10). Byte-exact port of the
+// MILESTONE 10 (docs/rebuild/PLAN.md build order, step 10). Byte-exact port of the
 // old build's src/reclamation.ts + src/reclamation/hash.ts +
 // src/run-registry/{gc,orphans}.ts + src/clones.ts. Reuses
 // shell/fs-atomic.ts's `withFileLock` directly (no reimplementation, per
@@ -106,6 +106,7 @@ const node_store_1 = require("./node-store");
 const node_snapshot_1 = require("../core/state/node-snapshot");
 const node_projection_1 = require("../core/state/node-projection");
 const hash_1 = require("../core/hash");
+const collate_1 = require("../core/util/collate");
 const run_registry_io_1 = require("./run-registry-io");
 // ---------------------------------------------------------------------------
 // Content addressing + byte measurement (in-process, no `du`) — carried
@@ -1287,7 +1288,7 @@ function readCloneEntries(root) {
             bytes: dirSize(dir),
         });
     }
-    entries.sort((a, b) => (a.fetchedAt || "").localeCompare(b.fetchedAt || ""));
+    entries.sort((a, b) => (0, collate_1.stableCompare)(a.fetchedAt || "", b.fetchedAt || ""));
     return entries;
 }
 /** `cw clones list` — every cached remote checkout with its origin,

package/dist/shell/registry-cli.js

@@ -58,6 +58,7 @@ exports.routineCreateCli = routineCreateCli;
 exports.routineListCli = routineListCli;
 exports.routineDeleteCli = routineDeleteCli;
 exports.routineFireCli = routineFireCli;
+exports.resolveRoutineFirePayload = resolveRoutineFirePayload;
 exports.routineEventsCli = routineEventsCli;
 exports.registryRefreshCli = registryRefreshCli;
 exports.registryShowCli = registryShowCli;
@@ -79,6 +80,7 @@ exports.orphansListCli = orphansListCli;
 exports.orphansGcCli = orphansGcCli;
 exports.clonesListCli = clonesListCli;
 exports.clonesGcCli = clonesGcCli;
+const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
 const run_registry_io_1 = require("./run-registry-io");
 const pipeline_1 = require("./pipeline");
@@ -149,6 +151,19 @@ function routineDeleteCli(id, options = {}) {
 function routineFireCli(kind, payload, options = {}) {
     return new scheduler_io_1.RoutineTriggerBridge(resolveCwd(options)).fire(kind, payload);
 }
+/** Resolves a `routine fire` payload: a `--payload-path`/positional file wins
+ *  (parsed as JSON) over the raw CLI/MCP options bag. The file read lives
+ *  here, in the shell layer, not in core/capability-table.ts. */
+function resolveRoutineFirePayload(payloadPath, options) {
+    if (!payloadPath)
+        return options;
+    try {
+        return JSON.parse(fs.readFileSync(payloadPath, "utf8"));
+    }
+    catch (e) {
+        throw new Error(`Failed to parse payload file "${payloadPath}": ${String((e && e.message) || e)}`);
+    }
+}
 function routineEventsCli(id, options = {}) {
     return new scheduler_io_1.RoutineTriggerBridge(resolveCwd(options)).events(id);
 }

package/dist/shell/report.js

@@ -59,13 +59,14 @@ const telemetry_ledger_io_1 = require("./telemetry-ledger-io");
 const multi_agent_io_1 = require("./multi-agent-io");
 const coordinator_io_1 = require("./coordinator-io");
 const multi_agent_operator_ux_1 = require("./multi-agent-operator-ux");
+const collate_1 = require("../core/util/collate");
 function formatInputList(value) {
     if (Array.isArray(value))
         return value.join("; ");
     return value ? String(value) : "";
 }
 function formatCounts(counts) {
-    const entries = Object.entries(counts).sort(([a], [b]) => a.localeCompare(b));
+    const entries = Object.entries(counts).sort(([a], [b]) => (0, collate_1.stableCompare)(a, b));
     if (!entries.length)
         return "none";
     return entries.map(([k, v]) => `${k}=${v}`).join(", ");

package/dist/shell/run-registry-io.js

@@ -2,7 +2,7 @@
 // shell/run-registry-io.ts — the on-disk run registry: index/queue/history
 // persistence, lifecycle derivation, search/resume/archive/rerun.
 //
-// MILESTONE 10 (v2/PLAN.md build order, step 10). Byte-exact port of the
+// MILESTONE 10 (docs/rebuild/PLAN.md build order, step 10). Byte-exact port of the
 // old build's src/run-registry.ts + src/run-registry/{derive,policy,
 // queue}.ts. The registry is a DERIVED, rebuildable index over each repo's
 // `.cw/runs/<id>/state.json` (the single source of truth, never mutated

package/dist/shell/run-store.js

@@ -50,6 +50,7 @@ exports.loadRunStateFile = loadRunStateFile;
 exports.checkRunStateFile = checkRunStateFile;
 exports.migrateRunStateFile = migrateRunStateFile;
 exports.loadRunFromCwd = loadRunFromCwd;
+exports.withRunStateLock = withRunStateLock;
 exports.saveCheckpoint = saveCheckpoint;
 exports.compactCheckpoint = compactCheckpoint;
 exports.createRun = createRun;
@@ -112,6 +113,22 @@ function loadRunFromCwd(runId, cwd = process.cwd()) {
     }
     return result.run;
 }
+/** Hold the state.json lock over a WHOLE load -> change -> save cycle.
+ *  A bare loadRunFromCwd + saveCheckpoint pair leaves a window where two
+ *  processes both load the same state and the later save silently drops
+ *  the earlier change (the same lost-update class PR #339 fixed for
+ *  queue.json / triggers.json). `fn` gets the run loaded UNDER the lock;
+ *  saveCheckpoint calls inside `fn` re-enter the same lock (withFileLock
+ *  is re-entrant in-process) and write exactly as before. The probe load
+ *  runs BEFORE the lock so an unknown run id throws the exact
+ *  loadRunFromCwd error without first creating the run directory as a
+ *  lock-file side effect — and it supplies `paths.state`, the same lock
+ *  target saveCheckpoint uses. Keep `fn` short: a critical section past
+ *  30s can be stolen as a stale lock. */
+function withRunStateLock(runId, cwd, fn) {
+    const probe = loadRunFromCwd(runId, cwd);
+    return (0, fs_atomic_1.withFileLock)(probe.paths.state, () => fn(loadRunFromCwd(runId, cwd)));
+}
 /** state.json is the single source of truth — set `updatedAt`, then write
  *  it DURABLY with a lock so concurrent processes never lose an update. */
 function saveCheckpoint(run) {

package/dist/shell/sandbox-profile.js

@@ -2,7 +2,7 @@
 // shell/sandbox-profile.ts — the 4 bundled sandbox profiles, resolution,
 // validation, and the runtime read/write/command/network checks.
 //
-// MILESTONE 5 (v2/PLAN.md build order, step 5). Byte-exact port of
+// MILESTONE 5 (docs/rebuild/PLAN.md build order, step 5). Byte-exact port of
 // plugins/cool-workflow/src/sandbox-profile.ts.
 //
 // Evidence: SPEC/execution-backend.md "Sandbox profiles".

package/dist/shell/scheduler-io.js

@@ -2,7 +2,7 @@
 // shell/scheduler-io.ts — Scheduler (cw schedule/loop), the daemon tick
 // (cw schedule daemon), and routine triggers (cw routine).
 //
-// MILESTONE 10 (v2/PLAN.md build order, step 10). Byte-exact port of the
+// MILESTONE 10 (docs/rebuild/PLAN.md build order, step 10). Byte-exact port of the
 // old build's src/scheduler.ts + src/daemon.ts + src/triggers.ts. Reuses
 // shell/fs-atomic.ts's `withFileLock`/`readJson`/`writeJson`/`safeFileName`
 // directly (no reimplementation).
@@ -387,51 +387,60 @@ class RoutineTriggerBridge {
         this.storePath = path.join(this.cwd, ".cw", "routines", "triggers.json");
         this.payloadsDir = path.join(this.cwd, ".cw", "routines", "payloads");
     }
+    locked(fn) {
+        return (0, fs_atomic_1.withFileLock)(this.storePath, fn);
+    }
     create(options) {
-        const now = new Date().toISOString();
-        const store = this.load();
-        // Monotonic id, NOT triggers.length: delete shrinks the collection, so
-        // a length-based seq would reuse a live id after delete+create.
-        const seq = (store.nextTriggerSeq || 0) + 1;
-        store.nextTriggerSeq = seq;
-        const trigger = {
-            id: createTriggerId(normalizeTriggerKind(options.kind), seq),
-            kind: normalizeTriggerKind(options.kind),
-            createdAt: now,
-            updatedAt: now,
-            source: String(options.source || options.kind || "api"),
-            prompt: requiredString(options.prompt, "prompt"),
-            workflowId: stringOption(options.workflowId),
-            runId: stringOption(options.runId),
-            match: parseJsonObject(options.match),
-            metadata: parseJsonObject(options.metadata),
-        };
-        store.triggers.push(trigger);
-        this.save(store);
-        return trigger;
+        return this.locked(() => {
+            const now = new Date().toISOString();
+            const store = this.load();
+            // Monotonic id, NOT triggers.length: delete shrinks the collection, so
+            // a length-based seq would reuse a live id after delete+create.
+            const seq = (store.nextTriggerSeq || 0) + 1;
+            store.nextTriggerSeq = seq;
+            const trigger = {
+                id: createTriggerId(normalizeTriggerKind(options.kind), seq),
+                kind: normalizeTriggerKind(options.kind),
+                createdAt: now,
+                updatedAt: now,
+                source: String(options.source || options.kind || "api"),
+                prompt: requiredString(options.prompt, "prompt"),
+                workflowId: stringOption(options.workflowId),
+                runId: stringOption(options.runId),
+                match: parseJsonObject(options.match),
+                metadata: parseJsonObject(options.metadata),
+            };
+            store.triggers.push(trigger);
+            this.save(store);
+            return trigger;
+        });
     }
     list(kind) {
         const store = this.load();
         return kind ? store.triggers.filter((trigger) => trigger.kind === kind) : store.triggers;
     }
     delete(id) {
-        const store = this.load();
-        const before = store.triggers.length;
-        store.triggers = store.triggers.filter((trigger) => trigger.id !== id);
-        this.save(store);
-        return { deleted: store.triggers.length !== before, id };
+        return this.locked(() => {
+            const store = this.load();
+            const before = store.triggers.length;
+            store.triggers = store.triggers.filter((trigger) => trigger.id !== id);
+            this.save(store);
+            return { deleted: store.triggers.length !== before, id };
+        });
     }
     fire(kind, payload) {
-        const normalizedKind = normalizeTriggerKind(kind);
-        const store = this.load();
-        const now = new Date().toISOString();
-        const base = store.events.length;
-        const events = store.triggers
-            .filter((trigger) => trigger.kind === normalizedKind)
-            .map((trigger, index) => this.createEvent(trigger, payload, now, base + index + 1));
-        store.events.push(...events);
-        this.save(store);
-        return events;
+        return this.locked(() => {
+            const normalizedKind = normalizeTriggerKind(kind);
+            const store = this.load();
+            const now = new Date().toISOString();
+            const base = store.events.length;
+            const events = store.triggers
+                .filter((trigger) => trigger.kind === normalizedKind)
+                .map((trigger, index) => this.createEvent(trigger, payload, now, base + index + 1));
+            store.events.push(...events);
+            this.save(store);
+            return events;
+        });
     }
     events(triggerId) {
         const store = this.load();