nolo-cli 0.160.0-alpha.4 → 0.160.0-alpha.5

package/{agentDeleteCommand-ON2KVSJ5.js → agentDeleteCommand-74EL5T7G.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-62TBKWTV.js";
 import {
   clearCliLocalRuntimePreparedAgentCache
-} from "./chunk-UY73HNIN.js";
+} from "./chunk-BO3ARJRK.js";
 import "./chunk-G3VYRPTV.js";
 import "./chunk-6MXDOUMH.js";
 import {

package/{agentEmailCommands-2QPD5VP3.js → agentEmailCommands-ST7HL3E7.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-I7S63QUU.js";
 import {
   runAgentCreateCommand
-} from "./chunk-ZSLIYVIQ.js";
+} from "./chunk-BMCPKNL2.js";
 import "./chunk-U4STABYN.js";
 import {
   positionalArgs,
@@ -13,7 +13,7 @@ import {
 import {
   getReadableCliDb
 } from "./chunk-62TBKWTV.js";
-import "./chunk-UY73HNIN.js";
+import "./chunk-BO3ARJRK.js";
 import "./chunk-G3VYRPTV.js";
 import "./chunk-6MXDOUMH.js";
 import "./chunk-2AB2HA4M.js";

package/{agentMachineCommands-V44DPSED.js → agentMachineCommands-JSQPNSS5.js}

@@ -93,7 +93,7 @@ async function defaultExecuteCli(provider, prompt, options) {
   return executeCli(provider, prompt, options);
 }
 async function forwardConnectorRunMessage(machine, message, pushMessage, executeCli, env, fetchImpl) {
-  const { handleConnectorRunMessage } = await import("./machineWsRunDispatch-T4LFRJL3.js");
+  const { handleConnectorRunMessage } = await import("./machineWsRunDispatch-CCDVG5AO.js");
   return handleConnectorRunMessage(message, pushMessage, executeCli, env, fetchImpl);
 }
 async function detectLaunchableMachineInfo() {

package/{agentRecordCommands-CKILCNQZ.js → agentRecordCommands-JWW5NQQ7.js}

@@ -2,10 +2,10 @@ import {
   runAgentCreateCommand,
   runAgentReadCommand,
   runAgentUpdateCommand
-} from "./chunk-ZSLIYVIQ.js";
+} from "./chunk-BMCPKNL2.js";
 import "./chunk-U4STABYN.js";
 import "./chunk-62TBKWTV.js";
-import "./chunk-UY73HNIN.js";
+import "./chunk-BO3ARJRK.js";
 import "./chunk-G3VYRPTV.js";
 import "./chunk-6MXDOUMH.js";
 import "./chunk-2AB2HA4M.js";

package/{agentRunCommand-6IN7NK7H.js → agentRunCommand-UTBBUSHP.js}

@@ -9,13 +9,13 @@ import {
   resolveRunSettlementNote,
   resolveWorkflowReference,
   runAgentRunCommand
-} from "./chunk-JSB2OPQT.js";
+} from "./chunk-CXCMXNME.js";
 import "./chunk-6QDYSCPW.js";
 import {
   parseAgentRunArgs
 } from "./chunk-ZAV4YVEA.js";
 import "./chunk-62TBKWTV.js";
-import "./chunk-UY73HNIN.js";
+import "./chunk-BO3ARJRK.js";
 import "./chunk-G3VYRPTV.js";
 import "./chunk-6MXDOUMH.js";
 import "./chunk-2AB2HA4M.js";

package/{chunk-ZSLIYVIQ.js → chunk-BMCPKNL2.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-62TBKWTV.js";
 import {
   clearCliLocalRuntimePreparedAgentCache
-} from "./chunk-UY73HNIN.js";
+} from "./chunk-BO3ARJRK.js";
 import {
   readCredentialAvailability
 } from "./chunk-6MXDOUMH.js";

package/{chunk-UY73HNIN.js → chunk-BO3ARJRK.js}

@@ -3532,6 +3532,77 @@ var OWNER_PROXY_BODY_FORBIDDEN_KEYS = [
   "agentHydratedKey",
   "credentialPolicy"
 ];
+var OWNER_PROXY_RETRYABLE_STATUSES = /* @__PURE__ */ new Set([429, 503]);
+var OWNER_PROXY_TOTAL_MAX_ATTEMPTS = 30;
+var OWNER_PROXY_GENERIC_MAX_ATTEMPTS = 3;
+var OWNER_PROXY_CORE_DRAINING_MAX_ATTEMPTS = 30;
+async function readStructuredErrorCode(response) {
+  try {
+    const body = await response.clone().json();
+    const nested = body?.error?.code;
+    if (typeof nested === "string") return nested;
+    return typeof body?.code === "string" ? body.code : null;
+  } catch {
+    return null;
+  }
+}
+async function shouldRetryOwnerProxyResponse(response) {
+  if (response.status === 503) {
+    try {
+      const body = await response.clone().json();
+      return body?.reason === "core_draining" || body?.retryable === true;
+    } catch {
+      return false;
+    }
+  }
+  return false;
+}
+var OWNER_ORIGIN_MISMATCH_RETRY_BUDGET = {
+  /** 额外尝试次数上限（不含首次请求）。 */
+  maxExtraAttempts: 2,
+  /** 每次额外尝试前的等待时长（ms），按序使用。 */
+  delaysMs: [5e3, 15e3]
+};
+function waitWithAbort(ms, signal) {
+  if (signal?.aborted) {
+    return Promise.reject(signal.reason ?? new Error("owner-required proxy aborted"));
+  }
+  return new Promise((resolve4, reject) => {
+    let timer;
+    const cleanup = () => {
+      if (timer !== void 0) clearTimeout(timer);
+      signal?.removeEventListener("abort", onAbort);
+    };
+    const onAbort = () => {
+      cleanup();
+      reject(signal?.reason ?? new Error("owner-required proxy aborted"));
+    };
+    timer = setTimeout(() => {
+      cleanup();
+      resolve4();
+    }, ms);
+    signal?.addEventListener("abort", onAbort, { once: true });
+  });
+}
+async function sendWithOwnerOriginMismatchRetry(send, signal, onRetry) {
+  let attempt = await send();
+  for (let extra = 0; extra < OWNER_ORIGIN_MISMATCH_RETRY_BUDGET.maxExtraAttempts; extra += 1) {
+    const response = attempt.response;
+    if (response.status !== 403) return response;
+    const code = await readStructuredErrorCode(response);
+    if (code !== "owner_origin_mismatch") return response;
+    if (attempt.innerRetried) return response;
+    const delayMs = OWNER_ORIGIN_MISMATCH_RETRY_BUDGET.delaysMs[extra] ?? 0;
+    onRetry?.({
+      attempt: extra + 1,
+      maxAttempts: OWNER_ORIGIN_MISMATCH_RETRY_BUDGET.maxExtraAttempts,
+      delayMs
+    });
+    await waitWithAbort(delayMs, signal);
+    attempt = await send();
+  }
+  return attempt.response;
+}
 var resolveOwnerOAuthProxyTransport = async (ctx) => {
   const {
     agentConfig,
@@ -3610,32 +3681,57 @@ var resolveOwnerOAuthProxyTransport = async (ctx) => {
         originSessionId: ownerOriginExecution.origin.sessionId
       });
       try {
-        const res = await fetchWithTransientRetry(
-          fetchImpl,
-          request.url,
-          init,
-          {
-            sleep: deps.sleep,
-            loopbackRequest,
-            // 与 platform-proxy 同口径：仅等服务端显式 draining 准入信号重试，
-            // 网络错误不重放（服务端可能已受理，重放会产生重复扣费/重复 tool_calls）。
-            retryableStatuses: /* @__PURE__ */ new Set([503]),
-            shouldRetryResponse: async (response) => {
-              if (response.status !== 503) return false;
-              try {
-                const body2 = await response.clone().json();
-                return body2?.reason === "core_draining" || body2?.retryable === true;
-              } catch {
-                return false;
+        let usedAttempts = 0;
+        const send = async () => {
+          const remaining = Math.max(
+            1,
+            OWNER_PROXY_TOTAL_MAX_ATTEMPTS - usedAttempts
+          );
+          let innerRetries = 0;
+          const response = await fetchWithTransientRetry(
+            fetchImpl,
+            request.url,
+            init,
+            {
+              sleep: deps.sleep,
+              loopbackRequest,
+              // 与 platform-proxy 同口径：网络错误不重放（服务端可能已受理，重放会
+              // 产生重复扣费/重复 tool_calls）。
+              retryableStatuses: OWNER_PROXY_RETRYABLE_STATUSES,
+              shouldRetryResponse: shouldRetryOwnerProxyResponse,
+              retryNetworkErrors: false,
+              // 内层预算按「剩余总额度」裁剪：普通可重试状态码 ≤ 3 次、503
+              // core_draining 排空窗口 ≤ 30 次，且都不超过剩余总额度。
+              maxAttempts: Math.min(
+                OWNER_PROXY_GENERIC_MAX_ATTEMPTS,
+                remaining
+              ),
+              coreDrainingMaxAttempts: Math.min(
+                OWNER_PROXY_CORE_DRAINING_MAX_ATTEMPTS,
+                remaining
+              ),
+              // 注意：计数必须**无条件**挂在 onRetry 上——若只在有 activityReporter
+              // 时才挂，innerRetries / usedAttempts 会漏计，重试预算就形同虚设。
+              onRetry: ({ attempt, maxAttempts, delayMs }) => {
+                innerRetries += 1;
+                usedAttempts += 1;
+                deps.activityReporter?.(
+                  `\u81EA\u52A8\u91CD\u8BD5 ${attempt}/${maxAttempts} \xB7 ${Math.ceil(delayMs / 1e3)}s`
+                );
               }
-            },
-            retryNetworkErrors: false,
-            onRetry: deps.activityReporter ? ({ attempt, maxAttempts, delayMs }) => {
-              deps.activityReporter(
-                `\u81EA\u52A8\u91CD\u8BD5 ${attempt}/${maxAttempts} \xB7 ${Math.ceil(delayMs / 1e3)}s`
-              );
-            } : void 0
-          }
+            }
+          );
+          usedAttempts += 1;
+          return { response, innerRetried: innerRetries > 0 };
+        };
+        const res = await sendWithOwnerOriginMismatchRetry(
+          send,
+          init.signal ?? void 0,
+          deps.activityReporter ? ({ attempt, maxAttempts, delayMs }) => {
+            deps.activityReporter(
+              `\u81EA\u52A8\u91CD\u8BD5 ${attempt}/${maxAttempts} \xB7 ${Math.ceil(delayMs / 1e3)}s`
+            );
+          } : void 0
         );
         if (!res.ok) {
           const raw2 = await res.text().catch(() => "");

package/{chunk-JSB2OPQT.js → chunk-CXCMXNME.js}

@@ -27,7 +27,7 @@ import {
   resolveBoundMachineId,
   resolveFileWriteGateEnabled,
   resolveLocalUserId
-} from "./chunk-UY73HNIN.js";
+} from "./chunk-BO3ARJRK.js";
 import {
   clearCredentialAvailability,
   readCredentialEntry,

package/{chunk-EVPKKBSI.js → chunk-OWCHFPWR.js}

@@ -1,7 +1,7 @@
 import {
   createCliLocalRuntimeAdapter,
   summarizeEndpoint
-} from "./chunk-UY73HNIN.js";
+} from "./chunk-BO3ARJRK.js";
 import {
   t
 } from "./chunk-2AB2HA4M.js";

package/{commandRegistry-76FLRKYQ.js → commandRegistry-HPL2KOVB.js}

@@ -110,7 +110,7 @@ function createDaemonShortcutCommand(path, description, command) {
 // packages/cli/agentInternalCommandEntries.ts
 function getAgentInternalCommandEntries() {
   const createAgentRunCommand = (path, description) => createContextCommand(path, description, async (args, ctx) => {
-    const { runAgentRunCommand } = await import("./agentRunCommand-6IN7NK7H.js");
+    const { runAgentRunCommand } = await import("./agentRunCommand-UTBBUSHP.js");
     return runAgentRunCommand(args, {
       env: ctx.env,
       scriptDir: ctx.scriptDir,
@@ -126,7 +126,7 @@ function getAgentInternalCommandEntries() {
       return runAgentListCommand(args, deps);
     }),
     createEnvCommand(["agent", "create"], "Create a new agent", async (args, deps) => {
-      const { runAgentCreateCommand } = await import("./agentRecordCommands-CKILCNQZ.js");
+      const { runAgentCreateCommand } = await import("./agentRecordCommands-JWW5NQQ7.js");
       return runAgentCreateCommand(args, deps);
     }),
     createEnvCommand(["agent", "models"], "List models: --preset <id> (server discovery, exit 1 on static fallback) or --url <base> --api-key <key> (OpenAI-compatible /models)", async (args, deps) => {
@@ -142,7 +142,7 @@ function getAgentInternalCommandEntries() {
       return runAgentPullCommand(args, deps);
     }),
     createEnvCommand(["agent", "read"], "Read a single agent", async (args, deps) => {
-      const { runAgentReadCommand } = await import("./agentRecordCommands-CKILCNQZ.js");
+      const { runAgentReadCommand } = await import("./agentRecordCommands-JWW5NQQ7.js");
       return runAgentReadCommand(args, deps);
     }),
     createAgentRunCommand(["agent", "run"], "Run an agent"),
@@ -171,31 +171,31 @@ function getAgentInternalCommandEntries() {
       return runSetupOfflineMarxistsAgentCommand(args, deps);
     }),
     createEnvCommand(["agent", "update"], "Update agent fields", async (args, deps) => {
-      const { runAgentUpdateCommand } = await import("./agentRecordCommands-CKILCNQZ.js");
+      const { runAgentUpdateCommand } = await import("./agentRecordCommands-JWW5NQQ7.js");
       return runAgentUpdateCommand(args, deps);
     }),
     createEnvCommand(["agent", "email", "provision"], "Provision a controlled inbox for an agent", async (args, deps) => {
-      const { runAgentEmailProvisionCommand } = await import("./agentEmailCommands-2QPD5VP3.js");
+      const { runAgentEmailProvisionCommand } = await import("./agentEmailCommands-ST7HL3E7.js");
       return runAgentEmailProvisionCommand(args, deps);
     }),
     createEnvCommand(["agent", "email", "bind"], "Bind an existing email address to an agent", async (args, deps) => {
-      const { runAgentEmailBindCommand } = await import("./agentEmailCommands-2QPD5VP3.js");
+      const { runAgentEmailBindCommand } = await import("./agentEmailCommands-ST7HL3E7.js");
       return runAgentEmailBindCommand(args, deps);
     }),
     createEnvCommand(["agent", "email", "transfer"], "Transfer an email identity from one agent to another (cross-account)", async (args, deps) => {
-      const { runAgentEmailTransferCommand } = await import("./agentEmailCommands-2QPD5VP3.js");
+      const { runAgentEmailTransferCommand } = await import("./agentEmailCommands-ST7HL3E7.js");
       return runAgentEmailTransferCommand(args, deps);
     }),
     createEnvCommand(
       ["agent", "email", "create-and-provision"],
       "Create an agent and provision its controlled inbox",
       async (args, deps) => {
-        const { runAgentEmailCreateAndProvisionCommand } = await import("./agentEmailCommands-2QPD5VP3.js");
+        const { runAgentEmailCreateAndProvisionCommand } = await import("./agentEmailCommands-ST7HL3E7.js");
         return runAgentEmailCreateAndProvisionCommand(args, deps);
       }
     ),
     createEnvCommand(["agent", "delete"], "Hard-delete an agent's private and public records", async (args, deps) => {
-      const { runAgentDeleteCommand } = await import("./agentDeleteCommand-ON2KVSJ5.js");
+      const { runAgentDeleteCommand } = await import("./agentDeleteCommand-74EL5T7G.js");
       return runAgentDeleteCommand(args, deps);
     }),
     createEnvCommand(["agent", "grant"], "Grant another user access to this agent's owner credentials", async (args, deps) => {
@@ -211,15 +211,15 @@ function getAgentInternalCommandEntries() {
       return runAgentRevokeGrantCommand(args, deps);
     }),
     createEnvCommand(["agent", "bind-current"], "Bind an agent to this machine", async (args, deps) => {
-      const { runAgentBindCurrentCommand } = await import("./agentMachineCommands-V44DPSED.js");
+      const { runAgentBindCurrentCommand } = await import("./agentMachineCommands-JSQPNSS5.js");
       return runAgentBindCurrentCommand(args, deps);
     }),
     createEnvCommand(["agent", "smoke-current"], "Smoke test a bound agent through this machine", async (args, deps) => {
-      const { runAgentSmokeCurrentCommand } = await import("./agentMachineCommands-V44DPSED.js");
+      const { runAgentSmokeCurrentCommand } = await import("./agentMachineCommands-JSQPNSS5.js");
       return runAgentSmokeCurrentCommand(args, deps);
     }),
     createEnvCommand(["agent", "runtime-doctor"], "Diagnose current machine runtime compatibility", async (args, deps) => {
-      const { runAgentRuntimeDoctorCommand } = await import("./agentMachineCommands-V44DPSED.js");
+      const { runAgentRuntimeDoctorCommand } = await import("./agentMachineCommands-JSQPNSS5.js");
       return runAgentRuntimeDoctorCommand(args, deps);
     }),
     createAgentRunCommand(["agent", "chat"], "Chat with an agent")
@@ -530,15 +530,15 @@ function getSystemInternalCommandEntries(renderHelpText2) {
       return runWhoamiCommand({ args, env: ctx.env });
     }),
     createEntrypointEnvCommand(["connect"], "Send machine heartbeats or hold a connector websocket", async (args, deps) => {
-      const { runMachineConnectCommand } = await import("./machineCommands-7MBJJY4K.js");
+      const { runMachineConnectCommand } = await import("./machineCommands-BUZTMLYD.js");
       return runMachineConnectCommand(args, deps);
     }),
     createDaemonShortcutCommand(["daemon"], "Run the connector daemon shortcut", async (args, deps) => {
-      const { runMachineConnectCommand } = await import("./machineCommands-7MBJJY4K.js");
+      const { runMachineConnectCommand } = await import("./machineCommands-BUZTMLYD.js");
       return runMachineConnectCommand(args, deps);
     }),
     createEnvCommand(["machine", "status"], "List machines registered to the current profile", async (args, deps) => {
-      const { runMachineStatusCommand } = await import("./machineCommands-7MBJJY4K.js");
+      const { runMachineStatusCommand } = await import("./machineCommands-BUZTMLYD.js");
       return runMachineStatusCommand(args, deps);
     }),
     createEnvCommand(["doctor", "runtime"], "Diagnose local-first agent runtime selection", async (args, deps) => {

package/index.js

@@ -71,9 +71,9 @@ async function runScript(script, forwardedArgs, env) {
   return proc.exited;
 }
 async function launchTuiWorkspace(args2) {
-  const { startTuiWorkspace } = await import("./readlineWorkspace-WRV322AB.js");
+  const { startTuiWorkspace } = await import("./readlineWorkspace-MS2ZIQ2P.js");
   const { createTuiSummaryLlmCaller } = await import("./tuiSummaryLlmCaller-FESHBDTT.js");
-  const { setCliAutoCompactionSummaryFallback } = await import("./localRuntimeAdapter-MO64KEOS.js");
+  const { setCliAutoCompactionSummaryFallback } = await import("./localRuntimeAdapter-74L7FLMW.js");
   setCliAutoCompactionSummaryFallback(
     createTuiSummaryLlmCaller(args2.env, { timeoutMs: 3e4 })
   );
@@ -85,7 +85,7 @@ async function launchTuiWorkspace(args2) {
   });
 }
 async function main() {
-  const { createCliRuntimeContext, looksLikeDaemonShortcut, renderHelpText, resolveCommand, runResolvedCommand } = await import("./commandRegistry-76FLRKYQ.js");
+  const { createCliRuntimeContext, looksLikeDaemonShortcut, renderHelpText, resolveCommand, runResolvedCommand } = await import("./commandRegistry-HPL2KOVB.js");
   const { buildCliRuntimeEnv, loadProfileConfig } = await import("./profileConfig-KN3N2BLF.js");
   const { resolveTuiLaunchMode } = await import("./runtimeModeArgs-2Y7BALTO.js");
   const runtimeEnv = {

package/{localRuntimeAdapter-MO64KEOS.js → localRuntimeAdapter-74L7FLMW.js}

@@ -45,7 +45,7 @@ import {
   withRuntimeEnabledPacksAndPrompt,
   writeDialog,
   writeLocalTokenRecord
-} from "./chunk-UY73HNIN.js";
+} from "./chunk-BO3ARJRK.js";
 import "./chunk-G3VYRPTV.js";
 import "./chunk-6MXDOUMH.js";
 import "./chunk-2AB2HA4M.js";

package/{machineCommands-7MBJJY4K.js → machineCommands-BUZTMLYD.js}

@@ -2,7 +2,7 @@ import {
   buildMachinePermissionPromptBlock,
   handleConnectorRunMessage,
   resolveMachineRunPermissionPolicy
-} from "./chunk-EVPKKBSI.js";
+} from "./chunk-OWCHFPWR.js";
 import {
   MAX_CONNECTOR_TIMER_DELAY_MS,
   clampConnectorTimerDelayMs,
@@ -11,7 +11,7 @@ import {
   resolveConnectorProbeTimeoutMs,
   resolveConnectorWebSocketTarget
 } from "./chunk-BLVSFYQ3.js";
-import "./chunk-UY73HNIN.js";
+import "./chunk-BO3ARJRK.js";
 import "./chunk-G3VYRPTV.js";
 import "./chunk-6MXDOUMH.js";
 import "./chunk-2AB2HA4M.js";

package/{machineWsRunDispatch-T4LFRJL3.js → machineWsRunDispatch-CCDVG5AO.js}

@@ -11,8 +11,8 @@ import {
   runtimeWorkspacePermissionPolicy,
   scopePermissionPolicyToRuntimeWorkspace,
   summarizeAgentConfigForLogs
-} from "./chunk-EVPKKBSI.js";
-import "./chunk-UY73HNIN.js";
+} from "./chunk-OWCHFPWR.js";
+import "./chunk-BO3ARJRK.js";
 import "./chunk-G3VYRPTV.js";
 import "./chunk-6MXDOUMH.js";
 import "./chunk-2AB2HA4M.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nolo-cli",
-  "version": "0.160.0-alpha.4",
+  "version": "0.160.0-alpha.5",
   "type": "module",
   "description": "Agent-first terminal workspace for Nolo",
   "bin": {

package/{readlineWorkspace-WRV322AB.js → readlineWorkspace-MS2ZIQ2P.js}

@@ -90,7 +90,7 @@ import {
   wrapTextToLines,
   wrapTranscriptLine,
   wrapTranscriptLineWithLayout
-} from "./chunk-JSB2OPQT.js";
+} from "./chunk-CXCMXNME.js";
 import "./chunk-6QDYSCPW.js";
 import "./chunk-ZAV4YVEA.js";
 import {
@@ -102,7 +102,7 @@ import {
   createCliLocalRuntimeAdapter,
   createOriginShellGrant,
   readTimestamp
-} from "./chunk-UY73HNIN.js";
+} from "./chunk-BO3ARJRK.js";
 import "./chunk-G3VYRPTV.js";
 import "./chunk-6MXDOUMH.js";
 import {