nolo-cli 0.14.0 → 0.15.0

package/{chunk-NZFWHBW5.js → chunk-AWDOJBHW.js}

@@ -4,15 +4,11 @@ import {
   refreshOpenAiCodexToken,
   refreshXaiOAuthToken
 } from "./chunk-EHLHSX7R.js";
-import {
-  CliProviderQuotaError,
-  executeCli
-} from "./chunk-CMKUBIGW.js";
 import {
   buildLocalAgentLookupKeys,
   normalizeAgentHandle,
   shouldReadAgentKeyRemotely
-} from "./chunk-TQCONXQ3.js";
+} from "./chunk-IOQ7IBPU.js";
 import {
   LOCAL_CODEX_AGENT_ID,
   LOCAL_CODEX_AGENT_KEY,
@@ -21,23 +17,21 @@ import {
 } from "./chunk-VHBWHNVT.js";
 import {
   inferCaptureIntent
-} from "./chunk-T3X232L6.js";
-import {
-  buildCliPrompt
-} from "./chunk-ATNTHIZI.js";
+} from "./chunk-WNLPAOIT.js";
 import {
   inlineImageUrlsForCustomProvider,
   prepareTools
-} from "./chunk-NFPO7274.js";
+} from "./chunk-WRN5EQT7.js";
 import {
   getAntigravityUserAgent,
   isAntigravityOAuthAgent,
   readAntigravityProjectId,
   resolveAntigravityCloudCodeBaseUrl
-} from "./chunk-OIMX7MM4.js";
+} from "./chunk-ISYE6GZB.js";
 import {
   FORCED_TOOLS,
   addDefaultLightWebToolsForConfiguredAgents,
+  addDefaultSystemCapabilityTools,
   appendEnabledPackPromptPatches,
   applyDisabledTools,
   applySystemBuiltinSkillFilter,
@@ -53,7 +47,7 @@ import {
   readXhsProfileFunctionSchema,
   rememberMemoryFunctionSchema,
   resolveEffectiveEnabledPacks
-} from "./chunk-R5AOLZZV.js";
+} from "./chunk-VE6XMVKG.js";
 import {
   createDrainExhaustedResponse,
   isCoreDrainingBody,
@@ -65,13 +59,13 @@ import {
 } from "./chunk-OWOHNGCN.js";
 import {
   prepareTokenUsageData
-} from "./chunk-TYRTLSGX.js";
+} from "./chunk-YNHQIXX5.js";
 import {
   BUILTIN_TITLE_LLM_CONFIG
 } from "./chunk-V2J635L5.js";
 import {
   fetchServerSyncedCredential
-} from "./chunk-IMZ7AFIJ.js";
+} from "./chunk-OQMPU2ML.js";
 import {
   buildAgentRuntimeDialogWritePlan,
   buildLocalWorkspaceOpenAiTools,
@@ -84,7 +78,7 @@ import {
   parseSseDataLineJson,
   readOpenAiCompatibleSseCompletion,
   resolveOpenAiCompatibleProviderConfig
-} from "./chunk-33K5FKRL.js";
+} from "./chunk-5VMYGIIL.js";
 import {
   buildPlatformChatCompletionRequest,
   canUsePlatformChatProvider,
@@ -94,14 +88,17 @@ import {
   resolveLegacyDeepSeekProxyChatFallback,
   resolvePlatformChatProviderConfig,
   shouldUsePlatformChatProvider
-} from "./chunk-PB2DHBEQ.js";
+} from "./chunk-WA6KZL5V.js";
 import {
   resolveAgentRuntimeConfigFromRecord
 } from "./chunk-OIQPORYI.js";
 import {
   parseToolArgumentsJson,
   summarizeToolArguments
-} from "./chunk-VQFY3VXW.js";
+} from "./chunk-6MHDWKOT.js";
+import {
+  resolvePlatformAuthToken
+} from "./chunk-HRQCKQA5.js";
 import {
   buildLoadSkillExecutor,
   buildNoloWorkspaceCliToolExecutors,
@@ -134,13 +131,27 @@ import {
   findRunRecord,
   listRunRecords,
   spawnLocalBackgroundRun
-} from "./chunk-4ON5AV72.js";
+} from "./chunk-MYMMNKYL.js";
+import {
+  CliProviderQuotaError,
+  executeCli
+} from "./chunk-CMKUBIGW.js";
+import {
+  buildCliPrompt
+} from "./chunk-ATNTHIZI.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
 import {
   getDefaultCliLocalRuntimeDb
 } from "./chunk-H33743XH.js";
+import {
+  isCompiledBinary,
+  parseUserIdFromAuthToken
+} from "./chunk-A7GB5UGH.js";
+import {
+  DEFAULT_NOLO_SERVER_URL
+} from "./chunk-OLZBQWZU.js";
 import {
   asRecordOrEmpty
 } from "./chunk-KX6YBIHG.js";
@@ -162,20 +173,13 @@ import {
   PUBLIC_GLM_52_AGENT_KEY,
   PUBLIC_KIMI_K26_IMAGE_AGENT_KEY,
   PUBLIC_KIMI_K27_CODING_AGENT_KEY
-} from "./chunk-NJVPXLRY.js";
+} from "./chunk-VPTJB4HM.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
 import {
   isRecord
 } from "./chunk-KUG52IAP.js";
-import {
-  isCompiledBinary,
-  parseUserIdFromAuthToken
-} from "./chunk-5NBHQD4D.js";
-import {
-  DEFAULT_NOLO_SERVER_URL
-} from "./chunk-OLZBQWZU.js";
 import {
   NOLO_CLUSTER_SERVERS
 } from "./chunk-LCBAMY2M.js";
@@ -291,6 +295,10 @@ var STRINGS = {
     en: "Agent switch cancelled.",
     zh: "\u5DF2\u53D6\u6D88\u5207\u6362 agent\u3002"
   },
