nolo-cli 0.29.2 → 0.30.0-alpha.10

package/{chunk-H5S4XUGI.js → chunk-Q243PXRU.js}

@@ -4,71 +4,35 @@ import {
   refreshAntigravityOAuthToken,
   refreshOpenAiCodexToken,
   xaiRefresh
-} from "./chunk-WX3ZOSTL.js";
+} from "./chunk-EBNSAABL.js";
 import {
-  buildLocalAgentLookupKeys
-} from "./chunk-R3JSTDQO.js";
-import {
-  LOCAL_CODEX_AGENT_ID,
-  LOCAL_CODEX_AGENT_KEY,
-  NOLO_DEFAULT_AGENT_ID,
-  NOLO_DEFAULT_AGENT_KEY
-} from "./chunk-VHBWHNVT.js";
-import {
-  inferCaptureIntent
-} from "./chunk-W2LZV5GE.js";
-import {
-  inlineImageUrlsForCustomProvider,
-  prepareTools
-} from "./chunk-32ZM6HVI.js";
-import {
-  getAntigravityUserAgent,
-  isAntigravityOAuthAgent,
-  readAntigravityProjectId,
-  resolveAntigravityCloudCodeBaseUrl
-} from "./chunk-2FX23RGA.js";
-import {
-  readXPostFunc,
-  readXPostFunctionSchema,
-  readXhsProfileFunc,
-  readXhsProfileFunctionSchema,
-  rememberMemoryFunctionSchema,
-  resolveAgentRequiredPackIds,
-  setTodoListFunc
-} from "./chunk-WMB7GVPN.js";
+  ackRunRecord,
+  checkStaleRun,
+  claimRunRecord,
+  commitRunRecordClaim,
+  finalizeRunRecord,
+  findRunRecord,
+  gcRunRecords,
+  queryRunRecords,
+  releaseRunRecordAck,
+  spawnLocalBackgroundRun
+} from "./chunk-4SAV7BD7.js";
 import {
-  createDrainExhaustedResponse,
-  isCoreDrainingBody,
-  normalizeNonNegativeMs,
-  parseRetryAfterHeaderMs
-} from "./chunk-RQSOAMPJ.js";
+  CliProviderQuotaError,
+  executeCli
+} from "./chunk-JDSUTNYY.js";
 import {
   getDefaultCliLocalRuntimeDb
 } from "./chunk-WJRJDX2W.js";
 import {
-  applyTokenUsageToDayStats,
-  prepareTokenUsageData,
-  runKeyed
-} from "./chunk-UFL6WHHJ.js";
-import {
-  BUILTIN_TITLE_LLM_CONFIG
-} from "./chunk-XOIF2TNF.js";
-import {
-  fetchServerSyncedCredential
-} from "./chunk-RJBTU7AS.js";
-import {
-  require_date_fns
-} from "./chunk-M76ECQRD.js";
+  buildLocalAgentLookupKeys
+} from "./chunk-GVPMJPCT.js";
 import {
-  FORCED_TOOLS,
-  addDefaultLightWebToolsForConfiguredAgents,
-  addDefaultSystemCapabilityTools,
-  appendEnabledPackPromptPatches,
-  applyDisabledTools,
-  applySystemBuiltinSkillFilter,
-  expandEnabledPacks,
-  resolveEffectiveEnabledPacks
-} from "./chunk-CF7S2RYZ.js";
+  LOCAL_CODEX_AGENT_ID,
+  LOCAL_CODEX_AGENT_KEY,
+  NOLO_DEFAULT_AGENT_ID,
+  NOLO_DEFAULT_AGENT_KEY
+} from "./chunk-K6QEHQZ3.js";
 import {
   buildAgentRuntimeDialogWritePlan,
   buildLoadSkillExecutor,
@@ -89,7 +53,7 @@ import {
   readOpenAiCompatibleSseCompletion,
   resolveAgentNextAvailableAt,
   resolveOpenAiCompatibleProviderConfig
-} from "./chunk-KEF5OBOZ.js";
+} from "./chunk-GKXS4F2I.js";
 import {
   buildPlatformChatCompletionRequest,
   canUsePlatformChatProvider,
@@ -99,42 +63,88 @@ import {
   readSseDataValues,
   resolvePlatformChatProviderConfig,
   shouldUsePlatformChatProvider
-} from "./chunk-HALKDXKP.js";
+} from "./chunk-XORE26Z4.js";
+import {
+  buildCliPrompt
+} from "./chunk-ATNTHIZI.js";
 import {
   resolveAgentRuntimeConfigFromRecord
 } from "./chunk-OIQPORYI.js";
 import {
+  inlineImageUrlsForCustomProvider,
+  prepareTools
+} from "./chunk-NZBH7FTB.js";
+import {
+  inferCaptureIntent,
   resolveHistoricalToolContentCap,
   summarizeToolArguments
-} from "./chunk-Z54ZAZZC.js";
+} from "./chunk-VQ4QPCKE.js";
+import {
+  getAntigravityUserAgent,
+  isAntigravityOAuthAgent,
+  readAntigravityProjectId,
+  resolveAntigravityCloudCodeBaseUrl
+} from "./chunk-J3LHGBNO.js";
 import {
   convertMessagesToResponsesInput,
   toResponsesTools
 } from "./chunk-D34RI6NI.js";
 import {
   resolvePlatformAuthToken
-} from "./chunk-XS7UPVR7.js";
-import {
-  buildNoloWorkspaceOpenAiTools,
-  parseNoloWorkspaceToolArguments,
-  resolveRuntimeToolSurfaceForAgent
-} from "./chunk-UEOPA6MV.js";
+} from "./chunk-WTPC3XD4.js";
 import {
   buildDialogFallbackTitleFromUserInput,
   normalizeDialogTitle
 } from "./chunk-2MBTWINN.js";
 import {
-  resolveBuiltinPlatformAgentConfig
-} from "./chunk-HYSJHRWD.js";
+  readXPostFunc,
+  readXPostFunctionSchema,
+  readXhsProfileFunc,
+  readXhsProfileFunctionSchema,
+  rememberMemoryFunctionSchema,
+  setTodoListFunc
+} from "./chunk-IPSPETAL.js";
+import {
+  createDrainExhaustedResponse,
+  isCoreDrainingBody,
+  normalizeNonNegativeMs,
+  parseRetryAfterHeaderMs
+} from "./chunk-Z5MXSEOJ.js";
 import {
+  TASK_PREVIEW_MAX,
+  formatListRunsCard,
+  formatNotFoundRunCard,
+  formatStartRunCard,
+  formatStatusRunCard,
+  formatStopRunCard,
+  isAgentNameFallback,
+  isAgentRunTerminalStatus,
+  resolveRunLabel,
+  shortRunId
+} from "./chunk-KXKQO4Q6.js";
+import {
+  buildNoloWorkspaceOpenAiTools,
+  parseNoloWorkspaceToolArguments,
+  resolveAgentRequiredPackIds,
+  resolveRuntimeToolSurfaceForAgent
+} from "./chunk-CYRMUTGB.js";
+import {
+  applyTokenUsageToDayStats,
+  prepareTokenUsageData,
+  resolveBuiltinPlatformAgentConfig,
+  runKeyed
+} from "./chunk-LEVCXTDN.js";
+import {
+  BUILTIN_TITLE_LLM_CONFIG,
   clipCompactText
-} from "./chunk-5MMAK75Q.js";
+} from "./chunk-OB6FBSH3.js";
 import {
   createFileCredentialBroker,
+  fetchServerSyncedCredential,
   resolveCurrentRunRuntimeToolPolicy,
   resolveLocalWorkspaceExecutorOptionsFromPolicy,
   resolveRequestedRuntimeToolNames
-} from "./chunk-5CS33IBL.js";
+} from "./chunk-4F77PJBR.js";
 import {
   createOAuthTokenStore,
   isTokenExpired,
@@ -142,45 +152,17 @@ import {
   resolveFreshAccessToken
 } from "./chunk-JZPBVBIY.js";
 import {
-  isAdaptiveThinkingModelId
-} from "./chunk-GT3GG2H7.js";
+  require_date_fns
+} from "./chunk-M76ECQRD.js";
 import {
-  canonicalizeToolNames
-} from "./chunk-ZZ2MH7LE.js";
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
 import {
-  ackRunRecord,
-  checkStaleRun,
-  finalizeRunRecord,
-  findRunRecord,
-  gcRunRecords,
-  queryRunRecords,
-  spawnLocalBackgroundRun
-} from "./chunk-RZNYL4LW.js";
-import {
-  TASK_PREVIEW_MAX,
-  formatListRunsCard,
-  formatNotFoundRunCard,
-  formatStartRunCard,
-  formatStatusRunCard,
-  formatStopRunCard,
-  isAgentNameFallback,
-  isAgentRunTerminalStatus,
-  resolveRunLabel,
-  shortRunId
-} from "./chunk-KXKQO4Q6.js";
-import {
-  CliProviderQuotaError,
-  executeCli
-} from "./chunk-JDSUTNYY.js";
-import {
-  buildCliPrompt
-} from "./chunk-ATNTHIZI.js";
-import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
+  isAdaptiveThinkingModelId
+} from "./chunk-EIQDGAAE.js";
 import {
   isCompiledBinary,
   parseUserIdFromAuthToken
@@ -188,24 +170,12 @@ import {
 import {
   DEFAULT_NOLO_SERVER_URL
 } from "./chunk-OLZBQWZU.js";
-import {
-  createTokenKey,
-  createTokenStatsKey,
-  createUserKey,
-  dialogMessageRange
-} from "./chunk-NRY4GCKJ.js";
-import {
-  asTrimmedNonEmptyStringArray
-} from "./chunk-I42VC5KR.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
 import {
   isSystemBuiltinTrustedAgentKey
-} from "./chunk-L6RBX4L4.js";
-import {
-  isRecord
-} from "./chunk-KUG52IAP.js";
+} from "./chunk-ZJH3LKEW.js";
 import {
   NOLO_CLUSTER_SERVERS
 } from "./chunk-LCBAMY2M.js";
@@ -215,6 +185,31 @@ import {
 import {
   normalizeServerOrigin
 } from "./chunk-CF7PE763.js";
+import {
+  createTokenKey,
+  createTokenStatsKey,
+  createUserKey,
+  dialogMessageRange
+} from "./chunk-WHLVPK32.js";
+import {
+  isRecord
+} from "./chunk-KUG52IAP.js";
+import {
+  canonicalizeToolNames
+} from "./chunk-3AUWC6EM.js";
+import {
+  FORCED_TOOLS,
+  addDefaultLightWebToolsForConfiguredAgents,
+  addDefaultSystemCapabilityTools,
+  appendEnabledPackPromptPatches,
+  applyDisabledTools,
+  applySystemBuiltinSkillFilter,
+  expandEnabledPacks,
+  resolveEffectiveEnabledPacks
+} from "./chunk-CF7S2RYZ.js";
+import {
+  asTrimmedNonEmptyStringArray
+} from "./chunk-I42VC5KR.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
@@ -2395,6 +2390,7 @@ function buildProgressField(record, nowMs) {
 }
 var WAIT_POLL_INTERVAL_MS = 500;
 var DEFAULT_WAIT_TIMEOUT_MS = 1e5;
+var ACK_LEASE_GRACE_MS = 6e4;
 function buildRunStatusPayload(reconciled, deps, opts = {}) {
   const logLines = opts.logTail ? opts.logTail.split("\n") : void 0;
   const name = resolveRunLabel(reconciled);
@@ -2530,8 +2526,9 @@ ${JSON.stringify(args.input)}`;
   };
 }
 function createCliControlAgentRunExecutor(deps = {}) {
-  return async (call) => {
+  return async (call, opts) => {
     const args = parseCallArgs(call);
+    const abortSignal = opts?.abortSignal;
     const action = typeof args.action === "string" ? args.action : "";
     const tailLines = typeof args.tailLines === "number" ? args.tailLines : 0;
     if (action === "list") {
@@ -2653,39 +2650,67 @@ function createCliControlAgentRunExecutor(deps = {}) {
     }
     if (action === "wait") {
       const timeoutMs = typeof args.timeoutMs === "number" && args.timeoutMs > 0 ? args.timeoutMs : DEFAULT_WAIT_TIMEOUT_MS;
-      const startMs = resolveNowMs(deps);
-      const deadline = startMs + timeoutMs;
-      const sleep = deps.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
-      let reconciled = record;
-      for (; ; ) {
-        reconciled = checkStaleRun(record.runId, deps) ?? record;
-        if (isAgentRunTerminalStatus(reconciled.status)) break;
-        const nowMs = resolveNowMs(deps);
-        const waitedMs = nowMs - startMs;
-        if (nowMs >= deadline) {
-          return {
-            content: JSON.stringify({
-              runId: reconciled.runId,
-              found: true,
-              status: "timeout",
-              runStatus: reconciled.status,
-              pid: reconciled.pid ?? null,
-              agentKey: reconciled.agentKey,
-              ...reconciled.agentName ? { agentName: reconciled.agentName } : {},
-              startedAt: reconciled.startedAt,
-              waitedMs,
-              timeoutMs,
-              ...buildProgressField(reconciled, nowMs)
-            }),
-            metadata: {
-              displayData: `\u23F3 wait \u8D85\u65F6\uFF08${Math.round(waitedMs / 1e3)}s\uFF09\uFF0Crun \u4ECD\u5728\u8FD0\u884C\uFF1A\u53EF\u7A0D\u540E\u518D wait\uFF0C\u6216\u6539\u7528 status/stop`
-            }
+      const claimToken = claimRunRecord(record.runId, {
+        ...deps,
+        ttlMs: timeoutMs + ACK_LEASE_GRACE_MS
+      });
+      let claimConsumed = false;
+      try {
+        const startMs = resolveNowMs(deps);
+        const deadline = startMs + timeoutMs;
+        const baseSleep = deps.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+        const sleep = abortSignal ? (ms) => new Promise((resolve, reject) => {
+          const done = () => {
+            abortSignal.removeEventListener("abort", done);
+            resolve();
           };
+          abortSignal.addEventListener("abort", done, { once: true });
+          Promise.resolve(baseSleep(ms)).then(done).catch((err) => {
+            abortSignal.removeEventListener("abort", done);
+            reject(err);
+          });
+        }) : baseSleep;
+        let reconciled = record;
+        for (; ; ) {
+          reconciled = checkStaleRun(record.runId, deps) ?? record;
+          if (isAgentRunTerminalStatus(reconciled.status)) break;
+          if (abortSignal?.aborted) {
+            throw new Error("controlAgentRun(wait) \u5DF2\u88AB\u4E2D\u6B62\u3002");
+          }
+          const nowMs = resolveNowMs(deps);
+          const waitedMs = nowMs - startMs;
+          if (nowMs >= deadline) {
+            return {
+              content: JSON.stringify({
+                runId: reconciled.runId,
+                found: true,
+                status: "timeout",
+                runStatus: reconciled.status,
+                pid: reconciled.pid ?? null,
+                agentKey: reconciled.agentKey,
+                ...reconciled.agentName ? { agentName: reconciled.agentName } : {},
+                startedAt: reconciled.startedAt,
+                waitedMs,
+                timeoutMs,
+                ...buildProgressField(reconciled, nowMs)
+              }),
+              metadata: {
+                displayData: `\u23F3 wait \u8D85\u65F6\uFF08${Math.round(waitedMs / 1e3)}s\uFF09\uFF0Crun \u4ECD\u5728\u8FD0\u884C\uFF1A\u53EF\u7A0D\u540E\u518D wait\uFF0C\u6216\u6539\u7528 status/stop`
+              }
+            };
+          }
+          await sleep(WAIT_POLL_INTERVAL_MS);
+        }
+        const payload = buildRunStatusPayload(reconciled, deps);
+        if (claimToken) commitRunRecordClaim(record.runId, claimToken, deps);
+        else ackRunRecord(reconciled.runId, deps);
+        claimConsumed = true;
+        return payload;
+      } finally {
+        if (!claimConsumed && claimToken) {
+          releaseRunRecordAck(record.runId, claimToken, deps);
         }
-        await sleep(WAIT_POLL_INTERVAL_MS);
       }
-      ackRunRecord(reconciled.runId, deps);
-      return buildRunStatusPayload(reconciled, deps);
     }
     if (typeof record.pid === "number") {
       try {
@@ -3066,7 +3091,7 @@ function extractInlineDataParts(content) {
 function convertOpenAiMessagesToGemini(messages, options) {
   const contents = [];
   const systemTexts = [];
-  const toolNamesById = /* @__PURE__ */ new Map();
+  let toolCallIndex = 0;
   let pendingFunctionCalls = [];
   const pushOrMergeContent = (role, parts) => {
     if (parts.length === 0) return;
@@ -3080,8 +3105,12 @@ function convertOpenAiMessagesToGemini(messages, options) {
   const flushPendingFunctionCalls = () => {
     if (pendingFunctionCalls.length === 0) return;
     const dummyResponses = pendingFunctionCalls.map(
-      ({ name }) => ({
-        functionResponse: { name, response: { output: "{}" } }
+      ({ name, id }) => ({
+        functionResponse: {
+          name,
+          response: { output: "{}" },
+          ...id ? { id } : {}
+        }
       })
     );
     pendingFunctionCalls = [];
@@ -3119,16 +3148,14 @@ function convertOpenAiMessagesToGemini(messages, options) {
         content
       );
       const toolCalls = "tool_calls" in raw && Array.isArray(raw.tool_calls) ? raw.tool_calls ?? [] : [];
-      if (text) pushOrMergeContent("model", [{ text }]);
-      if (toolCalls.length > 0 && contents.length > 0 && contents[contents.length - 1]?.role !== "user") {
-        contents.push({ role: "user", parts: [{ text: "" }] });
-      }
       const parts = [];
+      if (text) {
+        parts.push({ text });
+      }
       for (const call of toolCalls) {
         const name = call?.function?.name?.trim();
         if (!name) continue;
-        const id = call.id?.trim() || `${name}_${toolNamesById.size}`;
-        toolNamesById.set(id, name);
+        const id = call.id?.trim() || `${name}_${toolCallIndex++}`;
         pendingFunctionCalls.push({ name, id });
         const realSignature = typeof call.thought_signature === "string" && call.thought_signature ? call.thought_signature : void 0;
         const isFirstFunctionCallPart = !parts.some(

package/{chunk-BBGRJB5E.js → chunk-QBOW6RZN.js}

@@ -1,7 +1,10 @@
 import {
   readDbRecord,
   writeAgentRecord
-} from "./chunk-QC6ZWDSV.js";
+} from "./chunk-PIC6Z7VI.js";
+import {
+  createSpaceKey
+} from "./chunk-V54H24CQ.js";
 import {
   buildSkillSummaryMarker
 } from "./chunk-VF4K2QE6.js";
@@ -11,9 +14,6 @@ import {
   resolveAuthToken,
   resolveServerUrl
 } from "./chunk-A7GB5UGH.js";
-import {
-  createSpaceKey
-} from "./chunk-JSB4N6NU.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";