@deksden-com/dd-flow-cli 0.9.0-beta.15 → 0.9.0-beta.151

package/dist/services/projects.js

@@ -1,44 +1,24 @@
-import fs from "node:fs";
 import path from "node:path";
-import { formatFullId, isFullEntityId, isShortEntityId, parseFullEntityId, slugFromRoot } from "../domain/entity-ids.js";
+import { foreignKeyTransaction } from "../storage/foreign-key-transaction.js";
+import { isFullEntityId, isShortEntityId, parseFullEntityId } from "../domain/entity-ids.js";
 import { AppError } from "../shared/errors.js";
 import { projectRuntimeRoot, resolveProjectRoot } from "../storage/paths.js";
 import { appendAudit } from "./audit.js";
+import { registerProject, registerPreparedProject, PreparedProjectRegistration, normalizeStoredRoot, findProjectByRoot, requireProjectByRoot, newProjectRecord } from "./project-registry.js";
+export { registerProject, registerPreparedProject, PreparedProjectRegistration, findProjectByRoot, requireProjectByRoot };
 import { activeCodexSessionBindingsForProject, activeFlowSessionBindingsForProject, codexHomeProfilesForProject, codexHookEventsForProject, hookStatusForProject } from "./hooks.js";
 import { dashboardMarkdownPath, globalDashboardMarkdownPath, readProjectConfig } from "./config.js";
 import { loadProjectFlowContract } from "../domain/flow-contract.js";
 import { buildStaticFlowGuidance } from "./flow-guidance.js";
 import { normalizeProtocolLifecycle } from "./protocol-lifecycle.js";
 import { buildProjectSummary, projectRegistrySummary, readPublishedProjectSummary } from "./project-summary.js";
