@deksden-com/dd-flow-cli 0.9.0-beta.121 → 0.9.0-beta.122

package/dist/services/lifecycle-command.js

@@ -1,383 +1 @@
-import path from "node:path";
-import { parse, quote } from "shell-quote";
-import { lifecycleOperationForArgv } from "./lifecycle-contract.js";
-/** Native hooks and the lightweight ingress must recognize the same shell. */
-export function lifecycleCommandFromPayload(payload) {
-    const input = payload.tool_input && typeof payload.tool_input === "object" ? payload.tool_input : {};
-    const command = [payload.command, input.command, input.cmd].find(value => typeof value === "string" && value.length > 0);
-    return typeof command === "string" ? unwrapShellCommand(command) : undefined;
-}
-const controlOperators = new Set(["&&", "||", ";", "|", "|&", "&", "(", ")", "<(", ">("]);
-const redirectionOperators = new Set(["<", ">", ">>", ">|", "<&", ">&", "<<<"]);
-/** Parse the deliberately small direct-command surface accepted by lifecycle hooks. */
-export function parseLifecycleCommand(command) {
-    return parseLifecycleCommandInner(command, false);
-}
-/** Exact diagnostic routes; these deliberately confer no lifecycle authority. */
-export function continuationCommand(command) {
-    let entries;
-    try {
-        entries = parse(command, name => `$${name}`);
-    }
-    catch {
-        return null;
-    }
-    if (!entries.every(entry => typeof entry === "string"))
-        return null;
-    const words = entries;
-    const start = words.findIndex(word => ["stage", "work"].includes(word));
-    if (start < 1)
-        return null;
-    const launcher = words.slice(0, start);
-    while (launcher[0] && /^[A-Za-z_][A-Za-z0-9_]*=/.test(launcher[0]))
-        launcher.shift();
-    const direct = launcher.length === 1 && (path.basename(launcher[0]) === "dd-flow" || launcher[0] === "$DD_FLOW_BIN");
-    const node = launcher.length === 2 && path.basename(launcher[0]) === "node" && (path.basename(launcher[1]) === "cli.js" || launcher[1] === "$DD_FLOW_BIN");
-    if (!direct && !node)
-        return null;
-    const args = parseCommandArgs(words.slice(start));
-    const route = args.positional.slice(0, 3).join(" ");
-    const operation = route === "work repair add" ? "work_repair_add" : args.positional[0] === "stage" && args.positional[1] === "block" ? "stage_block" : null;
-    return operation ? { operation, args } : null;
-}
-/** Preserve the historical Desktop contract: execute the payload, not its one-command shell wrapper. */
-export function unwrapShellCommand(command) {
-    let entries;
-    try {
-        entries = parse(command, (name) => `$${name}`);
-    }
-    catch {
-        return command;
-    }
-    if (!entries.every((entry) => typeof entry === "string"))
-        return command;
-    const words = entries;
-    let index = 0;
-    while (index < words.length && assignment(words[index]))
-        index += 1;
-    const executable = path.basename(words[index] ?? "");
-    if (!new Set(["bash", "sh", "zsh"]).has(executable))
-        return command;
-    if (!new Set(["-c", "-lc", "-cl"]).has(words[index + 1] ?? "") || words.length !== index + 3)
-        return command;
-    return words[index + 2] ?? command;
-}
-function parseLifecycleCommandInner(command, wrapped) {
-    const heredoc = stripHeredocBodies(command);
-    let entries;
-    try {
-        entries = parse(withoutFileDescriptors(heredoc.command), (name) => `$${name}`);
-    }
-    catch {
-        // A command that cannot be tokenized cannot create a trusted claim. The
-        // real lifecycle CLI will consequently fail its binding requirement.
-        return { kind: "none" };
-    }
-    const { segments, composed } = commandSegments(entries);
-    const found = [];
-    const exportedEnv = {};
-    for (const segment of segments) {
-        Object.assign(exportedEnv, exportedAssignments(segment));
-        const direct = invocationFromSegment(segment, heredoc.present, wrapped, exportedEnv);
-        if (direct) {
-            found.push({ invocation: direct, nestedCompound: segment.dynamic });
-            continue;
-        }
-        const nested = wrappedInvocationFromSegment(segment);
-        if (nested && nested.kind !== "none")
-            found.push({ invocation: { ...nested.invocation, heredoc: nested.invocation.heredoc || heredoc.present, rewriteSafe: false, wrapped: true }, nestedCompound: nested.kind === "compound" });
-    }
-    if (!found.length)
-        return { kind: "none" };
-    const first = found[0];
-    if (found.length !== 1 || composed || first.nestedCompound || (heredoc.present && !heredoc.safe)) {
-        return {
-            kind: "compound",
-            invocation: { ...first.invocation, rewriteSafe: false },
-            reason: found.length !== 1 ? "multiple_lifecycle_invocations" : first.nestedCompound ? "nested_compound_invocation" : heredoc.present && !heredoc.safe ? "unsafe_heredoc" : "shell_composition"
-        };
-    }
-    return { kind: "standalone", invocation: first.invocation };
-}
-function commandSegments(entries) {
-    const segments = [];
-    let words = [];
-    let dynamic = false;
-    let composed = false;
-    const flush = () => {
-        if (words.length || dynamic)
-            segments.push({ words, dynamic });
-        words = [];
-        dynamic = false;
-    };
-    for (let index = 0; index < entries.length; index += 1) {
-        const entry = entries[index];
-        if (typeof entry === "string") {
-            words.push(entry);
-            continue;
-        }
-        if ("comment" in entry)
-            break;
-        if (!("op" in entry) || typeof entry.op !== "string") {
-            dynamic = true;
-            continue;
-        }
-        const operator = entry.op;
-        if (operator === "glob") {
-            dynamic = true;
-            words.push("pattern" in entry && typeof entry.pattern === "string" ? entry.pattern : "");
-            continue;
-        }
-        if (controlOperators.has(operator)) {
-            composed = true;
-            flush();
-            continue;
-        }
-        if (redirectionOperators.has(operator)) {
-            const target = entries[index + 1];
-            if (typeof target === "string" || (target && typeof target === "object" && "op" in target && target.op === "glob"))
-                index += 1;
-            continue;
-        }
-        dynamic = true;
-    }
-    flush();
-    return { segments, composed };
-}
-function invocationFromSegment(segment, heredoc, wrapped, inheritedEnv) {
-    let index = 0;
-    const env = { ...inheritedEnv };
-    while (index < segment.words.length && assignment(segment.words[index])) {
-        addAssignment(env, segment.words[index]);
-        index += 1;
-    }
-    if (path.basename(segment.words[index] ?? "") === "env") {
-        index += 1;
-        if (segment.words[index]?.startsWith("-"))
-            return null;
-        while (index < segment.words.length && assignment(segment.words[index])) {
-            addAssignment(env, segment.words[index]);
-            index += 1;
-        }
-    }
-    let executable = segment.words[index];
-    let nodeLauncher = false;
-    let launcher;
-    if (executable && path.basename(executable) === "node"
-        && (path.basename(segment.words[index + 1] ?? "") === "cli.js" || segment.words[index + 1] === "$DD_FLOW_BIN")) {
-        launcher = executable;
-        executable = segment.words[++index];
-        nodeLauncher = true;
-    }
-    if (!executable || path.basename(executable) !== "dd-flow" && executable !== "$DD_FLOW_BIN" && !(nodeLauncher && path.basename(executable) === "cli.js"))
-        return null;
-    const argv = segment.words.slice(index + 1);
-    const operation = lifecycleOperation(argv);
-    if (!operation)
-        return null;
-    return {
-        operation,
-        executable,
-        ...(launcher ? { launcher } : {}),
-        argv,
-        env,
-        args: parseCommandArgs(argv.slice(operation === "recovery_accept" ? 3 : 2)),
-        command: quote(segment.words),
-        rewriteSafe: !heredoc && !wrapped && !segment.dynamic,
-        wrapped,
-        heredoc
-    };
-}
-function exportedAssignments(segment) {
-    const result = {};
-    if (segment.words[0] !== "export")
-        return result;
-    for (const word of segment.words.slice(1)) {
-        if (!assignment(word))
-            return {};
-        addAssignment(result, word);
-    }
-    return result;
-}
-function wrappedInvocationFromSegment(segment) {
-    let index = 0;
-    while (index < segment.words.length && assignment(segment.words[index]))
-        index += 1;
-    const executable = path.basename(segment.words[index] ?? "");
-    if (!new Set(["bash", "sh", "zsh"]).has(executable))
-        return null;
-    const flag = segment.words[index + 1];
-    const payload = segment.words[index + 2];
-    if (!payload || !new Set(["-c", "-lc", "-cl"]).has(flag ?? "") || segment.words.length !== index + 3)
-        return null;
-    return parseLifecycleCommandInner(payload, true);
-}
-function lifecycleOperation(argv) {
-    return lifecycleOperationForArgv(argv);
-}
-export function parseCommandArgs(argv) {
-    const positional = [];
-    const options = new Map();
-    for (let index = 0; index < argv.length; index += 1) {
-        const value = argv[index];
-        if (value?.startsWith("--")) {
-            const equals = value.indexOf("=");
-            if (equals > 2) {
-                const key = value.slice(2, equals);
-                options.set(key, [...(options.get(key) ?? []), value.slice(equals + 1)]);
-                continue;
-            }
-            const key = value.slice(2);
-            const next = argv[index + 1];
-            const optionValue = !next || next.startsWith("--") ? "__dd_flow_flag__" : next;
-            options.set(key, [...(options.get(key) ?? []), optionValue]);
-            if (optionValue !== "__dd_flow_flag__")
-                index += 1;
-        }
-        else if (value)
-            positional.push(value);
-    }
-    return { positional, options };
-}
-export function commandOption(invocation, name) {
-    const values = invocation.args.options.get(name);
-    const value = values?.[values.length - 1];
-    return value === "__dd_flow_flag__" ? undefined : value;
-}
-export function commandHasOption(invocation, name) {
-    return invocation.args.options.has(name);
-}
-export function commandPosition(invocation, index) {
-    return invocation.args.positional[index];
-}
-function assignment(word) {
-    return /^[A-Za-z_][A-Za-z0-9_]*=/.test(word);
-}
-/** Source offsets matter: shell-quote loses the difference between `2>&1`
- * and the literal argument `2 >&1`. Only inspect unquoted shell syntax. */
-function shellSyntaxOffsets(command) {
-    const offsets = [];
-    let quoted = null, escaped = false;
-    for (let i = 0; i < command.length; i++) {
-        const char = command[i];
-        if (escaped) {
-            escaped = false;
-            continue;
-        }
-        if (char === "\\" && quoted !== "'") {
-            escaped = true;
-            continue;
-        }
-        if (quoted) {
-            if (char === quoted)
-                quoted = null;
-            continue;
-        }
-        if (char === "'" || char === '"') {
-            quoted = char;
-            continue;
-        }
-        if (char === "#" && (i === 0 || /\s/.test(command[i - 1]))) {
-            offsets.push(i);
-            break;
-        }
-        if (char === "<" || char === ">")
-            offsets.push(i);
-    }
-    return offsets;
-}
-function descriptorStart(command, index) {
-    let start = index;
-    while (start > 0 && /[0-9]/.test(command[start - 1]))
-        start--;
-    return start === 0 || /[\s;&|]/.test(command[start - 1]) ? start : index;
-}
-export function shellSuffixOffset(command) {
-    const offset = shellSyntaxOffsets(command)[0];
-    return offset === undefined ? command.length : descriptorStart(command, offset);
-}
-function withoutFileDescriptors(command) {
-    for (const index of shellSyntaxOffsets(command).reverse()) {
-        if (command[index] === "#")
-            continue;
-        const start = descriptorStart(command, index);
-        command = command.slice(0, start) + command.slice(index);
-    }
-    return command;
-}
-function addAssignment(env, word) {
-    const separator = word.indexOf("=");
-    env[word.slice(0, separator)] = word.slice(separator + 1);
-}
-function stripHeredocBodies(command) {
-    const lines = command.split(/\r?\n/);
-    const output = [];
-    const pending = [];
-    let active;
-    let present = false;
-    let count = 0, quoted = true;
-    for (const line of lines) {
-        if (active) {
-            const candidate = active.stripTabs ? line.replace(/^\t+/, "") : line;
-            if (candidate === active.delimiter)
-                active = pending.shift();
-            continue;
-        }
-        if (line.trim())
-            output.push(line);
-        const found = heredocDelimiters(line);
-        count += found.length;
-        quoted &&= found.every(item => item.quoted);
-        if (found.length) {
-            present = true;
-            active = found[0];
-            pending.push(...found.slice(1));
-        }
-    }
-    return { command: output.join(" ; "), present, safe: count === 1 && quoted && !active && pending.length === 0 };
-}
-function heredocDelimiters(line) {
-    const result = [];
-    let quoteState = null;
-    let escaped = false;
-    for (let index = 0; index < line.length - 1; index += 1) {
-        const char = line[index];
-        if (escaped) {
-            escaped = false;
-            continue;
-        }
-        if (char === "\\" && quoteState !== "'") {
-            escaped = true;
-            continue;
-        }
-        if (quoteState) {
-            if (char === quoteState)
-                quoteState = null;
-            continue;
-        }
-        if (char === "'" || char === '"') {
-            quoteState = char;
-            continue;
-        }
-        if (char !== "<" || line[index + 1] !== "<" || line[index + 2] === "<")
-            continue;
-        index += 2;
-        const stripTabs = line[index] === "-";
-        if (stripTabs)
-            index += 1;
-        while (/\s/.test(line[index] ?? ""))
-            index += 1;
-        const delimiterQuote = line[index] === "'" || line[index] === '"' ? line[index++] : null;
-        const start = index;
-        if (delimiterQuote)
-            while (index < line.length && line[index] !== delimiterQuote)
-                index += 1;
-        else
-            while (index < line.length && !/[\s;&|<>]/.test(line[index]))
-                index += 1;
-        const delimiter = line.slice(start, index);
-        if (delimiter)
-            result.push({ delimiter, stripTabs, quoted: delimiterQuote !== null });
-    }
-    return result;
-}
+export { lifecycleCommandFromPayload, parseLifecycleCommand, continuationCommand, unwrapShellCommand, parseCommandArgs, commandOption, commandHasOption, commandPosition, shellSuffixOffset } from "../harness-runtime/lib/lifecycle-command.mjs";

