nolo-cli 0.172.0-alpha.1 → 0.172.0-alpha.3

package/{appDeleteCommands-3HZNWZ2V.js → appDeleteCommands-BNQKVEIA.js}

@@ -4,35 +4,36 @@ import {
   pickDefined,
   printCliError,
   resolveCliContext
-} from "./chunk-TYQZRSL6.js";
+} from "./chunk-2FOT26E6.js";
 import {
   hasFlag,
   hasHelpArg
-} from "./chunk-EWLPIR2S.js";
+} from "./chunk-XWEAIAO2.js";
 import {
   t
 } from "./chunk-TDX2L4W2.js";
-import "./chunk-OPNHKULV.js";
-import "./chunk-PJVGNB4L.js";
+import "./chunk-UVP7VL6F.js";
+import "./chunk-RPZNVBA5.js";
 import "./chunk-NBTY7YJF.js";
 import "./chunk-VF4K2QE6.js";
 import "./chunk-UAD2WT54.js";
-import "./chunk-ME7N4YHG.js";
+import "./chunk-7YN3HYWC.js";
 import "./chunk-XWX5ZGWR.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-YEOFTC2H.js";
+import "./chunk-KSCX7GME.js";
 import "./chunk-HNUWUO75.js";
 import "./chunk-CHOZJMJS.js";
 import "./chunk-PWTNI4N7.js";
-import "./chunk-HBUKJB3W.js";
+import "./chunk-SRZ6BQIP.js";
+import "./chunk-EW6GOYKQ.js";
 import "./chunk-2WZXXAQD.js";
 import "./chunk-I33CJERI.js";
 import "./chunk-G6OOUQWJ.js";
 import "./chunk-56GBUMO5.js";
 import "./chunk-WJZOQR2J.js";
-import "./chunk-RATR6VCP.js";
-import "./chunk-SHPY7A3P.js";
-import "./chunk-6J227QXV.js";
+import "./chunk-ZEOR6XPJ.js";
+import "./chunk-QPUKYKMH.js";
+import "./chunk-2GRXE3YJ.js";
 import "./chunk-JLR5NWP2.js";
 import "./chunk-XBJIESNS.js";
 import "./chunk-2MBTWINN.js";

package/{appDeployCommands-Q5BIBQE2.js → appDeployCommands-V5WQ2ZBR.js}

@@ -5,35 +5,36 @@ import {
   pickDefined,
   printCliError,
   resolveCliContext
-} from "./chunk-TYQZRSL6.js";
+} from "./chunk-2FOT26E6.js";
 import {
   hasFlag,
   hasHelpArg
-} from "./chunk-EWLPIR2S.js";
+} from "./chunk-XWEAIAO2.js";
 import {
   t
 } from "./chunk-TDX2L4W2.js";
-import "./chunk-OPNHKULV.js";
-import "./chunk-PJVGNB4L.js";
+import "./chunk-UVP7VL6F.js";
+import "./chunk-RPZNVBA5.js";
 import "./chunk-NBTY7YJF.js";
 import "./chunk-VF4K2QE6.js";
 import "./chunk-UAD2WT54.js";
-import "./chunk-ME7N4YHG.js";
+import "./chunk-7YN3HYWC.js";
 import "./chunk-XWX5ZGWR.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-YEOFTC2H.js";
+import "./chunk-KSCX7GME.js";
 import "./chunk-HNUWUO75.js";
 import "./chunk-CHOZJMJS.js";
 import "./chunk-PWTNI4N7.js";
-import "./chunk-HBUKJB3W.js";
+import "./chunk-SRZ6BQIP.js";
+import "./chunk-EW6GOYKQ.js";
 import "./chunk-2WZXXAQD.js";
 import "./chunk-I33CJERI.js";
 import "./chunk-G6OOUQWJ.js";
 import "./chunk-56GBUMO5.js";
 import "./chunk-WJZOQR2J.js";
