@deksden-com/dd-flow-cli 0.9.0-beta.1 → 0.9.0-beta.100

package/dist/services/cleanup.js

@@ -2,12 +2,12 @@ import fs from "node:fs";
 import { spawnSync } from "node:child_process";
 import path from "node:path";
 import { AppError } from "../shared/errors.js";
-import { parseJsonObject } from "../shared/json.js";
-import { ensureReadableFile } from "../storage/database.js";
-import { projectCheckoutRoot, resolveProjectRoot } from "../storage/paths.js";
+import { prepareJsonFile } from "../cli/input-preparation.js";
+import { projectCheckoutRoot, resolveProjectRoot, runtimeStateJsonPath } from "../storage/paths.js";
 import { appendAudit } from "./audit.js";
 import { requireProjectByRoot } from "./projects.js";
-import { protocolRunDiagnostics, readProtocolRuntimeState, requireProtocol } from "./protocols.js";
+import { protocolRunDiagnostics, readProtocolRuntimeState, repairProtocolRuntimeState, requireProtocol } from "./protocols.js";
+import { publicSessionIdentity } from "./session-identity.js";
 const actionKinds = new Set([
     "repair_protocol_state",
     "cancel_queue_job",
@@ -24,7 +24,8 @@ export function cleanupScan(context, input) {
     const protocols = context.db.all("SELECT id, status, stage, state_path FROM protocols WHERE project_id = ? ORDER BY id ASC", [project.id]);
     for (const protocol of protocols) {
         const terminal = ["closed", "cancelled"].includes(protocol.status) || ["closed", "cancelled"].includes(protocol.stage);
-        if (!fs.existsSync(protocol.state_path)) {
+        const requiresMigration = protocol.state_path !== runtimeStateJsonPath(context.ddFlowHome, project.id, protocol.id);
+        if (!fs.existsSync(protocol.state_path) || requiresMigration) {
             pushFinding(findings, actions, "missing_protocol_runtime_state", "warning", {
                 protocol_id: protocol.id,
                 path: protocol.state_path,
@@ -42,6 +43,8 @@ export function cleanupScan(context, input) {
             }
         }
         const fullProtocol = requireProtocol(context, protocol.id, project.id);
+        if (requiresMigration)
+            continue;
         const state = readProtocolRuntimeState(context, fullProtocol).state;
         const diagnostics = protocolRunDiagnostics(context, fullProtocol, state).diagnostics;
         for (const diagnostic of diagnostics.filter((entry) => entry.code === "protocol_run_stage_mismatch")) {
@@ -68,7 +71,7 @@ export function cleanupScan(context, input) {
             action: { kind: "cancel_queue_job", project_id: project.id, protocol_id: job.protocol_id }
         });
     }
-    const staleSessions = context.db.all(`SELECT session_id, protocol_id, workspace_path FROM sessions
+    const staleSessions = context.db.all(`SELECT session_id, harness, provider_session_id, protocol_id, workspace_path FROM sessions
      WHERE project_id = ? AND status IN ('pending', 'active', 'waiting_user', 'blocked', 'stopping')
      ORDER BY updated_at ASC, session_id ASC`, [project.id]);
     for (const session of staleSessions) {
@@ -79,11 +82,11 @@ export function cleanupScan(context, input) {
         const terminalProtocol = Boolean(protocol && (["closed", "cancelled"].includes(protocol.status) || ["closed", "cancelled"].includes(protocol.stage)));
         if (missingWorkspace || terminalProtocol) {
             pushFinding(findings, actions, "stale_flow_session", "warning", {
-                session_id: session.session_id,
+                session: publicSessionIdentity(session),
                 protocol_id: session.protocol_id,
                 missing_workspace: missingWorkspace,
                 terminal_protocol: terminalProtocol,
-                action: { kind: "close_flow_session", project_id: project.id, session_id: session.session_id }
+                action: { kind: "close_flow_session", project_id: project.id, session: publicSessionIdentity(session) }
             });
         }
     }
@@ -169,20 +172,29 @@ export function cleanupScan(context, input) {
         plan: { project_root: project.root, project_id: project.id, actions }
     };
 }
-export function cleanupApply(context, input) {
-    const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
+export function prepareCleanupApply(context, input) {
     const reason = input.reason.trim();
     if (!reason) {
         throw new AppError("validation", "cleanup apply requires --reason", 2);
     }
-    ensureReadableFile(input.planFile);
-    const plan = validateCleanupPlan(parseJsonObject(fs.readFileSync(input.planFile, "utf8"), input.planFile), project);
+    const value = prepareJsonFile(input.planFile, "cleanup plan").value;
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        throw new AppError("validation", "cleanup plan must be an object", 2);
+    const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
+    const plan = validateCleanupPlan(value, project);
     validateNoDestructiveSurprises(context, plan, input.force);
+    return { project, reason, plan };
+}
+export function cleanupApply(context, input) {
+    const { project, reason, plan } = input.prepared ?? prepareCleanupApply(context, input);
     const now = context.now();
     const results = [];
-    context.db.exec("BEGIN IMMEDIATE");
+    context.db.beginWriteTransaction();
+    let executing = false;
     try {
+        validateNoDestructiveSurprises(context, plan, input.force);
         for (const action of plan.actions) {
+            executing = true;
             results.push(applyAction(context, action, reason, input.force, now));
         }
         const changed = results.filter((result) => result.changed).length;
@@ -199,6 +211,8 @@ export function cleanupApply(context, input) {
     }
     catch (error) {
         context.db.exec("ROLLBACK");
+        if (executing)
+            throw new AppError("cleanup_apply_failed", "Cleanup failed after execution began; inspect retained artifacts before retrying", 1, { effect: "unknown", database_rolled_back: true, attempted_results: results, cause: error instanceof Error ? error.message : String(error), ...(error instanceof AppError ? { cause_code: error.code } : {}) });
         throw error;
     }
     return {
@@ -241,11 +255,35 @@ function validateCleanupPlan(value, project) {
                 actual_project_id: action.project_id
             });
         }
+        if (action.kind === "close_flow_session") {
+            const session = action.session;
+            if (!session || typeof session.harness_id !== "string" || !session.harness_id || typeof session.session_id !== "string" || !session.session_id) {
+                throw new AppError("validation", "close_flow_session requires a native session identity", 2);
+            }
+        }
+        const requiredField = action.kind === "discard_stale_run" ? "run_id"
+            : ["repair_protocol_state", "cancel_queue_job", "close_worktree_record"].includes(String(action.kind)) ? "protocol_id" : undefined;
+        if (requiredField && (typeof action[requiredField] !== "string" || !action[requiredField].trim()))
+            throw new AppError("validation", `cleanup ${String(action.kind)} requires ${requiredField}`, 2);
+        const numericField = action.kind === "expire_lane_lock" ? "lock_id" : action.kind === "expire_lane_waiter" ? "waiter_id" : undefined;
+        if (numericField && (!Number.isSafeInteger(action[numericField]) || action[numericField] < 1))
+            throw new AppError("validation", `cleanup ${String(action.kind)} requires a positive integer ${numericField}`, 2);
+        if (action.worktree_path !== undefined && (typeof action.worktree_path !== "string" || !path.isAbsolute(action.worktree_path)))
+            throw new AppError("validation", "cleanup worktree_path must be an absolute path", 2);
         return action;
     });
     return { project_root: project.root, project_id: project.id, actions };
 }
 function validateNoDestructiveSurprises(context, plan, force) {
+    for (const action of plan.actions) {
+        if (action.kind === "repair_protocol_state")
+            requireProtocol(context, action.protocol_id, action.project_id);
+        if (action.kind === "discard_stale_run") {
+            const run = context.db.get("SELECT index_json, status FROM runs WHERE project_id = ? AND id = ?", [action.project_id, action.run_id]);
+            if (run && ["running", "discarded"].includes(run.status))
+                cleanupRunIndex(run.index_json);
+        }
+    }
     const destructive = plan.actions.find((action) => action.kind === "close_worktree_record" && action.worktree_path && dirtyGit(action.worktree_path));
     if (destructive && !force) {
         throw new AppError("worktree_dirty", "cleanup apply refuses dirty worktree actions without --force --reason", 1, {
@@ -276,7 +314,7 @@ function applyAction(context, action, reason, force, now) {
         const protocol = requireProtocol(context, action.protocol_id, action.project_id);
         const beforePath = protocol.state_path;
         const existed = fs.existsSync(beforePath);
-        readProtocolRuntimeState(context, protocol);
+        repairProtocolRuntimeState(context, protocol);
         return {
             kind: action.kind,
             changed: !existed || beforePath !== protocol.state_path,
@@ -305,20 +343,23 @@ function applyAction(context, action, reason, force, now) {
         });
         return { kind: action.kind, changed: true, protocol_id: action.protocol_id };
     }
-    if (action.kind === "close_flow_session" && action.session_id) {
+    if (action.kind === "close_flow_session" && action.session) {
+        const stored = context.db.get("SELECT session_id FROM sessions WHERE project_id = ? AND harness = ? AND COALESCE(provider_session_id, session_id) = ?", [action.project_id, action.session.harness_id, action.session.session_id]);
+        if (!stored)
+            return { kind: action.kind, changed: false, skipped: true, reason: "session_not_found", session: action.session };
         const result = context.db.run(`UPDATE sessions SET status = 'stopped', stop_reason = ?, updated_at = ?, stopped_at = ?
-       WHERE project_id = ? AND session_id = ? AND status IN ('pending', 'active', 'waiting_user', 'blocked', 'stopping')`, [reason, now, now, action.project_id, action.session_id]);
+       WHERE project_id = ? AND session_id = ? AND status IN ('pending', 'active', 'waiting_user', 'blocked', 'stopping')`, [reason, now, now, action.project_id, stored.session_id]);
         if (result.changes !== 1) {
-            return { kind: action.kind, changed: false, skipped: true, reason: "already_stopped", session_id: action.session_id };
+            return { kind: action.kind, changed: false, skipped: true, reason: "already_stopped", session: action.session };
         }
         appendAudit(context, {
             projectId: action.project_id,
             eventType: "flow_session.stopped",
             reason,
             forced: force,
-            payload: { session_id: action.session_id, source: "cleanup.apply" }
+            payload: { session_id: stored.session_id, source: "cleanup.apply" }
         });
-        return { kind: action.kind, changed: true, session_id: action.session_id };
+        return { kind: action.kind, changed: true, session: action.session };
     }
     if (action.kind === "discard_stale_run" && action.run_id) {
         const run = context.db.get("SELECT status, runtime_path, run_dir, workspace_root, index_json FROM runs WHERE project_id = ? AND id = ?", [action.project_id, action.run_id]);
@@ -397,7 +438,7 @@ function applyAction(context, action, reason, force, now) {
     return { kind: action.kind, changed: false, skipped: true, reason: "invalid_action" };
 }
 function discardedRunIndex(indexJson, reason, now) {
-    const index = JSON.parse(indexJson);
+    const index = cleanupRunIndex(indexJson);
     index.schema_id = "dd-flow/flow-run@3";
     index.status = "discarded";
     index.verdict = "discarded";
@@ -407,12 +448,25 @@ function discardedRunIndex(indexJson, reason, now) {
     index.finished_at ??= now;
     return index;
 }
+function cleanupRunIndex(indexJson) {
+    try {
+        const index = JSON.parse(indexJson);
+        if (!index || typeof index !== "object" || Array.isArray(index))
+            throw new Error("RUN index must be an object");
+        return index;
+    }
+    catch (error) {
+        throw new AppError("runtime_state_invalid", "Cleanup cannot read retained RUN state", 1, { cause: String(error) });
+    }
+}
 function dirtyGit(worktreePath) {
     if (!fs.existsSync(worktreePath)) {
         return false;
     }
     const result = spawnSync("git", ["-C", worktreePath, "status", "--porcelain"], { encoding: "utf8" });
-    return result.status === 0 && result.stdout.trim().length > 0;
+    if (result.error || result.status !== 0)
+        throw new AppError("workspace_status_failed", "Cannot establish worktree status before cleanup", 1, { path: worktreePath, cause: result.error?.message ?? result.stderr });
+    return result.stdout.trim().length > 0;
 }
 function safeCleanupWorktreePath(context, projectId, worktreePath) {
     if (!fs.existsSync(worktreePath)) {

package/dist/services/cli-operation-classifier.js

@@ -1,3 +1,4 @@
+import { parseCommandArgs } from "./lifecycle-command.js";
 export function classifyCliOperation(args, env = process.env) {
     const positional = positionalArgs(args);
     const [family = null, command = null, action = null] = positional;
@@ -14,19 +15,7 @@ export function classifyCliOperation(args, env = process.env) {
     return { mode: "normal_write", operation, family, command, action };
 }
 function positionalArgs(args) {
-    const positional = [];
-    for (let index = 0; index < args.length; index += 1) {
-        const value = args[index];
-        if (!value)
-            continue;
-        if (value.startsWith("--")) {
-            if (!value.includes("=") && args[index + 1] && !args[index + 1]?.startsWith("--"))
-                index += 1;
-            continue;
-        }
-        positional.push(value);
-    }
-    return positional;
+    return parseCommandArgs(args).positional;
 }
 export function isReadOnlyCliOperation(args, env = process.env) {
     return classifyCliOperation(args, env).mode === "read_only_diagnostics";
@@ -57,7 +46,7 @@ function isMbUpgradeMode(args, env) {
     }
     return marked && isUpgradeAllowlisted(args);
 }
-function isUpgradeAllowlisted(args) {
+export function isUpgradeAllowlisted(args) {
     const positional = positionalArgs(args);
     const [family, command] = positional;
     if (family === "status")
@@ -82,14 +71,9 @@ function hasRunBinding(args) {
     return Boolean(optionValue(args, "run") || positionalArgs(args).some((value) => value.startsWith("RUN-")));
 }
 function optionValue(args, name) {
-    for (let index = args.length - 1; index >= 0; index -= 1) {
-        const arg = args[index];
-        if (arg === `--${name}`)
-            return args[index + 1] ?? null;
-        if (arg?.startsWith(`--${name}=`))
-            return arg.slice(name.length + 3);
-    }
-    return null;
+    const values = parseCommandArgs(args).options.get(name);
+    const value = values?.[values.length - 1];
+    return value && value !== "__dd_flow_flag__" ? value : null;
 }
 function isRouterNative(args) {
     const first = args[0];
@@ -101,11 +85,17 @@ function isRouterNative(args) {
         return true;
     if (["engine", "version", "schema"].includes(first))
         return true;
+    if (first === "storage" && args[1] === "migrate-writer")
+        return true;
     return (first === "codex" && args[1] === "hook" && args[2] === "handle")
+        || (first === "zcode" && args[1] === "hook" && args[2] === "handle")
+        || (first === "zcode" && args[1] === "invocation" && args[2] === "prepare")
         || (first === "zcode" && args[1] === "event" && args[2] === "handle")
         || (first === "zcode" && args[1] === "usage" && args[2] === "ingest")
         || (first === "grok" && args[1] === "event" && args[2] === "handle")
         || (first === "grok" && args[1] === "usage" && args[2] === "ingest")
+        || (first === "droid" && args[1] === "event" && args[2] === "handle")
+        || (first === "droid" && args[1] === "usage" && args[2] === "ingest")
         || (first === "opencode" && args[1] === "event" && args[2] === "handle")
         || (first === "opencode" && args[1] === "usage" && args[2] === "ingest")
         || (first === "agy" && args[1] === "event" && args[2] === "handle")
@@ -119,13 +109,21 @@ function isReadOnlyDiagnostic(family, command, action) {
     if (family === "canon")
         return command === "status" || command === "resolve";
     if (family === "project")
-        return command === "status" || command === "resolve";
+        return command === "status" || command === "resolve" || (command === "config" && action === "status");
     if (family === "protocol")
         return ["status", "branch-status", "ready", "blockers", "implement"].includes(command ?? "");
     if (family === "plan")
         return command === "status";
     if (family === "run")
-        return command === "status" || command === "list";
+        return ["status", "list", "timeline"].includes(command ?? "") || (["config", "flags", "drive", "control"].includes(command ?? "") && action === "status") || (command === "vars" && ["ls", "get"].includes(action ?? "")) || (command === "recovery" && action === "inspect");
+    if (family === "runtime" && command === "process" && ["status", "check-admission"].includes(action ?? ""))
+        return true;
+    if (family === "runtime" && command === "scope" && action === "status")
+        return true;
+    if (family === "work")
+        return ["status", "ls", "show"].includes(command ?? "");
+    if (family === "stage")
+        return command === "fanout" && action === "status";
     if (family === "lane") {
         return (command === "status" ||
             command === "waiters" ||