@deksden-com/dd-flow-cli 0.9.0-beta.7 → 0.9.0-beta.74

package/dist/services/lanes.js

@@ -515,7 +515,7 @@ function ensureQueuedLaneWaiter(context, input) {
 function tryAcquireQueuedLaneLock(context, input) {
     expireStaleLocks(context, input.projectId);
     expireStaleWaiters(context, input.projectId);
-    context.db.exec("BEGIN IMMEDIATE");
+    context.db.beginWriteTransaction();
     try {
         const existingLock = activeLaneLock(context, input.projectId, input.lane);
         if (existingLock?.worker_id === input.workerId) {

package/dist/services/lifecycle-command.js

@@ -32,7 +32,7 @@ function parseLifecycleCommandInner(command, wrapped) {
     const heredoc = stripHeredocBodies(command);
     let entries;
     try {
-        entries = parse(heredoc.command, (name) => `$${name}`);
+        entries = parse(withoutFileDescriptors(heredoc.command), (name) => `$${name}`);
     }
     catch {
         // A command that cannot be tokenized cannot create a trusted claim. The
@@ -56,11 +56,11 @@ function parseLifecycleCommandInner(command, wrapped) {
     if (!found.length)
         return { kind: "none" };
     const first = found[0];
-    if (found.length !== 1 || composed || first.nestedCompound) {
+    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" : "shell_composition"
+            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 };
@@ -138,7 +138,7 @@ function invocationFromSegment(segment, heredoc, wrapped, inheritedEnv) {
         executable,
         argv,
         env,
-        args: parseCommandArgs(argv.slice(2)),
+        args: parseCommandArgs(argv.slice(operation === "recovery_accept" ? 3 : 2)),
         command: quote(segment.words),
         rewriteSafe: !heredoc && !wrapped && !segment.dynamic,
         wrapped,
@@ -170,15 +170,28 @@ function wrappedInvocationFromSegment(segment) {
     return parseLifecycleCommandInner(payload, true);
 }
 function lifecycleOperation(argv) {
+    // The CLI handles help before dispatch, wherever the flag occurs.
+    if (argv.some(arg => arg === "--help" || arg === "-h"))
+        return null;
+    if (argv[0] === "run" && argv[1] === "recovery" && argv[2] === "accept")
+        return "recovery_accept";
     const key = `${argv[0] ?? ""} ${argv[1] ?? ""}`;
     if (key === "session register")
         return "session_register";
     if (key === "stage start")
         return "stage_start";
+    if (key === "stage finish")
+        return "stage_finish";
+    if (key === "stage pause")
+        return "stage_pause";
     if (key === "stage resume")
         return "stage_resume";
     if (key === "work start")
         return "work_start";
+    if (key === "work finish")
+        return "work_finish";
+    if (key === "work fail")
+        return "work_fail";
     return null;
 }
 export function parseCommandArgs(argv) {
@@ -213,6 +226,58 @@ export function commandPosition(invocation, 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);
@@ -223,6 +288,7 @@ function stripHeredocBodies(command) {
     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;
@@ -233,13 +299,15 @@ function stripHeredocBodies(command) {
         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 };
+    return { command: output.join(" ; "), present, safe: count === 1 && quoted && !active && pending.length === 0 };
 }
 function heredocDelimiters(line) {
     const result = [];
@@ -282,7 +350,7 @@ function heredocDelimiters(line) {
                 index += 1;
         const delimiter = line.slice(start, index);
         if (delimiter)
-            result.push({ delimiter, stripTabs });
+            result.push({ delimiter, stripTabs, quoted: delimiterQuote !== null });
     }
     return result;
 }