-import "./chunk-RATR6VCP.js";
-import "./chunk-SHPY7A3P.js";
-import "./chunk-6J227QXV.js";
+import "./chunk-ZEOR6XPJ.js";
+import "./chunk-QPUKYKMH.js";
+import "./chunk-2GRXE3YJ.js";
 import "./chunk-JLR5NWP2.js";
 import "./chunk-XBJIESNS.js";
 import "./chunk-2MBTWINN.js";

package/{appDeployStatusCommands-ZZFFVM3W.js → appDeployStatusCommands-QA5GFIUU.js}

@@ -4,35 +4,36 @@ import {
   outputResult,
   printCliError,
   resolveCliContext
-} from "./chunk-TYQZRSL6.js";
+} from "./chunk-2FOT26E6.js";
 import {
   hasFlag,
   hasHelpArg
-} from "./chunk-EWLPIR2S.js";
+} from "./chunk-XWEAIAO2.js";
 import {
   t
 } from "./chunk-TDX2L4W2.js";
-import "./chunk-OPNHKULV.js";
-import "./chunk-PJVGNB4L.js";
+import "./chunk-UVP7VL6F.js";
+import "./chunk-RPZNVBA5.js";
 import "./chunk-NBTY7YJF.js";
 import "./chunk-VF4K2QE6.js";
 import "./chunk-UAD2WT54.js";
-import "./chunk-ME7N4YHG.js";
+import "./chunk-7YN3HYWC.js";
 import "./chunk-XWX5ZGWR.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-YEOFTC2H.js";
+import "./chunk-KSCX7GME.js";
 import "./chunk-HNUWUO75.js";
 import "./chunk-CHOZJMJS.js";
 import "./chunk-PWTNI4N7.js";
-import "./chunk-HBUKJB3W.js";
+import "./chunk-SRZ6BQIP.js";
+import "./chunk-EW6GOYKQ.js";
 import "./chunk-2WZXXAQD.js";
 import "./chunk-I33CJERI.js";
 import "./chunk-G6OOUQWJ.js";
 import "./chunk-56GBUMO5.js";
 import "./chunk-WJZOQR2J.js";
-import "./chunk-RATR6VCP.js";
-import "./chunk-SHPY7A3P.js";
-import "./chunk-6J227QXV.js";
+import "./chunk-ZEOR6XPJ.js";
+import "./chunk-QPUKYKMH.js";
+import "./chunk-2GRXE3YJ.js";
 import "./chunk-JLR5NWP2.js";
 import "./chunk-XBJIESNS.js";
 import "./chunk-2MBTWINN.js";

package/{appGetCommands-7AAOXZQK.js → appGetCommands-U3SDB4TE.js}

@@ -5,35 +5,36 @@ import {
   pickDefined,
   printCliError,
   resolveCliContext
-} from "./chunk-TYQZRSL6.js";
+} from "./chunk-2FOT26E6.js";
 import {
   hasFlag,
   hasHelpArg
-} from "./chunk-EWLPIR2S.js";
+} from "./chunk-XWEAIAO2.js";
 import {
   t
 } from "./chunk-TDX2L4W2.js";
-import "./chunk-OPNHKULV.js";
-import "./chunk-PJVGNB4L.js";
+import "./chunk-UVP7VL6F.js";
+import "./chunk-RPZNVBA5.js";
 import "./chunk-NBTY7YJF.js";
 import "./chunk-VF4K2QE6.js";
 import "./chunk-UAD2WT54.js";
-import "./chunk-ME7N4YHG.js";
+import "./chunk-7YN3HYWC.js";
 import "./chunk-XWX5ZGWR.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-YEOFTC2H.js";
+import "./chunk-KSCX7GME.js";
 import "./chunk-HNUWUO75.js";
 import "./chunk-CHOZJMJS.js";
 import "./chunk-PWTNI4N7.js";
