@deksden-com/dd-flow-cli 0.9.0-beta.19 → 0.9.0-beta.22

package/dist/services/work-registry.js

@@ -13,9 +13,18 @@ import { appendAudit } from "./audit.js";
 import { flowCommand } from "./stage-pause.js";
 import { assertPortableArtifactRef } from "./portable-refs.js";
 import { publicSessionIdentity } from "./session-identity.js";
-import { activateRecoveryWork, assertRunMutationAllowed, recoveryPromptForWork, settleRecoveryWork } from "./run-recovery.js";
+import { activateRecoveryWork, assertRecoveryHookCurrent, assertRunMutationAllowed, recoveryGuard, recoveryPromptForWork, settleRecoveryWork } from "./run-recovery.js";
 const workColumns = "work_id, project_id, run_id, parent_work_id, task, launch_policy, result_schema, payload_json, depends_on_json, status, result, created_at, started_at, updated_at, completed_at";
 export function ensureWorkRegistry(context) { context.db.exec("SELECT 1 FROM works LIMIT 1"); context.db.exec("SELECT 1 FROM work_sessions LIMIT 1"); }
+function ownsPhysicalWorkSession(context, projectId, owner, identity) {
+    if (identity.sessionId !== owner.session_id)
+        return false;
+    const binding = owner.hook_event_id ? context.db.get("SELECT daemon_id FROM hook_events WHERE project_id = ? AND event_key = ?", [projectId, owner.hook_event_id]) : undefined;
+    // Legacy non-daemon sessions remain usable. Once a physical daemon was
+    // captured, another process cannot inherit authority merely by resuming
+    // the same provider Session ID.
+    return !binding?.daemon_id || binding.daemon_id === identity.daemonId;
+}
 /**
  * A Stage terminal command is allowed only from the Session that owns its
  * running coordinator Work.  A hook receipt proves the caller; a WorkSession
@@ -28,7 +37,7 @@ export function assertStageLifecycleOwner(context, input) {
     if (!project)
         throw new AppError("not_found", "Project is not registered", 1, { project_root: projectRoot });
     requireRun(context, project.id, input.runId);
-    const owner = context.db.get(`SELECT ws.id, ws.work_id, ws.session_id
+    const owner = context.db.get(`SELECT ws.id, ws.work_id, ws.session_id, ws.hook_event_id
        FROM work_sessions ws
        JOIN works w ON w.work_id = ws.work_id
        JOIN sessions s ON s.project_id = w.project_id AND s.session_id = ws.session_id
@@ -42,7 +51,7 @@ export function assertStageLifecycleOwner(context, input) {
         projectId: project.id, ...(input.hookEventId ? { eventKey: input.hookEventId } : {}), operation: input.operation,
         runId: input.runId, stage: input.stage, projectRoot, ...(input.operation === "stage_pause" ? { workId: owner.work_id } : {})
     });
-    if (identity.sessionId === owner.session_id)
+    if (ownsPhysicalWorkSession(context, project.id, owner, identity))
         return identity;
     context.db.run("UPDATE hook_events SET status = 'rejected', claimed_at = ? WHERE id = ?", [context.now(), identity.hookEventId]);
     const payload = { run_id: input.runId, stage: input.stage, work_id: owner.work_id, operation: input.operation, expected_session_id: owner.session_id, observed_session_id: identity.sessionId, hook_event_id: identity.hookEventId };
@@ -63,7 +72,7 @@ export function assertWorkLifecycleOwner(context, input) {
     if (!owner)
         throw new AppError("trusted_session_binding_required", "Work lifecycle command has no running Work/Session binding", 1, { work_id: work.work_id });
     const identity = claimWorkLifecycleHookEvent(context, { projectId: work.project_id, ...(input.hookEventId ? { eventKey: input.hookEventId } : {}), operation: input.operation, workId: work.work_id, projectRoot: run.project_root });
-    if (identity.sessionId === owner.session_id)
+    if (ownsPhysicalWorkSession(context, work.project_id, owner, identity))
         return identity;
     context.db.run("UPDATE hook_events SET status = 'rejected', claimed_at = ? WHERE id = ?", [context.now(), identity.hookEventId]);
     const payload = { run_id: work.run_id, work_id: work.work_id, operation: input.operation, expected_session_id: owner.session_id, observed_session_id: identity.sessionId, hook_event_id: identity.hookEventId };
@@ -208,7 +217,7 @@ export function shortWorkId(id) { return /^WRK-\d{3,}(?:-|$)/.exec(id)?.[0]?.rep
  * PATH is not inherited; using the shared lifecycle command keeps them on the
  * same captured runtime as their parent stage.
  */
