@deksden-com/dd-flow-cli 0.3.1 → 0.4.1

package/dist/services/compatibility-preflight.js

@@ -1,14 +1,13 @@
 import { AppError } from "../shared/errors.js";
 import { getCliBuildInfo } from "./build-info.js";
 import { classifyCliOperation } from "./cli-operation-classifier.js";
-import { selectEngine } from "./engines.js";
-import { requireProtocol } from "./protocols.js";
-export function preflightCliCompatibility(context, args, env = process.env) {
+import { resolveOperationProjectRoot, selectEngine } from "./engines.js";
+export function preflightCliCompatibility(context, args, env = process.env, resolvedProjectRoot) {
     const classification = classifyCliOperation(args, env);
     if (classification.mode === "router_native") {
         return { ok: true, classification, compatibility: null };
     }
-    const projectRoot = resolveOperationProjectRoot(context, args);
+    const projectRoot = resolvedProjectRoot ?? resolveOperationProjectRoot(context, args);
     if (!projectRoot) {
         return { ok: true, classification, compatibility: null };
     }
@@ -27,6 +26,7 @@ export function preflightCliCompatibility(context, args, env = process.env) {
 }
 export function compatibilityReport(selection, classification) {
     const build = getCliBuildInfo();
+    const normalWriteAllowed = selection.status === "selected" && Boolean(selection.selected);
     return {
         verdict: selection.status === "selected" ? "ok" : "incompatible",
         memorybank_version: selection.memory_bank_version,
@@ -36,9 +36,11 @@ export function compatibilityReport(selection, classification) {
         engine_resolution: selection.status,
         required_engine_range: selection.required_range,
         recommended_engine_version: selection.recommended_version,
-        allowed_modes: ["read_only_diagnostics", "mb_upgrade"],
+        allowed_modes: normalWriteAllowed
+            ? ["read_only_diagnostics", "normal_write", "mb_upgrade"]
+            : ["read_only_diagnostics", "mb_upgrade"],
         operation_mode: classification.mode,
-        blocked_operation: classification.mode === "normal_write" ? classification.operation : null,
+        blocked_operation: classification.mode === "normal_write" && !normalWriteAllowed ? classification.operation : null,
         install_hint: selection.install_hint,
         project_root: selection.project_root,
         diagnostics: selection.diagnostics
@@ -51,74 +53,3 @@ function remediationForSelection(selection) {
         diagnostics: selection.diagnostics
     };
 }
-function resolveOperationProjectRoot(context, args) {
-    const [family, command, ...rest] = args;
-    const parsed = parseLightArgs(rest);
-    const explicitRoot = option(parsed, "project-root") ?? option(parsed, "root");
-    if (explicitRoot)
-        return explicitRoot;
-    if (family === "protocol") {
-        const protocolId = positional(parsed, 0);
-        if (protocolId && command && ["ready-for-merge", "cancel", "status"].includes(command)) {
-            return requireProtocol(context, protocolId).project_root;
-        }
-    }
-    if (family === "transition") {
-        const transitionParsed = parseLightArgs([command ?? "", ...rest]);
-        const protocolId = positional(transitionParsed, 0);
-        return protocolId ? requireProtocol(context, protocolId).project_root : null;
-    }
-    if (family === "plan" && (command === "set" || command === "status")) {
-        const protocolId = positional(parsed, 0);
-        return protocolId ? requireProtocol(context, protocolId).project_root : null;
-    }
-    if (family === "plan" && command === "item") {
-        const protocolId = positional(parsed, 1);
-        return protocolId ? requireProtocol(context, protocolId).project_root : null;
-    }
-    if (family === "merge-queue" && ["complete", "fail", "cancel", "note"].includes(command ?? "")) {
-        const protocolId = positional(parsed, 0);
-        return protocolId ? requireProtocol(context, protocolId).project_root : null;
-    }
-    if (family === "worktree") {
-        const protocolId = option(parsed, "protocol-id");
-        return protocolId ? requireProtocol(context, protocolId).project_root : null;
-    }
-    return null;
-}
-function parseLightArgs(args) {
-    const positional = [];
-    const options = new Map();
-    for (let index = 0; index < args.length; index += 1) {
-        const value = args[index];
-        if (value?.startsWith("--")) {
-            const equal = value.indexOf("=");
-            if (equal > 2) {
-                const key = value.slice(2, equal);
-                options.set(key, [...(options.get(key) ?? []), value.slice(equal + 1)]);
-                continue;
-            }
-            const key = value.slice(2);
-            const next = args[index + 1];
-            if (!next || next.startsWith("--")) {
-                options.set(key, [...(options.get(key) ?? []), ""]);
-            }
-            else {
-                options.set(key, [...(options.get(key) ?? []), next]);
-                index += 1;
-            }
-        }
-        else if (value) {
-            positional.push(value);
-        }
-    }
-    return { positional, options };
-}
-function option(parsed, key) {
-    const values = parsed.options.get(key);
-    const value = values?.[values.length - 1];
-    return value ? value : null;
-}
-function positional(parsed, index) {
-    return parsed.positional[index] ?? null;
-}

package/dist/services/dashboard.js

@@ -10,6 +10,7 @@ import { publishProjectSummary } from "./project-summary.js";
 import { requireProjectByRoot } from "./projects.js";
 import { protocolRunDiagnostics, protocolSetBoardForProtocol, protocolSetBoardsForProject, readProtocolRuntimeState, requireProtocol } from "./protocols.js";
 import { activeFlowSessionsForProject } from "./sessions.js";
+import { usageForRun } from "./usage.js";
 import { normalizeProtocolLifecycle } from "./protocol-lifecycle.js";
 export function getCmuxStatus(context, input) {
     const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
@@ -617,7 +618,7 @@ function buildProtocolDashboardData(context, project, protocolId, htmlPath) {
     if (!protocol) {
         throw new AppError("not_found", `Protocol is not registered: ${protocolId}`, 1, { protocol_id: protocolId });
     }
-    const runtimeProtocol = requireProtocol(context, protocol.id);
+    const runtimeProtocol = requireProtocol(context, protocol.id, project.id);
     const runtimeState = readProtocolRuntimeState(context, runtimeProtocol).state;
     const lifecycle = normalizeProtocolLifecycle({ state: runtimeState });
     const queueItem = queueForProject(context, project.id).find((item) => item.protocol_id === protocolId) ?? null;
@@ -626,6 +627,9 @@ function buildProtocolDashboardData(context, project, protocolId, htmlPath) {
      FROM flow_runs WHERE project_id = ? AND subject_type = 'protocol' AND subject_id = ?
      ORDER BY updated_at DESC, id DESC`, [project.id, protocolId]);
     const primaryRun = runs.find((run) => run.status === "running") ?? runs[0];
+    const observability = primaryRun
+        ? usageForRun(context, { projectId: project.id, runId: primaryRun.id, groupBy: "role" })
+        : { status: "not_observable", reason: "no_protocol_run" };
     const warnings = [...runDiagnostics.diagnostics];
     const protocolSetBoard = protocolSetBoardForProtocol(context, project.id, project.root, protocolId);
     const reviewRuns = recentReviewRunsForProtocol(context, project.id, protocolId, 8);
@@ -643,6 +647,7 @@ function buildProtocolDashboardData(context, project, protocolId, htmlPath) {
             run_index_path: run.run_index_path,
             updated_at: run.updated_at,
             completed_at: run.completed_at,
+            flow_flags: flowFlagsProjection(index),
             stages: Array.isArray(index?.stage_runs) ? index.stage_runs.map((stage) => stageLink(project.root, run, stage)) : []
         };
     });
@@ -696,6 +701,7 @@ function buildProtocolDashboardData(context, project, protocolId, htmlPath) {
         },
         primary_run_id: primaryRun?.id ?? null,
         primary_run_reason: primaryRun ? (primaryRun.status === "running" ? "latest running run" : "latest updated run") : "no runs registered",
+        observability,
         protocol_set_board: protocolSetBoard,
         review_runs: reviewRuns,
         run_history: runHistory,
@@ -730,7 +736,7 @@ function renderProjectDashboardMarkdown(context, project, output) {
     const config = readProjectConfig(context, project.id);
     const globalOutput = globalDashboardMarkdownPath(context, config);
     const latestProtocol = protocols.find((protocol) => isActiveProtocolStatus(protocol.status)) ?? protocols[0];
-    const latestProtocolSummary = latestProtocol ? planSummaryForProtocol(context, latestProtocol.id) : null;
+    const latestProtocolSummary = latestProtocol ? planSummaryForProtocol(context, project.id, latestProtocol.id) : null;
     const lines = [
         "# 🧭 dd-flow Dashboard",
         "",
@@ -750,14 +756,14 @@ function renderProjectDashboardMarkdown(context, project, output) {
     if (activeProtocols.length || sessions.length) {
         lines.push("| --- | --- | --- | --- |");
         for (const protocol of activeProtocols.slice(0, 5)) {
-            const summary = planSummaryForProtocol(context, protocol.id);
+            const summary = planSummaryForProtocol(context, project.id, protocol.id);
             lines.push(`| ${statusIcon(protocol.status)} ${cell(shortId(protocol.id))} | ${cell(`${protocol.stage}/${protocol.status} · ${summary.done}/${summary.total}`)} | ${cell(protocol.next_action ?? "none")} | ${cell(workspaceForProtocol(worktrees, protocol.id) ?? "-")} |`);
         }
         for (const session of sessions.slice(0, 6)) {
             lines.push(`| ${statusIcon(session.status)} ${cell(session.flow_kind)} | ${cell(session.worker_id ?? shortId(session.session_id))} | ${cell(session.next_action ?? "none")} | ${cell(compactPath(session.workspace_path))} |`);
         }
     }
-    const activeItems = activePlanItems(context, activeProtocols);
+    const activeItems = activePlanItems(context, project.id, activeProtocols);
     lines.push("", "## ✅ Plan", activeItems.length ? "| protocol | item | status | summary |" : "No active plan items.");
     if (activeItems.length) {
         lines.push("| --- | --- | --- | --- |");
@@ -793,7 +799,7 @@ function renderProjectDashboardMarkdown(context, project, output) {
     if (recentProtocols.length) {
         lines.push("| --- | --- | --- | --- |");
         for (const protocol of recentProtocols) {
-            const summary = planSummaryForProtocol(context, protocol.id);
+            const summary = planSummaryForProtocol(context, project.id, protocol.id);
             lines.push(`| ${cell(shortId(protocol.id))} | ${statusIcon(protocol.status)} ${cell(protocol.stage)}/${cell(protocol.status)} | ${cell(`${summary.done}/${summary.total}`)} | ${cell(protocol.updated_at)} |`);
         }
     }
@@ -874,8 +880,8 @@ function protocolsForProject(context, projectId) {
     return context.db.all(`SELECT id, status, stage, next_action, blockers_json, active_def_json, updated_at
      FROM protocols WHERE project_id = ? ORDER BY updated_at DESC`, [projectId]);
 }
-function planSummaryForProtocol(context, protocolId) {
-    const row = context.db.get("SELECT plan_json FROM plans WHERE protocol_id = ?", [protocolId]);
+function planSummaryForProtocol(context, projectId, protocolId) {
+    const row = context.db.get("SELECT plan_json FROM plans WHERE project_id = ? AND protocol_id = ?", [projectId, protocolId]);
     if (!row) {
         return { plan_id: "none", total: 0, done: 0, blocked: 0 };
     }
@@ -888,10 +894,10 @@ function planSummaryForProtocol(context, protocolId) {
         blocked: items.filter((item) => item.status === "blocked").length
     };
 }
-function activePlanItems(context, protocols) {
+function activePlanItems(context, projectId, protocols) {
     const items = [];
     for (const protocol of protocols) {
-        const row = context.db.get("SELECT plan_json FROM plans WHERE protocol_id = ?", [protocol.id]);
+        const row = context.db.get("SELECT plan_json FROM plans WHERE project_id = ? AND protocol_id = ?", [projectId, protocol.id]);
         if (!row) {
             continue;
         }
@@ -1031,7 +1037,7 @@ function link(label, href, status, reason) {
     };
 }
 function buildProtocolCard(context, project, protocol, generatePage) {
-    const summary = planSummaryForProtocol(context, protocol.id);
+    const summary = planSummaryForProtocol(context, project.id, protocol.id);
     const activeDefCount = jsonArray(protocol.active_def_json).length;
     const blockerCount = jsonArray(protocol.blockers_json).length;
     const latestRun = context.db.get(`SELECT id, short_id, flow_kind, subject_type, subject_id, status, verdict, next_action, run_index_path, index_json, created_at, updated_at, completed_at
@@ -1040,7 +1046,7 @@ function buildProtocolCard(context, project, protocol, generatePage) {
     let diagnostics = [];
     let lifecycle = normalizeProtocolLifecycle({ rawStage: protocol.stage, rawStatus: protocol.status });
     try {
-        const runtimeProtocol = requireProtocol(context, protocol.id);
+        const runtimeProtocol = requireProtocol(context, protocol.id, project.id);
         const runtimeState = readProtocolRuntimeState(context, runtimeProtocol).state;
         lifecycle = normalizeProtocolLifecycle({ state: runtimeState });
         diagnostics = [...protocolRunDiagnostics(context, runtimeProtocol, runtimeState).diagnostics, ...lifecycle.diagnostics];
@@ -1116,11 +1122,42 @@ function reviewRunSummary(run) {
         verdict: run.verdict,
         next_action: run.next_action,
         run_index_path: run.run_index_path,
+        flow_flags: flowFlagsProjection(index),
         report: reviewStage ? stageLink("", run, reviewStage).report : link("Run index", run.run_index_path, fs.existsSync(run.run_index_path) ? "available" : "missing"),
         updated_at: run.updated_at,
         completed_at: run.completed_at
     };
 }
+function flowFlagsProjection(index) {
+    const flags = index?.flow_flags;
+    if (!flags || typeof flags !== "object" || Array.isArray(flags))
+        return null;
+    const object = flags;
+    const values = object.values;
+    const projectedValues = {};
+    if (values && typeof values === "object" && !Array.isArray(values)) {
+        for (const [key, raw] of Object.entries(values)) {
+            if (!raw || typeof raw !== "object" || Array.isArray(raw))
+                continue;
+            const value = raw;
+            const source = value.source;
+            projectedValues[key] = {
+                value: value.value ?? null,
+                source: source && typeof source === "object" && !Array.isArray(source)
+                    ? { kind: source.kind ?? null, ref: source.ref ?? null }
+                    : null
+            };
+        }
+    }
+    return {
+        snapshot_revision: object.snapshot_revision ?? null,
+        snapshot_checksum: object.snapshot_checksum ?? null,
+        resolution_status: object.resolution_status ?? "legacy_incomplete",
+        preset: object.preset ?? null,
+        floors_applied: Array.isArray(object.floors_applied) ? object.floors_applied : [],
+        values: projectedValues
+    };
+}
 function safeParseIndex(text) {
     try {
         const parsed = JSON.parse(text);

package/dist/services/engines.js

@@ -2,13 +2,16 @@ import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { spawn } from "node:child_process";
+import { createRequire } from "node:module";
 import { getCliBuildInfo } from "./build-info.js";
 import { AppError } from "../shared/errors.js";
 import { ensureDir, engineStoreRoot, engineVersionRoot, resolveProjectRoot } from "../storage/paths.js";
 import { classifyCliOperation } from "./cli-operation-classifier.js";
+import { requireProtocol } from "./protocols.js";
 export const engineManifestSchemaId = "dd-flow/engine-manifest@1";
 const routerNativeFamilies = new Set(["engine", "version", "schema"]);
 const sourceFile = fileURLToPath(import.meta.url);
+const packageRequire = createRequire(sourceFile);
 export function isEngineMode(env) {
     return env.DD_FLOW_ENGINE_MODE === "1";
 }
@@ -115,11 +118,11 @@ export function doctorEngines(context, input = {}) {
         exit_code: checks.every((check) => check.status === "ok") && selection.status !== "missing" ? 0 : 1
     };
 }
-export function routeArgsThroughEngine(context, args, io, stdin, env) {
+export function routeArgsThroughEngine(context, args, io, stdin, env, resolvedProjectRoot) {
     if (isEngineMode(env) || isRouterNativeCommand(args))
         return Promise.resolve(null);
     installCurrentEngine(context);
-    const selection = selectEngine(context, { projectRoot: projectRootFromArgs(args) });
+    const selection = selectEngine(context, { projectRoot: resolvedProjectRoot ?? resolveOperationProjectRoot(context, args) ?? undefined });
     if (selection.status === "missing") {
         const classification = classifyCliOperation(args, env);
         if (classification.mode === "read_only_diagnostics" || classification.mode === "mb_upgrade") {
@@ -170,6 +173,33 @@ export function selectEngine(context, input) {
         diagnostics: selected ? [] : [`No installed engine satisfies ${packageName} ${requiredRange}`]
     };
 }
+export function resolveOperationProjectRoot(context, args) {
+    const [family, command, ...rest] = args;
+    const parsed = parseLightArgs(rest);
+    const explicitRoot = option(parsed, "project-root") ?? option(parsed, "root");
+    if (explicitRoot)
+        return explicitRoot;
+    let protocolId = null;
+    if (family === "protocol" && ["status", "branch-status", "transition", "sync-from-run", "ready-for-merge", "cancel", "implement"].includes(command ?? "")) {
+        protocolId = positional(parsed, 0);
+    }
+    else if (family === "transition") {
+        protocolId = positional(parseLightArgs([command ?? "", ...rest]), 0);
+    }
+    else if (family === "plan" && ["set", "status"].includes(command ?? "")) {
+        protocolId = positional(parsed, 0);
+    }
+    else if (family === "plan" && command === "item") {
+        protocolId = positional(parsed, 1);
+    }
+    else if (family === "worktree") {
+        protocolId = option(parsed, "protocol-id");
+    }
+    else if (family === "merge-queue" && ["complete", "note", "fail", "cancel"].includes(command ?? "")) {
+        protocolId = positional(parsed, 0);
+    }
+    return protocolId ? requireProtocol(context, protocolId).project_root : null;
+}
 function readCompatibilityForProject(projectRoot) {
     let resolvedProjectRoot = null;
     if (projectRoot) {
@@ -191,17 +221,38 @@ function readCompatibilityForProject(projectRoot) {
     }
     return null;
 }
-function projectRootFromArgs(args) {
+function parseLightArgs(args) {
+    const positional = [];
+    const options = new Map();
     for (let index = 0; index < args.length; index += 1) {
-        const arg = args[index];
-        if ((arg === "--project-root" || arg === "--root") && args[index + 1])
-            return args[index + 1];
-        if (arg?.startsWith("--project-root="))
-            return arg.slice("--project-root=".length);
-        if (arg?.startsWith("--root="))
-            return arg.slice("--root=".length);
+        const value = args[index];
+        if (value?.startsWith("--")) {
+            const equal = value.indexOf("=");
+            if (equal > 2) {
+                const key = value.slice(2, equal);
+                options.set(key, [...(options.get(key) ?? []), value.slice(equal + 1)]);
+                continue;
+            }
+            const key = value.slice(2);
+            const next = args[index + 1];
+            if (!next || next.startsWith("--"))
+                options.set(key, [...(options.get(key) ?? []), ""]);
+            else {
+                options.set(key, [...(options.get(key) ?? []), next]);
+                index += 1;
+            }
+        }
+        else if (value)
+            positional.push(value);
     }
-    return undefined;
+    return { positional, options };
+}
+function option(parsed, key) {
+    const values = parsed.options.get(key);
+    return values?.[values.length - 1] || null;
+}
+function positional(parsed, index) {
+    return parsed.positional[index] ?? null;
 }
 function buildManifest(context, packageName, version, packageRoot, snapshotRoot, checksumRoot) {
     return {
@@ -242,6 +293,63 @@ function copyPackageSnapshot(packageRoot, target) {
             fs.copyFileSync(from, to);
         }
     }
+    copyProductionDependencies(packageRoot, target);
+}
+function copyProductionDependencies(packageRoot, target) {
+    const queue = [{ sourceRoot: packageRoot, targetRoot: target, ancestors: new Set() }];
+    const copied = new Set();
+    while (queue.length > 0) {
+        const current = queue.shift();
+        if (!current)
+            continue;
+        for (const dependency of readProductionDependencies(current.sourceRoot)) {
+            const sourceRoot = resolvePackageRoot(dependency, current.sourceRoot);
+            if (!sourceRoot)
+                throw new AppError("engine_install_failed", `Cannot resolve runtime dependency: ${dependency}`, 1);
+            const targetRoot = path.join(current.targetRoot, "node_modules", dependency);
+            const copyKey = `${sourceRoot}\n${targetRoot}`;
+            if (copied.has(copyKey))
+                continue;
+            copied.add(copyKey);
+            copyDir(sourceRoot, targetRoot, true);
+            if (current.ancestors.has(sourceRoot))
+                continue;
+            queue.push({ sourceRoot, targetRoot, ancestors: new Set([...current.ancestors, sourceRoot]) });
+        }
+    }
+}
+function readProductionDependencies(packageRoot) {
+    try {
+        const manifest = JSON.parse(fs.readFileSync(path.join(packageRoot, "package.json"), "utf8"));
+        const dependencies = new Set();
+        for (const field of ["dependencies", "optionalDependencies"]) {
+            const value = manifest[field];
+            if (!value || typeof value !== "object" || Array.isArray(value))
+                continue;
+            for (const name of Object.keys(value))
+                dependencies.add(name);
+        }
+        return [...dependencies];
+    }
+    catch {
+        return [];
+    }
+}
+function resolvePackageRoot(name, from) {
+    try {
+        let current = path.dirname(packageRequire.resolve(name, { paths: [from] }));
+        while (true) {
+            if (fs.existsSync(path.join(current, "package.json")))
+                return fs.realpathSync(current);
+            const parent = path.dirname(current);
+            if (parent === current)
+                return null;
+            current = parent;
+        }
+    }
+    catch {
+        return null;
+    }
 }
 function inferInstallSource(packageRoot, ddFlowHome) {
     const normalized = path.resolve(packageRoot);
@@ -265,13 +373,15 @@ function hasAncestorFile(start, name) {
         current = parent;
     }
 }
-function copyDir(from, to) {
+function copyDir(from, to, skipNodeModules = false) {
     ensureDir(to);
     for (const entry of fs.readdirSync(from, { withFileTypes: true })) {
+        if (skipNodeModules && entry.name === "node_modules")
+            continue;
         const source = path.join(from, entry.name);
         const target = path.join(to, entry.name);
         if (entry.isDirectory())
-            copyDir(source, target);
+            copyDir(source, target, skipNodeModules);
         else if (entry.isFile())
             fs.copyFileSync(source, target);
     }

package/dist/services/hooks.js

@@ -695,7 +695,7 @@ function stopDecision(context, project, sessionId) {
     if (!session || ["waiting_user", "blocked", "stopping", "stopped", "closed"].includes(session.status)) {
         return {};
     }
-    if (session.protocol_id && protocolAllowsStop(context, session.protocol_id)) {
+    if (session.protocol_id && protocolAllowsStop(context, project.id, session.protocol_id)) {
         return {};
     }
     if (session.flow_kind === "merge_worker" && session.continuation_policy === "merge_queue") {
@@ -704,17 +704,17 @@ function stopDecision(context, project, sessionId) {
     if (session.flow_kind === "merge_job" && session.continuation_policy === "merge_job") {
         return stopContinuationDecision(context, project.id, sessionId, `merge-job:${session.protocol_id ?? session.session_id}:${session.next_action ?? "none"}`, `Continue dd-flow merge job ${session.protocol_id ?? ""}: complete merge work, close the protocol, and report terminal state.`);
     }
-    const nextAction = session.next_action ?? nextActionFromProtocol(context, session.protocol_id);
+    const nextAction = session.next_action ?? nextActionFromProtocol(context, project.id, session.protocol_id);
     if (!nextAction || nextAction === "none" || session.continuation_policy === "none") {
         return {};
     }
     return stopContinuationDecision(context, project.id, sessionId, `${session.flow_kind}:${session.protocol_id ?? session.session_id}:${nextAction}`, `Continue dd-flow ${session.flow_kind}${session.protocol_id ? ` ${session.protocol_id}` : ""}: ${nextAction}`);
 }
-function nextActionFromProtocol(context, protocolId) {
+function nextActionFromProtocol(context, projectId, protocolId) {
     if (!protocolId) {
         return null;
     }
-    const protocol = context.db.get("SELECT id, status, stage, next_action FROM protocols WHERE id = ?", [protocolId]);
+    const protocol = context.db.get("SELECT id, status, stage, next_action FROM protocols WHERE project_id = ? AND id = ?", [projectId, protocolId]);
     if (!protocol) {
         return null;
     }
@@ -723,8 +723,8 @@ function nextActionFromProtocol(context, protocolId) {
     }
     return protocol.next_action;
 }
-function protocolAllowsStop(context, protocolId) {
-    const protocol = context.db.get("SELECT status, stage FROM protocols WHERE id = ?", [protocolId]);
+function protocolAllowsStop(context, projectId, protocolId) {
+    const protocol = context.db.get("SELECT status, stage FROM protocols WHERE project_id = ? AND id = ?", [projectId, protocolId]);
     return Boolean(protocol && (["closed", "cancelled"].includes(protocol.status) || ["closed", "cancelled"].includes(protocol.stage)));
 }
 function stopContinuationDecision(context, projectId, sessionId, actionKey, reason, options = {}) {

package/dist/services/ids.js

@@ -2,10 +2,10 @@ import fs from "node:fs";
 import path from "node:path";
 import { formatFullId, parseFullEntityId } from "../domain/entity-ids.js";
 import { AppError } from "../shared/errors.js";
-import { projectRunHome, resolveProjectRoot } from "../storage/paths.js";
+import { resolveProjectRoot } from "../storage/paths.js";
 const kindConfig = {
     protocol: { type: "PRT", table: "protocols", fileRoot: ".memory-bank/protocol" },
-    run: { type: "RUN", table: "flow_runs", fileRoot: ".tasks/dd-flow-runs" }
+    run: { type: "RUN", table: "flow_runs" }
 };
 export function previewNextEntityId(context, input) {
     const projectRoot = resolveProjectRoot(input.projectRoot);
@@ -13,51 +13,31 @@ export function previewNextEntityId(context, input) {
     const slug = normalizeSlug(input.slug);
     const config = kindConfig[kind];
     const used = new Set();
-    for (const id of databaseIds(context, config.table, config.type)) {
+    const project = context.db.get("SELECT id FROM projects WHERE root = ?", [projectRoot]);
+    for (const id of databaseIds(context, config.table, config.type, project?.id)) {
         addSequence(used, id, config.type);
     }
-    for (const id of filesystemIds(projectRoot, config.fileRoot, config.type)) {
-        addSequence(used, id, config.type);
-    }
-    if (kind === "run") {
-        for (const id of homeRunIds(context, projectRoot)) {
+    if (config.fileRoot) {
+        for (const id of filesystemIds(projectRoot, config.fileRoot, config.type)) {
             addSequence(used, id, config.type);
         }
-        for (const id of filesystemIds(projectRoot, ".tasks", config.type)) {
-            addSequence(used, id, config.type);
-        }
-    }
-    for (let sequence = 1; sequence <= 999; sequence += 1) {
-        if (used.has(sequence))
-            continue;
-        const id = formatFullId(config.type, sequence, slug);
-        const parsed = parseFullEntityId(id);
-        return {
-            ok: true,
-            project_root: projectRoot,
-            entity: {
-                kind,
-                type: config.type,
-                id,
-                short_id: parsed.shortId,
-                slug,
-                sequence,
-                reserved: false
-            }
-        };
-    }
-    throw new AppError("validation", `${config.type} id sequence exhausted`, 2);
-}
-function homeRunIds(context, projectRoot) {
-    const project = context.db.get("SELECT id FROM projects WHERE root = ? AND status = 'active'", [projectRoot]);
-    if (!project) {
-        return [];
     }
-    const root = projectRunHome(context.ddFlowHome, project.id, "__placeholder__").replace(/__placeholder__$/, "");
-    if (!fs.existsSync(root) || !fs.statSync(root).isDirectory()) {
-        return [];
-    }
-    return fs.readdirSync(root).filter((entry) => entry.startsWith("RUN-"));
+    const sequence = Math.max(0, ...used) + 1;
+    const id = formatFullId(config.type, sequence, slug);
+    const parsed = parseFullEntityId(id);
+    return {
+        ok: true,
+        project_root: projectRoot,
+        entity: {
+            kind,
+            type: config.type,
+            id,
+            short_id: parsed.shortId,
+            slug,
+            sequence,
+            reserved: false
+        }
+    };
 }
 function parseEntityKind(value) {
     const normalized = value.toLowerCase();
@@ -67,20 +47,28 @@ function parseEntityKind(value) {
         return "run";
     throw new AppError("validation", "--type must be protocol or run", 2, { type: value });
 }
-function databaseIds(context, table, type) {
-    return context.db.all(`SELECT id FROM ${table} WHERE id LIKE ?`, [`${type}-%`]).map((row) => row.id);
+function databaseIds(context, table, type, projectId) {
+    if (!projectId)
+        return [];
+    return context.db
+        .all(`SELECT id FROM ${table} WHERE project_id = ? AND id LIKE ?`, [projectId, `${type}-%`])
+        .map((row) => row.id);
 }
 function filesystemIds(projectRoot, relativeRoot, type) {
     const root = path.join(projectRoot, relativeRoot);
-    if (!fs.existsSync(root) || !fs.statSync(root).isDirectory()) {
+    try {
+        return fs
+            .readdirSync(root)
+            .filter((entry) => entry.startsWith(`${type}-`))
+            .map((entry) => entry.replace(/\.md$/, ""));
+    }
+    catch {
         return [];
     }
-    return fs
-        .readdirSync(root)
-        .filter((entry) => entry.startsWith(`${type}-`))
-        .map((entry) => entry.replace(/\.md$/, ""));
 }
 function addSequence(used, id, type) {
+    if (type === "PRT" && isLegacyDateProtocolId(id))
+        return;
     try {
         const parsed = parseFullEntityId(id);
         if (parsed.type !== type)
@@ -91,6 +79,9 @@ function addSequence(used, id, type) {
         return;
     }
 }
+function isLegacyDateProtocolId(id) {
+    return /^PRT-\d{4}-\d{2}-\d{2}(?:-|$)/.test(id);
+}
 function normalizeSlug(value) {
     const slug = value
         .normalize("NFKD")