-import "./chunk-HBUKJB3W.js";
+import "./chunk-SRZ6BQIP.js";
+import "./chunk-EW6GOYKQ.js";
 import "./chunk-2WZXXAQD.js";
 import "./chunk-I33CJERI.js";
 import "./chunk-G6OOUQWJ.js";
 import "./chunk-56GBUMO5.js";
 import "./chunk-WJZOQR2J.js";
-import "./chunk-RATR6VCP.js";
-import "./chunk-SHPY7A3P.js";
-import "./chunk-6J227QXV.js";
+import "./chunk-ZEOR6XPJ.js";
+import "./chunk-QPUKYKMH.js";
+import "./chunk-2GRXE3YJ.js";
 import "./chunk-JLR5NWP2.js";
 import "./chunk-XBJIESNS.js";
 import "./chunk-2MBTWINN.js";

package/{appListCommands-H76IX2X5.js → appListCommands-DMHPABYC.js}

@@ -5,35 +5,36 @@ import {
   pickDefined,
   printCliError,
   resolveCliContext
-} from "./chunk-TYQZRSL6.js";
+} from "./chunk-2FOT26E6.js";
 import {
   hasFlag,
   hasHelpArg
-} from "./chunk-EWLPIR2S.js";
+} from "./chunk-XWEAIAO2.js";
 import {
   t
 } from "./chunk-TDX2L4W2.js";
-import "./chunk-OPNHKULV.js";
-import "./chunk-PJVGNB4L.js";
+import "./chunk-UVP7VL6F.js";
+import "./chunk-RPZNVBA5.js";
 import "./chunk-NBTY7YJF.js";
 import "./chunk-VF4K2QE6.js";
 import "./chunk-UAD2WT54.js";
-import "./chunk-ME7N4YHG.js";
+import "./chunk-7YN3HYWC.js";
 import "./chunk-XWX5ZGWR.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-YEOFTC2H.js";
+import "./chunk-KSCX7GME.js";
 import "./chunk-HNUWUO75.js";
 import "./chunk-CHOZJMJS.js";
 import "./chunk-PWTNI4N7.js";
-import "./chunk-HBUKJB3W.js";
+import "./chunk-SRZ6BQIP.js";
+import "./chunk-EW6GOYKQ.js";
 import "./chunk-2WZXXAQD.js";
 import "./chunk-I33CJERI.js";
 import "./chunk-G6OOUQWJ.js";
 import "./chunk-56GBUMO5.js";
 import "./chunk-WJZOQR2J.js";
-import "./chunk-RATR6VCP.js";
-import "./chunk-SHPY7A3P.js";
-import "./chunk-6J227QXV.js";
+import "./chunk-ZEOR6XPJ.js";
+import "./chunk-QPUKYKMH.js";
+import "./chunk-2GRXE3YJ.js";
 import "./chunk-JLR5NWP2.js";
 import "./chunk-XBJIESNS.js";
 import "./chunk-2MBTWINN.js";

package/{chromeCommands-IY4NVSXZ.js → chromeCommands-Z5LDHMYN.js}

@@ -7,7 +7,8 @@ import {
   REQUIRED_CHROME_CONNECTOR_FEATURES,
   createChromeConnectorClient,
   resolveUploadRoots
-} from "./chunk-BU2YQBV4.js";
+} from "./chunk-DPQYIS6D.js";
+import "./chunk-SRZ6BQIP.js";
 import "./chunk-KUG52IAP.js";
 import {
   toErrorMessage

package/{chromeOpsCommands-6JHNTKXU.js → chromeOpsCommands-CHBIUDJD.js}

@@ -1,7 +1,8 @@
 import {
   createChromeConnectorClient,
   createVerifiedChromeConnectorClient
-} from "./chunk-BU2YQBV4.js";
+} from "./chunk-DPQYIS6D.js";
+import "./chunk-SRZ6BQIP.js";
 import {
   readOption
 } from "./chunk-WACI5I6V.js";

