nolo-cli 0.10.0 → 0.11.0

package/{chunk-EXXFGKF7.js → chunk-X2S7JTIG.js}

@@ -3,12 +3,16 @@ import {
   refreshAntigravityOAuthToken,
   refreshOpenAiCodexToken,
   refreshXaiOAuthToken
-} from "./chunk-EHLHSX7R.js";
+} from "./chunk-5MMZUWSG.js";
+import {
+  CliProviderQuotaError,
+  executeCli
+} from "./chunk-CMKUBIGW.js";
 import {
   buildLocalAgentLookupKeys,
   normalizeAgentHandle,
   shouldReadAgentKeyRemotely
-} from "./chunk-CDTLMEB3.js";
+} from "./chunk-C2MDQQ4O.js";
 import {
   LOCAL_CODEX_AGENT_ID,
   LOCAL_CODEX_AGENT_KEY,
@@ -17,23 +21,19 @@ import {
 } from "./chunk-VHBWHNVT.js";
 import {
   inferCaptureIntent
-} from "./chunk-A67QFHAA.js";
-import {
-  CliProviderQuotaError,
-  executeCli
-} from "./chunk-X7W4TNB4.js";
+} from "./chunk-5OIFWVX7.js";
 import {
   buildCliPrompt
 } from "./chunk-ATNTHIZI.js";
 import {
   prepareTools
-} from "./chunk-2O4IZNTG.js";
+} from "./chunk-PXQN7IBQ.js";
 import {
   getAntigravityUserAgent,
   isAntigravityOAuthAgent,
   readAntigravityProjectId,
   resolveAntigravityCloudCodeBaseUrl
-} from "./chunk-C3RUNRHT.js";
+} from "./chunk-FXXSGWAJ.js";
 import {
   FORCED_TOOLS,
   addDefaultLightWebToolsForConfiguredAgents,
@@ -43,7 +43,10 @@ import {
   readXPostFunctionSchema,
   readXhsProfileFunc,
   readXhsProfileFunctionSchema
-} from "./chunk-TYSCFY6S.js";
+} from "./chunk-2W2VYVI5.js";
+import {
+  CORE_DRAIN_REASON
+} from "./chunk-D6OQHXVG.js";
 import {
   normalizeDialogTitle
 } from "./chunk-OWOHNGCN.js";
@@ -52,14 +55,7 @@ import {
 } from "./chunk-4ZDM73SD.js";
 import {
   fetchServerSyncedCredential
-} from "./chunk-I5URP43I.js";
-import {
-  isCompiledBinary,
-  parseUserIdFromAuthToken
-} from "./chunk-ISNCLGUZ.js";
-import {
-  DEFAULT_NOLO_SERVER_URL
-} from "./chunk-OLZBQWZU.js";
+} from "./chunk-Q3UKJVU4.js";
 import {
   buildAgentRuntimeDialogWritePlan,
   buildLocalWorkspaceOpenAiTools,
@@ -73,7 +69,7 @@ import {
   parseSseDataLineJson,
   readOpenAiCompatibleSseCompletion,
   resolveOpenAiCompatibleProviderConfig
-} from "./chunk-6KUOUWMP.js";
+} from "./chunk-BX6U3ETE.js";
 import {
   buildPlatformChatCompletionRequest,
   canUsePlatformChatProvider,
@@ -82,22 +78,23 @@ import {
   readSseDataValues,
   resolvePlatformChatProviderConfig,
   shouldUsePlatformChatProvider
-} from "./chunk-5KLGBAAR.js";
+} from "./chunk-ZPRK73XY.js";
 import {
   resolveAgentRuntimeConfigFromRecord
-} from "./chunk-TILFE6LV.js";
+} from "./chunk-YOCHZD7D.js";
 import {
   parseToolArgumentsJson,
   summarizeToolArguments
-} from "./chunk-6SLCD4RB.js";
+} from "./chunk-S3GS2PRL.js";
 import {
+  buildLoadSkillExecutor,
   buildNoloWorkspaceCliToolExecutors,
   buildNoloWorkspaceOpenAiTools,
   canonicalizeToolNames,
   filterNoloWorkspaceToolNames,
   parseNoloWorkspaceToolArguments,
   resolveRuntimeToolSurfaceForAgent
-} from "./chunk-AUQ747NZ.js";
+} from "./chunk-4SOKXIW4.js";
 import {
   clipCompactText
 } from "./chunk-5MMAK75Q.js";