-export function registerProject(context, input) {
-    const root = resolveProjectRoot(input.root);
-    const existing = findProjectByRoot(context, root);
-    const now = context.now();
-    const project = existing ?? newProjectRecord(context, root, now);
-    if (existing) {
-        context.db.run("UPDATE projects SET status = 'active', updated_at = ? WHERE id = ?", [now, existing.id]);
-    }
-    else {
-        context.db.run("INSERT INTO projects (id, short_id, slug, root, status, state_root, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", [
-            project.id,
-            project.short_id,
-            project.slug,
-            project.root,
-            project.status,
-            project.state_root,
-            project.created_at,
-            project.updated_at
-        ]);
-        appendAudit(context, {
-            projectId: project.id,
-            eventType: "project.registered",
-            payload: { project_id: project.id, root }
-        });
-    }
-    return { ok: true, project: { ...project, status: "active", updated_at: now }, db_path: context.db.path };
-}
-export function archiveProject(context, input) {
-    const reason = input.reason.trim();
+export function prepareProjectArchive(context, input) {
+    if (Boolean(input.idOrAlias) === Boolean(input.root))
+        throw new AppError("usage", "Project archive requires exactly one project ID/alias or --root", 2);
+    for (const value of [input.idOrAlias, input.root])
+        if (value !== undefined && (typeof value !== "string" || !value.trim()))
+            throw new AppError("validation", "Project archive target must be a non-empty string", 2);
+    const reason = typeof input.reason === "string" ? input.reason.trim() : "";
     if (!reason) {
         throw new AppError("validation", "project archive requires --reason", 2);
     }
@@ -50,6 +30,10 @@ export function archiveProject(context, input) {
     if (!project) {
         throw new AppError("not_found", "Project is not registered.", 1, { root: input.root, input: input.idOrAlias });
     }
+    return { project, reason };
+}
+export function archiveProject(context, input) {
+    const { project, reason } = prepareProjectArchive(context, input);
     const now = context.now();
     const result = context.db.run("UPDATE projects SET status = 'archived', updated_at = ? WHERE id = ? AND status <> 'archived'", [now, project.id]);
     if (result.changes === 1) {
@@ -67,17 +51,6 @@ export function archiveProject(context, input) {
         ...(result.changes === 1 ? {} : { skipped: true, reason: "already_archived" })
     };
 }
-function normalizeStoredRoot(root) {
-    const absolute = path.resolve(root);
-    if (fs.existsSync(absolute)) {
-        return fs.realpathSync(absolute);
-    }
-    const parent = path.dirname(absolute);
-    if (fs.existsSync(parent)) {
-        return path.join(fs.realpathSync(parent), path.basename(absolute));
-    }
-    return absolute;
-}
 export function resolveProject(context, input) {
     const candidates = resolveProjectCandidates(context, input.idOrAlias);
     if (candidates.length === 1) {
@@ -139,9 +112,7 @@ export function migrateProjectIds(context, input) {
     if (conflictingProject) {
         throw new AppError("conflict", `Target project id already exists: ${target.id}`, 1, plan);
     }
-    context.db.exec("PRAGMA foreign_keys = OFF");
-    context.db.exec("BEGIN IMMEDIATE");
-    try {
+    foreignKeyTransaction(context.db, () => {
         context.db.run("UPDATE projects SET id = ?, short_id = ?, slug = ?, state_root = ?, updated_at = ? WHERE id = ?", [target.id, target.short_id, target.slug, target.state_root, now, oldId]);
         for (const table of projectReferenceTables()) {
             context.db.run(`UPDATE ${table} SET project_id = ? WHERE project_id = ?`, [target.id, oldId]);
@@ -153,14 +124,7 @@ export function migrateProjectIds(context, input) {
                 foreign_key_errors: foreignKeyErrors
             });
         }
-        context.db.exec("COMMIT");
-        context.db.exec("PRAGMA foreign_keys = ON");
-    }
-    catch (error) {
-        context.db.exec("ROLLBACK");
-        context.db.exec("PRAGMA foreign_keys = ON");
-        throw error;
-    }
+    });
     appendAudit(context, {
         projectId: target.id,
         eventType: "project.id_migrated",
@@ -228,31 +192,6 @@ export function getProjectStatus(context, input) {
         }
     };
 }
-export function findProjectByRoot(context, root) {
-    return context.db.get("SELECT * FROM projects WHERE root = ?", [root]);
-}
-export function requireProjectByRoot(context, root) {
-    const project = findProjectByRoot(context, root);
-    if (!project) {
-        throw new AppError("not_found", `Project is not registered: ${root}`, 1);
-    }
-    return project;
-}
-function newProjectRecord(context, root, now) {
-    const slug = slugFromRoot(root);
-    const id = nextFullProjectId(context, slug);
-    const { shortId } = parseFullEntityId(id);
-    return {
-        id,
-        short_id: shortId,
-        slug,
-        root,
-        status: "active",
-        state_root: projectRuntimeRoot(context.ddFlowHome, id),
-        created_at: now,
-        updated_at: now
-    };
-}
 function backfilledTypedProjectRecord(context, project, typed, now) {
     return {
         ...project,
@@ -262,15 +201,6 @@ function backfilledTypedProjectRecord(context, project, typed, now) {
         updated_at: now
     };
 }
-function nextFullProjectId(context, slug) {
-    const rows = context.db.all("SELECT id FROM projects WHERE id LIKE 'PRJ-%'");
-    const used = rows
-        .map((row) => /^PRJ-(\d{3})-/.exec(row.id)?.[1])
-        .filter((value) => Boolean(value))
-        .map((value) => Number(value));
-    const next = Math.max(0, ...used) + 1;
-    return formatFullId("PRJ", next, slug);
-}
 function typedProjectMetadata(project) {
     if (!isFullEntityId(project.id)) {
         return null;

package/dist/services/prompt-delivery.js

@@ -0,0 +1,71 @@
+import crypto from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
+import { AppError } from "../shared/errors.js";
+import { publishImmutableInput } from "../storage/immutable-input.js";
+const digest = (text) => crypto.createHash("sha256").update(text).digest("hex");
+/** Describe the exact delivery before the existing operation receipt is settled.
+ * This does not issue commands or replace the original semantic prompt. */
+export function preparePromptDelivery(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return value;
+    const packet = value, text = packet.worker_prompt_markdown;
+    if (typeof text !== "string" || typeof packet.prompt_path !== "string")
+        return value;
+    if (!path.isAbsolute(packet.prompt_path))
+        throw new AppError("prompt_delivery_invalid", "Prompt delivery requires an absolute original prompt path", 1, { effect: "committed" });
+    const sha256 = digest(text);
+    let file = path.join(path.dirname(packet.prompt_path), "prompt-deliveries", `${sha256}.md`);
+    try {
+        if (fs.lstatSync(packet.prompt_path).isFile() && !fs.lstatSync(packet.prompt_path).isSymbolicLink()
+            && fs.readFileSync(packet.prompt_path, "utf8") === text)
+            file = packet.prompt_path;
+    }
+    catch { /* A retained delivery can republish an absent original without replay. */ }
+    const retained = packet.prompt_delivery;
+    if (retained && (retained.sha256 !== sha256 || retained.path !== file)) {
+        // An original file may disappear after commit. Keep the exact retained locator.
+        if (retained.sha256 !== sha256 || !path.isAbsolute(retained.path)
+            || retained.path !== packet.prompt_path && retained.path !== path.join(path.dirname(packet.prompt_path), "prompt-deliveries", `${sha256}.md`)) {
+            throw new AppError("prompt_delivery_invalid", "Retained delivery differs from its committed bytes", 1, { effect: "committed" });
+        }
+        file = retained.path;
+    }
+    const delivery = { path: file, sha256 };
+    // Keep the locator visible even when native tools clip verbose JSON metadata.
+    return Object.assign({ prompt_delivery: delivery }, packet, { prompt_delivery: delivery });
+}
+/** Publish only retained bytes, after commit and before advertising the locator. */
+export function publishPromptDelivery(value) {
+    if (!value || typeof value !== "object")
+        return;
+    const packet = value, delivery = packet.prompt_delivery;
+    if (!delivery)
+        return;
+    const text = packet.worker_prompt_markdown;
+    try {
+        if (typeof text !== "string" || digest(text) !== delivery.sha256 || !path.isAbsolute(delivery.path))
+            throw new Error("Delivery checksum mismatch");
+        if (typeof packet.prompt_path !== "string" || !path.isAbsolute(packet.prompt_path))
+            throw new Error("Delivery has no original prompt directory");
+        // Revalidate retained routing before touching the filesystem. System path
+        // aliases (/var on macOS) are allowed; a delivery-directory symlink is not.
+        preparePromptDelivery(packet);
+        const directory = path.dirname(delivery.path);
+        if (delivery.path !== packet.prompt_path) {
+            const stat = fs.lstatSync(directory, { throwIfNoEntry: false });
+            if (stat && (!stat.isDirectory() || stat.isSymbolicLink()))
+                throw new Error("Delivery directory is not an owned regular directory");
+        }
+        fs.mkdirSync(path.dirname(delivery.path), { recursive: true, mode: 0o700 });
+        if (delivery.path !== packet.prompt_path
+            && fs.realpathSync(directory) !== path.join(fs.realpathSync(path.dirname(packet.prompt_path)), "prompt-deliveries"))
+            throw new Error("Delivery directory escaped its original prompt directory");
+        publishImmutableInput(delivery.path, Buffer.from(text), "prompt_delivery_conflict");
+        fs.accessSync(delivery.path, fs.constants.R_OK);
+    }
+    catch (cause) {
+        throw new AppError("prompt_delivery_pending", "Operation committed; reconcile its retained delivery before continuing. Do not repeat the lifecycle operation or execute the old prompt", 1, { effect: "committed", publication_pending: true, path: delivery.path, sha256: delivery.sha256, cause: cause instanceof Error ? cause.message : String(cause) });
+    }
+}
+export const promptDeliveryInstruction = "Read the complete plain Markdown file at prompt_delivery.path; it is the exact current instruction packet (SHA-256 in prompt_delivery.sha256). Read all chunks if needed. The JSON response is routing metadata, not the primary prompt. If prompt_delivery is absent on a legacy response, read the complete worker_prompt_markdown from response_file. If publication is pending, stop and reconcile the existing operation; never replay Stage/Work start or use an old prompt.";

package/dist/services/prompts.js

@@ -9,7 +9,8 @@ import { validatePlanItem } from "../domain/validation.js";
 import { AppError } from "../shared/errors.js";
 import { parseJsonObject } from "../shared/json.js";
 import { ensureDir, resolveProjectRoot } from "../storage/paths.js";
-import { planWithProgress } from "./plan-runtime.js";
+import { boundCanonicalPlan, planWithProgress, prepareCanonicalPlan } from "./plan-runtime.js";
+import { prepareTextFile } from "../cli/input-preparation.js";
 import { registerFlowJob } from "./sessions.js";
 const profiles = {
     code_implementation: {
@@ -22,7 +23,7 @@ const profiles = {
         static_files: [".memory-bank/dd-flow/common/worker-session.md", ".memory-bank/dd-flow/workers/verify.md"]
     }
 };
-export function renderWorkerPrompt(context, input) {
+export function prepareWorkerPrompt(context, input) {
     const projectRoot = resolveProjectRoot(input.projectRoot);
     const project = requireProjectByRoot(context, projectRoot);
     const protocol = requireProtocol(context, protocolIdForRun(context, project.id, input.runId), project.id);
@@ -43,8 +44,10 @@ export function renderWorkerPrompt(context, input) {
         projectId: protocol.project_id,
         protocolId: protocol.id,
         planPath: protocol.plan_path
-    });
+    }, { bind: false });
     const plan = planRuntime?.plan ?? null;
+    if (planRuntime)
+        prepareCanonicalPlan(context, { projectId: protocol.project_id, protocolId: protocol.id, planPath: protocol.plan_path }, planRuntime.canonical);
     const genericTask = input.taskFile ? readWorkerTask(input.taskFile, runHomePath(run)) : null;
     const item = genericTask?.item ?? plan?.items.find((candidate) => candidate.id === input.planItemId);
     if (!item)
@@ -64,13 +67,6 @@ export function renderWorkerPrompt(context, input) {
     const profile = profiles[input.profile];
     if (!profile)
         throw new AppError("prompt_profile_unsupported", `Unsupported prompt profile: ${input.profile}`, 2);
-    const job = registerFlowJob(context, {
-        projectId: protocol.project_id,
-        runId: run.id,
-        protocolId: protocol.id,
-        planItemId: item.id,
-        groupId: item.execution_context.planned_write_areas[0] ?? null
-    });
     const staticInputs = profile.static_files.map((file) => readStaticInput(projectRoot, file));
     const requiredRead = item.execution_context.required_read.map((file) => checkedReference(projectRoot, runHomePath(run), file, "required_read", true));
     const discoveryBoundary = item.execution_context.discovery_boundary.map((file) => checkedReference(projectRoot, runHomePath(run), file, "discovery_boundary", false));
@@ -78,7 +74,6 @@ export function renderWorkerPrompt(context, input) {
     const runHome = runHomePath(run);
     const outputDir = path.join(runHome, stage.dir, "subagents", item.id);
     assertWithin(runHome, outputDir, "output directory");
-    ensureDir(outputDir);
     const prompt = renderPrompt({
         item,
         input,
@@ -90,6 +85,20 @@ export function renderWorkerPrompt(context, input) {
         staticInputs,
         ...(genericTask ? { handoff: genericTask.handoff } : {})
     });
+    return { protocol, run, item, plan, planRuntime, genericTask, workspaceRoot, staticInputs, requiredRead, discoveryBoundary, plannedWriteAreas, outputDir, prompt, canonVersion: readCanonVersion(projectRoot) };
+}
+export function renderWorkerPrompt(context, input, prepared = prepareWorkerPrompt(context, input)) {
+    const { protocol, run, item, plan, planRuntime, genericTask, workspaceRoot, staticInputs, requiredRead, discoveryBoundary, plannedWriteAreas, outputDir, prompt, canonVersion } = prepared;
+    if (planRuntime)
+        boundCanonicalPlan(context, { projectId: protocol.project_id, protocolId: protocol.id, planPath: protocol.plan_path }, planRuntime.canonical);
+    const job = registerFlowJob(context, {
+        projectId: protocol.project_id,
+        runId: run.id,
+        protocolId: protocol.id,
+        planItemId: item.id,
+        groupId: item.execution_context.planned_write_areas[0] ?? null
+    });
+    ensureDir(outputDir);
     const promptPath = path.join(outputDir, "launch-prompt.md");
     const stackPath = path.join(outputDir, "prompt-stack.json");
     const reportPath = path.join(outputDir, "render-report.json");
@@ -104,7 +113,7 @@ export function renderWorkerPrompt(context, input) {
         plan_item_id: input.taskFile ? null : item.id,
         task_id: input.taskFile ? item.id : null,
         job_id: job.job_id,
-        canon_version: readCanonVersion(projectRoot),
+        canon_version: canonVersion,
         renderer_version: getCliVersionReport().cli.version,
         static_inputs: staticInputs.map(({ path: inputPath, sha256 }) => ({ path: inputPath, sha256 })),
         validation: { required_read: requiredRead, discovery_boundary: discoveryBoundary, planned_write_areas: plannedWriteAreas },
@@ -143,9 +152,7 @@ function runHomePath(run) {
 function readWorkerTask(taskFile, runHome) {
     const resolved = path.resolve(taskFile);
     assertWithin(runHome, resolved, "worker task file");
-    if (!fs.existsSync(resolved))
-        throw new AppError("not_found", "Worker task file is missing", 1, { path: taskFile });
-    const task = parseJsonObject(fs.readFileSync(resolved, "utf8"), resolved);
+    const task = parseJsonObject(prepareTextFile(resolved, "worker task").text, resolved);
     if (task.schema_id !== "dd-flow/worker-task@1" || !task.task || typeof task.task !== "object") {
         throw new AppError("validation", "Worker task must use dd-flow/worker-task@1 with a task object", 2, { path: taskFile });
     }
@@ -180,7 +187,7 @@ function validateWorkerTaskHandoff(value, runHome) {
         const reportPath = path.resolve(report.report_path);
         assertWithin(runHome, reportPath, "predecessor report");
         if (!fs.existsSync(reportPath))
-            throw new AppError("not_found", "Accepted predecessor report is missing", 1, { path: report.report_path });
+            throw new AppError("runtime_artifact_missing", "Accepted predecessor report is missing", 1, { path: report.report_path });
         return { aspect_id: report.aspect_id, verdict, report_path: reportPath };
     });
     const recovery = handoff.recovery_attempt_paths ?? [];
@@ -261,7 +268,9 @@ function assertGitFacts(workspaceRoot, expected, runId) {
     if (!expected?.head && !expected?.branch)
         return;
     const read = (args) => {
-        const result = spawnSync("git", ["-C", workspaceRoot, ...args.split(" ")], { encoding: "utf8" });
+        const result = spawnSync("git", ["-C", workspaceRoot, ...args.split(" ")], { encoding: "utf8", timeout: 5000 });
+        if (result.error || result.signal)
+            throw new AppError("git_observation_unavailable", "Cannot establish RUN workspace identity", 1, { run_id: runId, effect: "unknown" });
         return result.status === 0 ? result.stdout.trim() || null : null;
     };
     const actual = { branch: read("branch --show-current"), head: read("rev-parse HEAD") };
@@ -293,6 +302,8 @@ function renderPrompt(input) {
         `- Acceptance contribution: ${item.semantic_spine?.acceptance_contribution ?? "not_applicable"}`,
         "",
         "## Hard Write Boundary",
+        "Before editing, change into the project workspace shown below (cd -- WORKSPACE) or use its absolute path when the tool cannot persist cwd.",
+        "Write only the project workspace and the named report directory; never write another RUN/native home or Git/worktree control data.",
         `- All project writes must stay under: \`${input.workspaceRoot}\``,
         "- Do not write outside this workspace, to another RUN, or into Git/worktree control data.",
         "- Accepted requirements and non-goals remain binding; planned write areas do not.",