package/dist/services/lifecycle-contract.js

@@ -1,30 +1 @@
-export const lifecycleRoutes = {
-    "session register": "session_register",
-    "stage start": "stage_start",
-    "stage finish": "stage_finish",
-    "stage pause": "stage_pause",
-    "stage resume": "stage_resume",
-    "work start": "work_start",
-    "work finish": "work_finish",
-    "work fail": "work_fail",
-    "merge apply": "merge_apply",
-    "merge repair": "merge_repair",
-    "run recovery accept": "recovery_accept"
-};
-export const lifecycleInternalOptions = ["invocation-id", "hook-event-id"];
-export function lifecycleOperationForArgv(argv) {
-    if (argv.some(arg => arg === "--help" || arg === "-h"))
-        return null;
-    for (const [route, operation] of Object.entries(lifecycleRoutes)) {
-        const parts = route.split(" ");
-        if (parts.every((part, index) => argv[index] === part))
-            return operation;
-    }
-    return null;
-}
-export function lifecycleRouteForOperation(operation) {
-    const entry = Object.entries(lifecycleRoutes).find(([, value]) => value === operation);
-    if (!entry)
-        throw new Error(`Unknown lifecycle operation: ${operation}`);
-    return entry[0];
-}
+export { lifecycleRoutes, lifecycleInternalOptions, lifecycleOperationForArgv, lifecycleRouteForOperation } from "../harness-runtime/lib/lifecycle-contract.mjs";