package/{chunk-TYQZRSL6.js → chunk-2FOT26E6.js}

@@ -1,6 +1,6 @@
 import {
   requireTokenUser
-} from "./chunk-EWLPIR2S.js";
+} from "./chunk-XWEAIAO2.js";
 import {
   t
 } from "./chunk-TDX2L4W2.js";

package/{chunk-6J227QXV.js → chunk-2GRXE3YJ.js}

@@ -1,6 +1,9 @@
 import {
   asRecordOrEmpty
 } from "./chunk-KX6YBIHG.js";
+import {
+  canonicalizeToolName
+} from "./chunk-5EBLANFT.js";
 import {
   isOwnedAgentKey,
   ownedAgentKey,
@@ -103,6 +106,23 @@ function applyToolSurfaceConstraints(surface, constraints) {
     finalToolNames: narrow(surface.finalToolNames)
   };
 }
+function resolveRequestToolSurface(args) {
+  const normalize = (name) => canonicalizeToolName(name.trim().replace(/^functions\./i, ""));
+  const names = (values) => new Set(values.map(normalize));
+  const allowed = args.profile?.allowedToolNames == null ? null : names(args.profile.allowedToolNames);
+  const blocked = names(args.profile?.blockedToolNames ?? []);
+  const supported = args.backend ? names(args.backend.toolNames) : null;
+  const scope = args.backend?.scopedToolNames ? names(args.backend.scopedToolNames) : null;
+  const filteredTools = [];
+  const finalToolNames = args.requestedToolNames.filter((toolName) => {
+    const name = normalize(toolName);
+    const reason = allowed && !allowed.has(name) ? "profile-not-allowed" : blocked.has(name) ? "profile-blocked" : supported && (!scope || scope.has(name)) && !supported.has(name) ? "backend-unsupported" : null;
+    if (!reason) return true;
+    filteredTools.push({ toolName, reason });
+    return false;
+  });
+  return { finalToolNames, filteredTools };
+}
 function uniqueToolNames(values) {
   return [...new Set(asTrimmedNonEmptyStringArray(values))];
 }
@@ -1484,6 +1504,7 @@ export {
   HIGH_RISK_MUTATION_TOOL_NAMES,
   resolveReadOnlyToolConstraints,
   applyToolSurfaceConstraints,
+  resolveRequestToolSurface,
   resolveRuntimeToolSurfaceForAgent,
   redactAgentRecordForWorkspaceTool,
   DEFAULT_READ_DIALOG_MAX_RESPONSE_CHARS,

package/{chunk-CFLYUFMA.js → chunk-3RF4DIQW.js}

@@ -7,7 +7,7 @@ import {
   mergeReferences,
   resolveReferenceAssets,
   resolveToolsFromKeys
-} from "./chunk-EK3LIELB.js";
+} from "./chunk-RU4KURIK.js";
 import {
   UI_CARD_ENVELOPE_MAX_BYTES,
   getAllToolRuns,
@@ -20,7 +20,7 @@ import {
   selectSpaceContextLevel,
   selectUserTonePreset,
   uiCardFallback
-} from "./chunk-MOOQN57G.js";
+} from "./chunk-SIZPFDPU.js";
 import {
   resolveToolBaseUrl
 } from "./chunk-MYOH447Z.js";
