nolo-cli 0.1.52 → 0.1.53

package/index.js

@@ -70008,10 +70008,12 @@ ${this.text}
 // packages/cli/agentRunControl.ts
 var agentRunControl_exports = {};
 __export(agentRunControl_exports, {
+  checkStaleRun: () => checkStaleRun,
   defaultGenerateRunId: () => defaultGenerateRunId,
   finalizeRunRecord: () => finalizeRunRecord,
   findRunRecord: () => findRunRecord,
   findRunRecordByPid: () => findRunRecordByPid,
+  isPidGone: () => isPidGone,
   listRunRecords: () => listRunRecords,
   readRunRecord: () => readRunRecord,
   resolveNoloHome: () => resolveNoloHome2,
@@ -70054,7 +70056,7 @@ function defaultGenerateRunId() {
 function writeRunRecord(record, deps = {}) {
   const fs5 = deps.fs ?? nodeFs;
   const path8 = resolveRunRecordPath(record.runId, deps.env, deps.homedir);
-  fs5.mkdirSync(join9(path8, ".."), { recursive: true });
+  fs5.mkdirSync(resolveRunsDir(deps.env, deps.homedir), { recursive: true });
   fs5.writeFileSync(path8, JSON.stringify(record, null, 2));
 }
 function readRunRecord(runId, deps = {}) {
@@ -70172,6 +70174,29 @@ function finalizeRunRecord(runId, update, deps = {}) {
   record.endedAt = now().toISOString();
   writeRunRecord(record, deps);
 }
+function isPidGone(pid, deps = {}) {
+  const kill = deps.kill ?? ((p, s) => process.kill(p, s));
+  try {
+    kill(pid, "0");
+    return false;
+  } catch (error) {
+    const code = error.code;
+    return code === "ESRCH";
+  }
+}
+function checkStaleRun(runId, deps = {}) {
+  const record = readRunRecord(runId, deps);
+  if (!record) return null;
+  if (record.status !== "running") return record;
+  if (typeof record.pid !== "number") return record;
+  if (!isPidGone(record.pid, deps)) return record;
+  const now = deps.now ?? (() => /* @__PURE__ */ new Date());
+  record.status = "failed";
+  record.note = "process gone: pid no longer exists";
+  record.endedAt = now().toISOString();
+  writeRunRecord(record, deps);
+  return record;
+}
 function formatDuration(startedAt, endedAt) {
   const start = new Date(startedAt).getTime();
   const end = endedAt ? new Date(endedAt).getTime() : Date.now();
@@ -70213,14 +70238,48 @@ function readLogContent(logPath, tailCount, deps) {
     return "";
   }
 }
-async function runAgentPsCommand(_args, deps) {
+function isRunningStatus(status) {
+  return RUNNING_STATUSES.has(status);
+}
+function parseJsonFlag(args2) {
+  let json = false;
+  const rest = [];
+  for (const arg of args2) {
+    if (arg === "--json") {
+      json = true;
+      continue;
+    }
+    if (arg.startsWith("--json=")) {
+      const value = arg.slice("--json=".length);
+      json = value === "" || value === "true" || value === "1";
+      continue;
+    }
+    rest.push(arg);
+  }
+  return { json, rest };
+}
+function defaultSleep2(ms) {
+  return new Promise((resolve8) => setTimeout(resolve8, ms));
+}
+async function runAgentPsCommand(args2, deps) {
+  const { json } = parseJsonFlag(args2);
   const records = listRunRecords(deps);
-  if (records.length === 0) {
+  for (const record of records) {
+    if (record.status === "running" && typeof record.pid === "number") {
+      checkStaleRun(record.runId, deps);
+    }
+  }
+  const refreshed = records.map((r) => readRunRecord(r.runId, deps)).filter(Boolean);
+  if (json) {
+    deps.output.write(JSON.stringify(refreshed) + "\n");
+    return 0;
+  }
+  if (refreshed.length === 0) {
     deps.output.write("No local runs found.\n");
     return 0;
   }
   deps.output.write("RUN ID                          STATUS   PID      AGENT\n");
-  for (const record of records) {
+  for (const record of refreshed) {
     const pid = record.pid?.toString() ?? "-";
     deps.output.write(
       `${record.runId.padEnd(32)} ${record.status.padEnd(8)} ${pid.padEnd(8)} ${record.agentKey}
@@ -70229,18 +70288,83 @@ async function runAgentPsCommand(_args, deps) {
   }
   return 0;
 }
+function parseStatusArgs(args2) {
+  let target = "";
+  let json = false;
+  let watch = false;
+  let intervalMs = 2e3;
+  for (let i = 0; i < args2.length; i++) {
+    const arg = args2[i];
+    if (arg === "--json") {
+      json = true;
+      continue;
+    }
+    if (arg.startsWith("--json=")) {
+      const value = arg.slice("--json=".length);
+      json = value === "" || value === "true" || value === "1";
+      continue;
+    }
+    if (arg === "--watch") {
+      watch = true;
+      continue;
+    }
+    if (arg.startsWith("--watch=")) {
+      const value = arg.slice("--watch=".length);
+      watch = value === "" || value === "true" || value === "1";
+      continue;
+    }
+    if (arg === "--interval-ms") {
+      const next = args2[i + 1];
+      if (next && /^\d+$/.test(next)) {
+        intervalMs = Number(next);
+        i += 1;
+      }
+      continue;
+    }
+    if (arg.startsWith("--interval-ms=")) {
+      const value = arg.slice("--interval-ms=".length);
+      if (/^\d+$/.test(value)) intervalMs = Number(value);
+      continue;
+    }
+    if (!arg.startsWith("-") && !target) {
+      target = arg;
+    }
+  }
+  return { target, json, watch, intervalMs };
+}
+function printStatusTick(record, deps) {
+  const elapsed = formatDuration(record.startedAt, record.endedAt);
+  const note = record.note ? ` (${record.note})` : "";
+  deps.output.write(
+    `[${(/* @__PURE__ */ new Date()).toISOString()}] ${record.runId} status=${record.status} elapsed=${elapsed}${note}
+`
+  );
+}
 async function runAgentStatusCommand(args2, deps) {
-  const target = args2[0];
+  const { target, json, watch, intervalMs } = parseStatusArgs(args2);
   if (!target) {
-    deps.output.write("Usage: nolo agent status <runId|pid>\n");
+    deps.output.write("Usage: nolo agent status <runId|pid> [--json] [--watch] [--interval-ms N]\n");
     return 1;
   }
-  const record = findRunRecord(target, deps);
-  if (!record) {
+  const initial = findRunRecord(target, deps);
+  if (!initial) {
     deps.output.write(`Run not found: ${target}
 `);
     return 1;
   }
+  const reconciled = checkStaleRun(initial.runId, deps) ?? initial;
+  if (json) {
+    const record = readRunRecord(reconciled.runId, deps) ?? reconciled;
+    deps.output.write(JSON.stringify(record) + "\n");
+    return 0;
+  }
+  if (!watch) {
+    const record = readRunRecord(reconciled.runId, deps) ?? reconciled;
+    return printStatusOnce(record, deps);
+  }
+  return runStatusWatch(reconciled.runId, intervalMs, deps);
+}
+function printStatusOnce(record, deps) {
   deps.output.write(`runId:    ${record.runId}
 `);
   deps.output.write(`status:   ${record.status}
@@ -70260,6 +70384,8 @@ async function runAgentStatusCommand(args2, deps) {
   if (typeof record.exitCode === "number") deps.output.write(`exitCode: ${record.exitCode}
 `);
   if (record.dialogId) deps.output.write(`dialog:   ${record.dialogId}
+`);
+  if (record.note) deps.output.write(`note:     ${record.note}
 `);
   deps.output.write(`log:      ${record.logPath}
 `);
@@ -70273,6 +70399,47 @@ async function runAgentStatusCommand(args2, deps) {
   }
   return 0;
 }
+async function runStatusWatch(runId, intervalMs, deps) {
+  const sleep7 = deps.sleep ?? defaultSleep2;
+  const now = deps.now ?? (() => /* @__PURE__ */ new Date());
+  let stopped = false;
+  const setSignalHandler = deps.setSignalHandler ?? ((handler) => {
+    process.once("SIGINT", handler);
+  });
+  const clearSignalHandler = deps.clearSignalHandler ?? (() => {
+    process.removeAllListeners("SIGINT");
+  });
+  setSignalHandler(() => {
+    stopped = true;
+  });
+  try {
+    let record = readRunRecord(runId, deps);
+    if (!record) {
+      deps.output.write(`Run not found: ${runId}
+`);
+      return 1;
+    }
+    printStatusTick(record, deps);
+    while (!stopped && isRunningStatus(record.status)) {
+      await sleep7(intervalMs);
+      if (stopped) break;
+      record = checkStaleRun(runId, deps);
+      if (!record) {
+        deps.output.write(`Run not found: ${runId}
+`);
+        return 1;
+      }
+      printStatusTick(record, deps);
+    }
+    if (stopped) {
+      deps.output.write(`watch stopped by signal
+`);
+    }
+    return 0;
+  } finally {
+    clearSignalHandler();
+  }
+}
 function parseLogsArgs(args2, onTail) {
   let runId = "";
   for (let i = 0; i < args2.length; i++) {
@@ -70364,10 +70531,12 @@ async function runAgentStopCommand(args2, deps) {
 async function runAgentKillCommand(args2, deps) {
   return runSignalCommand(args2, "SIGKILL", "kill", deps);
 }
+var RUNNING_STATUSES;
 var init_agentRunControl = __esm({
   "packages/cli/agentRunControl.ts"() {
     "use strict";
     init_cliEnvHelpers();
+    RUNNING_STATUSES = /* @__PURE__ */ new Set(["running"]);
   }
 });
 
@@ -77218,7 +77387,7 @@ async function runLoginCommand(args2, deps = {}) {
     serverUrl,
     fetchImpl: deps.fetchImpl ?? fetch,
     openBrowser: deps.openBrowser ?? defaultOpenBrowser,
-    sleep: deps.sleep ?? defaultSleep2,
+    sleep: deps.sleep ?? defaultSleep3,
     now: deps.now ?? Date.now,
     output: outputTarget,
     error: errorTarget,
@@ -77286,7 +77455,7 @@ function runLogoutCommand(deps = {}) {
   }
   return 0;
 }
-var LOGIN_HELP_TEXT, LOGOUT_HELP_TEXT, WHOAMI_HELP_TEXT, postJson2, defaultSleep2, defaultOpenBrowser;
+var LOGIN_HELP_TEXT, LOGOUT_HELP_TEXT, WHOAMI_HELP_TEXT, postJson2, defaultSleep3, defaultOpenBrowser;
 var init_authCommands = __esm({
   "packages/cli/authCommands.ts"() {
     "use strict";
@@ -77326,7 +77495,7 @@ Usage:
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(body)
     });
-    defaultSleep2 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
+    defaultSleep3 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
     defaultOpenBrowser = async (url) => {
       const command2 = process.platform === "darwin" ? "open" : process.platform === "win32" ? "cmd" : "xdg-open";
       const args2 = process.platform === "win32" ? ["/c", "start", "", url] : [url];
@@ -77654,7 +77823,7 @@ ${SYNC_HELP_LINE}
 
 // packages/connector-experimental/heartbeatLoop.ts
 async function runHeartbeatLoop(options) {
-  const sleep7 = options.sleep ?? defaultSleep3;
+  const sleep7 = options.sleep ?? defaultSleep4;
   let beats = 0;
   while (!options.signal?.aborted) {
     await options.sendHeartbeat();
@@ -77664,11 +77833,11 @@ async function runHeartbeatLoop(options) {
     await sleep7(options.intervalMs);
   }
 }
-var defaultSleep3;
+var defaultSleep4;
 var init_heartbeatLoop = __esm({
   "packages/connector-experimental/heartbeatLoop.ts"() {
     "use strict";
-    defaultSleep3 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
+    defaultSleep4 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
   }
 });
 
@@ -78281,7 +78450,7 @@ ${text}`);
       return 1;
     }
     const maxAttempts = deps.maxConnectorAttempts ?? Infinity;
-    const sleep7 = deps.sleep ?? defaultSleep4;
+    const sleep7 = deps.sleep ?? defaultSleep5;
     const reconnectDelayMs = resolveConnectorReconnectDelayMs(env);
     for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
       if (deps.signal?.aborted) {
@@ -78351,7 +78520,7 @@ ${text}`);
     sendHeartbeat
   });
 }
-var defaultSleep4;
+var defaultSleep5;
 var init_machineCommands = __esm({
   "packages/cli/machineCommands.ts"() {
     "use strict";
@@ -78366,7 +78535,7 @@ var init_machineCommands = __esm({
     init_machineWsRunDispatch();
     init_machineWsSession();
     init_machineStatusCommands();
-    defaultSleep4 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
+    defaultSleep5 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
   }
 });
 
@@ -80283,11 +80452,11 @@ function getAgentInternalCommandEntries() {
       return runAgentReadCommand2(args2, deps);
     }),
     createAgentRunCommand(["agent", "run"], "Run an agent"),
-    createEnvCommand(["agent", "ps"], "List active and recent local agent runs", async (_args, deps) => {
+    createEnvCommand(["agent", "ps"], "List active and recent local agent runs (--json for machine-readable output)", async (_args, deps) => {
       const { runAgentPsCommand: runAgentPsCommand2 } = await Promise.resolve().then(() => (init_agentRunControl(), agentRunControl_exports));
       return runAgentPsCommand2(_args, { ...deps, output: process.stdout });
     }),
-    createEnvCommand(["agent", "status"], "Show status of a local agent run", async (args2, deps) => {
+    createEnvCommand(["agent", "status"], "Show status of a local agent run (--json, --watch, --interval-ms N)", async (args2, deps) => {
       const { runAgentStatusCommand: runAgentStatusCommand2 } = await Promise.resolve().then(() => (init_agentRunControl(), agentRunControl_exports));
       return runAgentStatusCommand2(args2, { ...deps, output: process.stdout });
     }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nolo-cli",
-  "version": "0.1.52",
+  "version": "0.1.53",
   "type": "module",
   "description": "Agent-first terminal workspace for Nolo",
   "bin": {
@@ -47,6 +47,6 @@
     "serpapi": "^2.2.1"
   },
   "optionalDependencies": {
-    "nolo-cli-darwin-arm64": "0.1.52"
+    "nolo-cli-darwin-arm64": "0.1.53"
   }
 }