package/dist/services/lifecycle-invocations.js

@@ -777,7 +777,8 @@ export function issueLifecycleInvocation(context, command, scope) {
 }
 function commandWithInvocationId(command, id) {
     const at = shellSuffixOffset(command);
-    return `${command.slice(0, at).trimEnd()} --invocation-id ${id} ${command.slice(at)}`.trimEnd();
+    const suffix = command.slice(at);
+    return `${command.slice(0, at)} --invocation-id ${id}${suffix ? /^\s/.test(suffix) ? suffix : ` ${suffix}` : ""}`;
 }
 /** The attempt owns authority; the caller owns presentation-only shell input.
  * Preserve current stdin/heredoc/response-file text while validating that it
@@ -909,11 +910,7 @@ export function observeLifecycleInvocation(context, input) {
     storage(context);
     const supplied = input.id ? context.db.get("SELECT * FROM lifecycle_invocations WHERE id = ?", [input.id]) : undefined;
     const analysis = parseLifecycleCommand(input.command);
-    if (analysis.kind !== "standalone" || analysis.invocation.wrapped) {
-        if (analysis.kind !== "none" && ["grok-acp", "antigravity-cli"].includes(input.harness ?? "") && input.projectId
-            && managedNativeOwner(context, input.identity, input.harness, input.projectId)) {
-            throw new AppError("invocation_command_invalid", "Managed native lifecycle call must be one direct standalone command", 1, { phase: "prepare", effect: "no_effect", recoverable: false });
-        }
+    if (analysis.kind === "none" || analysis.supported === false) {
         const eventKey = input.recordReceipt();
         if (analysis.kind !== "none") {
             const retained = context.db.get("SELECT outcome_json FROM hook_events WHERE event_key = ?", [eventKey]);
@@ -928,22 +925,32 @@ export function observeLifecycleInvocation(context, input) {
                     ...outcome,
                     lifecycle_observation: {
                         code: "lifecycle_shell_syntax_invalid",
-                        reason: analysis.kind === "compound" ? analysis.reason : "wrapped_lifecycle_command",
+                        reason: analysis.kind === "compound" ? analysis.reason : "unsupported_lifecycle_command",
                         command_fingerprint: fingerprint(analysis.invocation),
                         effect: "no_effect",
                         recoverable: true
                     }
                 }), eventKey]);
         }
+        if (analysis.kind !== "none")
+            throw new AppError("lifecycle_shell_syntax_invalid", "This shell form cannot bind exactly one lifecycle execution; use the exact issued lifecycle command without the unsupported shell context", 1, { phase: "prepare", effect: "no_effect", recoverable: true, disposition: "pre_cli_shell_refusal", reason: analysis.kind === "compound" ? analysis.reason : "unsupported_lifecycle_command", event_key: eventKey });
         return { eventKey, duplicate: false, invocationId: null };
     }
-    const candidates = context.db.all("SELECT * FROM lifecycle_invocations WHERE status IN ('issued','observed') ORDER BY rowid DESC")
+    // Admit the one parsed leaf, never execute or fingerprint the prefix/suffix.
+    const leafCommand = analysis.invocation.command;
+    if (input.executionCwd !== undefined && !path.isAbsolute(input.executionCwd))
+        throw new AppError("invocation_directory_mismatch", "Bound lifecycle execution cwd must be absolute", 1, { phase: "prepare", effect: "no_effect", recoverable: false });
+    const deliveredIdentity = JSON.stringify([input.identity.daemonId, input.identity.rootSessionId, input.identity.sessionId, input.identity.parentSessionId, input.identity.toolCallId,
+        ...(input.executionCwd === undefined ? [] : [{ executionCwd: canonicalPath(input.executionCwd) }])]);
+    const candidates = context.db.all("SELECT * FROM lifecycle_invocations WHERE status IN ('issued','observed','executing','settled') ORDER BY rowid DESC")
         .filter(row => {
+        if (["executing", "settled"].includes(row.status) && row.identity_json !== deliveredIdentity)
+            return false;
         const scope = JSON.parse(row.scope_json);
         if (scope.daemonId !== input.identity.daemonId || scope.rootSessionId !== input.identity.rootSessionId)
             return false;
         try {
-            return fingerprint(invocation(canonicalManagedCommand(context, input.command, scope))) === row.fingerprint;
+            return fingerprint(invocation(canonicalManagedCommand(context, leafCommand, scope))) === row.fingerprint;
         }
         catch {
             return false;
@@ -979,7 +986,7 @@ export function observeLifecycleInvocation(context, input) {
     const project = requireProjectByRoot(context, scope.projectRoot);
     const identity = input.identity;
     checkNativeIdentity(scope, identity, initial.id);
-    const identityJson = JSON.stringify([identity.daemonId, identity.rootSessionId, identity.sessionId, identity.parentSessionId, identity.toolCallId]);
+    const identityJson = deliveredIdentity;
     return context.db.writeTransaction(() => {
         const row = context.db.get("SELECT * FROM lifecycle_invocations WHERE id = ?", [initial.id]);
         if (row.status === "settled")
@@ -992,6 +999,9 @@ export function observeLifecycleInvocation(context, input) {
         if (row.identity_json === identityJson) {
             return { eventKey: row.event_key, duplicate: true, ...resolved };
         }
+        if (row.identity_json && JSON.stringify(JSON.parse(row.identity_json).slice(0, 5)) === JSON.stringify(JSON.parse(identityJson).slice(0, 5))) {
+            throw new AppError("invocation_identity_mismatch", "The same native tool call changed its bound execution route", 1, { phase: "prepare", effect: "no_effect", recoverable: false });
+        }
         const eventKey = input.recordReceipt({ projectRoot: scope.projectRoot, runId: scope.runId, command: initial.command });
         // A native hook may execute from a provider worktree while the issued
         // lifecycle scope is anchored to the stable project root. Project
@@ -1019,7 +1029,7 @@ export function observedLifecycleNativeEvent(context, command, daemonId) {
         return null;
     const signature = (value) => {
         const parsed = parseLifecycleCommand(value);
-        const candidate = parsed.kind === "standalone" && !parsed.invocation.wrapped ? parsed.invocation : continuationCommand(value);
+        const candidate = parsed.kind !== "none" && parsed.supported ? parsed.invocation : continuationCommand(value);
         if (!candidate)
             return null;
         return JSON.stringify([candidate.operation, candidate.args.positional,
@@ -1080,8 +1090,9 @@ export function observedLifecycleInvocation(context, command, daemonId) {
     if (!context.db.get("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'lifecycle_invocations'"))
         return null;
     const analysis = parseLifecycleCommand(command);
-    if (analysis.kind !== "standalone" || analysis.invocation.wrapped)
+    if (analysis.kind === "none" || analysis.supported === false)
         return null;
+    const leafCommand = analysis.invocation.command;
     // `issued` is a rendezvous, not authority: the CLI still blocks in
     // awaitLifecycleInvocation until the native observer commits the receipt.
     const matches = context.db.all("SELECT * FROM lifecycle_invocations WHERE status IN ('issued','observed','executing') ORDER BY rowid DESC")
@@ -1090,7 +1101,7 @@ export function observedLifecycleInvocation(context, command, daemonId) {
             const scope = JSON.parse(row.scope_json);
             if (daemonId && scope.daemonId !== daemonId)
                 return false;
-            return fingerprint(invocation(canonicalManagedCommand(context, command, scope))) === row.fingerprint;
+            return fingerprint(invocation(canonicalManagedCommand(context, leafCommand, scope))) === row.fingerprint;
         }
         catch {
             return false;
@@ -1348,6 +1359,16 @@ export async function awaitLifecycleInvocation(context, input) {
         }
         input.assertCurrent(JSON.parse(row.scope_json));
         if (row.status === "observed") {
+            if (row.identity_json) {
+                // Receipt display text is bounded/redacted and may not be valid JSON.
+                // Only the native admission's typed identity binds an execution route.
+                const identity = JSON.parse(row.identity_json);
+                const route = identity[5]?.executionCwd;
+                if (identity.length > 5 && (typeof route !== "string" || !path.isAbsolute(route)))
+                    throw new AppError("invocation_directory_mismatch", "Bound lifecycle execution cwd is invalid", 1, { phase: "prepare", effect: "no_effect", recoverable: false });
+                if (typeof route === "string" && canonicalPath(process.cwd()) !== canonicalPath(route))
+                    throw new AppError("invocation_directory_mismatch", "Reached CLI cwd differs from the bound shell execution route", 1, { phase: "prepare", effect: "no_effect", recoverable: false, expected: route, actual: process.cwd(), actual_provenance: "cli_process_cwd" });
+            }
             const claimed = context.db.run("UPDATE lifecycle_invocations SET status = 'executing', updated_at = ? WHERE id = ? AND status = 'observed'", [context.now(), input.id]);
             if (claimed.changes === 1)
                 return { eventKey: row.event_key, replay: false };