@deksden-com/dd-flow-cli 0.6.0 → 0.8.0-beta.135

package/dist/services/ids.js

@@ -4,8 +4,9 @@ import { formatFullId, parseFullEntityId } from "../domain/entity-ids.js";
 import { AppError } from "../shared/errors.js";
 import { resolveProjectRoot } from "../storage/paths.js";
 const kindConfig = {
-    protocol: { type: "PRT", table: "protocols", fileRoot: ".memory-bank/protocol" },
-    run: { type: "RUN", table: "flow_runs" }
+    protocol: { type: "PRT", table: "protocols", idField: "id", fileRoot: ".memory-bank/protocol" },
+    run: { type: "RUN", table: "runs", idField: "id" },
+    work: { type: "WRK", table: "works", idField: "work_id" }
 };
 export function previewNextEntityId(context, input) {
     const projectRoot = resolveProjectRoot(input.projectRoot);
@@ -14,7 +15,7 @@ export function previewNextEntityId(context, input) {
     const config = kindConfig[kind];
     const used = new Set();
     const project = context.db.get("SELECT id FROM projects WHERE root = ?", [projectRoot]);
-    for (const id of databaseIds(context, config.table, config.type, project?.id)) {
+    for (const id of databaseIds(context, config.table, config.idField, config.type, project?.id)) {
         addSequence(used, id, config.type);
     }
     if (config.fileRoot) {
@@ -39,19 +40,28 @@ export function previewNextEntityId(context, input) {
         }
     };
 }
+/** Work ids are globally allocated because work_id is the database primary key. */
+export function nextWorkId(context, _projectId, slug) {
+    const used = new Set();
+    for (const row of context.db.all("SELECT work_id AS id FROM works WHERE work_id LIKE ?", ["WRK-%"]))
+        addSequence(used, row.id, "WRK");
+    return formatFullId("WRK", Math.max(0, ...used) + 1, normalizeSlug(slug));
+}
 function parseEntityKind(value) {
     const normalized = value.toLowerCase();
     if (normalized === "protocol" || normalized === "prt")
         return "protocol";
     if (normalized === "run")
         return "run";
-    throw new AppError("validation", "--type must be protocol or run", 2, { type: value });
+    if (normalized === "work" || normalized === "wrk")
+        return "work";
+    throw new AppError("validation", "--type must be protocol, run, or work", 2, { type: value });
 }
-function databaseIds(context, table, type, projectId) {
+function databaseIds(context, table, idField, type, projectId) {
     if (!projectId)
         return [];
     return context.db
-        .all(`SELECT id FROM ${table} WHERE project_id = ? AND id LIKE ?`, [projectId, `${type}-%`])
+        .all(`SELECT ${idField} AS id FROM ${table} WHERE project_id = ? AND ${idField} LIKE ?`, [projectId, `${type}-%`])
         .map((row) => row.id);
 }
 function filesystemIds(projectRoot, relativeRoot, type) {

package/dist/services/lanes.js

@@ -10,8 +10,6 @@ const defaultTtlSeconds = 300;
 const defaultPollIntervalSeconds = 10;
 export function getLaneStatus(context, input) {
     const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
-    expireStaleLocks(context, project.id);
-    expireStaleWaiters(context, project.id);
     return {
         ok: true,
         lanes: lanesForProject(context, project.id, input.lane),
@@ -179,8 +177,6 @@ export async function waitForLaneLock(context, input) {
 }
 export function getLaneWaiters(context, input) {
     const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
-    expireStaleLocks(context, project.id);
-    expireStaleWaiters(context, project.id);
     return {
         ok: true,
         lane: input.lane ? normalizeLane(input.lane) : null,
@@ -463,7 +459,7 @@ function assertWorkerMayAcquireLaneLock(context, projectId, lane, workerId) {
     if (lane !== "merge") {
         return;
     }
-    const latest = context.db.get(`SELECT status, stop_reason, flow_kind FROM flow_sessions
+    const latest = context.db.get(`SELECT status, stop_reason, flow_kind FROM sessions
      WHERE project_id = ? AND worker_id = ? AND flow_kind IN ('merge_worker', 'merge_job')
      ORDER BY updated_at DESC, rowid DESC LIMIT 1`, [projectId, workerId]);
     if (latest && ["stopped", "stopping"].includes(latest.status)) {

package/dist/services/merge-queue.js

@@ -1,4 +1,4 @@
-import { loadProjectFlowContract } from "../domain/flow-contract.js";
+import { flowContractForState } from "../domain/flow-contract.js";
 import { AppError } from "../shared/errors.js";
 import { appendAudit } from "./audit.js";
 import { requireProjectByRoot } from "./projects.js";
@@ -73,6 +73,54 @@ export function claimNextMergeJob(context, input) {
         claimed: Boolean(claimedProtocolId)
     });
 }
+export function claimMergeJob(context, input) {
+    const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
+    const stopState = stoppedMergeWorkerState(context, project.id, input.workerId);
+    if (stopState.stopped) {
+        throw new AppError("merge_worker_stopped", "Stopped or stopping merge worker cannot claim another merge job", 1, {
+            worker_id: input.workerId,
+            status: stopState.status,
+            reason: stopState.reason
+        });
+    }
+    requireLaneLockOwner(context, {
+        projectRoot: project.root,
+        lane: "merge",
+        workerId: input.workerId,
+        workspacePath: input.workspacePath
+    });
+    const now = context.now();
+    context.db.exec("BEGIN IMMEDIATE");
+    try {
+        const job = queueJobByProtocol(context, project.id, input.protocolId);
+        if (!job || !["ready", "requeued"].includes(job.status)) {
+            throw new AppError("merge_job_not_claimable", "Requested merge job is not ready to claim", 1, {
+                protocol_id: input.protocolId,
+                status: job?.status ?? "missing",
+                allowed: ["ready", "requeued"]
+            });
+        }
+        const update = context.db.run(`UPDATE merge_queue
+       SET status = 'claimed', claimed_by_session_id = ?, claimed_at = ?, updated_at = ?
+       WHERE id = ? AND status IN ('ready', 'requeued')`, [input.workerId, now, now, job.id]);
+        if (update.changes !== 1) {
+            throw new AppError("merge_job_claim_race", "Requested merge job changed while claiming", 1, { protocol_id: input.protocolId });
+        }
+        appendAudit(context, {
+            protocolId: job.protocol_id,
+            projectId: project.id,
+            eventType: "merge_queue.claimed",
+            payload: { protocol_id: job.protocol_id, worker_id: input.workerId, targeted: true }
+        });
+        transitionClaimedProtocolToIntegration(context, project.id, job.protocol_id, input.workerId, now);
+        context.db.exec("COMMIT");
+        return mergeQueueResult(queueJobByProtocol(context, project.id, job.protocol_id), { ok: true, outcome: "claimed", claimed: true, targeted: true });
+    }
+    catch (error) {
+        context.db.exec("ROLLBACK");
+        throw error;
+    }
+}
 export function claimMergeBundle(context, input) {
     const { project, protocolIds } = requireClaimableBranchBundle(context, {
         projectRoot: input.projectRoot,
@@ -292,7 +340,7 @@ export function completeMergeJob(context, input) {
      SET status = 'merged', last_reason = ?, completed_at = ?, updated_at = ?
      WHERE id = ?`, [input.summary, now, now, job.id]);
     const state = readProtocolRuntimeState(context, protocol).state;
-    const flowContract = loadProjectFlowContract(protocol.project_root);
+    const flowContract = flowContractForState(state);
     const targetStage = flowContract.merge_queue.complete.target_stage;
     const targetStatus = flowContract.stages[targetStage]?.terminal ? targetStage : "running";
     persistProtocolState(context, protocol, {
@@ -342,7 +390,7 @@ export function completeMergeBundle(context, input) {
          SET status = 'merged', last_reason = ?, completed_at = ?, updated_at = ?
          WHERE id = ?`, [input.summary, now, now, job.id]);
             const state = readProtocolRuntimeState(context, protocol).state;
-            const flowContract = loadProjectFlowContract(protocol.project_root);
+            const flowContract = flowContractForState(state);
             const targetStage = flowContract.merge_queue.complete.target_stage;
             const targetStatus = flowContract.stages[targetStage]?.terminal ? targetStage : "running";
             persistProtocolState(context, protocol, {
@@ -643,7 +691,7 @@ function requireClaimedJob(context, projectId, protocolId, sessionId) {
 function transitionClaimedProtocolToIntegration(context, projectId, protocolId, workerId, now) {
     const protocol = requireProtocol(context, protocolId, projectId);
     const state = readProtocolRuntimeState(context, protocol).state;
-    const flowContract = loadProjectFlowContract(protocol.project_root);
+    const flowContract = flowContractForState(state);
     if (!["ready_for_merge", "queued_for_merge"].includes(state.stage)) {
         throw new AppError("merge_protocol_not_ready", "Cannot claim a protocol whose runtime state is not ready for merge", 1, {
             protocol_id: protocolId,
@@ -685,7 +733,7 @@ function releaseLaneLockIfOwned(context, input) {
     }
 }
 function stopAfterCurrentIfRequested(context, projectId, projectRoot, workerId, reason) {
-    const requested = context.db.get(`SELECT session_id FROM flow_sessions
+    const requested = context.db.get(`SELECT session_id FROM sessions
      WHERE project_id = ? AND worker_id = ? AND flow_kind = 'merge_worker'
        AND status = 'stopping' AND current_stage = 'stop_after_current'
      ORDER BY updated_at DESC, rowid DESC LIMIT 1`, [projectId, workerId]);

package/dist/services/merge-worker.js

@@ -1,7 +1,7 @@
 import { AppError } from "../shared/errors.js";
 import { resolveProjectRoot } from "../storage/paths.js";
 import { appendAudit } from "./audit.js";
-import { ensureLaneWorkspace, acquireLaneLock, releaseLaneLock, expireProjectLaneLocks } from "./lanes.js";
+import { ensureLaneWorkspace, acquireLaneLock, releaseLaneLock } from "./lanes.js";
 import { claimNextMergeJob, queueForProject } from "./merge-queue.js";
 import { requireProjectByRoot } from "./projects.js";
 import { buildStaticFlowGuidance } from "./flow-guidance.js";
@@ -72,7 +72,7 @@ export function stopProjectMergeWorker(context, input) {
     if (claimed.length > 0) {
         const now = context.now();
         for (const session of targetSessions) {
-            context.db.run(`UPDATE flow_sessions
+            context.db.run(`UPDATE sessions
          SET status = 'stopping', stop_reason = ?, current_stage = ?, next_action = ?, updated_at = ?
          WHERE project_id = ? AND session_id = ?`, [input.reason, "stop_after_current", "finish_current_merge_job_then_stop", now, project.id, session.session_id]);
         }
@@ -175,15 +175,14 @@ function withJobGuidance(context, job) {
     }
 }
 function detectMergeWorkerState(context, projectId) {
-    expireProjectLaneLocks(context, projectId);
     const workers = activeMergeWorkerSessions(context, projectId);
     const workerIds = [...new Set(workers.map((worker) => worker.worker_id).filter((value) => Boolean(value)))];
     const claimed = context.db.all(`SELECT protocol_id, claimed_by_session_id, status, updated_at FROM merge_queue
      WHERE project_id = ? AND status = 'claimed'
      ORDER BY updated_at DESC, id DESC`, [projectId]);
     const lock = context.db.get(`SELECT worker_id, status, expires_at, reason FROM lane_locks
-     WHERE project_id = ? AND lane = 'merge' AND status = 'active'
-     ORDER BY updated_at DESC, id DESC LIMIT 1`, [projectId]);
+     WHERE project_id = ? AND lane = 'merge' AND status = 'active' AND expires_at > ?
+     ORDER BY updated_at DESC, id DESC LIMIT 1`, [projectId, context.now()]);
     if (workerIds.length > 1) {
         return { state: "blocked", reason: "multiple_active_merge_workers", workers };
     }
@@ -199,7 +198,7 @@ function detectMergeWorkerState(context, projectId) {
     return { state: "clear" };
 }
 function activeMergeWorkerSessions(context, projectId) {
-    return context.db.all(`SELECT session_id, worker_id, status, current_stage, next_action, updated_at FROM flow_sessions
+    return context.db.all(`SELECT session_id, worker_id, status, current_stage, next_action, updated_at FROM sessions
      WHERE project_id = ? AND flow_kind = 'merge_worker' AND status IN ('pending', 'active', 'waiting_user', 'blocked', 'stopping')
      ORDER BY updated_at DESC, rowid DESC`, [projectId]);
 }