@@ -113,12 +110,6 @@ import {
   readOAuthCredential,
   resolveFreshAccessToken
 } from "./chunk-JZPBVBIY.js";
-import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
-import {
-  getDefaultCliLocalRuntimeDb
-} from "./chunk-H33743XH.js";
 import {
   asRecordOrEmpty
 } from "./chunk-KX6YBIHG.js";
@@ -131,6 +122,26 @@ import {
 import {
   asOptionalFiniteNumber
 } from "./chunk-WWC7I6TA.js";
+import {
+  checkStaleRun,
+  finalizeRunRecord,
+  findRunRecord,
+  listRunRecords,
+  spawnLocalBackgroundRun
+} from "./chunk-2FTTDCD4.js";
+import {
+  isCompiledBinary,
+  parseUserIdFromAuthToken
+} from "./chunk-ISNCLGUZ.js";
+import {
+  DEFAULT_NOLO_SERVER_URL
+} from "./chunk-OLZBQWZU.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
+import {
+  getDefaultCliLocalRuntimeDb
+} from "./chunk-H33743XH.js";
 import {
   BUILTIN_NOLO_AGENT_KEY,
   PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY,
@@ -138,25 +149,25 @@ import {
   PUBLIC_GLM_52_AGENT_KEY,
   PUBLIC_KIMI_K26_IMAGE_AGENT_KEY,
   PUBLIC_KIMI_K27_CODING_AGENT_KEY
-} from "./chunk-DSZUWUYB.js";
+} from "./chunk-XFOLQLDN.js";
+import {
+  asTrimmedString
+} from "./chunk-3EUW3WEO.js";
+import {
+  isRecord
+} from "./chunk-KUG52IAP.js";
 import {
   isLoopbackHostname
 } from "./chunk-4SN6J65J.js";
 import {
   NOLO_CLUSTER_SERVERS
 } from "./chunk-LCBAMY2M.js";
-import {
-  asTrimmedString
-} from "./chunk-3EUW3WEO.js";
 import {
   normalizeServerOrigin
 } from "./chunk-CF7PE763.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
-import {
-  isRecord
-} from "./chunk-KUG52IAP.js";
 
 // packages/cli/client/localRuntimeAdapter.ts
 import { dirname, extname, join } from "node:path";
@@ -191,6 +202,7 @@ import { request as httpRequest } from "node:http";
 import { request as httpsRequest } from "node:https";
 var TRANSIENT_FETCH_MAX_ATTEMPTS = 3;
 var TRANSIENT_FETCH_RETRY_BASE_DELAY_MS = 250;
+var CORE_DRAINING_MAX_ATTEMPTS = 30;
 var RETRYABLE_HTTP_STATUSES = /* @__PURE__ */ new Set([429, 503]);
 function isTransientFetchError(error) {
   const message = toErrorMessage(error);
@@ -281,26 +293,44 @@ async function defaultLoopbackRequest(input, init) {
     req.end();
   });
 }