@@ -32,15 +32,15 @@ import {
 } from "./chunk-TDNAAXUQ.js";
 import {
   getDocState
-} from "./chunk-VAQ3EGPC.js";
+} from "./chunk-3SF6NB4R.js";
 import {
   getTableState
-} from "./chunk-MTAWQNSU.js";
+} from "./chunk-BIF4B4ON.js";
 import {
   PERSONALIZATION_DIALOG_CATEGORY,
   buildPersonalizationDialogPolicyContext,
   selectAllMsgs
-} from "./chunk-DNQ55DHN.js";
+} from "./chunk-XKL2RXV6.js";
 import {
   getCurrentSpaceIdRaw,
   getViewMode

package/{chunk-VAQ3EGPC.js → chunk-3SF6NB4R.js}

@@ -333,7 +333,7 @@ async function saveDocState(arg, { dispatch, getState }) {
     ).unwrap();
     if (dbSpaceId) {
       try {
-        const { updateContentTitle } = await import("./contentThunks-P2GNXUKN.js");
+        const { updateContentTitle } = await import("./contentThunks-AAGKCQCZ.js");
         await dispatch(
           updateContentTitle({
             spaceId: dbSpaceId,
@@ -372,7 +372,7 @@ async function saveDocState(arg, { dispatch, getState }) {
   }
 }
 async function createDocState(args, thunkApi) {
-  const { createPageAction } = await import("./createPageAction-IKB3LOMU.js");
+  const { createPageAction } = await import("./createPageAction-MBDADKFQ.js");
   return createPageAction(args, thunkApi);
 }
 function subscribe(listener) {

package/{chunk-3XUE7WJA.js → chunk-4TTEZGP3.js}

@@ -23,7 +23,7 @@ import {
 import {
   OAUTH_PROVIDER_REFS,
   buildLocalAgentLookupKeys
-} from "./chunk-PJVGNB4L.js";
+} from "./chunk-RPZNVBA5.js";
 import {
   LOCAL_CODEX_AGENT_ID,
   LOCAL_CODEX_AGENT_KEY,
@@ -51,7 +51,7 @@ import {
   createChromeConnectorClientResolver,
   createVerifiedChromeConnectorClient,
   executeChromeConnectorTool
-} from "./chunk-BU2YQBV4.js";
+} from "./chunk-DPQYIS6D.js";
 import {
   applyPublicAgentCatalogOverride
 } from "./chunk-W6E5IXIP.js";
@@ -64,7 +64,7 @@ import {
 import {
   inlineImageUrlsForCustomProvider,
   prepareTools
-} from "./chunk-PPR6G2U2.js";
+} from "./chunk-ZCXK773F.js";
 import {
   getServerProviderSecret
 } from "./chunk-HS7MLR74.js";
@@ -86,18 +86,18 @@ import {
   resolveCliLocalRuntimeKeyCapability,
   resolveCliLocalSpawnDispatch,
   resolveStartAgentRunCwd
-} from "./chunk-UMVEB5QT.js";
+} from "./chunk-6KS4TTCI.js";
 import {
   deriveCredentialGroup,
   deriveCustomProviderCredentialGroup
-} from "./chunk-BE42X662.js";
+} from "./chunk-CK4GWPSD.js";
 import {
   fetchWithTransientRetry,
   isTransientFetchError
 } from "./chunk-KFHREHUQ.js";
 import {
   resolveAgentRequiredPackIds
-} from "./chunk-MOOQN57G.js";
+} from "./chunk-SIZPFDPU.js";
 import {
   applyBuiltinAgentRuntimeOverride,
   applyTokenUsageToDayStats,
@@ -106,14 +106,14 @@ import {
   resolveBuiltinPlatformAgentConfig,
   runKeyed,
   validateAskChoiceInput
-} from "./chunk-DNQ55DHN.js";
+} from "./chunk-XKL2RXV6.js";
 import {
   BUILTIN_DIALOG_LLM_CHAT_FALLBACK_MODEL,
   BUILTIN_TITLE_LLM_CONFIG
 } from "./chunk-523DITKR.js";
 import {
   fetchServerSyncedCredential
-} from "./chunk-54YLFF7P.js";
+} from "./chunk-TOLFIE2I.js";
 import {
   isTombstoneRecord
 } from "./chunk-D2MDMY2M.js";
@@ -170,7 +170,7 @@ import {
   runExecShellGates,
   validateConfiguredRootExecutionLease,
   verifyOwnerRouteAck
-} from "./chunk-ME7N4YHG.js";
+} from "./chunk-7YN3HYWC.js";
 import {
   accumulateGeminiChunks,
   buildGeminiGenerateContentRequest,
@@ -193,14 +193,14 @@ import {
   readPlatformChatSseCompletion,
   resolvePlatformChatProviderConfig,
   shouldUsePlatformChatProvider
-} from "./chunk-YEOFTC2H.js";
+} from "./chunk-KSCX7GME.js";
 import {
   readSseDataValues,
   readSseFrames
 } from "./chunk-HNUWUO75.js";
 import {
   resolveAgentRuntimeConfigFromRecord
-} from "./chunk-HBUKJB3W.js";
+} from "./chunk-EW6GOYKQ.js";
 import {
   resolveHistoricalToolContentCap
 } from "./chunk-2WZXXAQD.js";