-export function workStartCommand(context, work) { const run = requireRun(context, work.project_id, work.run_id); return `${flowCommand(context)} work start ${work.work_id} --project-root ${JSON.stringify(run.project_root)} --json`; }
+export function workStartCommand(context, work) { const run = requireRun(context, work.project_id, work.run_id); const recovery = recoveryGuard(context, work.project_id, work.run_id); return `${flowCommand(context)} work start ${work.work_id} --project-root ${JSON.stringify(run.project_root)}${recovery ? ` --recovery-id ${JSON.stringify(recovery.recovery_id)}` : ""} --json`; }
 export function startWork(context, id, input) {
     ensureWorkRegistry(context);
     const work = requireWork(context, id);
@@ -223,17 +232,27 @@ export function startWork(context, id, input) {
     const run = requireRun(context, work.project_id, work.run_id);
     if (input.projectRoot && resolveProjectRoot(input.projectRoot) !== resolveProjectRoot(run.project_root))
         throw new AppError("project_mismatch", "work start project root does not match its RUN", 1, { work_id: id });
+    const recoveryId = recoveryGuard(context, work.project_id, work.run_id)?.recovery_id;
+    if (input.recoveryId !== recoveryId)
+        throw new AppError("run_recovery_generation_stale", "Work launch must use the exact current recovery packet", 1, { work_id: id, recovery_id: recoveryId ?? null });
     let hookEventId = input.hookEventId;
     if (!hookEventId) {
         try {
-            hookEventId = findRecentMatchingHookEvent(context, { projectId: work.project_id, matchKey: workStartMatchKey(shortWorkId(work.work_id), run.project_root), errorCode: "trusted_session_binding_required", operation: "work start" }).eventKey;
+            hookEventId = findRecentMatchingHookEvent(context, { projectId: work.project_id, matchKey: workStartMatchKey(shortWorkId(work.work_id), run.project_root, recoveryId), errorCode: "trusted_session_binding_required", operation: "work start" }).eventKey;
         }
         catch {
-            hookEventId = findRecentMatchingHookEvent(context, { projectId: work.project_id, matchKey: workStartMatchKey(work.work_id, run.project_root), errorCode: "trusted_session_binding_required", operation: "work start" }).eventKey;
+            hookEventId = findRecentMatchingHookEvent(context, { projectId: work.project_id, matchKey: workStartMatchKey(work.work_id, run.project_root, recoveryId), errorCode: "trusted_session_binding_required", operation: "work start" }).eventKey;
         }
     }
-    const identity = claimWorkStartHookEvent(context, { projectId: work.project_id, eventKey: hookEventId, workId: work.work_id, projectRoot: run.project_root });
-    const started = startBoundWork(context, work, run, identity, hookEventId);
+    const identity = claimWorkStartHookEvent(context, { projectId: work.project_id, eventKey: hookEventId, workId: work.work_id, projectRoot: run.project_root, ...(recoveryId ? { recoveryId } : {}) });
+    let started;
+    try {
+        started = startBoundWork(context, work, run, identity, hookEventId);
+    }
+    catch (error) {
+        context.db.run("UPDATE hook_events SET status = 'observed', claimed_at = NULL WHERE project_id = ? AND event_key = ? AND status = 'claimed'", [work.project_id, hookEventId]);
+        throw error;
+    }
     appendFlowRunTimelineEvent(context, work.project_id, work.run_id, { type: "work_started", work_id: work.work_id, session_id: identity.sessionId, agent_id: identity.agentId });
     return started;
 }
@@ -245,8 +264,11 @@ export function bindRunningWorkSession(context, input) {
         throw new AppError("invalid_work_state", "Stage coordinator Work must be running", 1, { work_id: work.work_id, status: work.status });
     const run = requireRun(context, work.project_id, work.run_id);
     const identity = hookSessionIdentity(context, work.project_id, input.hookEventId);
+    assertRecoveryHookCurrent(context, work.project_id, work.run_id, identity);
     const active = context.db.get("SELECT id, work_id, session_id, hook_event_id, status, prompt_path, result_path, created_at, completed_at FROM work_sessions WHERE work_id = ? AND status = 'running' ORDER BY created_at DESC LIMIT 1", [work.work_id]);
     if (active) {
+        if (active.session_id === identity.sessionId && !ownsPhysicalWorkSession(context, work.project_id, active, identity))
+            throw new AppError("handoff_session_mismatch", "The active Work belongs to another physical daemon", 1, { work_id: work.work_id });
         if (active.session_id !== identity.sessionId) {
             // A frozen `new_session` policy may transfer the same coordinator Work
             // only to its next stage. Repeating the same stage from another Session
@@ -320,7 +342,8 @@ export function startStageCoordinatorWork(context, input) {
 }
 /** Stage entry points call this only after their own trusted hook claim. */
 export function startBoundWork(context, work, run, identity, hookEventId) {
-    assertRunMutationAllowed(context, work.project_id, work.run_id);
+    assertRecoveryHookCurrent(context, work.project_id, work.run_id, identity);
+    const generation = assertRunMutationAllowed(context, work.project_id, work.run_id);
     if (work.status !== "created")
         throw new AppError("invalid_work_state", "Work is not created", 2, { work_id: work.work_id, status: work.status });
     const now = context.now();
@@ -345,15 +368,18 @@ export function startBoundWork(context, work, run, identity, hookEventId) {
     fs.writeFileSync(contextCandidate, `${JSON.stringify(workContext, null, 2)}\n`);
     context.db.exec("BEGIN IMMEDIATE");
     try {
+        assertRunMutationAllowed(context, work.project_id, work.run_id, generation);
         bindSession(context, work, run, identity, now);
         if (work.parent_work_id && work.launch_policy === "reuse_allowed")
             context.db.run("UPDATE work_sessions SET status = 'completed', completed_at = ?, updated_at = ? WHERE session_id = ? AND status = 'running' AND work_id <> ?", [now, now, identity.sessionId, work.work_id]);
-        const claimed = context.db.run("UPDATE works SET status = 'running', started_at = ?, updated_at = ? WHERE work_id = ? AND status = 'created'", [now, now, work.work_id]);
+        const claimed = context.db.run("UPDATE works SET status = 'running', started_at = COALESCE(started_at, ?), updated_at = ? WHERE work_id = ? AND status = 'created'", [now, now, work.work_id]);
         if (claimed.changes !== 1)
             throw new AppError("conflict", "Work was claimed concurrently", 1, { work_id: work.work_id });
         context.db.run(`INSERT INTO work_sessions (id, work_id, session_id, hook_event_id, status, prompt_path, result_path, created_at, updated_at, completed_at) VALUES (?, ?, ?, ?, 'running', ?, ?, ?, ?, NULL)`, [linkId, work.work_id, identity.sessionId, hookEventId, promptPath, resultPath, now, now]);
         fs.renameSync(promptCandidate, promptPath);
         fs.renameSync(contextCandidate, contextPath);
+        if (recovery)
+            activateRecoveryWork(context, work.work_id);
         context.db.exec("COMMIT");
     }
     catch (error) {
@@ -362,8 +388,6 @@ export function startBoundWork(context, work, run, identity, hookEventId) {
         fs.rmSync(contextCandidate, { force: true });
         throw error;
     }
-    if (recovery)
-        activateRecoveryWork(context, work.work_id);
     refreshRunWorkProjection(context, work.project_id, work.run_id);
     return { ok: true, work_id: work.work_id, work_session_id: linkId, worker_prompt_markdown: prompt, prompt_path: promptPath, ...(recovery ? { recovery } : {}), session_binding: { source: "PreToolUse", session: { harness_id: identity.harness, session_id: identity.nativeSessionId } } };
 }
@@ -423,6 +447,9 @@ async function settle(context, id, status, result, progress) {
     const now = context.now();
     context.db.exec("BEGIN IMMEDIATE");
     try {
+        assertRunMutationAllowed(context, work.project_id, work.run_id);
+        if (link && !context.db.get("SELECT 1 FROM work_sessions WHERE id = ? AND status = 'running'", [link.id]))
+            throw new AppError("work_generation_stale", "Work Session was interrupted or superseded while checks ran", 1, { work_id: id });
         context.db.run("UPDATE works SET status = ?, result = ?, completed_at = ?, updated_at = ? WHERE work_id = ?", [status, result, now, now, id]);
         if (link) {
             if (link.result_path && work.parent_work_id !== null)

package/dist/storage/database.js

@@ -19,7 +19,16 @@ export function ensureRecoveryStorage(db) {
       recovery_id TEXT NOT NULL, work_id TEXT NOT NULL, generation INTEGER NOT NULL, prior_started_at TEXT, evidence_path TEXT NOT NULL, status TEXT NOT NULL, created_at TEXT NOT NULL, updated_at TEXT NOT NULL, PRIMARY KEY(recovery_id, work_id), FOREIGN KEY(recovery_id) REFERENCES run_recovery_guards(recovery_id), FOREIGN KEY(work_id) REFERENCES works(work_id)
     );
     CREATE INDEX IF NOT EXISTS idx_work_recovery_segments_work ON work_recovery_segments(work_id, generation DESC);
+    CREATE TABLE IF NOT EXISTS run_recovery_bindings (
+      recovery_id TEXT PRIMARY KEY REFERENCES run_recovery_guards(recovery_id),
+      work_id TEXT NOT NULL REFERENCES works(work_id), prior_work_session_id TEXT NOT NULL,
+      session_id TEXT NOT NULL, harness TEXT NOT NULL, provider_session_id TEXT NOT NULL,
+      daemon_id TEXT NOT NULL, status TEXT NOT NULL, hook_event_key TEXT,
+      created_at TEXT NOT NULL, accepted_at TEXT
+    );
   `);
+    ensureColumn(db, "run_recovery_bindings", "packet_json", "ALTER TABLE run_recovery_bindings ADD COLUMN packet_json TEXT");
+    ensureColumn(db, "run_recovery_bindings", "packet_sha256", "ALTER TABLE run_recovery_bindings ADD COLUMN packet_sha256 TEXT");
 }
 /** Creates the single Work/Session authority used by a fresh vNext beta runtime. */
 export function ensureVnextWorkStorage(db) {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@deksden-com/dd-flow-cli",
-  "version": "0.9.0-beta.19",
+  "version": "0.9.0-beta.22",
   "description": "Mechanical runtime CLI for dd-flow workflows.",
   "type": "module",
   "bin": {
-    "dd-flow": "./dist/cli.js"
+    "dd-flow": "dist/cli.js"
   },
   "files": [
     "dist",