+async function isCoreDrainingResponse(response) {
+  if (response.status !== 503) return false;
+  try {
+    const body = await response.clone().json();
+    return body?.reason === CORE_DRAIN_REASON;
+  } catch {
+    return false;
+  }
+}
 async function fetchWithTransientRetry(fetchImpl, input, init, options = {}) {
   const retryableStatuses = options.retryableStatuses ?? RETRYABLE_HTTP_STATUSES;
+  const requestedMaxAttempts = Number(options.maxAttempts);
+  const maxAttempts = Number.isFinite(requestedMaxAttempts) ? Math.min(100, Math.max(1, Math.floor(requestedMaxAttempts))) : TRANSIENT_FETCH_MAX_ATTEMPTS;
+  const requestedCoreDrainingMaxAttempts = Number(options.coreDrainingMaxAttempts);
+  const coreDrainingMaxAttempts = Number.isFinite(requestedCoreDrainingMaxAttempts) ? Math.min(100, Math.max(1, Math.floor(requestedCoreDrainingMaxAttempts))) : CORE_DRAINING_MAX_ATTEMPTS;
+  const loopMaxAttempts = Math.max(maxAttempts, coreDrainingMaxAttempts);
   let lastError;
-  for (let attempt = 1; attempt <= TRANSIENT_FETCH_MAX_ATTEMPTS; attempt += 1) {
+  for (let attempt = 1; attempt <= loopMaxAttempts; attempt += 1) {
     try {
       if (options.loopbackRequest && isLoopbackUrl(input)) {
         return await options.loopbackRequest(input, init);
       }
       const response = await fetchImpl(input, init);
-      if (retryableStatuses.has(response.status) && attempt < TRANSIENT_FETCH_MAX_ATTEMPTS && !init?.signal?.aborted) {
-        const delayMs = await resolveRetryAfterMs(response, attempt);
-        await (options.sleep ?? defaultSleep)(delayMs);
-        continue;
+      if (retryableStatuses.has(response.status) && !init?.signal?.aborted) {
+        const coreDraining = await isCoreDrainingResponse(response);
+        const attemptBudget = coreDraining ? coreDrainingMaxAttempts : maxAttempts;
+        if (attempt < attemptBudget) {
+          const delayMs = await resolveRetryAfterMs(response, attempt);
+          await (options.sleep ?? defaultSleep)(delayMs);
+          continue;
+        }
       }
       return response;
     } catch (error) {
       if (init?.signal?.aborted) throw error;
       if (!isTransientFetchError(error)) throw error;
       lastError = error;
-      if (attempt < TRANSIENT_FETCH_MAX_ATTEMPTS) {
+      if (attempt < maxAttempts) {
         await (options.sleep ?? defaultSleep)(transientFetchRetryDelayMs(attempt));
       }
     }
@@ -1142,6 +1172,132 @@ function buildServerPlatformToolExecutors(args) {
   return { ...tableExecutors, ...webExecutors };
 }
 
+// packages/cli/client/cliAgentRunToolExecutors.ts
+import { existsSync, readFileSync } from "node:fs";
+var noopOutput = { write: () => {
+} };
+var parseCallArgs = (call) => {
+  try {
+    return JSON.parse(call?.arguments || "{}");
+  } catch {
+    return {};
+  }
+};
+var resolveFs = (deps) => deps.fs ?? { existsSync, readFileSync };
+var tailFile = (logPath, tailLines, fs) => {
+  if (!fs.existsSync(logPath)) return void 0;
+  try {
+    const content = fs.readFileSync(logPath, "utf8");
+    const lines = String(content).split(/\r?\n/);
+    if (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
+    return lines.slice(Math.max(0, lines.length - tailLines)).join("\n");
+  } catch {
+    return void 0;
+  }
+};
+function createCliStartAgentRunExecutor(deps = {}) {
+  return async (call) => {
+    const args = parseCallArgs(call);
+    const agentKey = typeof args.agentKey === "string" ? args.agentKey.trim() : "";
+    const task = typeof args.task === "string" ? args.task.trim() : "";
+    if (!agentKey) throw new Error("startAgentRun: \u7F3A\u5C11 agentKey \u53C2\u6570\u3002");
+    if (!task) throw new Error("startAgentRun: \u7F3A\u5C11\u6709\u6548\u7684 task \u6587\u672C\u63CF\u8FF0\u3002");
+    const message = typeof args.input === "undefined" ? task : `${task}
+
+--- \u9644\u52A0\u8F93\u5165 ---
+${JSON.stringify(args.input)}`;
+    const rawArgs = ["--agent", agentKey, "--msg-file", "PLACEHOLDER", "--bg"];
+    const { runId, pid } = await spawnLocalBackgroundRun(
+      {
+        rawArgs,
+        commandPath: ["agent", "run"],
+        cliEntrypointPath: deps.cliEntrypoint,
+        agentKey,
+        cwd: deps.cwd ?? process.cwd(),
+        message,
+        output: noopOutput
+      },
+      deps
+    );
+    return {
+      content: JSON.stringify({ runId, status: "running" }),
+      metadata: {
+        displayData: `\u23F3 \u540E\u53F0 run \u5DF2\u542F\u52A8\uFF0CrunId: ${runId}\uFF08pid ${pid ?? "-"}\uFF09\u3002\u7528 controlAgentRun(action:"status", runId:"${runId}") \u67E5\u8FDB\u5EA6\u3002`
+      }
+    };
+  };
+}
+function createCliControlAgentRunExecutor(deps = {}) {
+  return async (call) => {
+    const args = parseCallArgs(call);
+    const action = typeof args.action === "string" ? args.action : "";
+    const tailLines = typeof args.tailLines === "number" ? args.tailLines : 0;
+    if (action === "list") {
+      const runs = listRunRecords(deps).map((record2) => ({
+        runId: record2.runId,
+        status: record2.status,
+        agentKey: record2.agentKey,
+        pid: record2.pid ?? null,
+        startedAt: record2.startedAt
+      }));
+      return {
+        content: JSON.stringify({ runs, count: runs.length }),
+        metadata: {
+          displayData: runs.length > 0 ? `\u{1F4CB} \u627E\u5230 ${runs.length} \u4E2A run\uFF1A
+${runs.map((r) => `${r.runId} [${r.status}] ${r.agentKey}`).join("\n")}` : "\u{1F4CB} \u6CA1\u6709\u627E\u5230 run\u3002"
+        }
+      };
+    }
+    if (action !== "status" && action !== "stop") {
+      throw new Error(`controlAgentRun: \u672A\u77E5 action "${action}"\u3002`);
+    }
+    if (!args.runId) throw new Error(`controlAgentRun(action:"${action}"): \u7F3A\u5C11 runId\u3002`);
+    const record = findRunRecord(String(args.runId), deps);
+    if (!record) {
+      return {
+        content: JSON.stringify({ runId: args.runId, found: false }),
+        metadata: { displayData: `\u2753 run ${args.runId} \u672A\u627E\u5230\u3002\u53EF\u80FD\u5DF2\u5B8C\u6210\u5E76\u88AB\u6E05\u7406\uFF0C\u6216 ID \u9519\u8BEF\u3002` }
+      };
+    }
+    if (action === "status") {
+      const reconciled = checkStaleRun(record.runId, deps) ?? record;
+      const logTail = tailLines > 0 ? tailFile(record.logPath, tailLines, resolveFs(deps)) : void 0;
+      return {
+        content: JSON.stringify({
+          runId: reconciled.runId,
+          found: true,
+          status: reconciled.status,
+          pid: reconciled.pid ?? null,
+          agentKey: reconciled.agentKey,
+          startedAt: reconciled.startedAt,
+          endedAt: reconciled.endedAt ?? null,
+          exitCode: reconciled.exitCode ?? null,
+          ...logTail !== void 0 ? { logTail } : {}
+        }),
+        metadata: {
+          displayData: `\u{1F4CC} run ${reconciled.runId} status=${reconciled.status}` + (logTail ? `
+--- \u65E5\u5FD7\uFF08\u672B ${tailLines} \u884C\uFF09---
+${logTail}` : "")
+        }
+      };
+    }
+    if (typeof record.pid === "number") {
+      try {
+        (deps.kill ?? ((pid, signal) => process.kill(pid, signal)))(
+          record.pid,
+          "SIGTERM"
+        );
+      } catch {
+      }
+    }
+    finalizeRunRecord(record.runId, { status: "killed" }, deps);
+    return {
+      content: JSON.stringify({ runId: record.runId, found: true, status: "killed" }),
+      metadata: { displayData: `\u{1F6D1} run ${record.runId} \u5DF2\u505C\u6B62\uFF08killed\uFF09\u3002` }
+    };
+  };
+}
+
 // packages/cli/client/cliLocalToolExecutors.ts
 function buildCliWorkspaceToolExecutors(args) {
   return buildNoloWorkspaceCliToolExecutors({
@@ -1166,6 +1322,10 @@ function buildLocalToolExecutors(args) {
       env: args.env,
       cliEntrypoint: args.cliEntrypoint
     }),
+    // loadSkill resolves SKILL.md from the agent's workspace root (local-fs,
+    // no `nolo` CLI subcommand), so it is wired here instead of inside
+    // buildCliWorkspaceToolExecutors.
+    loadSkill: buildLoadSkillExecutor({ cwd: args.workspaceRoot }),
     read_x_post: async (call) => {
       const parsedArgs = (() => {
         try {
@@ -1292,6 +1452,16 @@ function buildLocalToolExecutors(args) {
         metadata: { uiAskChoice: true }
       };
     },
+    // agent-orchestration 能力包：startAgentRun / controlAgentRun 本地 --bg 执行器
+    // （复用 ~/.nolo/runs/ 注册表，MED-1 修复）。
+    startAgentRun: createCliStartAgentRunExecutor({
+      env: args.env,
+      cliEntrypoint: args.cliEntrypoint,
+      cwd: args.workspaceRoot
+    }),
+    controlAgentRun: createCliControlAgentRunExecutor({
+      env: args.env
+    }),
     ...args.localToolExecutors ?? {}
   };
 }
@@ -8083,7 +8253,13 @@ function buildOpenAiTools(args) {
       searchFilesParameterVariant: resolveSearchFilesParameterVariant(args.env)
     }),
     ...buildServerPlatformOpenAiTools({ toolNames: args.toolNames }),
-    ...buildNoloWorkspaceOpenAiTools({ toolNames: args.toolNames })
+    ...buildNoloWorkspaceOpenAiTools({ toolNames: args.toolNames }),
+    // startAgentRun/controlAgentRun：CLI 本地 --bg 执行器已就绪（MED-1 修复，
+    // cliAgentRunToolExecutors），只要 agent 声明（agent-orchestration 包展开）
+    // 就注入 schema。
+    ...prepareTools(
+      ["startAgentRun", "controlAgentRun"].filter((name) => toolNameSet.has(name))
+    )
   ];
 }
 var CLI_DEFAULT_TOOLS = ["exa_search", "fetchWebpage"];
@@ -8098,9 +8274,10 @@ function resolveCliEffectiveEnabledPacks(args) {
   }
   const base = args.enabledPacks ?? [];
   if (base.length === 0) {
-    return ["code"];
+    return ["code", "agent-orchestration", "skills"];
   }
-  return base;
+  const withOrchestration = base.includes("agent-orchestration") ? base : [...base, "agent-orchestration"];
+  return withOrchestration.includes("skills") ? withOrchestration : [...withOrchestration, "skills"];
 }
 function resolveCliRequestedToolNames(agentConfig, env) {
   const declaredOnly = shouldUseDeclaredOnlyLocalWorkspaceTools(env);

package/{chunk-DSZUWUYB.js → chunk-XFOLQLDN.js}

@@ -7,7 +7,7 @@ import {
   scheduleExistingRecordReplication,
   shouldReplaceLocalWithRemoteRecord,
   shouldReplicateLocalRecord
-} from "./chunk-UTLZINAP.js";
+} from "./chunk-OOM6SJNR.js";
 import {
   fetchFromClientDb,
   fetchFromServer,

package/{chunk-YIHFXH5Q.js → chunk-XYZA7S7V.js}

@@ -1,19 +1,19 @@
 import {
   updateContentTitle
-} from "./chunk-PIVFPOW6.js";
+} from "./chunk-5MOUAAMK.js";
 import {
   require_date_fns
 } from "./chunk-M76ECQRD.js";
+import {
+  patch,
+  readAndWait
+} from "./chunk-O26GI2JP.js";
 import {
   require_react
 } from "./chunk-3ASDTTEI.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
-import {
-  patch,
-  readAndWait
-} from "./chunk-BE2OOJ5P.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
@@ -367,7 +367,7 @@ async function saveDocState(arg, { dispatch, getState }) {
   }
 }
 async function createDocState(args, thunkApi) {
-  const { createPageAction } = await import("./createPageAction-Y4KQOAJE.js");
+  const { createPageAction } = await import("./createPageAction-5MXWVRGY.js");
   return createPageAction(args, thunkApi);
 }
 function subscribe(listener) {