@@ -216,13 +216,14 @@ import {
   stablePromptCacheKey,
   toResponsesTools,
   toolImages
-} from "./chunk-SHPY7A3P.js";
+} from "./chunk-QPUKYKMH.js";
 import {
   buildNoloWorkspaceOpenAiTools,
   filterClientNoloWorkspaceToolNames,
   parseNoloWorkspaceToolArguments,
+  resolveRequestToolSurface,
   resolveRuntimeToolSurfaceForAgent
-} from "./chunk-6J227QXV.js";
+} from "./chunk-2GRXE3YJ.js";
 import {
   isCapacitySaturatedRateLimit,
   mergeAvailabilityDeadline,
@@ -1059,7 +1060,17 @@ function isAnthropicOAuthAgent(agent) {
 
 // packages/cli/client/localRuntimeDiagnostics.ts
 import { ulid } from "ulid";
-var preparedAgentRuntimeCache = /* @__PURE__ */ new Map();
+var PREPARED_AGENT_RUNTIME_CACHE_LIMIT = 128;
+var PreparedAgentRuntimeCache = class extends Map {
+  set(key, value) {
+    super.set(key, value);
+    while (this.size > PREPARED_AGENT_RUNTIME_CACHE_LIMIT) {
+      super.delete(this.keys().next().value);
+    }
+    return this;
+  }
+};
+var preparedAgentRuntimeCache = new PreparedAgentRuntimeCache();
 var hybridStoreCache = /* @__PURE__ */ new Map();
 function normalizeRuntimeCacheCwd(cwd) {
   return (cwd?.trim() || process.cwd()).replace(/\/+$/, "") || ".";
@@ -1069,7 +1080,15 @@ function buildPreparedAgentCacheKey(args) {
     Object.keys(args.systemBuiltinSkills).sort().map((key) => [key, args.systemBuiltinSkills?.[key]])
   ) : "default";
   const wakeKey = args.wake !== void 0 ? args.wake ? "wake:1" : "wake:0" : "";
-  return `${args.userId}\0${args.agentRef}\0${args.cwd}\0${systemBuiltinSkillsKey}${wakeKey ? `\0${wakeKey}` : ""}`;
+  const policyKey = JSON.stringify([
+    args.env?.NOLO_LOCAL_WORKSPACE_TOOLSET ?? "",
+    args.env?.NOLO_LOCAL_TOOLSET_MODE ?? "",
+    args.env?.NOLO_AGENT_RUN_CHILD ?? "",
+    args.env?.NOLO_LOCAL_TOOL_MODE ?? "",
+    args.env?.NOLO_LOCAL_ALLOWED_TOOLS ?? "",
+    args.env?.NOLO_LOCAL_ALLOW_UNDECLARED_TOOLS ?? ""
+  ]);
+  return `${policyKey}\0${args.userId}\0${args.agentRef}\0${args.cwd}\0${systemBuiltinSkillsKey}${wakeKey ? `\0${wakeKey}` : ""}`;
 }
 function clearCliLocalRuntimePreparedAgentCache() {
   preparedAgentRuntimeCache.clear();
@@ -3216,7 +3235,7 @@ var resolveCursorTransport = async (ctx) => {
         ...deps.confirmDestructiveAction ? { confirmDestructiveAction: deps.confirmDestructiveAction } : {}
       });
       return {
-        content: result.content,
+        ...result,
         metadata: {
           ...result.metadata ?? {},
           workspaceRoot,
@@ -9597,7 +9616,7 @@ async function createLocalDockerWorkload(args) {
   const createLifecycle = args.createLifecycle ?? (async () => {
     const [{ DockerWorkloadLifecycle, createDockerBindingAuthorizer }, accounts] = await Promise.all([
       import("./workloadLifecycle-MZ2V5L43.js"),
-      import("./accountResolver-JS7QDNNL.js")
+      import("./accountResolver-YGMLY3WW.js")
     ]);
     const resolveAccount = args.resolveAccount ?? accounts.createDockerAccountResolver({
       env: args.env,
@@ -12393,7 +12412,8 @@ function createCliLocalRuntimeAdapter(deps) {
         agentRef,
         cwd: normalizeRuntimeCacheCwd(workspaceRoot),
         systemBuiltinSkills,
-        wake: hasRunWakeChannel(deps.env)
+        wake: hasRunWakeChannel(deps.env),
+        env: deps.env
       })}:${dockerRuntimeEnabled ? "docker" : instaboxRuntimeEnabled ? "instabox" : "host"}`;
       const cached = deps.pastedTextStore ? void 0 : preparedAgentRuntimeCache.get(cacheKey);
       if (cached) {
@@ -12418,17 +12438,16 @@ function createCliLocalRuntimeAdapter(deps) {
         deps.env,
         systemBuiltinSkills
       ) : [];
-      let effectiveToolNames = [...requestedToolNames, ...additionalToolNames];
       const backendExecutionToolNames = dockerRuntimeEnabled ? dockerExecutionToolNames : instaboxRuntimeEnabled ? LOCAL_INSTABOX_TOOL_NAMES : null;
-      if (backendExecutionToolNames) {
-        effectiveToolNames = effectiveToolNames.filter((toolName) => {
-          const normalized = normalizeLocalToolName(toolName);
-          if (WORKSPACE_TOOL_NAMES.includes(normalized)) {
-            return backendExecutionToolNames.includes(normalized);
-          }
-          return true;
-        });
-      }
+      const requestSurface = resolveRequestToolSurface({
+        requestedToolNames: [...requestedToolNames, ...additionalToolNames],
+        profile: { allowedToolNames: [...requestedToolNames, ...additionalToolNames] },
+        backend: backendExecutionToolNames ? {
+          toolNames: backendExecutionToolNames,
+          scopedToolNames: WORKSPACE_TOOL_NAMES
+        } : null
+      });
+      const effectiveToolNames = requestSurface.finalToolNames;
       activeAgentToolNames = buildLocalPolicyToolNames({
         agentKey: agentConfig?.key,
         toolNames: effectiveToolNames,

package/{chunk-KUA3PPFK.js → chunk-55HS2GQD.js}

@@ -1,19 +1,19 @@
 import {
   createCliLocalRuntimeAdapter,
   summarizeEndpoint
-} from "./chunk-3XUE7WJA.js";
+} from "./chunk-4TTEZGP3.js";
 import {
   t
 } from "./chunk-TDX2L4W2.js";
 import {
   clipMultilineText
-} from "./chunk-MOOQN57G.js";
+} from "./chunk-SIZPFDPU.js";
 import {
   runLocalAgentTurn
-} from "./chunk-ME7N4YHG.js";
+} from "./chunk-7YN3HYWC.js";
 import {
   applyToolSurfaceConstraints
-} from "./chunk-6J227QXV.js";
+} from "./chunk-2GRXE3YJ.js";
 import {
   resolveLocalRuntimeEnvFromPolicy
 } from "./chunk-LIQJTQRN.js";