@deksden-com/dd-flow-cli 0.4.2 → 0.6.0

package/dist/services/sessions.js

@@ -8,7 +8,60 @@ import { appendAudit } from "./audit.js";
 import { cancelLaneWaitersForWorker } from "./lanes.js";
 import { checkpointSessionUsage } from "./usage.js";
 import { refreshRunSessionProjection } from "./run-projection.js";
+import { reconcileSessionCoverageRows } from "../domain/session-coverage.js";
 import { appendFlowRunTimelineEvent } from "./runs.js";
+export function recordFlowSessionObservation(context, input) {
+    const duplicate = context.db.get("SELECT id FROM flow_session_segments WHERE project_id = ? AND event_key = ?", [input.projectId, input.eventKey]);
+    if (duplicate)
+        return { changed: false, segment_id: duplicate.id };
+    const open = context.db.get(`SELECT id, run_id, protocol_id FROM flow_session_segments
+     WHERE project_id = ? AND session_id = ? AND ended_at IS NULL ORDER BY started_at DESC, id DESC LIMIT 1`, [input.projectId, input.sessionId]);
+    const now = context.now();
+    const runId = input.runId ?? null;
+    const protocolId = input.protocolId ?? null;
+    if (open && open.run_id === runId && open.protocol_id === protocolId) {
+        return { changed: false, segment_id: open.id };
+    }
+    if (open)
+        context.db.run("UPDATE flow_session_segments SET ended_at = ? WHERE id = ? AND ended_at IS NULL", [now, open.id]);
+    const result = context.db.run(`INSERT INTO flow_session_segments
+      (project_id, session_id, run_id, protocol_id, started_at, ended_at, cwd, tool_name, event_key)
+     VALUES (?, ?, ?, ?, ?, NULL, ?, ?, ?)`, [input.projectId, input.sessionId, runId, protocolId, now, input.cwd ?? null, input.toolName ?? null, input.eventKey]);
+    return { changed: true, segment_id: Number(result.lastInsertRowid) };
+}
+export function bindObservedFlowSession(context, project, payload, sessionId) {
+    if (resolveProjectRoot(payload.project_root) !== project.root) {
+        throw new AppError("project_mismatch", "Observed session payload project_root does not match hook cwd project", 1, {
+            expected: project.root,
+            actual: payload.project_root
+        });
+    }
+    const session = upsertFlowSession(context, project, payload, sessionId);
+    if (session.session_kind !== "orchestrator") {
+        const now = context.now();
+        for (const unit of payload.coverage_units ?? []) {
+            if (!unit.job_id)
+                continue;
+            context.db.run(`UPDATE flow_jobs SET status = 'running', worker_session_id = ?, attempts = attempts + 1, started_at = COALESCE(started_at, ?), updated_at = ?
+         WHERE project_id = ? AND run_id = ? AND job_id = ? AND status IN ('pending', 'failed')`, [session.session_id, now, now, project.id, session.run_id ?? "", unit.job_id]);
+        }
+    }
+    if (session.run_id)
+        refreshRunSessionProjection(context, project.id, session.run_id);
+    return session;
+}
+export function registerFlowJob(context, input) {
+    const jobId = input.jobId ?? `JOB-${input.runId}-${input.planItemId}`.replace(/[^A-Za-z0-9_-]+/g, "-");
+    const now = context.now();
+    context.db.run(`INSERT INTO flow_jobs (job_id, project_id, run_id, protocol_id, plan_item_id, group_id, status, worker_session_id, attempts, last_error, registered_at, updated_at, started_at, finished_at)
+     VALUES (?, ?, ?, ?, ?, ?, 'pending', NULL, 0, NULL, ?, ?, NULL, NULL)
+     ON CONFLICT(project_id, run_id, plan_item_id) DO UPDATE SET protocol_id = excluded.protocol_id, group_id = excluded.group_id, updated_at = excluded.updated_at`, [jobId, input.projectId, input.runId, input.protocolId ?? null, input.planItemId, input.groupId ?? null, now, now]);
+    refreshRunSessionProjection(context, input.projectId, input.runId);
+    return context.db.get("SELECT * FROM flow_jobs WHERE project_id = ? AND run_id = ? AND plan_item_id = ?", [input.projectId, input.runId, input.planItemId]) ?? { job_id: jobId };
+}
+export function flowJobsForRun(context, projectId, runId) {
+    return context.db.all("SELECT * FROM flow_jobs WHERE project_id = ? AND run_id = ? ORDER BY plan_item_id", [projectId, runId]);
+}
 export function registerFlowSession(context, input) {
     const payload = decodeFlowSessionPayload(input);
     const project = requireProjectByRoot(context, resolveProjectRoot(payload.project_root));
@@ -36,14 +89,19 @@ export function registerFlowSession(context, input) {
 }
 export function getFlowSessionStatus(context, input) {
     const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
+    const sessions = flowSessionsForProject(context, project.id, {
+        sessionId: input.sessionId,
+        workerId: input.workerId
+    });
     return {
         ok: true,
-        sessions: flowSessionsForProject(context, project.id, {
-            sessionId: input.sessionId,
-            workerId: input.workerId
-        })
+        sessions,
+        coverage: reconcileSessionCoverage(sessions)
     };
 }
+export function reconcileSessionCoverage(sessions) {
+    return reconcileSessionCoverageRows(sessions);
+}
 export function stopFlowSession(context, input) {
     const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
     const session = requireFlowSession(context, project.id, input.sessionId);
@@ -126,67 +184,11 @@ export function updateFlowSessionContinuation(context, projectId, sessionId, act
         refreshRunSessionProjection(context, projectId, session.run_id);
     return nextCount;
 }
-export function recordPendingFlowSessionBinding(context, project, input) {
-    const payload = flowSessionPayloadFromRegisterCommand(input.command);
-    if (!payload) {
-        return { recorded: false };
-    }
-    const payloadRoot = resolveProjectRoot(payload.project_root);
-    if (payloadRoot !== project.root) {
-        throw new AppError("project_mismatch", "Session register payload project_root does not match hook project", 1, {
-            expected: project.root,
-            actual: payloadRoot
-        });
-    }
-    const now = context.now();
-    context.db.run(`INSERT INTO pending_flow_session_bindings
-      (session_id, project_id, payload_json, cwd, transcript_path, turn_id, status, created_at, updated_at)
-     VALUES (?, ?, ?, ?, ?, ?, 'observed', ?, ?)
-     ON CONFLICT(session_id, project_id) DO UPDATE SET
-       payload_json = excluded.payload_json,
-       cwd = COALESCE(excluded.cwd, cwd),
-       transcript_path = COALESCE(excluded.transcript_path, transcript_path),
-       turn_id = excluded.turn_id,
-       status = 'observed',
-       updated_at = excluded.updated_at`, [
-        input.sessionId,
-        project.id,
-        JSON.stringify(sanitizeSessionPayload(payload)),
-        input.cwd ?? payload.cwd ?? null,
-        input.transcriptPath ?? payload.transcript_path ?? null,
-        input.turnId ?? null,
-        now,
-        now
-    ]);
-    return { recorded: true, payload };
-}
-export function confirmPendingFlowSessionBinding(context, project, input) {
-    const pending = context.db.get("SELECT * FROM pending_flow_session_bindings WHERE project_id = ? AND session_id = ? AND status = 'observed'", [project.id, input.sessionId]);
-    if (!pending) {
-        return undefined;
-    }
-    const payload = normalizeFlowSessionPayload(JSON.parse(pending.payload_json));
-    const session = upsertFlowSession(context, project, {
-        ...payload,
-        cwd: pending.cwd ?? payload.cwd ?? null,
-        transcript_path: pending.transcript_path ?? payload.transcript_path ?? null
-    }, input.sessionId);
-    if (session.run_id)
-        refreshRunSessionProjection(context, project.id, session.run_id);
-    context.db.run(`UPDATE pending_flow_session_bindings SET status = 'confirmed', updated_at = ?
-     WHERE project_id = ? AND session_id = ?`, [context.now(), project.id, input.sessionId]);
-    appendAudit(context, {
-        projectId: project.id,
-        eventType: "flow_session.bound",
-        payload: { project_id: project.id, session_id: input.sessionId, flow_kind: session.flow_kind },
-        ...(session.protocol_id ? { protocolId: session.protocol_id } : {})
-    });
-    return session;
-}
 export function flowSessionPayloadFromRegisterCommand(command) {
-    if (!/\bdd-flow\s+session\s+register\b/.test(command)) {
+    if (/\bdd-flow\s+stage\s+start\b/.test(command))
+        return flowSessionPayloadFromStageStartCommand(command);
+    if (!/\bdd-flow\s+session\s+register\b/.test(command))
         return undefined;
-    }
     const payloadBase64 = optionFromCommand(command, "payload-base64");
     const payloadJson = optionFromCommand(command, "payload-json");
     const payloadFile = optionFromCommand(command, "payload-file");
@@ -195,6 +197,25 @@ export function flowSessionPayloadFromRegisterCommand(command) {
     }
     return decodeFlowSessionPayload({ payloadBase64, payloadJson, payloadFile });
 }
+function flowSessionPayloadFromStageStartCommand(command) {
+    const projectRoot = optionFromCommand(command, "project-root");
+    const stage = optionFromCommand(command, "stage");
+    const run = command.match(/\bdd-flow\s+stage\s+start\s+([^\s]+)/)?.[1];
+    if (!projectRoot || !stage || !run || run.startsWith("--"))
+        return undefined;
+    return {
+        project_root: projectRoot,
+        flow_kind: ["code", "implementation", "readiness", "merge"].includes(stage) ? "implementation" : "planning",
+        run_id: run,
+        protocol_id: null,
+        worker_id: null,
+        workspace_path: null,
+        continuation_policy: "go_router",
+        session_kind: "orchestrator",
+        current_stage: stage,
+        coverage_units: []
+    };
+}
 function decodeFlowSessionPayload(input) {
     if (input.payloadFile) {
         return normalizeFlowSessionPayload(parseJsonObject(fs.readFileSync(input.payloadFile, "utf8"), "session payload"));
@@ -320,6 +341,10 @@ function markSessionStopped(context, project, session, reason) {
     context.db.run(`UPDATE flow_sessions
      SET status = 'stopped', stop_reason = ?, updated_at = ?, stopped_at = ?
      WHERE project_id = ? AND session_id = ?`, [reason, now, now, project.id, session.session_id]);
+    if (session.run_id && session.session_kind !== "orchestrator") {
+        context.db.run(`UPDATE flow_jobs SET status = 'pending', worker_session_id = NULL, last_error = ?, updated_at = ?
+       WHERE project_id = ? AND run_id = ? AND worker_session_id = ? AND status = 'running'`, [reason, now, project.id, session.run_id, session.session_id]);
+    }
     if (session.run_id)
         appendFlowRunTimelineEvent(context, project.id, session.run_id, { type: "session_stopped", session_id: session.session_id });
     if (session.run_id)
@@ -374,13 +399,6 @@ function optionFromCommand(command, key) {
     const match = command.match(pattern);
     return match?.[1] ?? match?.[2] ?? match?.[3];
 }
-function sanitizeSessionPayload(payload) {
-    return {
-        ...payload,
-        next_action: redactString(payload.next_action ?? null),
-        metadata: sanitizeValue(payload.metadata ?? {})
-    };
-}
 function sanitizeValue(value) {
     if (Array.isArray(value)) {
         return value.map(sanitizeValue);
@@ -427,9 +445,8 @@ function sessionKind(payload) {
 function normalizeCoverageUnits(value) {
     if (value === undefined || value === null)
         return [];
-    if (!Array.isArray(value)) {
+    if (!Array.isArray(value))
         throw new AppError("validation", "coverage_units must be an array", 2);
-    }
     return value.map((item, index) => {
         if (!item || typeof item !== "object" || Array.isArray(item)) {
             throw new AppError("validation", `coverage_units[${index}] must be an object`, 2);
@@ -438,7 +455,14 @@ function normalizeCoverageUnits(value) {
         if (typeof object.unit_id !== "string" || object.unit_id.length === 0) {
             throw new AppError("validation", `coverage_units[${index}].unit_id is required`, 2);
         }
-        const optional = (key) => object[key] === undefined || object[key] === null ? null : typeof object[key] === "string" ? object[key] : (() => { throw new AppError("validation", `coverage_units[${index}].${key} must be a string`, 2); })();
+        const optional = (key) => {
+            const field = object[key];
+            if (field === undefined || field === null)
+                return null;
+            if (typeof field === "string")
+                return field;
+            throw new AppError("validation", `coverage_units[${index}].${key} must be a string`, 2);
+        };
         return { unit_id: object.unit_id, group_id: optional("group_id"), job_id: optional("job_id"), kind: optional("kind") };
     });
 }