+  agentPickerLoading: {
+    en: "Loading agents\u2026",
+    zh: "\u6B63\u5728\u52A0\u8F7D agent \u5217\u8868\u2026"
+  },
   historyPickerTitle: {
     en: "Resume dialog (\u2191\u2193 Enter Esc)",
     zh: "\u6062\u590D\u5BF9\u8BDD\uFF08\u2191\u2193 \u79FB\u52A8 \xB7 Enter \u9009\u62E9 \xB7 Esc \u53D6\u6D88\uFF09"
@@ -610,10 +618,6 @@ var STRINGS = {
     en: "tools",
     zh: "\u5DE5\u5177"
   },
-  contextFieldThinking: {
-    en: "thinking",
-    zh: "\u601D\u8003"
-  },
   contextFieldServer: {
     en: "server",
     zh: "\u670D\u52A1\u7AEF"
@@ -651,7 +655,6 @@ var STRINGS = {
       "  /context              Show workspace context and next actions",
       "  /runtime <mode>       Use auto, local, or server runtime",
       "  /tools <mode>         Control tool trace: hide, compact, verbose",
-      "  /thinking <mode>      Control thinking output: hide, marker, show",
       "  /switch               Pick an agent interactively (\u2191\u2193, Enter)",
       "  /switch list          List agents as text",
       "  /switch <name>        Switch directly by name, alias, or key (alias: /agent)",
@@ -688,7 +691,6 @@ var STRINGS = {
       "  /context              \u67E5\u770B\u5DE5\u4F5C\u533A\u4E0A\u4E0B\u6587\u4E0E\u540E\u7EED\u64CD\u4F5C",
       "  /runtime <mode>       \u5207\u6362 runtime\uFF1Aauto\u3001local\u3001server",
       "  /tools <mode>         \u5DE5\u5177\u8F68\u8FF9\u663E\u793A\uFF1Ahide\u3001compact\u3001verbose",
-      "  /thinking <mode>      \u601D\u8003\u8FC7\u7A0B\u663E\u793A\uFF1Ahide\u3001marker\u3001show",
       "  /switch               \u4EA4\u4E92\u5F0F\u9009\u62E9 agent\uFF08\u2191\u2193 \u79FB\u52A8\uFF0CEnter \u786E\u8BA4\uFF09",
       "  /switch list          \u4EE5\u6587\u672C\u5217\u51FA\u5168\u90E8 agent",
       "  /switch <name>        \u6309\u540D\u79F0\u3001\u522B\u540D\u6216 key \u76F4\u63A5\u5207\u6362\uFF08\u522B\u540D\uFF1A/agent\uFF09",
@@ -733,12 +735,6 @@ var STRINGS = {
   },
   toolsUsage: { en: "Usage: /tools <hide|compact|verbose>", zh: "\u7528\u6CD5\uFF1A/tools <hide|compact|verbose>" },
   toolsSet: { en: "Tool display: {0}", zh: "\u5DE5\u5177\u663E\u793A\uFF1A{0}" },
-  thinkingCurrent: {
-    en: "Thinking display: {0} (hide | marker | show)",
-    zh: "\u601D\u8003\u663E\u793A\uFF1A{0}\uFF08hide | marker | show\uFF09"
-  },
-  thinkingUsage: { en: "Usage: /thinking <hide|marker|show>", zh: "\u7528\u6CD5\uFF1A/thinking <hide|marker|show>" },
-  thinkingSet: { en: "Thinking display: {0}", zh: "\u601D\u8003\u663E\u793A\uFF1A{0}" },
   tasksRunning: { en: "Running processes ({0}):", zh: "\u8FD0\u884C\u4E2D\u7684\u8FDB\u7A0B\uFF08{0}\uFF09\uFF1A" },
   tasksStopped: { en: "Stopped/exited ({0}):", zh: "\u5DF2\u505C\u6B62/\u5DF2\u9000\u51FA\uFF08{0}\uFF09\uFF1A" },
   tasksNone: { en: "No processes.", zh: "\u6CA1\u6709\u8FD0\u884C\u4E2D\u7684\u8FDB\u7A0B\u3002" },
@@ -929,6 +925,44 @@ function agentRunCardLabels() {
   };
 }
 
+// packages/cli/client/localRuntimeDiagnostics.ts
+import { ulid } from "ulid";
+var preparedAgentRuntimeCache = /* @__PURE__ */ new Map();
+var hybridStoreCache = /* @__PURE__ */ new Map();
+function normalizeRuntimeCacheCwd(cwd) {
+  return (cwd?.trim() || process.cwd()).replace(/\/+$/, "") || ".";
+}
+function buildPreparedAgentCacheKey(args) {
+  const systemBuiltinSkillsKey = args.systemBuiltinSkills ? JSON.stringify(
+    Object.keys(args.systemBuiltinSkills).sort().map((key) => [key, args.systemBuiltinSkills?.[key]])
+  ) : "default";
+  return `${args.userId}\0${args.agentRef}\0${args.cwd}\0${systemBuiltinSkillsKey}`;
+}
+function clearCliLocalRuntimePreparedAgentCache() {
+  preparedAgentRuntimeCache.clear();
+  hybridStoreCache.clear();
+}
+async function defaultLocalRuntimeDb() {
+  return getDefaultCliLocalRuntimeDb();
+}
+function createFallbackId() {
+  return ulid();
+}
+function logLocalRuntimeDiagnostic(event, fields) {
+  if (process.env.NOLO_LOCAL_RUNTIME_DEBUG !== "1" && process.env.NOLO_DEBUG !== "1") {
+    return;
+  }
+  console.error(`[nolo-local-runtime] ${event} ${JSON.stringify(fields)}`);
+}
+function summarizeOpenAiToolNames(tools) {
+  return tools.reduce((acc, tool) => {
+    const fn = tool.function;
+    const name = fn && typeof fn === "object" && "name" in fn && typeof fn.name === "string" ? fn.name : null;
+    if (name) acc.push(name);
+    return acc;
+  }, []);
+}
+
 // packages/cli/client/localRuntimeAdapter.ts
 import { dirname, extname, join } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -954,7 +988,7 @@ function resolveRuntimeServerUrl(env) {
   return (env?.NOLO_SERVER_URL || env?.NOLO_SERVER || env?.BASE_URL || "").replace(/\/+$/, "");
 }
 function resolveRuntimeAuthToken(env) {
-  return env?.AUTH_TOKEN || env?.AUTH || env?.NOLO_MACHINE_API_KEY || "";
+  return resolvePlatformAuthToken(env ?? {});
 }
 
 // packages/cli/client/localRuntimeFetchRetry.ts
@@ -1368,56 +1402,6 @@ async function syncLocalDialogEvidenceToRemote(args) {
   return { attempted: true };
 }
 
-// packages/cli/client/cliChildDialogPersist.ts
-async function persistCliPendingChildDialog(args) {
-  const nowIso = new Date(args.now).toISOString();
-  const dialogKey = `dialog-${args.userId}-${args.dialogId}`;
-  const record = {
-    id: args.dialogId,
-    dbKey: dialogKey,
-    type: "dialog",
-    userId: args.userId,
-    cybots: [args.agentKey],
-    primaryAgentKey: args.agentKey,
-    title: args.title.slice(0, 80),
-    status: "pending",
-    triggerType: "cli-local",
-    executionMode: args.background ? "background" : "foreground",
-    createdAt: nowIso,
-    updatedAt: nowIso,
-    ...args.spaceId ? { spaceId: args.spaceId } : {},
-    ...args.parentDialogId ? { parentDialogId: args.parentDialogId } : {},
-    ...args.rootDialogId ? { rootDialogId: args.rootDialogId } : {},
-    localRuntime: {
-      host: "cli",
-      workspaceRoot: args.workspaceRoot,
-      workspaceKind: "current",
-      workspaceAccess: "inherited"
-    }
-  };
-  await args.store.batch([{ type: "put", key: dialogKey, value: record }]);
-}
-async function persistCliFailedChildDialog(args) {
-  const dialogKey = `dialog-${args.userId}-${args.dialogId}`;
-  const existing = await args.store.read(dialogKey);
-  const existingRecord = existing && typeof existing === "object" ? existing : {};
-  await args.store.batch([
-    {
-      type: "put",
-      key: dialogKey,
-      value: {
-        ...existingRecord,
-        id: args.dialogId,
-        dbKey: dialogKey,
-        status: "failed",
-        errorMessage: args.errorMessage,
-        updatedAt: new Date(args.now).toISOString(),
-        finishedAt: args.now
-      }
-    }
-  ]);
-}
-
 // packages/cli/client/cliLocalToolBudget.ts
 function parseLocalToolBudgets(env) {
   const raw = env.NOLO_LOCAL_TOOL_BUDGETS?.trim();
@@ -1637,58 +1621,6 @@ async function readDialogMessages(args) {
   return messages;
 }
 
-// packages/cli/client/cliWorkspaceToolVariants.ts
-function shouldUseDeclaredOnlyLocalWorkspaceTools(env) {
-  const value = env.NOLO_LOCAL_WORKSPACE_TOOLSET || env.NOLO_LOCAL_TOOLSET_MODE || "";
-  return value === "declared-only" || value === "declared";
-}
-function resolveGlobFilesDescriptionVariant(env) {
-  return resolveLocalWorkspaceDescriptionVariant(
-    env.NOLO_GLOBFILES_DESCRIPTION_VARIANT
-  );
-}
-function resolveListFilesDescriptionVariant(env) {
-  return resolveLocalWorkspaceDescriptionVariant(
-    env.NOLO_LISTFILES_DESCRIPTION_VARIANT
-  );
-}
-function resolveListFilesParameterVariant(env) {
-  return resolveLocalWorkspaceParameterVariant(
-    env.NOLO_LISTFILES_PARAMETER_VARIANT
-  );
-}
-function resolveReadFileDescriptionVariant(env) {
-  return resolveLocalWorkspaceDescriptionVariant(
-    env.NOLO_READFILE_DESCRIPTION_VARIANT
-  );
-}
-function resolveReadFileParameterVariant(env) {
-  return resolveLocalWorkspaceParameterVariant(
-    env.NOLO_READFILE_PARAMETER_VARIANT
-  );
-}
-function resolveGlobFilesParameterVariant(env) {
-  return resolveLocalWorkspaceParameterVariant(
-    env.NOLO_GLOBFILES_PARAMETER_VARIANT
-  );
-}
-function resolveSearchFilesDescriptionVariant(env) {
-  return resolveLocalWorkspaceDescriptionVariant(
-    env.NOLO_SEARCHFILES_DESCRIPTION_VARIANT
-  );
-}
-function resolveSearchFilesParameterVariant(env) {
-  return resolveLocalWorkspaceParameterVariant(
-    env.NOLO_SEARCHFILES_PARAMETER_VARIANT
-  );
-}
-function resolveLocalWorkspaceDescriptionVariant(value) {
-  return value === "brief" || value === "strategy" || value === "workflow" || value === "antiShell" ? value : "strategy";
-}
-function resolveLocalWorkspaceParameterVariant(value) {
-  return value === "minimal" || value === "scoped" || value === "rich" ? value : "rich";
-}
-
 // packages/cli/client/cliProviderHelpers.ts
 function buildDelegatedTaskContent(task, input) {
   if (input === void 0 || input === null) {
@@ -2541,6 +2473,24 @@ function convertOpenAiMessagesToCca(messages, options) {
   const contents = [];
   const systemTexts = [];
   const toolNamesById = /* @__PURE__ */ new Map();
+  let pendingFunctionCalls = [];
+  const pushOrMergeContent = (role, parts) => {
+    if (parts.length === 0) return;
+    const last = contents[contents.length - 1];
+    if (last && last.role === role) {
+      last.parts.push(...parts);
+    } else {
+      contents.push({ role, parts });
+    }
+  };
+  const flushPendingFunctionCalls = () => {
+    if (pendingFunctionCalls.length === 0) return;
+    const dummyResponses = pendingFunctionCalls.map(({ name }) => ({
+      functionResponse: { name, response: { output: "{}" } }
+    }));
+    pendingFunctionCalls = [];
+    pushOrMergeContent("user", dummyResponses);
+  };
   for (const raw of messages) {
     if (!raw || typeof raw !== "object" || !("role" in raw)) continue;
     const role = String(raw.role);
@@ -2551,6 +2501,7 @@ function convertOpenAiMessagesToCca(messages, options) {
       continue;
     }
     if (role === "user") {
+      flushPendingFunctionCalls();
       const text = messageText(content);
       const imageParts = extractInlineDataParts(
         content
@@ -2559,10 +2510,11 @@ function convertOpenAiMessagesToCca(messages, options) {
       const parts = [];
       if (text) parts.push({ text });
       for (const img of imageParts) parts.push(img);
-      contents.push({ role: "user", parts });
+      pushOrMergeContent("user", parts);
       continue;
     }
     if (role === "assistant") {
+      flushPendingFunctionCalls();
       const parts = [];
       const text = messageText(content);
       if (text) parts.push({ text });
@@ -2572,6 +2524,7 @@ function convertOpenAiMessagesToCca(messages, options) {
         if (!name) continue;
         const id = call.id?.trim() || `${name}_${toolNamesById.size}`;
         toolNamesById.set(id, name);
+        pendingFunctionCalls.push({ name, id });
         const realSignature = typeof call.thought_signature === "string" && call.thought_signature ? call.thought_signature : void 0;
         const isFirstFunctionCallPart = !parts.some((p) => "functionCall" in p);
         parts.push({
@@ -2584,19 +2537,28 @@ function convertOpenAiMessagesToCca(messages, options) {
         });
       }
       if (parts.length === 0) continue;
-      contents.push({ role: "model", parts });
+      pushOrMergeContent("model", parts);
       continue;
     }
     if (role === "tool") {
       const toolCallId = "tool_call_id" in raw && typeof raw.tool_call_id === "string" ? raw.tool_call_id : "";
-      const name = toolNamesById.get(toolCallId) ?? "tool";
+      const rawName = "name" in raw && typeof raw.name === "string" ? raw.name.trim() : "";
+      const name = toolNamesById.get(toolCallId) || rawName || pendingFunctionCalls[0]?.name || "tool";
+      const pendingIndex = pendingFunctionCalls.findIndex(
+        (p) => toolCallId ? p.id === toolCallId : p.name === name
+      );
+      if (pendingIndex !== -1) {
+        pendingFunctionCalls.splice(pendingIndex, 1);
+      } else if (pendingFunctionCalls.length > 0) {
+        pendingFunctionCalls.shift();
+      }
       const output = messageText(content) || "{}";
-      contents.push({
-        role: "user",
-        parts: [{ functionResponse: { name, response: { output } } }]
-      });
+      pushOrMergeContent("user", [
+        { functionResponse: { name, response: { output } } }
+      ]);
     }
   }
+  flushPendingFunctionCalls();
   return { contents, systemTexts };
 }
 function convertOpenAiTools(tools) {
@@ -9121,6 +9083,30 @@ function createOAuthApiKeyRefResolver(options = {}) {
   };
 }
 
+// packages/cli/client/hybridRecordStore.ts
+function resolveFallbackServers(env) {
+  const values = [
+    env.NOLO_SERVER_URL,
+    env.BASE_URL,
+    ...NOLO_CLUSTER_SERVERS
+  ].filter((value) => typeof value === "string" && value.trim().length > 0);
+  return [...new Set(values.map(normalizeServerOrigin))];
+}
+function resolveAuthToken(env) {
+  return resolvePlatformAuthToken(env);
+}
+function createCliHybridRecordStore(deps) {
+  return createHybridRecordStore({
+    db: deps.db,
+    defaultServer: normalizeServerOrigin(
+      deps.env.NOLO_SERVER || deps.env.BASE_URL || DEFAULT_NOLO_SERVER_URL
+    ),
+    fallbackServers: resolveFallbackServers(deps.env),
+    authToken: resolveAuthToken(deps.env),
+    fetchImpl: deps.fetchImpl
+  });
+}
+
 // packages/agent-runtime/dialogTitleLlm.ts
 async function generateLocalDialogTitle(input) {
   const { env, messages, fallbackTitle } = input;
@@ -9189,73 +9175,315 @@ function safeParseJson(raw) {
   }
 }
 
-// packages/cli/client/hybridRecordStore.ts
-function resolveFallbackServers(env) {
-  const values = [
-    env.NOLO_SERVER_URL,
-    env.BASE_URL,
-    ...NOLO_CLUSTER_SERVERS
-  ].filter((value) => typeof value === "string" && value.trim().length > 0);
-  return [...new Set(values.map(normalizeServerOrigin))];
-}
-function resolveAuthToken(env) {
-  return env.AUTH_TOKEN || env.AUTH || env.BENCHMARK_AUTH_TOKEN || "";
-}
-function createCliHybridRecordStore(deps) {
-  return createHybridRecordStore({
-    db: deps.db,
-    defaultServer: normalizeServerOrigin(
-      deps.env.NOLO_SERVER || deps.env.BASE_URL || DEFAULT_NOLO_SERVER_URL
-    ),
-    fallbackServers: resolveFallbackServers(deps.env),
-    authToken: resolveAuthToken(deps.env),
+// packages/cli/client/localRuntimeDialog.ts
+async function resolveStore(deps) {
+  if (deps.store) return deps.store;
+  return createCliHybridRecordStore({
+    db: deps.db ?? await defaultLocalRuntimeDb(),
+    env: deps.env,
     fetchImpl: deps.fetchImpl
   });
 }
-
-// packages/cli/client/localRuntimeAdapter.ts
-import { ulid } from "ulid";
-var resolveRuntimeAuthToken2 = resolveRuntimeAuthToken;
-var currentMetaFile = fileURLToPath(import.meta.url);
-var isJsBundle = extname(currentMetaFile) === ".js";
-var SOURCE_CLI_DIR = isJsBundle ? dirname(currentMetaFile) : dirname(dirname(currentMetaFile));
-var CLI_DIR = isCompiledBinary() ? dirname(process.execPath) : SOURCE_CLI_DIR;
-var CLI_ENTRYPOINT = isCompiledBinary() ? process.execPath : isJsBundle ? currentMetaFile : join(SOURCE_CLI_DIR, "index.ts");
-var preparedAgentRuntimeCache = /* @__PURE__ */ new Map();
-var hybridStoreCache = /* @__PURE__ */ new Map();
-function normalizeRuntimeCacheCwd(cwd) {
-  return (cwd?.trim() || process.cwd()).replace(/\/+$/, "") || ".";
-}
-function buildPreparedAgentCacheKey(args) {
-  const systemBuiltinSkillsKey = args.systemBuiltinSkills ? JSON.stringify(
-    Object.keys(args.systemBuiltinSkills).sort().map((key) => [key, args.systemBuiltinSkills?.[key]])
-  ) : "default";
-  return `${args.userId}\0${args.agentRef}\0${args.cwd}\0${systemBuiltinSkillsKey}`;
-}
-function clearCliLocalRuntimePreparedAgentCache() {
-  preparedAgentRuntimeCache.clear();
-  hybridStoreCache.clear();
+async function getOrCreateSharedStore(deps) {
+  if (deps.store) return deps.store;
+  const cacheKey = normalizeRuntimeCacheCwd(deps.cwd);
+  let storePromise = hybridStoreCache.get(cacheKey);
+  if (!storePromise) {
+    storePromise = resolveStore(deps);
+    hybridStoreCache.set(cacheKey, storePromise);
+  }
+  return storePromise;
 }
-async function defaultLocalRuntimeDb() {
-  return getDefaultCliLocalRuntimeDb();
-}
-function createFallbackId() {
-  return ulid();
+function createLocalDialogTitleGenerator(deps, ctx) {
+  return async (input) => {
+    if (!canUsePlatformChatProvider(deps.env)) {
+      return null;
+    }
+    const result = await generateLocalDialogTitle({
+      messages: input.messages,
+      env: deps.env,
+      fetchImpl: async (url, init) => fetchWithTransientRetry(
+        deps.fetchImpl ?? fetch,
+        url,
+        init,
+        {
+          sleep: deps.sleep,
+          loopbackRequest: ctx.loopbackRequest
+        }
+      ),
+      resolveProviderConfig: async (args) => resolvePlatformChatProviderConfig({
+        agentConfig: args.agentConfig,
+        env: args.env,
+        apiKeyRefResolver: ctx.apiKeyRefResolver,
+        credentialBroker: ctx.credentialBroker
+      }),
+      buildRequest: (args) => buildPlatformChatCompletionRequest({
+        providerConfig: args.providerConfig,
+        messages: args.messages,
+        stream: false
+      }),
+      parseResponse: (args) => parsePlatformChatCompletionResponse({
+        providerConfig: args.providerConfig,
+        data: args.data,
+        trace: []
+      }),
+      fallbackTitle: input.fallbackTitle,
+      timeoutMs: 15e3
+    });
+    return result.source === "llm" ? result.title : null;
+  };
 }
-function logLocalRuntimeDiagnostic(event, fields) {
-  if (process.env.NOLO_LOCAL_RUNTIME_DEBUG !== "1" && process.env.NOLO_DEBUG !== "1") {
+async function writeLocalTokenRecord(args) {
+  const rawUsage = args.input.result.usage;
+  if (!rawUsage || typeof rawUsage !== "object" || Object.keys(rawUsage).length === 0) {
     return;
   }
-  console.error(`[nolo-local-runtime] ${event} ${JSON.stringify(fields)}`);
+  const timestamp = args.now();
+  const prepared = prepareTokenUsageData({
+    rawUsage,
+    agentConfig: {
+      model: args.input.result.model || "unknown",
+      provider: args.input.result.provider,
+      apiSource: "cli"
+    },
+    userId: args.userId,
+    agentId: args.input.agentKey,
+    dialogId: args.dialogId,
+    timestamp,
+    entry_path: "cli-local"
+  });
+  const recordKey = createTokenKey.record(args.userId, timestamp);
+  const tokenRecord = {
+    id: args.createId(),
+    type: "token",
+    ...prepared.tokenData
+  };
+  await args.store.write(recordKey, tokenRecord);
 }
-function summarizeOpenAiToolNames(tools) {
-  return tools.reduce((acc, tool) => {
-    const fn = tool.function;
-    const name = fn && typeof fn === "object" && "name" in fn && typeof fn.name === "string" ? fn.name : null;
-    if (name) acc.push(name);
-    return acc;
-  }, []);
+async function writeDialog(args) {
+  let existingDialog = null;
+  if (args.input.continueDialogId) {
+    const dialogKey = `dialog-${args.userId}-${args.input.continueDialogId}`;
+    existingDialog = await args.store.read(dialogKey);
+  }
+  const authToken = resolveRuntimeAuthToken(args.env);
+  const isLoggedIn = Boolean(
+    authToken && (parseUserIdFromAuthToken(authToken) || args.env.NOLO_MACHINE_API_KEY?.trim())
+  );
+  const hasExistingTitle = typeof existingDialog?.title === "string" && existingDialog.title.trim();
+  let titleOverride;
+  if (isLoggedIn && !hasExistingTitle && args.titleGenerator) {
+    const fallbackTitle = extractLastUserText(args.input.messages).trim().slice(0, 80) || "Local agent run";
+    try {
+      const generated = await args.titleGenerator({
+        messages: args.input.messages,
+        fallbackTitle
+      });
+      if (generated) {
+        titleOverride = generated;
+      }
+    } catch {
+    }
+  }
+  const plan = buildLocalDialogWritePlan({
+    input: args.input,
+    userId: args.userId,
+    now: args.now(),
+    createId: args.createId,
+    existingDialog,
+    cwd: args.cwd,
+    ...titleOverride ? { titleOverride } : {}
+  });
+  await args.store.batch(plan.ops);
+  try {
+    await writeLocalTokenRecord({
+      store: args.store,
+      input: args.input,
+      userId: args.userId,
+      dialogId: plan.dialogId,
+      now: args.now,
+      createId: args.createId,
+      output: args.output
+    });
+  } catch (error) {
+    args.output?.write(
+      `[nolo] Token usage record write failed (non-fatal): ${toErrorMessage(error)}
+`
+    );
+  }
+  const hasSubjectRefs = localTurnHasSubjectRefs(args.input);
+  const isLocalUser = args.userId === "local";
+  if (!isLocalUser) {
+    try {
+      const syncResult = await syncLocalDialogEvidenceToRemote({
+        env: args.env,
+        fetchImpl: args.fetchImpl,
+        input: args.input,
+        ops: plan.ops,
+        output: args.output,
+        userId: args.userId
+      });
+      if (!syncResult.attempted) {
+        if (hasSubjectRefs) {
+          args.output?.write(
+            "[nolo] Local dialog evidence is local-only; set NOLO_SERVER and AUTH_TOKEN to make subjectRefs remotely queryable.\n"
+          );
+        }
+      }
+    } catch (error) {
+      if (hasSubjectRefs) {
+        throw error;
+      }
+      args.output?.write(
+        `[nolo] Remote dialog evidence sync failed; local dialog only: ${toErrorMessage(
+          error
+        )}
+`
+      );
+    }
+  }
+  return { dialogId: plan.dialogId, title: plan.title };
+}
+function resolveCliDialogRecordKey(userId, dialogId) {
+  if (dialogId.startsWith("dialog-") && !dialogId.includes("-msg-")) {
+    return dialogId;
+  }
+  return `dialog-${userId}-${dialogId}`;
+}
+async function loadCliDialogSummary(args) {
+  const dialogKey = resolveCliDialogRecordKey(args.userId, args.dialogId);
+  const record = await args.store.read(dialogKey);
+  if (!record || typeof record !== "object") return null;
+  const summary = typeof record.summary === "string" ? record.summary.trim() : "";
+  if (!summary) return null;
+  const summarizedBeforeId = record.summarizedBeforeId;
+  return {
+    summary,
+    ...typeof summarizedBeforeId === "string" && summarizedBeforeId ? { summarizedBeforeId } : {}
+  };
+}
+async function saveCliDialogSummary(args) {
+  const dialogKey = resolveCliDialogRecordKey(args.userId, args.dialogId);
+  const existing = await args.store.read(dialogKey) ?? {};
+  const bareId = typeof existing.id === "string" && existing.id ? existing.id : args.dialogId.startsWith("dialog-") ? args.dialogId.slice(args.dialogId.lastIndexOf("-") + 1) : args.dialogId;
+  const compressionCount = typeof existing.compressionCount === "number" ? existing.compressionCount + 1 : 1;
+  await args.store.write(dialogKey, {
+    ...existing,
+    id: bareId,
+    dbKey: dialogKey,
+    type: "dialog",
+    userId: args.userId,
+    summary: args.summary,
+    ...args.summarizedBeforeId !== void 0 ? { summarizedBeforeId: args.summarizedBeforeId } : {},
+    compressionCount,
+    summaryPending: false,
+    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+  });
 }
+
+// packages/cli/client/cliWorkspaceToolVariants.ts
+function shouldUseDeclaredOnlyLocalWorkspaceTools(env) {
+  const value = env.NOLO_LOCAL_WORKSPACE_TOOLSET || env.NOLO_LOCAL_TOOLSET_MODE || "";
+  return value === "declared-only" || value === "declared";
+}
+function resolveGlobFilesDescriptionVariant(env) {
+  return resolveLocalWorkspaceDescriptionVariant(
+    env.NOLO_GLOBFILES_DESCRIPTION_VARIANT
+  );
+}
+function resolveListFilesDescriptionVariant(env) {
+  return resolveLocalWorkspaceDescriptionVariant(
+    env.NOLO_LISTFILES_DESCRIPTION_VARIANT
+  );
+}
+function resolveListFilesParameterVariant(env) {
+  return resolveLocalWorkspaceParameterVariant(
+    env.NOLO_LISTFILES_PARAMETER_VARIANT
+  );
+}
+function resolveReadFileDescriptionVariant(env) {
+  return resolveLocalWorkspaceDescriptionVariant(
+    env.NOLO_READFILE_DESCRIPTION_VARIANT
+  );
+}
+function resolveReadFileParameterVariant(env) {
+  return resolveLocalWorkspaceParameterVariant(
+    env.NOLO_READFILE_PARAMETER_VARIANT
+  );
+}
+function resolveGlobFilesParameterVariant(env) {
+  return resolveLocalWorkspaceParameterVariant(
+    env.NOLO_GLOBFILES_PARAMETER_VARIANT
+  );
+}
+function resolveSearchFilesDescriptionVariant(env) {
+  return resolveLocalWorkspaceDescriptionVariant(
+    env.NOLO_SEARCHFILES_DESCRIPTION_VARIANT
+  );
+}
+function resolveSearchFilesParameterVariant(env) {
+  return resolveLocalWorkspaceParameterVariant(
+    env.NOLO_SEARCHFILES_PARAMETER_VARIANT
+  );
+}
+function resolveLocalWorkspaceDescriptionVariant(value) {
+  return value === "brief" || value === "strategy" || value === "workflow" || value === "antiShell" ? value : "strategy";
+}
+function resolveLocalWorkspaceParameterVariant(value) {
+  return value === "minimal" || value === "scoped" || value === "rich" ? value : "rich";
+}
+
+// packages/cli/client/cliChildDialogPersist.ts
+async function persistCliPendingChildDialog(args) {
+  const nowIso = new Date(args.now).toISOString();
+  const dialogKey = `dialog-${args.userId}-${args.dialogId}`;
+  const record = {
+    id: args.dialogId,
+    dbKey: dialogKey,
+    type: "dialog",
+    userId: args.userId,
+    cybots: [args.agentKey],
+    primaryAgentKey: args.agentKey,
+    title: args.title.slice(0, 80),
+    status: "pending",
+    triggerType: "cli-local",
+    executionMode: args.background ? "background" : "foreground",
+    createdAt: nowIso,
+    updatedAt: nowIso,
+    ...args.spaceId ? { spaceId: args.spaceId } : {},
+    ...args.parentDialogId ? { parentDialogId: args.parentDialogId } : {},
+    ...args.rootDialogId ? { rootDialogId: args.rootDialogId } : {},
+    localRuntime: {
+      host: "cli",
+      workspaceRoot: args.workspaceRoot,
+      workspaceKind: "current",
+      workspaceAccess: "inherited"
+    }
+  };
+  await args.store.batch([{ type: "put", key: dialogKey, value: record }]);
+}
+async function persistCliFailedChildDialog(args) {
+  const dialogKey = `dialog-${args.userId}-${args.dialogId}`;
+  const existing = await args.store.read(dialogKey);
+  const existingRecord = existing && typeof existing === "object" ? existing : {};
+  await args.store.batch([
+    {
+      type: "put",
+      key: dialogKey,
+      value: {
+        ...existingRecord,
+        id: args.dialogId,
+        dbKey: dialogKey,
+        status: "failed",
+        errorMessage: args.errorMessage,
+        updatedAt: new Date(args.now).toISOString(),
+        finishedAt: args.now
+      }
+    }
+  ]);
+}
+
+// packages/cli/client/localRuntimeTools.ts
 function buildOpenAiTools(args) {
   const toolset = buildLocalWorkspaceToolsetForEnv(args);
   const toolNameSet = new Set(args.toolNames ?? []);
@@ -9312,19 +9540,19 @@ function buildOpenAiTools(args) {
     }),
     ...buildServerPlatformOpenAiTools({ 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"];
-function addDefaultCliCoreTools(toolNames, env) {
+function addDefaultCliCoreTools(toolNames, env, options) {
   const declaredOnly = env && shouldUseDeclaredOnlyLocalWorkspaceTools(env);
-  const injected = declaredOnly ? [...FORCED_TOOLS] : [...FORCED_TOOLS, ...CLI_DEFAULT_TOOLS];
-  return [.../* @__PURE__ */ new Set([...toolNames, ...injected])];
+  const forcedTools = options?.hasUserChoice === true ? FORCED_TOOLS : FORCED_TOOLS.filter((name) => name !== "ui_ask_choice");
+  const injected = declaredOnly ? [...forcedTools] : [...forcedTools, ...CLI_DEFAULT_TOOLS];
+  const combined = [...toolNames, ...injected];
+  const filtered = options?.hasUserChoice === true ? combined : combined.filter((name) => name !== "ui_ask_choice");
+  return [...new Set(filtered)];
 }
 function resolveCliEffectiveEnabledPacks(args) {
   return resolveEffectiveEnabledPacks({
@@ -9349,16 +9577,12 @@ function withRuntimeEnabledPacksAndPrompt(config) {
     ...prompt ? { prompt } : {}
   };
 }
-function resolveCliRequestedToolNames(agentConfig, env, systemBuiltinSkills) {
+function resolveCliRequestedToolNames(agentConfig, env, systemBuiltinSkills, options) {
   const declaredOnly = shouldUseDeclaredOnlyLocalWorkspaceTools(env);
   const expanded = addDefaultLightWebToolsForConfiguredAgents(
     addDefaultCliCoreTools(
       canonicalizeToolNames(
         expandEnabledPacks(
-          // CLI 端默认开 code 能力包：enabledPacks 为空时补 ["code"]，保持
-          // 「CLI agent 默认能改代码」的体感，但走显式能力包而非隐式兜底
-          // （DEFAULT_LOCAL_CODING_TOOL_NAMES 已删除）。
-          // declared-only 模式下不补——用户显式要 ablation。
           resolveCliEffectiveEnabledPacks({
             enabledPacks: agentConfig?.enabledPacks,
             declaredOnly
@@ -9366,20 +9590,28 @@ function resolveCliRequestedToolNames(agentConfig, env, systemBuiltinSkills) {
           resolveRequestedRuntimeToolNames({ agentConfig })
         )
       ),
-      env
+      env,
+      options
     ),
     agentConfig
   );
-  const filtered = applySystemBuiltinSkillFilter(expanded, systemBuiltinSkills);
+  const filtered = applySystemBuiltinSkillFilter(
+    // Default-on system capabilities (agent-orchestration) are mounted for
+    // every non-declared-only agent before the global filter runs, so the
+    // user's global "off" still wins. declared-only (ablation) runs keep
+    // their strict surface.
+    declaredOnly ? expanded : addDefaultSystemCapabilityTools(expanded),
+    systemBuiltinSkills
+  );
   return applyDisabledTools(
     filtered,
     agentConfig?.disabledTools
   );
 }
-function resolveProviderOpenAiToolBundle(agentConfig, env, buildTools = buildOpenAiTools, additionalToolNames = []) {
+function resolveProviderOpenAiToolBundle(agentConfig, env, buildTools = buildOpenAiTools, additionalToolNames = [], options) {
   const requestedToolNames = [
     .../* @__PURE__ */ new Set([
-      ...resolveCliRequestedToolNames(agentConfig, env),
+      ...resolveCliRequestedToolNames(agentConfig, env, null, options),
       ...additionalToolNames
     ])
   ];
@@ -9401,18 +9633,16 @@ function buildLocalWorkspaceToolsetForEnv(args) {
   return toolset;
 }
 function buildLocalPolicyToolNames(args) {
-  const buildTools = args.buildTools ?? buildOpenAiTools;
-  return [
-    ...new Set(
-      summarizeOpenAiToolNames(
-        buildTools({
-          agentKey: args.agentKey,
-          toolNames: args.toolNames,
-          env: args.env
-        })
-      )
-    )
-  ];
+  const schemaBuilder = args.buildProviderOpenAiTools ?? buildOpenAiTools;
+  const tools = schemaBuilder({
+    agentKey: args.agentKey,
+    toolNames: args.toolNames,
+    env: args.env
+  });
+  const policyNames = summarizeOpenAiToolNames(
+    tools
+  );
+  return [...new Set(policyNames)];
 }
 function buildServerPlatformOpenAiTools(args) {
   const toolNameSet = new Set(args.toolNames ?? []);
@@ -9610,208 +9840,13 @@ function createCliCallAgentToolExecutor(deps, ctx) {
     }
   };
 }
-async function resolveStore(deps) {
-  if (deps.store) return deps.store;
-  return createCliHybridRecordStore({
-    db: deps.db ?? await defaultLocalRuntimeDb(),
-    env: deps.env,
-    fetchImpl: deps.fetchImpl
-  });
-}
-async function getOrCreateSharedStore(deps) {
-  if (deps.store) return deps.store;
-  const cacheKey = normalizeRuntimeCacheCwd(deps.cwd);
-  let storePromise = hybridStoreCache.get(cacheKey);
-  if (!storePromise) {
-    storePromise = resolveStore(deps);
-    hybridStoreCache.set(cacheKey, storePromise);
-  }
-  return storePromise;
-}
-function createLocalDialogTitleGenerator(deps, ctx) {
-  return async (input) => {
-    if (!canUsePlatformChatProvider(deps.env)) {
-      return null;
-    }
-    const result = await generateLocalDialogTitle({
-      messages: input.messages,
-      env: deps.env,
-      fetchImpl: async (url, init) => fetchWithTransientRetry(
-        deps.fetchImpl ?? fetch,
-        url,
-        init,
-        {
-          sleep: deps.sleep,
-          loopbackRequest: ctx.loopbackRequest
-        }
-      ),
-      resolveProviderConfig: async (args) => resolvePlatformChatProviderConfig({
-        agentConfig: args.agentConfig,
-        env: args.env,
-        apiKeyRefResolver: ctx.apiKeyRefResolver,
-        credentialBroker: ctx.credentialBroker
-      }),
-      buildRequest: (args) => buildPlatformChatCompletionRequest({
-        providerConfig: args.providerConfig,
-        messages: args.messages,
-        stream: false
-      }),
-      parseResponse: (args) => parsePlatformChatCompletionResponse({
-        providerConfig: args.providerConfig,
-        data: args.data,
-        trace: []
-      }),
-      fallbackTitle: input.fallbackTitle,
-      timeoutMs: 15e3
-    });
-    return result.source === "llm" ? result.title : null;
-  };
-}
-async function writeLocalTokenRecord(args) {
-  const rawUsage = args.input.result.usage;
-  if (!rawUsage || typeof rawUsage !== "object" || Object.keys(rawUsage).length === 0) {
-    return;
-  }
-  const timestamp = args.now();
-  const prepared = prepareTokenUsageData({
-    rawUsage,
-    agentConfig: {
-      model: args.input.result.model || "unknown",
-      provider: args.input.result.provider,
-      apiSource: "cli"
-    },
-    userId: args.userId,
-    agentId: args.input.agentKey,
-    dialogId: args.dialogId,
-    timestamp,
-    entry_path: "cli-local"
-  });
-  const recordKey = createTokenKey.record(args.userId, timestamp);
-  const tokenRecord = {
-    id: args.createId(),
-    type: "token",
-    ...prepared.tokenData
-  };
-  await args.store.write(recordKey, tokenRecord);
-}
-async function writeDialog(args) {
-  let existingDialog = null;
-  if (args.input.continueDialogId) {
-    const dialogKey = `dialog-${args.userId}-${args.input.continueDialogId}`;
-    existingDialog = await args.store.read(dialogKey);
-  }
-  const authToken = resolveRuntimeAuthToken2(args.env);
-  const isLoggedIn = Boolean(authToken && parseUserIdFromAuthToken(authToken));
-  const hasExistingTitle = typeof existingDialog?.title === "string" && existingDialog.title.trim();
-  let titleOverride;
-  if (isLoggedIn && !hasExistingTitle && args.titleGenerator) {
-    const fallbackTitle = extractLastUserText(args.input.messages).trim().slice(0, 80) || "Local agent run";
-    try {
-      const generated = await args.titleGenerator({
-        messages: args.input.messages,
-        fallbackTitle
-      });
-      if (generated) {
-        titleOverride = generated;
-      }
-    } catch {
-    }
-  }
-  const plan = buildLocalDialogWritePlan({
-    input: args.input,
-    userId: args.userId,
-    now: args.now(),
-    createId: args.createId,
-    existingDialog,
-    cwd: args.cwd,
-    ...titleOverride ? { titleOverride } : {}
-  });
-  await args.store.batch(plan.ops);
-  try {
-    await writeLocalTokenRecord({
-      store: args.store,
-      input: args.input,
-      userId: args.userId,
-      dialogId: plan.dialogId,
-      now: args.now,
-      createId: args.createId,
-      output: args.output
-    });
-  } catch (error) {
-    args.output?.write(
-      `[nolo] Token usage record write failed (non-fatal): ${toErrorMessage(error)}
-`
-    );
-  }
-  const hasSubjectRefs = localTurnHasSubjectRefs(args.input);
-  const isLocalUser = args.userId === "local";
-  if (!isLocalUser) {
-    try {
-      const syncResult = await syncLocalDialogEvidenceToRemote({
-        env: args.env,
-        fetchImpl: args.fetchImpl,
-        input: args.input,
-        ops: plan.ops,
-        output: args.output,
-        userId: args.userId
-      });
-      if (!syncResult.attempted) {
-        if (hasSubjectRefs) {
-          args.output?.write(
-            "[nolo] Local dialog evidence is local-only; set NOLO_SERVER and AUTH_TOKEN to make subjectRefs remotely queryable.\n"
-          );
-        }
-      }
-    } catch (error) {
-      if (hasSubjectRefs) {
-        throw error;
-      }
-      args.output?.write(
-        `[nolo] Remote dialog evidence sync failed; local dialog only: ${toErrorMessage(
-          error
-        )}
-`
-      );
-    }
-  }
-  return { dialogId: plan.dialogId };
-}
-function resolveCliDialogRecordKey(userId, dialogId) {
-  if (dialogId.startsWith("dialog-") && !dialogId.includes("-msg-")) {
-    return dialogId;
-  }
-  return `dialog-${userId}-${dialogId}`;
-}
-async function loadCliDialogSummary(args) {
-  const dialogKey = resolveCliDialogRecordKey(args.userId, args.dialogId);
-  const record = await args.store.read(dialogKey);
-  if (!record || typeof record !== "object") return null;
-  const summary = typeof record.summary === "string" ? record.summary.trim() : "";
-  if (!summary) return null;
-  const summarizedBeforeId = record.summarizedBeforeId;
-  return {
-    summary,
-    ...typeof summarizedBeforeId === "string" && summarizedBeforeId ? { summarizedBeforeId } : {}
-  };
-}
-async function saveCliDialogSummary(args) {
-  const dialogKey = resolveCliDialogRecordKey(args.userId, args.dialogId);
-  const existing = await args.store.read(dialogKey) ?? {};
-  const bareId = typeof existing.id === "string" && existing.id ? existing.id : args.dialogId.startsWith("dialog-") ? args.dialogId.slice(args.dialogId.lastIndexOf("-") + 1) : args.dialogId;
-  const compressionCount = typeof existing.compressionCount === "number" ? existing.compressionCount + 1 : 1;
-  await args.store.write(dialogKey, {
-    ...existing,
-    id: bareId,
-    dbKey: dialogKey,
-    type: "dialog",
-    userId: args.userId,
-    summary: args.summary,
-    ...args.summarizedBeforeId !== void 0 ? { summarizedBeforeId: args.summarizedBeforeId } : {},
-    compressionCount,
-    summaryPending: false,
-    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-  });
-}
+
+// packages/cli/client/localRuntimeAdapter.ts
+var currentMetaFile = fileURLToPath(import.meta.url);
+var isJsBundle = extname(currentMetaFile) === ".js";
+var SOURCE_CLI_DIR = isJsBundle ? dirname(currentMetaFile) : dirname(dirname(currentMetaFile));
+var CLI_DIR = isCompiledBinary() ? dirname(process.execPath) : SOURCE_CLI_DIR;
+var CLI_ENTRYPOINT = isCompiledBinary() ? process.execPath : isJsBundle ? currentMetaFile : join(SOURCE_CLI_DIR, "index.ts");
 function createCliLocalRuntimeAdapter(deps) {
   const now = deps.now ?? Date.now;
   const createId = deps.createId ?? createFallbackId;
@@ -9883,7 +9918,13 @@ function createCliLocalRuntimeAdapter(deps) {
         deps.env
       );
       const agentConfig = baseAgentConfig ? withRuntimeEnabledPacksAndPrompt(baseAgentConfig) : baseAgentConfig;
-      const requestedToolNames = agentConfig ? resolveCliRequestedToolNames(agentConfig, deps.env, systemBuiltinSkills) : [];
+      const hasUserChoice = Boolean(deps.requestUserChoice);
+      const requestedToolNames = agentConfig ? resolveCliRequestedToolNames(
+        agentConfig,
+        deps.env,
+        systemBuiltinSkills,
+        { hasUserChoice }
+      ) : [];
       activeAgentToolNames = buildLocalPolicyToolNames({
         agentKey: agentConfig?.key,
         toolNames: [...requestedToolNames, ...additionalToolNames],
@@ -10013,7 +10054,8 @@ function createCliLocalRuntimeAdapter(deps) {
           agentConfig,
           deps.env,
           buildProviderOpenAiTools,
-          additionalToolNames
+          additionalToolNames,
+          { hasUserChoice: Boolean(deps.requestUserChoice) }
         );
         logLocalRuntimeDiagnostic("provider.selected", {
           agentKey: agentConfig.key,
@@ -10094,7 +10136,8 @@ function createCliLocalRuntimeAdapter(deps) {
           agentConfig,
           deps.env,
           buildProviderOpenAiTools,
-          additionalToolNames
+          additionalToolNames,
+          { hasUserChoice: Boolean(deps.requestUserChoice) }
         );
         logLocalRuntimeDiagnostic("provider.selected", {
           agentKey: agentConfig.key,
@@ -10160,7 +10203,8 @@ function createCliLocalRuntimeAdapter(deps) {
           agentConfig,
           deps.env,
           buildProviderOpenAiTools,
-          additionalToolNames
+          additionalToolNames,
+          { hasUserChoice: Boolean(deps.requestUserChoice) }
         );
         logLocalRuntimeDiagnostic("provider.selected", {
           agentKey: agentConfig.key,
@@ -10243,7 +10287,8 @@ function createCliLocalRuntimeAdapter(deps) {
           agentConfig,
           deps.env,
           buildProviderOpenAiTools,
-          additionalToolNames
+          additionalToolNames,
+          { hasUserChoice: Boolean(deps.requestUserChoice) }
         );
         return {
           model: providerConfig2.model,
@@ -10399,7 +10444,8 @@ function createCliLocalRuntimeAdapter(deps) {
         agentConfig,
         deps.env,
         buildProviderOpenAiTools,
-        additionalToolNames
+        additionalToolNames,
+        { hasUserChoice: Boolean(deps.requestUserChoice) }
       );
       return {
         model: providerConfig.model,