nolo-cli 0.54.0 → 0.61.0-alpha.2

package/{chunk-SSXTSPSG.js → chunk-45YO6H7P.js}

@@ -1,6 +1,6 @@
 import {
   isAgentRunTerminalStatus
-} from "./chunk-KXKQO4Q6.js";
+} from "./chunk-NTW5GWDM.js";
 import {
   isCompiledBinary,
   resolveCliEntrypointPath
@@ -335,12 +335,6 @@ async function popQueueMessages(queuePath, depsOrFs = {}) {
   const entries = await popAllQueueEntries(queuePath, depsOrFs);
   return entries.map((e) => e.text);
 }
-function resolveRunReportPath(runId, env, homedir = nodeHomedir) {
-  return join(resolveRunsDir(env, homedir), `${runId}.report.md`);
-}
-function resolveRunReportJsonPath(runId, env, homedir = nodeHomedir) {
-  return join(resolveRunsDir(env, homedir), `${runId}.report.json`);
-}
 function defaultGenerateRunId() {
   const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
   const random = Math.random().toString(36).slice(2, 8);
@@ -602,8 +596,6 @@ async function gcRunRecords(deps = {}, options = {}) {
     const jsonPath = resolveRunRecordPath(record.runId, deps.env, deps.homedir);
     const logPath = resolveRunLogPath(record.runId, deps.env, deps.homedir);
     const queuePath = record.queuePath ?? resolveRunQueuePath(record.runId, deps.env, deps.homedir);
-    const reportPath = resolveRunReportPath(record.runId, deps.env, deps.homedir);
-    const reportJsonPath = resolveRunReportJsonPath(record.runId, deps.env, deps.homedir);
     const msgPath = record.msgFile ?? join(resolveRunsDir(deps.env, deps.homedir), `${record.runId}.msg.md`);
     const logOk = tryUnlinkFile(fs, logPath);
     const msgOk = tryUnlinkFile(fs, msgPath);
@@ -617,8 +609,9 @@ async function gcRunRecords(deps = {}, options = {}) {
         queueOk = false;
       }
     }
-    tryUnlinkFile(fs, reportPath);
-    tryUnlinkFile(fs, reportJsonPath);
+    const runsDirForLegacy = resolveRunsDir(deps.env, deps.homedir);
+    tryUnlinkFile(fs, join(runsDirForLegacy, `${record.runId}.report.md`));
+    tryUnlinkFile(fs, join(runsDirForLegacy, `${record.runId}.report.json`));
     if (!logOk || !msgOk || !queueOk) {
       failedIds.push(record.runId);
       continue;
@@ -897,21 +890,60 @@ function releaseRunRecordAck(runId, token, deps = {}) {
     writeRunRecord(record, deps);
   });
 }
-function finalizeRunRecord(runId, update, deps = {}) {
-  withRunRecordLock(runId, deps, () => {
-    const record = readRunRecord(runId, deps);
-    if (!record) return;
+function transitionRunToTerminal(runId, update, deps = {}, options = {}) {
+  const settled = withRunRecordLock(runId, deps, () => {
+    const record2 = readRunRecord(runId, deps);
+    if (!record2) return { kind: "not_found" };
+    const orphanCorrection = options.allowOverOrphaned === true && record2.status === "orphaned" && (update.status === "done" || update.status === "failed");
+    if (isAgentRunTerminalStatus(record2.status) && !orphanCorrection) {
+      return { kind: "kept", record: record2 };
+    }
     const now = deps.now ?? (() => /* @__PURE__ */ new Date());
-    record.status = update.status;
-    if (typeof update.exitCode === "number") record.exitCode = update.exitCode;
-    if (update.dialogId) record.dialogId = update.dialogId;
+    record2.status = update.status;
+    if (typeof update.exitCode === "number") record2.exitCode = update.exitCode;
+    if (update.dialogId) record2.dialogId = update.dialogId;
     if (typeof update.credits === "number" && Number.isFinite(update.credits)) {
-      record.credits = update.credits;
+      record2.credits = update.credits;
     }
-    record.endedAt = now().toISOString();
-    if (record.note?.startsWith("orphaned:")) record.note = void 0;
-    writeRunRecord(record, deps);
-  });
+    if (update.dodResults && update.dodResults.length > 0) {
+      record2.dodResults = update.dodResults;
+    }
+    record2.endedAt = now().toISOString();
+    if (typeof update.note === "string" && update.note.trim()) {
+      record2.note = update.note.trim();
+    }
+    if (record2.note?.startsWith("orphaned:")) record2.note = void 0;
+    writeRunRecord(record2, deps);
+    return { kind: "transitioned", record: record2 };
+  }, { strict: true });
+  if (settled !== void 0) return settled;
+  const record = readRunRecord(runId, deps);
+  if (!record) return { kind: "not_found" };
+  if (isAgentRunTerminalStatus(record.status)) return { kind: "kept", record };
+  return { kind: "contended", record };
+}
+var AUTHORITATIVE_SETTLE_MAX_ATTEMPTS = 4;
+var AUTHORITATIVE_SETTLE_RETRY_DELAY_MS = 15;
+async function settleRunTerminalAuthoritatively(runId, update, deps = {}, transition = transitionRunToTerminal) {
+  const attempt = () => transition(runId, update, deps, { allowOverOrphaned: true });
+  let result = attempt();
+  for (let attemptNo = 1; result?.kind === "contended" && attemptNo < AUTHORITATIVE_SETTLE_MAX_ATTEMPTS; attemptNo += 1) {
+    await (deps.sleep ?? defaultSleep)(AUTHORITATIVE_SETTLE_RETRY_DELAY_MS);
+    result = attempt();
+  }
+  if (result?.kind === "contended") {
+    console.error(
+      `[nolo] authoritative settlement for run ${runId} lost the record lock ${AUTHORITATIVE_SETTLE_MAX_ATTEMPTS} times; durable record still ${result.record.status} \u2014 terminal status pending reconcile, child outcome (exitCode/dialogId/credits/DoD) may be lost`
+    );
+  } else if (result?.kind === "kept" && result.record.status !== update.status) {
+    console.warn(
+      `[nolo] run ${runId} already terminal (${result.record.status}); keeping the durable outcome over intended ${update.status}`
+    );
+  }
+  return result ?? { kind: "not_found" };
+}
+function finalizeRunRecord(runId, update, deps = {}) {
+  transitionRunToTerminal(runId, update, deps);
 }
 function isPidGone(pid, deps = {}) {
   const kill = deps.kill ?? ((p, s) => process.kill(p, s));
@@ -1349,12 +1381,18 @@ async function runSignalCommand(args, signal, verb, deps) {
 `);
     return 1;
   }
-  if (typeof record.pid !== "number") {
-    deps.output.write(`Run has no pid: ${record.runId}
+  const reconciled = checkStaleRun(record.runId, deps) ?? record;
+  if (isAgentRunTerminalStatus(reconciled.status)) {
+    deps.output.write(`Run ${reconciled.runId} is already ${reconciled.status}.
+`);
+    return 0;
+  }
+  if (typeof reconciled.pid !== "number") {
+    deps.output.write(`Run has no pid: ${reconciled.runId}
 `);
     return 1;
   }
-  const confirmed = await terminateRunProcess(record, signal, deps);
+  const confirmed = await terminateRunProcess(reconciled, signal, deps);
   if (!confirmed) {
     deps.output.write(
       `Failed to ${verb} ${record.runId} (pid ${record.pid}): process still alive after SIGKILL.
@@ -1362,9 +1400,10 @@ async function runSignalCommand(args, signal, verb, deps) {
     );
     return 1;
   }
-  finalizeRunRecord(record.runId, { status: "killed" }, deps);
+  const transition = transitionRunToTerminal(reconciled.runId, { status: "killed" }, deps);
   deps.output.write(
-    `Stopped ${record.runId} (pid ${record.pid}): process group confirmed gone.
+    transition.kind === "contended" ? `Stopped ${reconciled.runId} (pid ${reconciled.pid}): process group confirmed gone; terminal status pending reconcile.
+` : `Stopped ${reconciled.runId} (pid ${reconciled.pid}): process group confirmed gone.
 `
   );
   return 0;
@@ -1404,8 +1443,6 @@ export {
   popAllQueueEntries,
   popSingleQueueMessage,
   popQueueMessages,
-  resolveRunReportPath,
-  resolveRunReportJsonPath,
   defaultGenerateRunId,
   defaultGenerateBatchId,
   writeRunRecord,
@@ -1432,6 +1469,10 @@ export {
   claimRunRecord,
   commitRunRecordClaim,
   releaseRunRecordAck,
+  transitionRunToTerminal,
+  AUTHORITATIVE_SETTLE_MAX_ATTEMPTS,
+  AUTHORITATIVE_SETTLE_RETRY_DELAY_MS,
+  settleRunTerminalAuthoritatively,
   finalizeRunRecord,
   isPidGone,
   defaultGetProcessStartTime,