@yeaft/webchat-agent 1.0.166 → 1.0.168

package/yeaft/work-center/store.js

@@ -5,7 +5,7 @@ import { randomUUID } from 'node:crypto';
 import { normalizeEvidence } from './evidence.js';
 import { normalizeActionCheckpoint } from './action-checkpoint.js';
 
-const SCHEMA_VERSION = 8;
+const SCHEMA_VERSION = 11;
 const OPEN_ACTION_STATUSES = "'ready','running','waiting'";
 const MAX_REUSABLE_CONTEXT_ITEMS = 12;
 const MAX_RUN_RESPONSE_CHARS = 65_536;
@@ -47,6 +47,7 @@ function mapWorkItem(row) {
     reuseMemory: row.reuse_memory !== 0,
     origin: parseJson(row.origin, null),
     linkedSessionIds: parseJson(row.linked_session_ids, []),
+    sessionContext: parseJson(row.session_context, []),
     attachments: parseJson(row.attachments, []),
     executionStats: {
       llmRequestCount: Math.max(0, Number(row.usage_llm_request_count) || 0),
@@ -73,6 +74,10 @@ function mapAction(row) {
     stageId: row.stage_id || row.type,
     assignmentPolicy: parseJson(row.assignment_policy, null),
     modelPolicy: parseJson(row.model_policy, null),
+    dependsOnStageIds: parseJson(row.depends_on_stage_ids, []),
+    workspaceMode: row.workspace_mode || 'shared',
+    changesRequestedStageId: row.changes_requested_stage_id || null,
+    workspace: parseJson(row.workspace, null),
     requiredRole: row.required_role || '',
     instruction: row.instruction,
     brief: parseJson(row.brief, null),
@@ -189,6 +194,7 @@ export class WorkItemStore {
         reuse_memory INTEGER NOT NULL DEFAULT 1,
         origin TEXT,
         linked_session_ids TEXT NOT NULL DEFAULT '[]',
+        session_context TEXT NOT NULL DEFAULT '[]',
         attachments TEXT NOT NULL DEFAULT '[]',
         created_at INTEGER NOT NULL,
         updated_at INTEGER NOT NULL
@@ -202,6 +208,10 @@ export class WorkItemStore {
         stage_id TEXT,
         assignment_policy TEXT,
         model_policy TEXT,
+        depends_on_stage_ids TEXT NOT NULL DEFAULT '[]',
+        workspace_mode TEXT NOT NULL DEFAULT 'shared',
+        changes_requested_stage_id TEXT,
+        workspace TEXT,
         instruction TEXT NOT NULL,
         brief TEXT,
         context TEXT NOT NULL DEFAULT '[]',
@@ -325,6 +335,9 @@ export class WorkItemStore {
     if (!hasColumn(this.db, 'work_items', 'workflow_snapshot')) {
       this.db.exec('ALTER TABLE work_items ADD COLUMN workflow_snapshot TEXT');
     }
+    if (!hasColumn(this.db, 'work_items', 'session_context')) {
+      this.db.exec("ALTER TABLE work_items ADD COLUMN session_context TEXT NOT NULL DEFAULT '[]'");
+    }
     if (!hasColumn(this.db, 'work_items', 'attachments')) {
       this.db.exec("ALTER TABLE work_items ADD COLUMN attachments TEXT NOT NULL DEFAULT '[]'");
     }
@@ -337,6 +350,18 @@ export class WorkItemStore {
     if (!hasColumn(this.db, 'actions', 'model_policy')) {
       this.db.exec('ALTER TABLE actions ADD COLUMN model_policy TEXT');
     }
+    if (!hasColumn(this.db, 'actions', 'depends_on_stage_ids')) {
+      this.db.exec("ALTER TABLE actions ADD COLUMN depends_on_stage_ids TEXT NOT NULL DEFAULT '[]'");
+    }
+    if (!hasColumn(this.db, 'actions', 'workspace_mode')) {
+      this.db.exec("ALTER TABLE actions ADD COLUMN workspace_mode TEXT NOT NULL DEFAULT 'shared'");
+    }
+    if (!hasColumn(this.db, 'actions', 'changes_requested_stage_id')) {
+      this.db.exec('ALTER TABLE actions ADD COLUMN changes_requested_stage_id TEXT');
+    }
+    if (!hasColumn(this.db, 'actions', 'workspace')) {
+      this.db.exec('ALTER TABLE actions ADD COLUMN workspace TEXT');
+    }
     this.db.prepare(`INSERT INTO schema_meta(key, value) VALUES('schema_version', ?)
       ON CONFLICT(key) DO UPDATE SET value = excluded.value`).run(String(SCHEMA_VERSION));
   }
@@ -367,8 +392,8 @@ export class WorkItemStore {
       this.db.prepare(`INSERT INTO work_items
         (id, revision, title, goal, acceptance_criteria, workflow_template, workflow_snapshot, status,
          current_action_id, current_run_id, work_dir, workspace_key, reuse_memory, origin, linked_session_ids,
-         attachments, created_at, updated_at)
-        VALUES (?, 1, ?, ?, ?, ?, ?, ?, NULL, NULL, ?, ?, ?, ?, ?, ?, ?, ?)`).run(
+         session_context, attachments, created_at, updated_at)
+        VALUES (?, 1, ?, ?, ?, ?, ?, ?, NULL, NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(
         id,
         input.title,
         input.goal,
@@ -381,6 +406,7 @@ export class WorkItemStore {
         input.reuseMemory === false ? 0 : 1,
         stringify(input.origin || null),
         stringify(input.linkedSessionIds || []),
+        stringify(input.sessionContext || []),
         stringify(input.attachments || []),
         now,
         now,
@@ -404,6 +430,10 @@ export class WorkItemStore {
       stageId: input.stageId || input.type,
       assignmentPolicy: input.assignmentPolicy || null,
       modelPolicy: input.modelPolicy || null,
+      dependsOnStageIds: Array.isArray(input.dependsOnStageIds) ? input.dependsOnStageIds : [],
+      workspaceMode: input.workspaceMode || 'shared',
+      changesRequestedStageId: input.changesRequestedStageId || null,
+      workspace: input.workspace || null,
       requiredRole: input.requiredRole || '',
       instruction: input.instruction || '',
       brief: input.brief && typeof input.brief === 'object' ? input.brief : null,
@@ -419,9 +449,9 @@ export class WorkItemStore {
     };
     this.db.prepare(`INSERT INTO actions
       (id, work_item_id, sequence, type, required_role, stage_id, assignment_policy, model_policy,
-       instruction, brief, context, contract_revision, status, attempt, max_attempts, current_run_id,
-       lease_epoch, created_at, updated_at)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, 0, ?, ?)`).run(
+       depends_on_stage_ids, workspace_mode, changes_requested_stage_id, workspace, instruction, brief, context, contract_revision,
+       status, attempt, max_attempts, current_run_id, lease_epoch, created_at, updated_at)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, 0, ?, ?)`).run(
       action.id,
       workItemId,
       action.sequence,
@@ -430,6 +460,10 @@ export class WorkItemStore {
       action.stageId,
       stringify(action.assignmentPolicy),
       stringify(action.modelPolicy),
+      stringify(action.dependsOnStageIds),
+      action.workspaceMode,
+      action.changesRequestedStageId,
+      stringify(action.workspace),
       action.instruction,
       stringify(action.brief),
       stringify(action.context),
@@ -448,10 +482,188 @@ export class WorkItemStore {
     return Number(row.seq) + 1;
   }
 
+  #hasActiveIntegrationReservation(action, now = this.now()) {
+    const reservation = action?.workspace?.integration?.reservation;
+    return !!reservation && Number(reservation.expiresAt) > now;
+  }
+
+  #assertNoIntegrationReservation(actions, now = this.now()) {
+    if (actions.some(action => this.#hasActiveIntegrationReservation(action, now))) {
+      throw new Error('Work Center integration finalization currently owns the Action lease');
+    }
+  }
+
+  #resetGraphFromStage(workItemId, targetStageId, replacement, reason, now) {
+    const actions = this.db.prepare(`SELECT * FROM actions WHERE work_item_id = ?
+      AND status NOT IN ('superseded', 'cancelled') ORDER BY sequence`).all(workItemId).map(mapAction);
+    const target = actions.find(action => action.stageId === targetStageId);
+    if (!target) throw new Error('Work Center graph reset target is missing');
+    const affected = new Set([targetStageId]);
+    for (const action of actions) {
+      if (action.status === 'running') affected.add(action.stageId);
+    }
+    let changed = true;
+    while (changed) {
+      changed = false;
+      for (const action of actions) {
+        if (affected.has(action.stageId)) continue;
+        if (action.dependsOnStageIds.some(stageId => affected.has(stageId))) {
+          affected.add(action.stageId);
+          changed = true;
+        }
+      }
+    }
+    const affectedActions = actions.filter(action => affected.has(action.stageId));
+    this.#assertNoIntegrationReservation(affectedActions, now);
+    const preservedTargetWorkspace = target.workspaceMode === 'integrate'
+      && ['prepared', 'finalized'].includes(target.workspace?.integration?.status)
+      && (!replacement || replacement.workspaceMode === 'integrate')
+      ? target.workspace
+      : null;
+    const ids = affectedActions.map(action => action.id);
+    const running = affectedActions.filter(action => action.status === 'running' && action.currentRunId);
+    const nextEpoch = new Map(actions.map(action => [action.id, action.leaseEpoch]));
+    for (const action of running) nextEpoch.set(action.id, action.leaseEpoch + 1);
+    const placeholders = ids.map(() => '?').join(',');
+    if (ids.length > 0) {
+      this.db.prepare(`UPDATE runs SET status = 'superseded', ended_at = ?, error = ?
+        WHERE action_id IN (${placeholders}) AND status = 'running'`).run(now, reason, ...ids);
+      for (const action of affectedActions) {
+        const workspace = action.id === target.id ? preservedTargetWorkspace : null;
+        this.db.prepare(`UPDATE actions SET status = 'ready', attempt = 0, current_run_id = NULL,
+          lease_epoch = ?, workspace = ?, updated_at = ? WHERE id = ?`).run(
+          nextEpoch.get(action.id), stringify(workspace), now, action.id,
+        );
+      }
+    }
+    if (replacement) {
+      this.db.prepare(`UPDATE actions SET type = ?, required_role = ?, assignment_policy = ?,
+        model_policy = ?, depends_on_stage_ids = ?, workspace_mode = ?, changes_requested_stage_id = ?,
+        instruction = ?, brief = ?, context = ?, max_attempts = ?, workspace = ?, updated_at = ?
+        WHERE id = ?`).run(
+        replacement.type || target.type,
+        replacement.requiredRole || '',
+        stringify(replacement.assignmentPolicy || null),
+        stringify(replacement.modelPolicy || null),
+        stringify(Array.isArray(replacement.dependsOnStageIds) ? replacement.dependsOnStageIds : []),
+        replacement.workspaceMode || 'shared',
+        replacement.changesRequestedStageId || null,
+        replacement.instruction || '',
+        stringify(replacement.brief || null),
+        stringify(Array.isArray(replacement.context) ? replacement.context : []),
+        Number.isInteger(replacement.maxAttempts) ? replacement.maxAttempts : 2,
+        stringify(preservedTargetWorkspace),
+        now,
+        target.id,
+      );
+    }
+    return this.getAction(target.id);
+  }
+
   createNextAction(workItemId, input) {
     return this.#insertAction(workItemId, input, this.#nextSequence(workItemId));
   }
 
+  setActionWorkspace(actionId, workspace, workspaceMode = null) {
+    const changed = this.db.prepare(`UPDATE actions SET workspace = ?,
+      workspace_mode = COALESCE(?, workspace_mode), updated_at = ? WHERE id = ?`).run(
+      stringify(workspace), workspaceMode, this.now(), actionId,
+    );
+    return Number(changed.changes) === 1 ? this.getAction(actionId) : null;
+  }
+
+  setIntegrationWorkspaceForRun(actionId, runId, ownerBootId, leaseEpoch, workspace) {
+    return withTransaction(this.db, () => {
+      const active = this.#activeRunRow(runId, ownerBootId, leaseEpoch, true);
+      if (!active || active.action_id !== actionId) return null;
+      const changed = this.db.prepare(`UPDATE actions SET workspace = ?, workspace_mode = 'integrate',
+        updated_at = ? WHERE id = ? AND status = 'running' AND current_run_id = ? AND lease_epoch = ?`).run(
+        stringify(workspace), this.now(), actionId, runId, leaseEpoch,
+      );
+      return Number(changed.changes) === 1 ? this.getAction(actionId) : null;
+    });
+  }
+
+  acquireIntegrationFinalization(actionId, runId, ownerBootId, leaseEpoch, reservationMs = 300_000) {
+    return withTransaction(this.db, () => {
+      const active = this.#activeRunRow(runId, ownerBootId, leaseEpoch, true);
+      if (!active || active.action_id !== actionId) return null;
+      const action = this.getAction(actionId);
+      if (action?.workspaceMode !== 'integrate' || action.workspace?.integration?.status !== 'prepared') return null;
+      const now = this.now();
+      const token = randomUUID();
+      const expiresAt = now + Math.max(10_000, Number(reservationMs) || 300_000);
+      const workspace = {
+        ...action.workspace,
+        integration: {
+          ...action.workspace.integration,
+          reservation: { token, runId, ownerBootId, leaseEpoch, expiresAt },
+        },
+      };
+      const changed = this.db.prepare(`UPDATE actions SET workspace = ?, updated_at = ?
+        WHERE id = ? AND status = 'running' AND current_run_id = ? AND lease_epoch = ?`).run(
+        stringify(workspace), now, actionId, runId, leaseEpoch,
+      );
+      if (Number(changed.changes) !== 1) return null;
+      this.db.prepare(`UPDATE runs SET expires_at = ? WHERE id = ? AND owner_boot_id = ?
+        AND lease_epoch = ? AND status = 'running'`).run(expiresAt, runId, ownerBootId, leaseEpoch);
+      return { action: this.getAction(actionId), token, expiresAt };
+    });
+  }
+
+  finishIntegrationFinalization(actionId, runId, ownerBootId, leaseEpoch, token, workspace) {
+    return withTransaction(this.db, () => {
+      const active = this.#activeRunRow(runId, ownerBootId, leaseEpoch, false);
+      if (!active || active.action_id !== actionId) return null;
+      const action = this.getAction(actionId);
+      const reservation = action?.workspace?.integration?.reservation;
+      if (!reservation || reservation.token !== token || reservation.runId !== runId
+          || reservation.ownerBootId !== ownerBootId || reservation.leaseEpoch !== leaseEpoch
+          || Number(reservation.expiresAt) <= this.now()) return null;
+      const changed = this.db.prepare(`UPDATE actions SET workspace = ?, workspace_mode = 'integrate',
+        updated_at = ? WHERE id = ? AND status = 'running' AND current_run_id = ? AND lease_epoch = ?`).run(
+        stringify(workspace), this.now(), actionId, runId, leaseEpoch,
+      );
+      return Number(changed.changes) === 1 ? this.getAction(actionId) : null;
+    });
+  }
+
+  rollbackIntegrationFinalization(actionId, runId, ownerBootId, leaseEpoch, token) {
+    return withTransaction(this.db, () => {
+      const active = this.#activeRunRow(runId, ownerBootId, leaseEpoch, false);
+      if (!active || active.action_id !== actionId) return null;
+      const action = this.getAction(actionId);
+      const reservation = action?.workspace?.integration?.reservation;
+      if (!reservation || reservation.token !== token || reservation.runId !== runId
+          || reservation.ownerBootId !== ownerBootId || reservation.leaseEpoch !== leaseEpoch
+          || Number(reservation.expiresAt) <= this.now()) return null;
+      const changed = this.db.prepare(`UPDATE actions SET workspace = NULL, workspace_mode = 'integrate',
+        updated_at = ? WHERE id = ? AND status = 'running' AND current_run_id = ? AND lease_epoch = ?`).run(
+        this.now(), actionId, runId, leaseEpoch,
+      );
+      return Number(changed.changes) === 1 ? this.getAction(actionId) : null;
+    });
+  }
+
+  listActionDependencies(workItemId, stageIds) {
+    if (!Array.isArray(stageIds) || stageIds.length === 0) return [];
+    const placeholders = stageIds.map(() => '?').join(',');
+    return this.db.prepare(`SELECT a.*, r.summary AS dependency_summary,
+      r.evidence AS dependency_evidence, r.vp_snapshot AS dependency_vp_snapshot
+      FROM actions a LEFT JOIN runs r ON r.id = (
+        SELECT completed.id FROM runs completed WHERE completed.action_id = a.id
+          AND completed.status = 'completed'
+          ORDER BY completed.ended_at DESC LIMIT 1
+      ) WHERE a.work_item_id = ? AND COALESCE(a.stage_id, a.type) IN (${placeholders})
+        AND a.status != 'superseded'
+      ORDER BY a.sequence`).all(workItemId, ...stageIds).map(row => ({
+        ...mapAction(row),
+        summary: row.dependency_summary || '',
+        evidence: normalizeEvidence(parseJson(row.dependency_evidence, [])),
+        vpId: parseJson(row.dependency_vp_snapshot, null)?.id || null,
+      }));
+  }
+
   getWorkItem(id) {
     return mapWorkItem(this.db.prepare('SELECT * FROM work_items WHERE id = ?').get(id));
   }
@@ -582,6 +794,9 @@ export class WorkItemStore {
   }
 
   #invalidateExecution(workItem, actionStatus, runStatus, reason, now) {
+    const openActions = this.db.prepare(`SELECT * FROM actions WHERE work_item_id = ?
+      AND status IN (${OPEN_ACTION_STATUSES})`).all(workItem.id).map(mapAction);
+    this.#assertNoIntegrationReservation(openActions, now);
     if (workItem.currentRunId) {
       this.db.prepare(`UPDATE runs SET status = ?, ended_at = ?, error = ?
         WHERE id = ? AND status = 'running'`).run(runStatus, now, reason, workItem.currentRunId);
@@ -704,8 +919,23 @@ export class WorkItemStore {
             AND status != 'running' ORDER BY ended_at DESC, started_at DESC LIMIT 1`).get(id, previous.id))
         : null;
       const now = this.now();
+      const replacement = makeAction(workItem, previous, previousRun);
+      if (workItem.workflowSnapshot?.executionMode === 'graph') {
+        if (!previous) throw new Error('WorkItem graph retry target is missing');
+        const action = this.#resetGraphFromStage(
+          id,
+          previous.stageId,
+          replacement,
+          'Superseded by manual graph retry',
+          now,
+        );
+        this.db.prepare(`UPDATE work_items SET status = 'ready', current_action_id = ?,
+          current_run_id = NULL, updated_at = ? WHERE id = ?`).run(action.id, now, id);
+        this.appendEvent(id, 'work_item.retried', { targetStageId: action.stageId }, { actionId: action.id });
+        return this.getWorkItemDetail(id);
+      }
       const action = this.#insertAction(id, {
-        ...makeAction(workItem, previous, previousRun),
+        ...replacement,
         contractRevision: workItem.revision,
       }, this.#nextSequence(id), now);
       this.db.prepare(`UPDATE work_items SET status = 'ready', current_action_id = ?,
@@ -720,7 +950,31 @@ export class WorkItemStore {
       const row = this.db.prepare(`SELECT a.* FROM actions a
         JOIN work_items w ON w.id = a.work_item_id
         WHERE a.status = 'ready' AND a.current_run_id IS NULL
-          AND w.status = 'ready' AND w.current_action_id = a.id AND w.current_run_id IS NULL
+          AND (
+            (COALESCE(json_extract(w.workflow_snapshot, '$.executionMode'), 'linear') != 'graph'
+              AND w.status = 'ready' AND w.current_action_id = a.id AND w.current_run_id IS NULL)
+            OR
+            (json_extract(w.workflow_snapshot, '$.executionMode') = 'graph'
+              AND w.status IN ('ready', 'running')
+              AND NOT EXISTS (
+                SELECT 1 FROM json_each(a.depends_on_stage_ids) dependency
+                LEFT JOIN actions required ON required.work_item_id = a.work_item_id
+                  AND required.stage_id = dependency.value
+                WHERE required.id IS NULL OR required.status != 'completed'
+              )
+              )
+          )
+          AND NOT EXISTS (
+            SELECT 1 FROM actions running
+            JOIN work_items running_item ON running_item.id = running.work_item_id
+            WHERE running.status = 'running'
+              AND running_item.workspace_key != ''
+              AND running_item.workspace_key = w.workspace_key
+              AND (a.workspace_mode IN ('shared', 'integrate')
+                OR running.workspace_mode IN ('shared', 'integrate')
+                OR (running.work_item_id != a.work_item_id
+                  AND a.workspace_mode != 'read' AND running.workspace_mode != 'read'))
+          )
         ORDER BY a.updated_at ASC, a.sequence ASC LIMIT 1`).get();
       if (!row) return null;
       const now = this.now();
@@ -732,35 +986,30 @@ export class WorkItemStore {
       const changedAction = this.db.prepare(`UPDATE actions SET status = 'running', attempt = attempt + 1,
         current_run_id = ?, lease_epoch = ?, updated_at = ?
         WHERE id = ? AND status = 'ready' AND current_run_id IS NULL`).run(
-        runId,
-        leaseEpoch,
-        now,
-        row.id,
+        runId, leaseEpoch, now, row.id,
       );
       if (Number(changedAction.changes) !== 1) return null;
-      const changedWorkItem = this.db.prepare(`UPDATE work_items SET status = 'running',
-        current_run_id = ?, updated_at = ? WHERE id = ? AND status = 'ready'
-        AND current_action_id = ? AND current_run_id IS NULL`).run(
-        runId,
-        now,
-        row.work_item_id,
-        row.id,
-      );
-      if (Number(changedWorkItem.changes) !== 1) throw new Error('WorkItem claim lost its current Action');
+      const workItem = this.getWorkItem(row.work_item_id);
+      const graphMode = workItem.workflowSnapshot?.executionMode === 'graph';
+      const changedWorkItem = graphMode
+        ? this.db.prepare(`UPDATE work_items SET status = 'running', current_action_id = ?,
+          current_run_id = NULL, updated_at = ? WHERE id = ? AND status IN ('ready', 'running')`).run(
+          row.id, now, row.work_item_id,
+        )
+        : this.db.prepare(`UPDATE work_items SET status = 'running', current_run_id = ?, updated_at = ?
+          WHERE id = ? AND status = 'ready' AND current_action_id = ? AND current_run_id IS NULL`).run(
+          runId, now, row.work_item_id, row.id,
+        );
+      if (Number(changedWorkItem.changes) !== 1) throw new Error('WorkItem claim lost its Action fence');
       this.db.prepare(`INSERT INTO runs
         (id, action_id, work_item_id, owner_boot_id, lease_epoch, status, started_at,
          expires_at, evidence, progress_revision)
         VALUES (?, ?, ?, ?, ?, 'running', ?, ?, '[]', ?)`).run(
-        runId,
-        row.id,
-        row.work_item_id,
-        ownerBootId,
-        leaseEpoch,
-        now,
-        now + leaseMs,
-        progressRevision,
+        runId, row.id, row.work_item_id, ownerBootId, leaseEpoch, now, now + leaseMs, progressRevision,
       );
-      this.appendEvent(row.work_item_id, 'run.claimed', { ownerBootId, leaseEpoch }, { actionId: row.id, runId });
+      this.appendEvent(row.work_item_id, 'run.claimed', { ownerBootId, leaseEpoch }, {
+        actionId: row.id, runId,
+      });
       return {
         workItem: this.getWorkItem(row.work_item_id),
         action: this.getAction(row.id),
@@ -770,18 +1019,20 @@ export class WorkItemStore {
   }
 
   #activeRunRow(runId, ownerBootId, leaseEpoch, requireUnexpired = true) {
-    return this.db.prepare(`SELECT r.* FROM runs r
+    const row = this.db.prepare(`SELECT r.* FROM runs r
       JOIN actions a ON a.id = r.action_id
       JOIN work_items w ON w.id = r.work_item_id
       WHERE r.id = ? AND r.owner_boot_id = ? AND r.lease_epoch = ? AND r.status = 'running'
         AND a.status = 'running' AND a.current_run_id = r.id AND a.lease_epoch = r.lease_epoch
-        AND w.status = 'running' AND w.current_action_id = a.id AND w.current_run_id = r.id
+        AND w.status IN ('ready', 'running', 'waiting')
         ${requireUnexpired ? 'AND r.expires_at > ?' : ''}`).get(
-      runId,
-      ownerBootId,
-      leaseEpoch,
-      ...(requireUnexpired ? [this.now()] : []),
+      runId, ownerBootId, leaseEpoch, ...(requireUnexpired ? [this.now()] : []),
     );
+    if (!row) return null;
+    const workItem = this.getWorkItem(row.work_item_id);
+    if (workItem?.workflowSnapshot?.executionMode === 'graph') return row;
+    return workItem?.status === 'running' && workItem.currentActionId === row.action_id
+      && workItem.currentRunId === row.id ? row : null;
   }
 
   renewLease(runId, ownerBootId, leaseEpoch, leaseMs = 60_000) {
@@ -814,6 +1065,7 @@ export class WorkItemStore {
       if (!active) return false;
       const action = this.getAction(active.action_id);
       const now = this.now();
+      this.#assertNoIntegrationReservation([action], now);
       const retryable = action.type !== 'deliver' && action.attempt < action.maxAttempts;
       const hasFinalProgress = finalProgress && typeof finalProgress === 'object';
       const runChanged = hasFinalProgress
@@ -858,15 +1110,17 @@ export class WorkItemStore {
         leaseEpoch,
       );
       if (Number(actionChanged.changes) !== 1) throw new Error('Run interruption lost the Action fence');
-      const itemChanged = this.db.prepare(`UPDATE work_items SET status = ?, current_run_id = NULL,
-        updated_at = ? WHERE id = ? AND status = 'running' AND current_action_id = ?
-        AND current_run_id = ?`).run(
-        retryable ? 'ready' : 'needs_attention',
-        now,
-        active.work_item_id,
-        action.id,
-        runId,
-      );
+      const graphMode = this.getWorkItem(active.work_item_id)?.workflowSnapshot?.executionMode === 'graph';
+      const itemChanged = graphMode
+        ? this.db.prepare(`UPDATE work_items SET status = ?, current_action_id = ?, current_run_id = NULL,
+          updated_at = ? WHERE id = ? AND status = 'running'`).run(
+          retryable ? 'ready' : 'needs_attention', action.id, now, active.work_item_id,
+        )
+        : this.db.prepare(`UPDATE work_items SET status = ?, current_run_id = NULL,
+          updated_at = ? WHERE id = ? AND status = 'running' AND current_action_id = ?
+          AND current_run_id = ?`).run(
+          retryable ? 'ready' : 'needs_attention', now, active.work_item_id, action.id, runId,
+        );
       if (Number(itemChanged.changes) !== 1) throw new Error('Run interruption lost the WorkItem fence');
       this.appendEvent(active.work_item_id, 'run.interrupted', { retryable, reason }, {
         actionId: action.id,
@@ -1018,24 +1272,52 @@ export class WorkItemStore {
       }
 
       let nextAction = null;
+      if (transition.graphResetStageId) {
+        nextAction = this.#resetGraphFromStage(
+          workItem.id,
+          transition.graphResetStageId,
+          transition.graphResetAction,
+          'Superseded by review changes request',
+          now,
+        );
+      }
+      const nextActions = Array.isArray(transition.nextActions) ? transition.nextActions : [];
+      for (const candidate of nextActions) {
+        const inserted = this.#insertAction(workItem.id, {
+          ...candidate,
+          contractRevision: nextWorkItem.revision,
+        }, this.#nextSequence(workItem.id), now);
+        if (!nextAction) nextAction = inserted;
+      }
       if (transition.nextAction) {
         nextAction = this.#insertAction(workItem.id, {
           ...transition.nextAction,
           contractRevision: nextWorkItem.revision,
         }, this.#nextSequence(workItem.id), now);
       }
-      const currentActionId = nextAction?.id
-        ?? (transition.keepCurrentAction ? action.id : null);
-      const changedWorkItem = this.db.prepare(`UPDATE work_items SET status = ?, current_action_id = ?,
-        current_run_id = NULL, updated_at = ? WHERE id = ? AND current_run_id = ?
-        AND current_action_id = ? AND status = 'running'`).run(
-        transition.workItemStatus,
-        currentActionId,
-        now,
-        workItem.id,
-        runId,
-        action.id,
-      );
+      let workItemStatus = transition.workItemStatus;
+      let currentActionId = nextAction?.id ?? (transition.keepCurrentAction ? action.id : null);
+      let changedWorkItem;
+      if (transition.graphAdvance) {
+        const remaining = this.db.prepare(`SELECT id, status FROM actions WHERE work_item_id = ?
+          AND status IN ('ready', 'running', 'waiting', 'failed') ORDER BY sequence`).all(workItem.id);
+        const blocked = remaining.find(candidate => candidate.status === 'waiting' || candidate.status === 'failed');
+        const runnable = remaining.find(candidate => candidate.status === 'ready' || candidate.status === 'running');
+        workItemStatus = blocked ? (blocked.status === 'waiting' ? 'waiting' : 'needs_attention')
+          : runnable ? (remaining.some(candidate => candidate.status === 'running') ? 'running' : 'ready')
+            : 'done';
+        currentActionId = blocked?.id || runnable?.id || null;
+        changedWorkItem = this.db.prepare(`UPDATE work_items SET status = ?, current_action_id = ?,
+          current_run_id = NULL, updated_at = ? WHERE id = ? AND status IN ('ready', 'running')`).run(
+          workItemStatus, currentActionId, now, workItem.id,
+        );
+      } else {
+        changedWorkItem = this.db.prepare(`UPDATE work_items SET status = ?, current_action_id = ?,
+          current_run_id = NULL, updated_at = ? WHERE id = ? AND current_run_id = ?
+          AND current_action_id = ? AND status = 'running'`).run(
+          workItemStatus, currentActionId, now, workItem.id, runId, action.id,
+        );
+      }
       if (Number(changedWorkItem.changes) !== 1) {
         throw new Error('Work Center terminal transition lost the current WorkItem fence');
       }
@@ -1048,22 +1330,47 @@ export class WorkItemStore {
     });
   }
 
+  #refreshGraphWorkItem(workItemId, now) {
+    const remaining = this.db.prepare(`SELECT id, status FROM actions WHERE work_item_id = ?
+      AND status IN ('ready', 'running', 'waiting', 'failed') ORDER BY sequence`).all(workItemId);
+    const blocked = remaining.find(action => action.status === 'waiting' || action.status === 'failed');
+    const runnable = remaining.find(action => action.status === 'ready' || action.status === 'running');
+    const status = blocked ? (blocked.status === 'waiting' ? 'waiting' : 'needs_attention')
+      : runnable ? (remaining.some(action => action.status === 'running') ? 'running' : 'ready')
+        : 'done';
+    const currentActionId = blocked?.id || runnable?.id || null;
+    this.db.prepare(`UPDATE work_items SET status = ?, current_action_id = ?, current_run_id = NULL,
+      updated_at = ? WHERE id = ?`).run(status, currentActionId, now, workItemId);
+  }
+
   recoverInterruptedRuns(ownerBootId) {
     return withTransaction(this.db, () => {
       const now = this.now();
       const rows = this.db.prepare(`SELECT * FROM runs
         WHERE status = 'running' AND (owner_boot_id != ? OR expires_at <= ?)`).all(ownerBootId, now);
+      let recovered = 0;
       for (const row of rows) {
         const action = this.getAction(row.action_id);
+        if (this.#hasActiveIntegrationReservation(action, now)) continue;
         const workItem = this.getWorkItem(row.work_item_id);
+        const graphMode = workItem?.workflowSnapshot?.executionMode === 'graph';
         const isCurrent = action?.status === 'running'
           && action.currentRunId === row.id
           && action.leaseEpoch === row.lease_epoch
           && workItem?.status === 'running'
-          && workItem.currentActionId === action.id
-          && workItem.currentRunId === row.id;
+          && (graphMode || (workItem.currentActionId === action.id && workItem.currentRunId === row.id));
         if (!isCurrent) {
           const staleStatus = workItem?.status === 'cancelled' ? 'cancelled' : 'superseded';
+          const stillOwnsAction = action?.status === 'running'
+            && action.currentRunId === row.id
+            && action.leaseEpoch === row.lease_epoch;
+          if (stillOwnsAction) {
+            const retryable = action.type !== 'deliver' && action.attempt < action.maxAttempts;
+            this.db.prepare(`UPDATE actions SET status = ?, current_run_id = NULL, updated_at = ?
+              WHERE id = ? AND status = 'running' AND current_run_id = ? AND lease_epoch = ?`).run(
+              retryable ? 'ready' : 'failed', now, action.id, row.id, row.lease_epoch,
+            );
+          }
           this.db.prepare(`UPDATE runs SET status = ?, ended_at = ?, error = ?
             WHERE id = ? AND status = 'running'`).run(
             staleStatus,
@@ -1075,6 +1382,8 @@ export class WorkItemStore {
             actionId: row.action_id,
             runId: row.id,
           });
+          if (graphMode && workItem) this.#refreshGraphWorkItem(workItem.id, now);
+          recovered += 1;
           continue;
         }
 
@@ -1084,19 +1393,24 @@ export class WorkItemStore {
         const retryable = action.type !== 'deliver' && action.attempt < action.maxAttempts;
         this.db.prepare(`UPDATE actions SET status = ?, current_run_id = NULL, updated_at = ?
           WHERE id = ?`).run(retryable ? 'ready' : 'failed', now, action.id);
-        this.db.prepare(`UPDATE work_items SET status = ?, current_action_id = ?,
-          current_run_id = NULL, updated_at = ? WHERE id = ?`).run(
-          retryable ? 'ready' : 'needs_attention',
-          action.id,
-          now,
-          workItem.id,
-        );
+        if (graphMode) {
+          this.#refreshGraphWorkItem(workItem.id, now);
+        } else {
+          this.db.prepare(`UPDATE work_items SET status = ?, current_action_id = ?,
+            current_run_id = NULL, updated_at = ? WHERE id = ?`).run(
+            retryable ? 'ready' : 'needs_attention',
+            action.id,
+            now,
+            workItem.id,
+          );
+        }
         this.appendEvent(workItem.id, 'run.interrupted', { retryable }, {
           actionId: action.id,
           runId: row.id,
         });
+        recovered += 1;
       }
-      return rows.length;
+      return recovered;
     });
   }
 }