nolo-cli 0.18.0 → 0.24.0-alpha.6

package/{chunk-VNAEBGDK.js → chunk-RZNYL4LW.js}

@@ -1,6 +1,6 @@
 import {
   isAgentRunTerminalStatus
-} from "./chunk-FQZZLA3C.js";
+} from "./chunk-KXKQO4Q6.js";
 import {
   isCompiledBinary,
   resolveCliEntrypointPath
@@ -45,11 +45,58 @@ function defaultGenerateBatchId() {
   const random = Math.random().toString(36).slice(2, 8);
   return `batch-${timestamp}-${random}`;
 }
+var LOCK_STALE_MS = 5e3;
+var TMP_STALE_MS = 6e4;
+function withRunRecordLock(runId, deps, fn) {
+  const fs = deps.fs ?? nodeFs;
+  const now = deps.now ?? (() => /* @__PURE__ */ new Date());
+  const lockPath = `${resolveRunRecordPath(runId, deps.env, deps.homedir)}.lock`;
+  let held = false;
+  try {
+    try {
+      fs.writeFileSync(lockPath, String(process.pid), { flag: "wx" });
+      held = true;
+    } catch {
+      try {
+        const stat = fs.statSync?.(lockPath);
+        const ageMs = stat ? now().getTime() - stat.mtimeMs : Number.POSITIVE_INFINITY;
+        if (ageMs > LOCK_STALE_MS) {
+          fs.unlinkSync(lockPath);
+          fs.writeFileSync(lockPath, String(process.pid), { flag: "wx" });
+          held = true;
+        }
+      } catch {
+      }
+    }
+    return fn();
+  } finally {
+    if (held) {
+      try {
+        fs.unlinkSync(lockPath);
+      } catch {
+      }
+    }
+  }
+}
 function writeRunRecord(record, deps = {}) {
   const fs = deps.fs ?? nodeFs;
   const path = resolveRunRecordPath(record.runId, deps.env, deps.homedir);
   fs.mkdirSync(resolveRunsDir(deps.env, deps.homedir), { recursive: true });
-  fs.writeFileSync(path, JSON.stringify(record, null, 2));
+  const payload = JSON.stringify(record, null, 2);
+  if (typeof fs.renameSync === "function") {
+    const tmp = `${path}.${process.pid}.${Math.random().toString(36).slice(2, 8)}.tmp`;
+    try {
+      fs.writeFileSync(tmp, payload);
+      fs.renameSync(tmp, path);
+      return;
+    } catch {
+      try {
+        fs.unlinkSync(tmp);
+      } catch {
+      }
+    }
+  }
+  fs.writeFileSync(path, payload);
 }
 var FILE_EDIT_TOOL_NAMES = /* @__PURE__ */ new Set(["writeFile", "editFile"]);
 var DEFAULT_ACTIVITY_WRITE_INTERVAL_MS = 2e3;
@@ -130,11 +177,14 @@ function createRunActivityTracker(runId, deps = {}, options = {}) {
 function readRunRecord(runId, deps = {}) {
   const fs = deps.fs ?? nodeFs;
   const path = resolveRunRecordPath(runId, deps.env, deps.homedir);
-  try {
-    return JSON.parse(fs.readFileSync(path, "utf8"));
-  } catch {
-    return null;
+  for (let attempt = 0; attempt < 2; attempt += 1) {
+    try {
+      return JSON.parse(fs.readFileSync(path, "utf8"));
+    } catch {
+      if (attempt === 1) return null;
+    }
   }
+  return null;
 }
 function listRunRecords(deps = {}) {
   const fs = deps.fs ?? nodeFs;
@@ -248,6 +298,22 @@ function gcRunRecords(deps = {}, options = {}) {
       failedIds.push(record.runId);
     }
   }
+  try {
+    const dir = resolveRunsDir(deps.env, deps.homedir);
+    const statSync = fs.statSync;
+    for (const entry of fs.readdirSync(dir)) {
+      if (typeof entry !== "string" || !entry.endsWith(".tmp")) continue;
+      const tmpPath = join(dir, entry);
+      try {
+        const stat = statSync?.(tmpPath);
+        if (stat && nowMs - stat.mtimeMs <= TMP_STALE_MS) continue;
+      } catch {
+        continue;
+      }
+      tryUnlinkFile(fs, tmpPath);
+    }
+  } catch {
+  }
   return { swept: sweptIds.length, sweptIds, failedIds };
 }
 function stripBackgroundFlag(args) {
@@ -367,28 +433,39 @@ async function spawnLocalBackgroundRun(input, deps = {}) {
     record.pid = proc.pid;
     const processStartedAt = (deps.getProcessStartTime ?? defaultGetProcessStartTime)(proc.pid);
     if (processStartedAt) record.processStartedAt = processStartedAt.toISOString();
-    fs.writeFileSync(recordPath, JSON.stringify(record, null, 2));
+    writeRunRecord(record, deps);
   }
   return { runId, pid: proc.pid, logPath, batchId };
 }
+function ackRunRecord(runId, deps = {}) {
+  withRunRecordLock(runId, deps, () => {
+    const record = readRunRecord(runId, deps);
+    if (!record) return;
+    if (record.ack) return;
+    record.ack = true;
+    writeRunRecord(record, deps);
+  });
+}
 function finalizeRunRecord(runId, update, deps = {}) {
-  const record = readRunRecord(runId, deps);
-  if (!record) return;
-  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;
-  record.endedAt = now().toISOString();
-  writeRunRecord(record, deps);
+  withRunRecordLock(runId, deps, () => {
+    const record = readRunRecord(runId, deps);
+    if (!record) return;
+    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;
+    record.endedAt = now().toISOString();
+    if (record.note?.startsWith("orphaned:")) record.note = void 0;
+    writeRunRecord(record, deps);
+  });
 }
 function isPidGone(pid, deps = {}) {
   const kill = deps.kill ?? ((p, s) => process.kill(p, s));
   try {
-    kill(pid, "0");
+    kill(pid, 0);
     return false;
   } catch (error) {
-    const code = error.code;
-    return code === "ESRCH";
+    return error.code === "ESRCH";
   }
 }
 function defaultGetProcessStartTime(pid) {
@@ -406,7 +483,13 @@ function defaultGetProcessStartTime(pid) {
   }
 }
 var MAX_PROCESS_START_TIME_DIFF_MS = 3e4;
-var MAX_PERSISTED_PROCESS_START_TIME_DIFF_MS = 1e3;
+var MAX_PERSISTED_PROCESS_START_TIME_DIFF_MS = 2e3;
+var ORPHAN_HEARTBEAT_GRACE_MS = 1e4;
+function readTimestampMs(value) {
+  if (!value) return null;
+  const ms = new Date(value).getTime();
+  return Number.isNaN(ms) ? null : ms;
+}
 function isPidReused(pid, expectedStartedAt, deps = {}, maxDiffMs = MAX_PROCESS_START_TIME_DIFF_MS) {
   const getStartTime = deps.getProcessStartTime ?? defaultGetProcessStartTime;
   const procStartTime = getStartTime(pid);
@@ -429,13 +512,25 @@ function checkStaleRun(runId, deps = {}) {
   const pidReused = !pidGone && isPidReused(record.pid, expectedStartedAt, deps, maxStartTimeDiffMs);
   if (!pidGone && !pidReused) return record;
   const now = deps.now ?? (() => /* @__PURE__ */ new Date());
-  record.status = "orphaned";
-  record.note = pidReused ? "orphaned: process gone (pid reused by another process)" : "orphaned: process gone without writing terminal status";
-  record.endedAt = now().toISOString();
-  record.reconciledAt = now().toISOString();
-  record.pid = void 0;
-  writeRunRecord(record, deps);
-  return record;
+  const heartbeatAt = readTimestampMs(record.activity?.updatedAt);
+  if (heartbeatAt !== null) {
+    const silentMs = now().getTime() - heartbeatAt;
+    if (silentMs < ORPHAN_HEARTBEAT_GRACE_MS) return record;
+  }
+  return withRunRecordLock(runId, deps, () => {
+    const latest = readRunRecord(runId, deps);
+    if (!latest) return record;
+    if (latest.status !== "running") return latest;
+    if (latest.activity?.updatedAt !== record.activity?.updatedAt) return latest;
+    const at = now().toISOString();
+    latest.status = "orphaned";
+    latest.note = pidReused ? "orphaned: process gone (pid reused by another process)" : "orphaned: process gone without writing terminal status";
+    latest.endedAt = at;
+    latest.reconciledAt = at;
+    latest.pid = void 0;
+    writeRunRecord(latest, deps);
+    return latest;
+  });
 }
 function formatDuration(startedAt, endedAt) {
   const start = new Date(startedAt).getTime();
@@ -812,10 +907,12 @@ export {
   absolutizeSkillArgs,
   rewriteMsgFileArg,
   spawnLocalBackgroundRun,
+  ackRunRecord,
   finalizeRunRecord,
   isPidGone,
   defaultGetProcessStartTime,
   MAX_PROCESS_START_TIME_DIFF_MS,
+  ORPHAN_HEARTBEAT_GRACE_MS,
   isPidReused,
   checkStaleRun,
   runAgentPsCommand,

package/{chunk-RVOUXDFU.js → chunk-S6KVFOUG.js}

@@ -1,6 +1,9 @@
 import {
   parsePositiveFiniteNumberOrFallback
 } from "./chunk-Y5GCAMGP.js";
+import {
+  DEFAULT_SYSTEM_AGENT_CAPABILITIES
+} from "./chunk-UZ6XXCVR.js";
 import {
   asRecordOrEmpty
 } from "./chunk-KX6YBIHG.js";
@@ -10,18 +13,18 @@ import {
   toTimestampMs,
   upsert,
   write
-} from "./chunk-XRZJGPFI.js";
+} from "./chunk-FON47ACC.js";
 import {
   createUserKey,
   createUserPreferenceKey,
   ulid
-} from "./chunk-6Y7A3OQQ.js";
+} from "./chunk-NRY4GCKJ.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
 import {
   BUILTIN_NOLO_AGENT_KEY
-} from "./chunk-3ND52WIL.js";
+} from "./chunk-ATWUOTJP.js";
 import {
   asyncThunkCreator,
   buildCreateSlice,
@@ -65,35 +68,6 @@ var DEFAULT_USER_PREFERENCE_PROFILE = {
   spaceContextLevel: 3
 };
 
-// packages/ai/tools/agentCapabilities.ts
-var SYSTEM_AGENT_CAPABILITIES = [
-  {
-    id: "web-search",
-    label: "\u8054\u7F51\u641C\u7D22",
-    description: "\u8BA9 agent \u80FD\u641C\u7D22\u4E92\u8054\u7F51\u3001\u6293\u53D6\u7F51\u9875\u5185\u5BB9\uFF0C\u83B7\u53D6\u6700\u65B0\u4FE1\u606F\u3002",
-    tools: ["exa_search", "fetchWebpage"],
-    defaultEnabled: true,
-    icon: "\u{1F310}"
-  },
-  {
-    id: "agent-orchestration",
-    label: "\u591A agent \u7F16\u6392",
-    description: "\u5148\u6309\u6536\u85CF\u3001\u7B80\u4ECB\u3001\u80FD\u529B\u548C\u6210\u672C\u5217\u51FA\u5B89\u5168 agent \u6458\u8981\uFF0C\u6309\u9700\u8BFB\u53D6\u5019\u9009\u914D\u7F6E\u89E3\u6790\u53EF\u8FD0\u884C key\uFF0C\u518D\u540E\u53F0\u542F\u52A8\u5176\u4ED6 agent \u6267\u884C\u5B50\u4EFB\u52A1\uFF0C\u5E76\u89C2\u5BDF\u3001\u67E5\u8BE2\u3001\u505C\u6B62\u8FD0\u884C\u4E2D\u7684 agent run\u2014\u2014\u9002\u5408\u5E76\u884C\u6D3E\u53D1\u3001\u957F\u4EFB\u52A1\u8DDF\u8E2A\u3001\u4E2D\u9014\u53EB\u505C\u7B49\u7F16\u6392\u573A\u666F\u3002",
-    tools: ["startAgentRun", "controlAgentRun", "listAgents"],
-    defaultEnabled: true,
-    icon: "\u{1F9E9}"
-  }
-];
-var SYSTEM_AGENT_CAPABILITY_IDS = SYSTEM_AGENT_CAPABILITIES.map(
-  ({ id }) => id
-);
-var DEFAULT_SYSTEM_AGENT_CAPABILITIES = Object.fromEntries(
-  SYSTEM_AGENT_CAPABILITIES.map(({ id, defaultEnabled }) => [
-    id,
-    defaultEnabled
-  ])
-);
-
 // packages/ai/policy/selfUpdateFields.ts
 var AGENT_UPDATE_FIELD_NAMES = [
   "name",
@@ -2015,8 +1989,6 @@ var settingSlice_default = settingSlice.reducer;
 export {
   DEFAULT_AGENT_BASE_POLICY,
   DEFAULT_USER_PREFERENCE_PROFILE,
-  SYSTEM_AGENT_CAPABILITIES,
-  SYSTEM_AGENT_CAPABILITY_IDS,
   AGENT_UPDATE_FIELD_NAMES,
   normalizeAgentUpdateFieldList,
   SYSTEM_DEFAULT_AGENT_ID,

package/{chunk-V3ED5AWK.js → chunk-S77SCVBU.js}

@@ -7,11 +7,11 @@ import {
   listUserRecordsFromServers,
   readDbRecordFromServers,
   readLiveDbRecordAfterTombstoneMerge
-} from "./chunk-HEGV7BH3.js";
+} from "./chunk-AQZCWJOG.js";
 import {
   buildDialogAttachmentPlan,
   extractFileContentIds
-} from "./chunk-B5TOXZAK.js";
+} from "./chunk-SIZQB7BD.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
@@ -624,9 +624,9 @@ async function tryHttpDialogCandidates(args) {
   }
   throw Object.assign(new Error("All HTTP dialog reads failed"), { attempts });
 }
-async function readDialogFromLocalDb(dialogKey, dialogId, limit) {
-  const { readDialogFromLocalDb: readLocalDialog } = await import("./localDialogRead-4H3QJFLW.js");
-  const result = await readLocalDialog({ dialogKey, dialogId, limit });
+async function readDialogFromLocalDb(dialogKey, dialogId, limit, readLocalDialog) {
+  const reader = readLocalDialog ?? (await import("./localDialogRead-JXTAHW2E.js")).readDialogFromLocalDb;
+  const result = await reader({ dialogKey, dialogId, limit });
   return {
     ...result,
     source: "local-db-fallback"
@@ -650,18 +650,29 @@ async function readDialogSnapshot(args) {
     const statuses = attempts.map((attempt) => attempt.status).filter((status) => typeof status === "number");
     const all404 = attempts.length > 0 && statuses.length === attempts.length && statuses.every((status) => status === 404);
     const localhostCandidate = candidateBases.find(isLocalBaseUrl);
-    if (!localhostCandidate || all404) {
-      throw Object.assign(new Error(
-        all404 ? `dialog not found on tried servers: ${candidateBases.join(", ")}` : `read dialog failed across candidates: ${attempts.map((attempt) => `${attempt.base} -> ${attempt.status ?? attempt.message}`).join("; ")}`
-      ), { attempts });
+    const remoteError = Object.assign(new Error(
+      all404 ? `dialog not found on tried servers: ${candidateBases.join(", ")}` : `read dialog failed across candidates: ${attempts.map((attempt) => `${attempt.base} -> ${attempt.status ?? attempt.message}`).join("; ")}`
+    ), { attempts });
+    if (all404 || localhostCandidate) {
+      try {
+        const fallback = await readDialogFromLocalDb(
+          args.dialogKey,
+          args.dialogId,
+          args.limit,
+          args.readLocalDialog
+        );
+        return {
+          ...fallback,
+          // Keep the configured base stable for callers that render it; the
+          // source field identifies that the payload came from local storage.
+          resolvedBase: localhostCandidate ?? args.base,
+          attempts,
+          candidateBases
+        };
+      } catch {
+      }
     }
-    const fallback = await readDialogFromLocalDb(args.dialogKey, args.dialogId, args.limit);
-    return {
-      ...fallback,
-      resolvedBase: localhostCandidate,
-      attempts,
-      candidateBases
-    };
+    throw remoteError;
   }
 }
 function compact(value, max = 180) {

package/{chunk-UBHAWFQ6.js → chunk-S7RWIPDI.js}

@@ -5,10 +5,10 @@ import {
   inlineImageUrlsForCustomProvider,
   prepareTools,
   shouldInlineImageUrlsForAgent
-} from "./chunk-CZ6NYQTV.js";
+} from "./chunk-P4QWLZGU.js";
 import {
   performFetchRequest
-} from "./chunk-VYHDJEQD.js";
+} from "./chunk-QNLLGS37.js";
 import {
   createSSEParser,
   createToolRunId,
@@ -19,7 +19,7 @@ import {
   toolRunSetPending,
   toolRunStarted,
   toolRunSucceeded
-} from "./chunk-EDV7EBOI.js";
+} from "./chunk-4ZH6GUJF.js";
 import {
   getPublicImageAgentMode
 } from "./chunk-VIDPVFP3.js";
@@ -29,13 +29,13 @@ import {
   messageStreaming,
   selectCurrentSpaceId,
   updateToolMessage
-} from "./chunk-SCTYAHYK.js";
+} from "./chunk-H2NAWOLH.js";
 import {
   streamAgentChatTurn
-} from "./chunk-REA4JLBH.js";
+} from "./chunk-M5OZCOBV.js";
 import {
   EMPTY_ASSISTANT_REPAIR_PROMPT
-} from "./chunk-YGW4G5W5.js";
+} from "./chunk-X546QUDT.js";
 import {
   accumulateToolCallDelta,
   createThinkParserState,
@@ -44,35 +44,32 @@ import {
   flushToolCallTextParserIntoCallback,
   processContentChunkWithToolCallStripping,
   processThinkChunk
-} from "./chunk-LSFAWXKC.js";
+} from "./chunk-N7J63Q6C.js";
 import {
   getModelInfo
-} from "./chunk-I2ZJKTG5.js";
+} from "./chunk-CGVRC2TB.js";
 import {
   getApiEndpoint
-} from "./chunk-UAIVG4J6.js";
-import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
-import {
-  extractCustomId
-} from "./chunk-DFFIZ25G.js";
+} from "./chunk-CHSCAUZN.js";
 import {
   addActiveController,
   removeActiveController,
   tokenUsageLiveUpdate
 } from "./chunk-3ASDTTEI.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
 import {
   selectCurrentServer
-} from "./chunk-RVOUXDFU.js";
+} from "./chunk-S6KVFOUG.js";
 import {
   write
-} from "./chunk-XRZJGPFI.js";
+} from "./chunk-FON47ACC.js";
 import {
   createDialogMessageKeyAndId,
   dialogMessageKey,
   toTrimmedString
-} from "./chunk-6Y7A3OQQ.js";
+} from "./chunk-NRY4GCKJ.js";
 import {
   createAsyncThunk,
   selectIdentityToken
@@ -83,6 +80,9 @@ import {
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
+import {
+  extractCustomId
+} from "./chunk-SLOGKB7M.js";
 import {
   isRecord
 } from "./chunk-KUG52IAP.js";
@@ -307,17 +307,20 @@ function updateTotalUsage(currentUsage, newUsageChunk) {
     return currentUsage;
   }
   if (!currentUsage) {
-    return {
+    const first = {
       completion_tokens: 0,
       prompt_tokens: 0,
       total_tokens: 0,
       ...newUsageChunk
     };
+    applyResponsesUsageFields(first, newUsageChunk);
+    return first;
   }
   const updatedUsage = { ...currentUsage };
   if (newUsageChunk.completion_tokens !== void 0) updatedUsage.completion_tokens = newUsageChunk.completion_tokens;
   if (newUsageChunk.prompt_tokens !== void 0) updatedUsage.prompt_tokens = newUsageChunk.prompt_tokens;
   if (newUsageChunk.total_tokens !== void 0) updatedUsage.total_tokens = newUsageChunk.total_tokens;
+  applyResponsesUsageFields(updatedUsage, newUsageChunk);
   if (newUsageChunk.prompt_tokens_details) {
     updatedUsage.prompt_tokens_details = {
       ...updatedUsage.prompt_tokens_details || {},
@@ -349,6 +352,26 @@ function updateTotalUsage(currentUsage, newUsageChunk) {
   }
   return updatedUsage;
 }
+function applyResponsesUsageFields(target, chunk) {
+  if (chunk.input_tokens !== void 0) {
+    target.prompt_tokens = chunk.input_tokens;
+  }
+  if (chunk.output_tokens !== void 0) {
+    target.completion_tokens = chunk.output_tokens;
+  }
+  if (chunk.input_tokens_details) {
+    target.prompt_tokens_details = {
+      ...target.prompt_tokens_details || {},
+      ...chunk.input_tokens_details
+    };
+  }
+  if (chunk.output_tokens_details) {
+    target.completion_tokens_details = {
+      ...target.completion_tokens_details || {},
+      ...chunk.output_tokens_details
+    };
+  }
+}
 
 // packages/chat/messages/toolThunks.ts
 var TOOL_ARGS_SENTINELS = [

package/{chunk-B5TOXZAK.js → chunk-SIZQB7BD.js}

@@ -1,6 +1,6 @@
 import {
   dialogMessageKey
-} from "./chunk-6Y7A3OQQ.js";
+} from "./chunk-NRY4GCKJ.js";
 import {
   asOptionalFiniteNumber
 } from "./chunk-WWC7I6TA.js";

package/{chunk-DFFIZ25G.js → chunk-SLOGKB7M.js}

@@ -23,8 +23,11 @@ var extractCustomId = (key) => {
   }
   return extractKeyPart(key, 2);
 };
+var PUBLIC_AGENT_KEY_PREFIX = "agent-pub-";
+var publicAgentKey = (id) => `${PUBLIC_AGENT_KEY_PREFIX}${id}`;
 
 export {
   extractUserId,
-  extractCustomId
+  extractCustomId,
+  publicAgentKey
 };

package/{chunk-FXUSIQC2.js → chunk-SROR5TSM.js}

@@ -1,6 +1,6 @@
 import {
   trimTrailingSlash
-} from "./chunk-MHSGJW4Z.js";
+} from "./chunk-EHOYZRTI.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";

package/{chunk-PIZYJVHQ.js → chunk-TN4YHAI3.js}

@@ -1,3 +1,6 @@
+import {
+  clearCliLocalRuntimePreparedAgentCache
+} from "./chunk-OJFYT3ZQ.js";
 import {
   getReadableCliDb
 } from "./chunk-WFHXMLHZ.js";
@@ -9,10 +12,7 @@ import {
   resolveAgentRecordFromHybridStore,
   sanitizeAgentRecordForCliOutput,
   writeAgentRecord
-} from "./chunk-DFCFMCY6.js";
-import {
-  clearCliLocalRuntimePreparedAgentCache
-} from "./chunk-23FZYPLC.js";
+} from "./chunk-JBLY6HQP.js";
 import {
   resolveCliAgentKeyInput
 } from "./chunk-VHBWHNVT.js";