@openma/deepseek-harness-acp 0.4.24 → 0.4.26

package/dist/bridge.js

@@ -71,6 +71,7 @@ import {
 } from "@agentclientprotocol/sdk";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
 import { ReasoningEffortId } from "@deepseek-ai/dsh-llm";
+import { PERMISSION_SETTINGS_NAMESPACE } from "@deepseek-ai/dsh-permission-presets";
 
 // src/version.ts
 import { createRequire } from "node:module";
@@ -531,7 +532,10 @@ var SessionProjection = class {
   title;
   streamedText = /* @__PURE__ */ new Set();
   streamedReasoning = /* @__PURE__ */ new Set();
+  /** One authoritative state per open ACP tool call. Block indexes only
+   * route streaming fragments to that state; they never own lifecycle. */
   toolCalls = /* @__PURE__ */ new Map();
+  toolCallBlocks = /* @__PURE__ */ new Map();
   window = emptyWindow();
   lastContextUse;
   /** Client renders `_meta.terminal_output` display terminals (Zed extension). */
@@ -550,6 +554,7 @@ var SessionProjection = class {
   /** Reset per-prompt accumulators; call when a new `session/prompt` starts. */
   beginPrompt() {
     this.window = emptyWindow();
+    this.toolCallBlocks.clear();
   }
   /** The captured ending for a specific turn, when it already ended. */
   turnEndFor(turn) {
@@ -589,6 +594,8 @@ var SessionProjection = class {
     switch (event.type) {
       case "assistant/chunk":
         return this.onChunk(data);
+      case "tool-call-chunks":
+        return this.onToolCallChunks(data);
       case "assistant/message":
         return this.onAssistantMessage(data);
       case "tool/call":
@@ -671,42 +678,31 @@ var SessionProjection = class {
   onSubagentStart(data) {
     const subagent = this.subagentMeta(data, "started");
     if (subagent === void 0) return [];
-    const runId = subagent["runId"];
-    const childSessionId = subagent["childSessionId"];
     return [{
-      sessionUpdate: "tool_call",
-      toolCallId: `subagent:${runId}`,
-      title: `Start subagent ${childSessionId}`,
-      kind: "other",
-      status: "in_progress",
-      rawInput: {
-        childSessionId,
-        provider: subagent["provider"],
-        local: subagent["local"]
-      },
-      _meta: { dsh: { subagent } }
+      sessionUpdate: "session_info_update",
+      _meta: { dsh: { event: "subagent/lifecycle", subagent } }
     }];
   }
   onSubagentEnd(data) {
     const subagent = this.subagentMeta(data, "finished");
     if (subagent === void 0) return [];
     const stopReason = asString(data["stopReason"]) ?? "error";
-    const lastAssistantMessage = data["lastAssistantMessage"];
     return [{
-      sessionUpdate: "tool_call_update",
-      toolCallId: `subagent:${String(subagent["runId"])}`,
-      status: stopReason === "completed" ? "completed" : "failed",
-      rawOutput: {
-        stopReason,
-        ...Array.isArray(lastAssistantMessage) ? { lastAssistantMessage } : {}
-      },
-      _meta: { dsh: { subagent } }
+      sessionUpdate: "session_info_update",
+      _meta: {
+        dsh: {
+          event: "subagent/lifecycle",
+          subagent: { ...subagent, stopReason }
+        }
+      }
     }];
   }
   onChunk(data) {
     const chunk = data["chunk"];
     if (chunk === null || typeof chunk === "undefined" || typeof chunk !== "object") return [];
     const c = chunk;
+    if (c["type"] === "block-end") return this.onToolCallBlockEnd(data, c);
+    if (c["type"] === "tool-call-delta") return this.onToolCallDelta(data, c);
     const text = c["text"];
     if (typeof text !== "string" || text.length === 0) return [];
     const messageId = this.stepKey(data);
@@ -720,6 +716,97 @@ var SessionProjection = class {
     }
     return [];
   }
+  toolBlockKey(data, index) {
+    return `${this.stepKey(data)}:${index}`;
+  }
+  onToolCallDelta(data, chunk) {
+    const callId = asString(chunk["id"]);
+    const index = chunk["index"];
+    const argumentsDelta = chunk["argumentsDelta"];
+    if (callId === void 0 || typeof index !== "number" || !Number.isInteger(index) || typeof argumentsDelta !== "string") {
+      return [];
+    }
+    const current = this.toolCalls.get(callId);
+    const name5 = asString(chunk["name"]) ?? current?.name;
+    if (name5 === void 0) return [];
+    const rawArguments = `${current?.arguments ?? ""}${argumentsDelta}`;
+    const state = {
+      callId,
+      name: name5,
+      arguments: rawArguments,
+      facts: this.toolCallFacts(name5, rawArguments),
+      status: current?.status ?? "pending"
+    };
+    this.toolCalls.set(callId, state);
+    this.toolCallBlocks.set(this.toolBlockKey(data, index), callId);
+    if (current === void 0) return [this.toolCallCreated(state)];
+    return [{
+      sessionUpdate: "tool_call_update",
+      toolCallId: callId,
+      title: state.facts.title,
+      name: name5,
+      kind: state.facts.kind,
+      status: "pending",
+      rawInput: state.facts.rawInput,
+      ...state.facts.locations.length > 0 ? { locations: state.facts.locations } : {}
+    }];
+  }
+  onToolCallChunks(data) {
+    const callId = asString(data["id"]);
+    const name5 = asString(data["name"]);
+    const index = data["index"];
+    const args = data["args"];
+    if (callId === void 0 || name5 === void 0 || typeof index !== "number" || !Number.isInteger(index) || !Array.isArray(args)) {
+      return [];
+    }
+    const key = this.toolBlockKey(data, index);
+    const current = this.toolCalls.get(callId);
+    const fragments = args.filter((fragment) => typeof fragment === "string").join("");
+    const rawArguments = `${current?.arguments ?? ""}${fragments}`;
+    const state = {
+      callId,
+      name: name5,
+      arguments: rawArguments,
+      facts: this.toolCallFacts(name5, rawArguments),
+      status: current?.status ?? "pending"
+    };
+    this.toolCalls.set(callId, state);
+    this.toolCallBlocks.set(key, callId);
+    return current === void 0 ? [this.toolCallCreated(state)] : [];
+  }
+  onToolCallBlockEnd(data, chunk) {
+    const index = chunk["index"];
+    if (typeof index !== "number" || !Number.isInteger(index)) return [];
+    const key = this.toolBlockKey(data, index);
+    const callId = this.toolCallBlocks.get(key);
+    this.toolCallBlocks.delete(key);
+    const block = chunk["block"];
+    const complete = block !== null && typeof block === "object" ? block : void 0;
+    const completeCallId = complete?.["type"] === "tool-call" ? asString(complete["id"]) : void 0;
+    const resolvedCallId = callId ?? completeCallId;
+    if (resolvedCallId === void 0) return [];
+    const current = this.toolCalls.get(resolvedCallId);
+    const name5 = (complete?.["type"] === "tool-call" ? asString(complete["name"]) : void 0) ?? current?.name;
+    if (name5 === void 0) return [];
+    const rawArguments = (complete?.["type"] === "tool-call" && typeof complete["arguments"] === "string" ? complete["arguments"] : void 0) ?? current?.arguments ?? "{}";
+    const state = {
+      callId: resolvedCallId,
+      name: name5,
+      arguments: rawArguments,
+      facts: this.toolCallFacts(name5, rawArguments),
+      status: current?.status ?? "pending"
+    };
+    this.toolCalls.set(resolvedCallId, state);
+    if (current === void 0) return [this.toolCallCreated(state)];
+    return [{
+      sessionUpdate: "tool_call_update",
+      toolCallId: resolvedCallId,
+      title: state.facts.title,
+      kind: state.facts.kind,
+      rawInput: state.facts.rawInput,
+      locations: state.facts.locations
+    }];
+  }
   onAssistantMessage(data) {
     const updates = [];
     const key = this.stepKey(data);
@@ -783,11 +870,7 @@ var SessionProjection = class {
     }
     return updates;
   }
-  onToolCall(data) {
-    const callId = asString(data["callId"]);
-    const name5 = asString(data["name"]) ?? "tool";
-    if (callId === void 0) return [];
-    const rawArguments = typeof data["arguments"] === "string" ? data["arguments"] : "{}";
+  toolCallFacts(name5, rawArguments) {
     let parsedArgs = {};
     try {
       parsedArgs = JSON.parse(rawArguments);
@@ -795,30 +878,52 @@ var SessionProjection = class {
       parsedArgs = { arguments: rawArguments };
     }
     const presented = this.presentCall?.(name5, parsedArgs);
-    const facts = presented !== void 0 ? factsFromPresentCall(name5, rawArguments, presented) : classifyToolCall(name5, rawArguments);
-    this.toolCalls.set(callId, facts);
+    return presented !== void 0 ? factsFromPresentCall(name5, rawArguments, presented) : classifyToolCall(name5, rawArguments);
+  }
+  toolCallCreated(state) {
+    const { callId, name: name5, facts, status } = state;
     const displayTerminal = this.terminalOutput && facts.kind === "execute";
-    return [
-      {
-        sessionUpdate: "tool_call",
-        toolCallId: callId,
-        title: facts.title,
-        name: name5,
-        kind: facts.kind,
-        status: "in_progress",
-        rawInput: facts.rawInput,
-        ...facts.locations.length > 0 ? { locations: facts.locations } : {},
-        ...displayTerminal ? {
-          content: [{ type: "terminal", terminalId: callId }],
-          _meta: {
-            terminal_info: {
-              terminal_id: callId,
-              ...this.cwd !== void 0 ? { cwd: this.cwd } : {}
-            }
+    return {
+      sessionUpdate: "tool_call",
+      toolCallId: callId,
+      title: facts.title,
+      name: name5,
+      kind: facts.kind,
+      status,
+      rawInput: facts.rawInput,
+      ...facts.locations.length > 0 ? { locations: facts.locations } : {},
+      ...displayTerminal ? {
+        content: [{ type: "terminal", terminalId: callId }],
+        _meta: {
+          terminal_info: {
+            terminal_id: callId,
+            ...this.cwd !== void 0 ? { cwd: this.cwd } : {}
           }
-        } : {}
-      }
-    ];
+        }
+      } : {}
+    };
+  }
+  onToolCall(data) {
+    const callId = asString(data["callId"]);
+    const name5 = asString(data["name"]) ?? "tool";
+    if (callId === void 0) return [];
+    const rawArguments = typeof data["arguments"] === "string" ? data["arguments"] : "{}";
+    const facts = this.toolCallFacts(name5, rawArguments);
+    const current = this.toolCalls.get(callId);
+    const state = { callId, name: name5, arguments: rawArguments, facts, status: "in_progress" };
+    this.toolCalls.set(callId, state);
+    if (current === void 0) return [this.toolCallCreated(state)];
+    if (current.status === "in_progress" && current.arguments === rawArguments && current.name === name5) return [];
+    return [{
+      sessionUpdate: "tool_call_update",
+      toolCallId: callId,
+      title: facts.title,
+      name: name5,
+      kind: facts.kind,
+      status: "in_progress",
+      rawInput: facts.rawInput,
+      locations: facts.locations
+    }];
   }
   onToolResult(data) {
     const message = data["message"];
@@ -833,7 +938,8 @@ var SessionProjection = class {
       })() : void 0
     ) ?? asString(data["callId"]);
     if (callId === void 0) return [];
-    const facts = this.toolCalls.get(callId);
+    const state = this.toolCalls.get(callId);
+    const facts = state?.facts;
     const { failed, text, diffs } = extractToolResult(data);
     const content = diffs.map((diff) => ({
       type: "diff",
@@ -844,6 +950,9 @@ var SessionProjection = class {
     const isCommand = facts?.kind === "execute";
     if (this.terminalOutput && isCommand) {
       this.toolCalls.delete(callId);
+      for (const [key, value] of this.toolCallBlocks) {
+        if (value === callId) this.toolCallBlocks.delete(key);
+      }
       return [
         ...text.length > 0 ? [
           {
@@ -874,6 +983,9 @@ ${text.replace(/\n+$/, "")}
       content.push({ type: "content", content: block });
     }
     this.toolCalls.delete(callId);
+    for (const [key, value] of this.toolCallBlocks) {
+      if (value === callId) this.toolCallBlocks.delete(key);
+    }
     return [
       {
         sessionUpdate: "tool_call_update",
@@ -895,6 +1007,8 @@ ${text.replace(/\n+$/, "")}
         this.window.error = { message: r.error?.message ?? "model turn failed" };
       }
     }
+    this.toolCallBlocks.clear();
+    this.toolCalls.clear();
     return [];
   }
 };
@@ -2094,11 +2208,16 @@ async function apply3(ctx, config = {}) {
       'no credential found for this provider: call authenticate with `_meta["api-key"].apiKey` or `_meta.gateway`, use the browser method, run `dsh-acp login`, or save a key in the dsh Web UI (Settings \u2192 Models)'
     );
   };
-  const agentOptionsFor = (model, provider) => withInteractionMode({
-    ...provider !== void 0 ? { provider } : config.provider !== void 0 ? { provider: config.provider } : {},
-    ...model !== void 0 ? { model } : {},
-    ...config.maxTokens !== void 0 ? { maxTokens: config.maxTokens } : {}
-  }, clientInteractionMode);
+  const agentOptionsFor = (model, provider) => {
+    const defaults = defaultSelection();
+    const resolvedProvider = provider ?? config.provider ?? defaults.provider;
+    const resolvedModel = model ?? config.model ?? defaults.model;
+    return withInteractionMode({
+      ...resolvedProvider !== void 0 ? { provider: resolvedProvider } : {},
+      ...resolvedModel !== void 0 ? { model: resolvedModel } : {},
+      ...config.maxTokens !== void 0 ? { maxTokens: config.maxTokens } : {}
+    }, clientInteractionMode);
+  };
   const ownedRecord = (agent) => {
     const record = sessions.get(String(agent.session.id));
     return record?.agent === agent ? record : void 0;
@@ -2291,8 +2410,8 @@ async function apply3(ctx, config = {}) {
       return {
         currentModeId: record.modeId,
         availableModes: permission.names.map((name5) => {
-          const spec = permission.resolve(name5);
-          return { id: name5, name: spec.name, description: spec.description };
+          const presentation = permissionPresentation(name5);
+          return { id: name5, ...presentation };
         })
       };
     }
@@ -2368,6 +2487,25 @@ async function apply3(ctx, config = {}) {
     record.approvals = policy;
   };
   const permissionService = () => permissionPresets;
+  const permissionPresentation = (id) => {
+    const spec = permissionService().resolve(id);
+    const stock = MODE_LABELS[id];
+    const fallbackName = stock?.name ?? id.split("-").map((part) => part.length > 0 ? `${part[0].toUpperCase()}${part.slice(1)}` : part).join(" ");
+    return {
+      name: typeof spec.name === "string" && spec.name.trim().length > 0 ? spec.name : fallbackName,
+      description: typeof spec.description === "string" ? spec.description : stock?.description ?? ""
+    };
+  };
+  const saveDefaultPermission = async (modeId) => {
+    if (!permissionService().names.includes(modeId)) return;
+    try {
+      await ctx.get("settings")?.update(PERMISSION_SETTINGS_NAMESPACE, {
+        defaultPreset: modeId
+      });
+    } catch (error) {
+      logWarn(`permission switch applied to the session but was not saved as the default: ${String(error)}`);
+    }
+  };
   const applyMode = (record, sessionId, modeId) => {
     const permission = permissionService();
     if (permission.names.includes(modeId)) {
@@ -2418,8 +2556,8 @@ async function apply3(ctx, config = {}) {
     {
       const permission = permissionService();
       const levels = permission.names.length > 0 ? permission.names.map((name5) => {
-        const spec = permission.resolve(name5);
-        return { value: name5, name: spec.name, description: spec.description };
+        const presentation = permissionPresentation(name5);
+        return { value: name5, ...presentation };
       }) : SANDBOX_MODES2.map((mode) => {
         const label = MODE_LABELS[mode] ?? { name: mode, description: "" };
         return { value: mode, name: label.name, description: label.description };
@@ -3081,6 +3219,7 @@ async function apply3(ctx, config = {}) {
       async setSessionMode(params) {
         const record = await requireOrRestoreSession(params.sessionId);
         applyMode(record, params.sessionId, params.modeId);
+        await saveDefaultPermission(params.modeId);
         notify(params.sessionId, {
           sessionUpdate: "config_option_update",
           configOptions: await configOptions(record)
@@ -3094,6 +3233,7 @@ async function apply3(ctx, config = {}) {
         switch (params.configId) {
           case "mode": {
             applyMode(record, params.sessionId, value);
+            await saveDefaultPermission(value);
             break;
           }
           case "agent":

package/dist/index.js

@@ -295,11 +295,8 @@ async function bootAcpProfile(host, overrides) {
   const appBoot = await import(pathToFileURL(req.resolve("@deepseek-ai/dsh-app-boot")).href);
   const homePaths = await import(pathToFileURL(req.resolve("@deepseek-ai/dsh-home-paths")).href);
   const home = homePaths.resolveDshHome();
-  let bundlePatches;
-  let profilePatches = [];
-  let profilePatchPath;
-  let rootConfigPath = join3(ownRoot(), "profile-root.cordis.yml");
-  let bareModuleBaseUrl = pathToFileURL(dshDir + sep2).href;
+  const rootConfigPath = join3(ownRoot(), "profile-root.cordis.yml");
+  const bareModuleBaseUrl = pathToFileURL(dshDir + sep2).href;
   const distBridge = join3(ownRoot(), "dist", "bridge.js");
   const bridgeEntry = import.meta.url.endsWith(".ts") || !existsSync3(distBridge) ? join3(ownRoot(), "src", "bundle.ts") : distBridge;
   const distServer = join3(ownRoot(), "dist", "server.js");
@@ -308,26 +305,13 @@ async function bootAcpProfile(host, overrides) {
   const pluginEntry = import.meta.url.endsWith(".ts") || !existsSync3(distPlugin) ? join3(ownRoot(), "src", "plugin.ts") : distPlugin;
   const distStdio = join3(ownRoot(), "dist", "stdio.js");
   const stdioEntry = import.meta.url.endsWith(".ts") || !existsSync3(distStdio) ? join3(ownRoot(), "src", "stdio.ts") : distStdio;
-  const realProfileDir = join3(home, "profiles", "acp");
-  if (existsSync3(join3(realProfileDir, "package.json"))) {
-    appBoot.healProfilesModuleFallback(dshPkgPath);
-    const profile = appBoot.loadProfile(BIN, "acp", dshPkgPath);
-    bundlePatches = profile.layers.flatMap((layer) => layer.patches);
-    profilePatches = profile.patches;
-    profilePatchPath = join3(profile.dir, "cordis.patch.yml");
-    const realRoot = join3(profile.dir, "cordis.yml");
-    if (existsSync3(realRoot)) rootConfigPath = realRoot;
-    bareModuleBaseUrl = void 0;
-    logDebug(`profile: real (${profile.dir})`);
-  } else {
-    const basePatch = bundlePatchPath(req.resolve("@deepseek-ai/dsh-base/package.json"));
-    const ownPatch = bundlePatchPath(join3(ownRoot(), "package.json"));
-    bundlePatches = [
-      ...appBoot.loadOverlayPatches(BIN, basePatch),
-      ...appBoot.loadOverlayPatches(BIN, ownPatch)
-    ];
-    logDebug(`profile: virtual (dsh-base + ${ownRoot()})`);
-  }
+  const basePatch = bundlePatchPath(req.resolve("@deepseek-ai/dsh-base/package.json"));
+  const ownPatch = bundlePatchPath(join3(ownRoot(), "package.json"));
+  const bundlePatches = [
+    ...appBoot.loadOverlayPatches(BIN, basePatch),
+    ...appBoot.loadOverlayPatches(BIN, ownPatch)
+  ];
+  logDebug(`profile: standalone (dsh-base + ${ownRoot()})`);
   for (const bundle of overrides?.bundles ?? []) {
     bundlePatches.push(...loadBundleLayer(appBoot, bundle));
     logDebug(`profile: added bundle ${bundle}`);
@@ -343,7 +327,7 @@ async function bootAcpProfile(host, overrides) {
   const homePatchPath = join3(home, "cordis.patch.yml");
   const homePatches = appBoot.loadOptionalPatches(BIN, homePatchPath) ?? [];
   const rows = /* @__PURE__ */ new Map();
-  for (const row of appBoot.composeEntries([bundlePatches, profilePatches, homePatches])) {
+  for (const row of appBoot.composeEntries([bundlePatches, homePatches])) {
     if (typeof row.id === "string") rows.set(row.id, row);
   }
   const overlays = [];
@@ -376,7 +360,7 @@ async function bootAcpProfile(host, overrides) {
       overlays.push({ id: configRowId, config: { ...configRow.config ?? {}, ...patch } });
     }
   }
-  const allPatches = [...bundlePatches, ...profilePatches, ...homePatches, ...overlays];
+  const allPatches = [...bundlePatches, ...homePatches, ...overlays];
   const launchEnvironment = appBoot.loadLayeredEnv("dsh");
   const launchEnvKey = (await import(pathToFileURL(req.resolve("@deepseek-ai/dsh-launch-environment")).href)).DSH_LAUNCH_ENVIRONMENT_KEY;
   const ctx = await appBoot.boot(
@@ -396,9 +380,6 @@ async function bootAcpProfile(host, overrides) {
     });
     throw error;
   }
-  if (profilePatchPath !== void 0) {
-    logDebug(`user patch layers are read at boot; edit ${profilePatchPath} and restart to apply`);
-  }
   return ctx;
 }
 

package/dist/plugin.js

@@ -73,6 +73,7 @@ import {
 } from "@agentclientprotocol/sdk";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
 import { ReasoningEffortId } from "@deepseek-ai/dsh-llm";
+import { PERMISSION_SETTINGS_NAMESPACE } from "@deepseek-ai/dsh-permission-presets";
 
 // src/version.ts
 import { createRequire } from "node:module";
@@ -533,7 +534,10 @@ var SessionProjection = class {
   title;
   streamedText = /* @__PURE__ */ new Set();
   streamedReasoning = /* @__PURE__ */ new Set();
+  /** One authoritative state per open ACP tool call. Block indexes only
+   * route streaming fragments to that state; they never own lifecycle. */
   toolCalls = /* @__PURE__ */ new Map();
+  toolCallBlocks = /* @__PURE__ */ new Map();
   window = emptyWindow();
   lastContextUse;
   /** Client renders `_meta.terminal_output` display terminals (Zed extension). */
@@ -552,6 +556,7 @@ var SessionProjection = class {
   /** Reset per-prompt accumulators; call when a new `session/prompt` starts. */
   beginPrompt() {
     this.window = emptyWindow();
+    this.toolCallBlocks.clear();
   }
   /** The captured ending for a specific turn, when it already ended. */
   turnEndFor(turn) {
@@ -591,6 +596,8 @@ var SessionProjection = class {
     switch (event.type) {
       case "assistant/chunk":
         return this.onChunk(data);
+      case "tool-call-chunks":
+        return this.onToolCallChunks(data);
       case "assistant/message":
         return this.onAssistantMessage(data);
       case "tool/call":
@@ -673,42 +680,31 @@ var SessionProjection = class {
   onSubagentStart(data) {
     const subagent = this.subagentMeta(data, "started");
     if (subagent === void 0) return [];
-    const runId = subagent["runId"];
-    const childSessionId = subagent["childSessionId"];
     return [{
-      sessionUpdate: "tool_call",
-      toolCallId: `subagent:${runId}`,
-      title: `Start subagent ${childSessionId}`,
-      kind: "other",
-      status: "in_progress",
-      rawInput: {
-        childSessionId,
-        provider: subagent["provider"],
-        local: subagent["local"]
-      },
-      _meta: { dsh: { subagent } }
+      sessionUpdate: "session_info_update",
+      _meta: { dsh: { event: "subagent/lifecycle", subagent } }
     }];
   }
   onSubagentEnd(data) {
     const subagent = this.subagentMeta(data, "finished");
     if (subagent === void 0) return [];
     const stopReason = asString(data["stopReason"]) ?? "error";
-    const lastAssistantMessage = data["lastAssistantMessage"];
     return [{
-      sessionUpdate: "tool_call_update",
-      toolCallId: `subagent:${String(subagent["runId"])}`,
-      status: stopReason === "completed" ? "completed" : "failed",
-      rawOutput: {
-        stopReason,
-        ...Array.isArray(lastAssistantMessage) ? { lastAssistantMessage } : {}
-      },
-      _meta: { dsh: { subagent } }
+      sessionUpdate: "session_info_update",
+      _meta: {
+        dsh: {
+          event: "subagent/lifecycle",
+          subagent: { ...subagent, stopReason }
+        }
+      }
     }];
   }
   onChunk(data) {
     const chunk = data["chunk"];
     if (chunk === null || typeof chunk === "undefined" || typeof chunk !== "object") return [];
     const c = chunk;
+    if (c["type"] === "block-end") return this.onToolCallBlockEnd(data, c);
+    if (c["type"] === "tool-call-delta") return this.onToolCallDelta(data, c);
     const text = c["text"];
     if (typeof text !== "string" || text.length === 0) return [];
     const messageId = this.stepKey(data);
@@ -722,6 +718,97 @@ var SessionProjection = class {
     }
     return [];
   }
+  toolBlockKey(data, index) {
+    return `${this.stepKey(data)}:${index}`;
+  }
+  onToolCallDelta(data, chunk) {
+    const callId = asString(chunk["id"]);
+    const index = chunk["index"];
+    const argumentsDelta = chunk["argumentsDelta"];
+    if (callId === void 0 || typeof index !== "number" || !Number.isInteger(index) || typeof argumentsDelta !== "string") {
+      return [];
+    }
+    const current = this.toolCalls.get(callId);
+    const name6 = asString(chunk["name"]) ?? current?.name;
+    if (name6 === void 0) return [];
+    const rawArguments = `${current?.arguments ?? ""}${argumentsDelta}`;
+    const state = {
+      callId,
+      name: name6,
+      arguments: rawArguments,
+      facts: this.toolCallFacts(name6, rawArguments),
+      status: current?.status ?? "pending"
+    };
+    this.toolCalls.set(callId, state);
+    this.toolCallBlocks.set(this.toolBlockKey(data, index), callId);
+    if (current === void 0) return [this.toolCallCreated(state)];
+    return [{
+      sessionUpdate: "tool_call_update",
+      toolCallId: callId,
+      title: state.facts.title,
+      name: name6,
+      kind: state.facts.kind,
+      status: "pending",
+      rawInput: state.facts.rawInput,
+      ...state.facts.locations.length > 0 ? { locations: state.facts.locations } : {}
+    }];
+  }
+  onToolCallChunks(data) {
+    const callId = asString(data["id"]);
+    const name6 = asString(data["name"]);
+    const index = data["index"];
+    const args = data["args"];
+    if (callId === void 0 || name6 === void 0 || typeof index !== "number" || !Number.isInteger(index) || !Array.isArray(args)) {
+      return [];
+    }
+    const key = this.toolBlockKey(data, index);
+    const current = this.toolCalls.get(callId);
+    const fragments = args.filter((fragment) => typeof fragment === "string").join("");
+    const rawArguments = `${current?.arguments ?? ""}${fragments}`;
+    const state = {
+      callId,
+      name: name6,
+      arguments: rawArguments,
+      facts: this.toolCallFacts(name6, rawArguments),
+      status: current?.status ?? "pending"
+    };
+    this.toolCalls.set(callId, state);
+    this.toolCallBlocks.set(key, callId);
+    return current === void 0 ? [this.toolCallCreated(state)] : [];
+  }
+  onToolCallBlockEnd(data, chunk) {
+    const index = chunk["index"];
+    if (typeof index !== "number" || !Number.isInteger(index)) return [];
+    const key = this.toolBlockKey(data, index);
+    const callId = this.toolCallBlocks.get(key);
+    this.toolCallBlocks.delete(key);
+    const block = chunk["block"];
+    const complete = block !== null && typeof block === "object" ? block : void 0;
+    const completeCallId = complete?.["type"] === "tool-call" ? asString(complete["id"]) : void 0;
+    const resolvedCallId = callId ?? completeCallId;
+    if (resolvedCallId === void 0) return [];
+    const current = this.toolCalls.get(resolvedCallId);
+    const name6 = (complete?.["type"] === "tool-call" ? asString(complete["name"]) : void 0) ?? current?.name;
+    if (name6 === void 0) return [];
+    const rawArguments = (complete?.["type"] === "tool-call" && typeof complete["arguments"] === "string" ? complete["arguments"] : void 0) ?? current?.arguments ?? "{}";
+    const state = {
+      callId: resolvedCallId,
+      name: name6,
+      arguments: rawArguments,
+      facts: this.toolCallFacts(name6, rawArguments),
+      status: current?.status ?? "pending"
+    };
+    this.toolCalls.set(resolvedCallId, state);
+    if (current === void 0) return [this.toolCallCreated(state)];
+    return [{
+      sessionUpdate: "tool_call_update",
+      toolCallId: resolvedCallId,
+      title: state.facts.title,
+      kind: state.facts.kind,
+      rawInput: state.facts.rawInput,
+      locations: state.facts.locations
+    }];
+  }
   onAssistantMessage(data) {
     const updates = [];
     const key = this.stepKey(data);
@@ -785,11 +872,7 @@ var SessionProjection = class {
     }
     return updates;
   }
-  onToolCall(data) {
-    const callId = asString(data["callId"]);
-    const name6 = asString(data["name"]) ?? "tool";
-    if (callId === void 0) return [];
-    const rawArguments = typeof data["arguments"] === "string" ? data["arguments"] : "{}";
+  toolCallFacts(name6, rawArguments) {
     let parsedArgs = {};
     try {
       parsedArgs = JSON.parse(rawArguments);
@@ -797,30 +880,52 @@ var SessionProjection = class {
       parsedArgs = { arguments: rawArguments };
     }
     const presented = this.presentCall?.(name6, parsedArgs);
-    const facts = presented !== void 0 ? factsFromPresentCall(name6, rawArguments, presented) : classifyToolCall(name6, rawArguments);
-    this.toolCalls.set(callId, facts);
+    return presented !== void 0 ? factsFromPresentCall(name6, rawArguments, presented) : classifyToolCall(name6, rawArguments);
+  }
+  toolCallCreated(state) {
+    const { callId, name: name6, facts, status } = state;
     const displayTerminal = this.terminalOutput && facts.kind === "execute";
-    return [
-      {
-        sessionUpdate: "tool_call",
-        toolCallId: callId,
-        title: facts.title,
-        name: name6,
-        kind: facts.kind,
-        status: "in_progress",
-        rawInput: facts.rawInput,
-        ...facts.locations.length > 0 ? { locations: facts.locations } : {},
-        ...displayTerminal ? {
-          content: [{ type: "terminal", terminalId: callId }],
-          _meta: {
-            terminal_info: {
-              terminal_id: callId,
-              ...this.cwd !== void 0 ? { cwd: this.cwd } : {}
-            }
+    return {
+      sessionUpdate: "tool_call",
+      toolCallId: callId,
+      title: facts.title,
+      name: name6,
+      kind: facts.kind,
+      status,
+      rawInput: facts.rawInput,
+      ...facts.locations.length > 0 ? { locations: facts.locations } : {},
+      ...displayTerminal ? {
+        content: [{ type: "terminal", terminalId: callId }],
+        _meta: {
+          terminal_info: {
+            terminal_id: callId,
+            ...this.cwd !== void 0 ? { cwd: this.cwd } : {}
           }
-        } : {}
-      }
-    ];
+        }
+      } : {}
+    };
+  }
+  onToolCall(data) {
+    const callId = asString(data["callId"]);
+    const name6 = asString(data["name"]) ?? "tool";
+    if (callId === void 0) return [];
+    const rawArguments = typeof data["arguments"] === "string" ? data["arguments"] : "{}";
+    const facts = this.toolCallFacts(name6, rawArguments);
+    const current = this.toolCalls.get(callId);
+    const state = { callId, name: name6, arguments: rawArguments, facts, status: "in_progress" };
+    this.toolCalls.set(callId, state);
+    if (current === void 0) return [this.toolCallCreated(state)];
+    if (current.status === "in_progress" && current.arguments === rawArguments && current.name === name6) return [];
+    return [{
+      sessionUpdate: "tool_call_update",
+      toolCallId: callId,
+      title: facts.title,
+      name: name6,
+      kind: facts.kind,
+      status: "in_progress",
+      rawInput: facts.rawInput,
+      locations: facts.locations
+    }];
   }
   onToolResult(data) {
     const message = data["message"];
@@ -835,7 +940,8 @@ var SessionProjection = class {
       })() : void 0
     ) ?? asString(data["callId"]);
     if (callId === void 0) return [];
-    const facts = this.toolCalls.get(callId);
+    const state = this.toolCalls.get(callId);
+    const facts = state?.facts;
     const { failed, text, diffs } = extractToolResult(data);
     const content = diffs.map((diff) => ({
       type: "diff",
@@ -846,6 +952,9 @@ var SessionProjection = class {
     const isCommand = facts?.kind === "execute";
     if (this.terminalOutput && isCommand) {
       this.toolCalls.delete(callId);
+      for (const [key, value] of this.toolCallBlocks) {
+        if (value === callId) this.toolCallBlocks.delete(key);
+      }
       return [
         ...text.length > 0 ? [
           {
@@ -876,6 +985,9 @@ ${text.replace(/\n+$/, "")}
       content.push({ type: "content", content: block });
     }
     this.toolCalls.delete(callId);
+    for (const [key, value] of this.toolCallBlocks) {
+      if (value === callId) this.toolCallBlocks.delete(key);
+    }
     return [
       {
         sessionUpdate: "tool_call_update",
@@ -897,6 +1009,8 @@ ${text.replace(/\n+$/, "")}
         this.window.error = { message: r.error?.message ?? "model turn failed" };
       }
     }
+    this.toolCallBlocks.clear();
+    this.toolCalls.clear();
     return [];
   }
 };
@@ -2096,11 +2210,16 @@ async function apply3(ctx, config = {}) {
       'no credential found for this provider: call authenticate with `_meta["api-key"].apiKey` or `_meta.gateway`, use the browser method, run `dsh-acp login`, or save a key in the dsh Web UI (Settings \u2192 Models)'
     );
   };
-  const agentOptionsFor = (model, provider) => withInteractionMode({
-    ...provider !== void 0 ? { provider } : config.provider !== void 0 ? { provider: config.provider } : {},
-    ...model !== void 0 ? { model } : {},
-    ...config.maxTokens !== void 0 ? { maxTokens: config.maxTokens } : {}
-  }, clientInteractionMode);
+  const agentOptionsFor = (model, provider) => {
+    const defaults = defaultSelection();
+    const resolvedProvider = provider ?? config.provider ?? defaults.provider;
+    const resolvedModel = model ?? config.model ?? defaults.model;
+    return withInteractionMode({
+      ...resolvedProvider !== void 0 ? { provider: resolvedProvider } : {},
+      ...resolvedModel !== void 0 ? { model: resolvedModel } : {},
+      ...config.maxTokens !== void 0 ? { maxTokens: config.maxTokens } : {}
+    }, clientInteractionMode);
+  };
   const ownedRecord = (agent) => {
     const record = sessions.get(String(agent.session.id));
     return record?.agent === agent ? record : void 0;
@@ -2293,8 +2412,8 @@ async function apply3(ctx, config = {}) {
       return {
         currentModeId: record.modeId,
         availableModes: permission.names.map((name6) => {
-          const spec = permission.resolve(name6);
-          return { id: name6, name: spec.name, description: spec.description };
+          const presentation = permissionPresentation(name6);
+          return { id: name6, ...presentation };
         })
       };
     }
@@ -2370,6 +2489,25 @@ async function apply3(ctx, config = {}) {
     record.approvals = policy;
   };
   const permissionService = () => permissionPresets;
+  const permissionPresentation = (id) => {
+    const spec = permissionService().resolve(id);
+    const stock = MODE_LABELS[id];
+    const fallbackName = stock?.name ?? id.split("-").map((part) => part.length > 0 ? `${part[0].toUpperCase()}${part.slice(1)}` : part).join(" ");
+    return {
+      name: typeof spec.name === "string" && spec.name.trim().length > 0 ? spec.name : fallbackName,
+      description: typeof spec.description === "string" ? spec.description : stock?.description ?? ""
+    };
+  };
+  const saveDefaultPermission = async (modeId) => {
+    if (!permissionService().names.includes(modeId)) return;
+    try {
+      await ctx.get("settings")?.update(PERMISSION_SETTINGS_NAMESPACE, {
+        defaultPreset: modeId
+      });
+    } catch (error) {
+      logWarn(`permission switch applied to the session but was not saved as the default: ${String(error)}`);
+    }
+  };
   const applyMode = (record, sessionId, modeId) => {
     const permission = permissionService();
     if (permission.names.includes(modeId)) {
@@ -2420,8 +2558,8 @@ async function apply3(ctx, config = {}) {
     {
       const permission = permissionService();
       const levels = permission.names.length > 0 ? permission.names.map((name6) => {
-        const spec = permission.resolve(name6);
-        return { value: name6, name: spec.name, description: spec.description };
+        const presentation = permissionPresentation(name6);
+        return { value: name6, ...presentation };
       }) : SANDBOX_MODES2.map((mode) => {
         const label = MODE_LABELS[mode] ?? { name: mode, description: "" };
         return { value: mode, name: label.name, description: label.description };
@@ -3083,6 +3221,7 @@ async function apply3(ctx, config = {}) {
       async setSessionMode(params) {
         const record = await requireOrRestoreSession(params.sessionId);
         applyMode(record, params.sessionId, params.modeId);
+        await saveDefaultPermission(params.modeId);
         notify(params.sessionId, {
           sessionUpdate: "config_option_update",
           configOptions: await configOptions(record)
@@ -3096,6 +3235,7 @@ async function apply3(ctx, config = {}) {
         switch (params.configId) {
           case "mode": {
             applyMode(record, params.sessionId, value);
+            await saveDefaultPermission(value);
             break;
           }
           case "agent":

package/dist/server.js

@@ -67,6 +67,7 @@ import {
 } from "@agentclientprotocol/sdk";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
 import { ReasoningEffortId } from "@deepseek-ai/dsh-llm";
+import { PERMISSION_SETTINGS_NAMESPACE } from "@deepseek-ai/dsh-permission-presets";
 
 // src/version.ts
 import { createRequire } from "node:module";
@@ -527,7 +528,10 @@ var SessionProjection = class {
   title;
   streamedText = /* @__PURE__ */ new Set();
   streamedReasoning = /* @__PURE__ */ new Set();
+  /** One authoritative state per open ACP tool call. Block indexes only
+   * route streaming fragments to that state; they never own lifecycle. */
   toolCalls = /* @__PURE__ */ new Map();
+  toolCallBlocks = /* @__PURE__ */ new Map();
   window = emptyWindow();
   lastContextUse;
   /** Client renders `_meta.terminal_output` display terminals (Zed extension). */
@@ -546,6 +550,7 @@ var SessionProjection = class {
   /** Reset per-prompt accumulators; call when a new `session/prompt` starts. */
   beginPrompt() {
     this.window = emptyWindow();
+    this.toolCallBlocks.clear();
   }
   /** The captured ending for a specific turn, when it already ended. */
   turnEndFor(turn) {
@@ -585,6 +590,8 @@ var SessionProjection = class {
     switch (event.type) {
       case "assistant/chunk":
         return this.onChunk(data);
+      case "tool-call-chunks":
+        return this.onToolCallChunks(data);
       case "assistant/message":
         return this.onAssistantMessage(data);
       case "tool/call":
@@ -667,42 +674,31 @@ var SessionProjection = class {
   onSubagentStart(data) {
     const subagent = this.subagentMeta(data, "started");
     if (subagent === void 0) return [];
-    const runId = subagent["runId"];
-    const childSessionId = subagent["childSessionId"];
     return [{
-      sessionUpdate: "tool_call",
-      toolCallId: `subagent:${runId}`,
-      title: `Start subagent ${childSessionId}`,
-      kind: "other",
-      status: "in_progress",
-      rawInput: {
-        childSessionId,
-        provider: subagent["provider"],
-        local: subagent["local"]
-      },
-      _meta: { dsh: { subagent } }
+      sessionUpdate: "session_info_update",
+      _meta: { dsh: { event: "subagent/lifecycle", subagent } }
     }];
   }
   onSubagentEnd(data) {
     const subagent = this.subagentMeta(data, "finished");
     if (subagent === void 0) return [];
     const stopReason = asString(data["stopReason"]) ?? "error";
-    const lastAssistantMessage = data["lastAssistantMessage"];
     return [{
-      sessionUpdate: "tool_call_update",
-      toolCallId: `subagent:${String(subagent["runId"])}`,
-      status: stopReason === "completed" ? "completed" : "failed",
-      rawOutput: {
-        stopReason,
-        ...Array.isArray(lastAssistantMessage) ? { lastAssistantMessage } : {}
-      },
-      _meta: { dsh: { subagent } }
+      sessionUpdate: "session_info_update",
+      _meta: {
+        dsh: {
+          event: "subagent/lifecycle",
+          subagent: { ...subagent, stopReason }
+        }
+      }
     }];
   }
   onChunk(data) {
     const chunk = data["chunk"];
     if (chunk === null || typeof chunk === "undefined" || typeof chunk !== "object") return [];
     const c = chunk;
+    if (c["type"] === "block-end") return this.onToolCallBlockEnd(data, c);
+    if (c["type"] === "tool-call-delta") return this.onToolCallDelta(data, c);
     const text = c["text"];
     if (typeof text !== "string" || text.length === 0) return [];
     const messageId = this.stepKey(data);
@@ -716,6 +712,97 @@ var SessionProjection = class {
     }
     return [];
   }
+  toolBlockKey(data, index) {
+    return `${this.stepKey(data)}:${index}`;
+  }
+  onToolCallDelta(data, chunk) {
+    const callId = asString(chunk["id"]);
+    const index = chunk["index"];
+    const argumentsDelta = chunk["argumentsDelta"];
+    if (callId === void 0 || typeof index !== "number" || !Number.isInteger(index) || typeof argumentsDelta !== "string") {
+      return [];
+    }
+    const current = this.toolCalls.get(callId);
+    const name5 = asString(chunk["name"]) ?? current?.name;
+    if (name5 === void 0) return [];
+    const rawArguments = `${current?.arguments ?? ""}${argumentsDelta}`;
+    const state = {
+      callId,
+      name: name5,
+      arguments: rawArguments,
+      facts: this.toolCallFacts(name5, rawArguments),
+      status: current?.status ?? "pending"
+    };
+    this.toolCalls.set(callId, state);
+    this.toolCallBlocks.set(this.toolBlockKey(data, index), callId);
+    if (current === void 0) return [this.toolCallCreated(state)];
+    return [{
+      sessionUpdate: "tool_call_update",
+      toolCallId: callId,
+      title: state.facts.title,
+      name: name5,
+      kind: state.facts.kind,
+      status: "pending",
+      rawInput: state.facts.rawInput,
+      ...state.facts.locations.length > 0 ? { locations: state.facts.locations } : {}
+    }];
+  }
+  onToolCallChunks(data) {
+    const callId = asString(data["id"]);
+    const name5 = asString(data["name"]);
+    const index = data["index"];
+    const args = data["args"];
+    if (callId === void 0 || name5 === void 0 || typeof index !== "number" || !Number.isInteger(index) || !Array.isArray(args)) {
+      return [];
+    }
+    const key = this.toolBlockKey(data, index);
+    const current = this.toolCalls.get(callId);
+    const fragments = args.filter((fragment) => typeof fragment === "string").join("");
+    const rawArguments = `${current?.arguments ?? ""}${fragments}`;
+    const state = {
+      callId,
+      name: name5,
+      arguments: rawArguments,
+      facts: this.toolCallFacts(name5, rawArguments),
+      status: current?.status ?? "pending"
+    };
+    this.toolCalls.set(callId, state);
+    this.toolCallBlocks.set(key, callId);
+    return current === void 0 ? [this.toolCallCreated(state)] : [];
+  }
+  onToolCallBlockEnd(data, chunk) {
+    const index = chunk["index"];
+    if (typeof index !== "number" || !Number.isInteger(index)) return [];
+    const key = this.toolBlockKey(data, index);
+    const callId = this.toolCallBlocks.get(key);
+    this.toolCallBlocks.delete(key);
+    const block = chunk["block"];
+    const complete = block !== null && typeof block === "object" ? block : void 0;
+    const completeCallId = complete?.["type"] === "tool-call" ? asString(complete["id"]) : void 0;
+    const resolvedCallId = callId ?? completeCallId;
+    if (resolvedCallId === void 0) return [];
+    const current = this.toolCalls.get(resolvedCallId);
+    const name5 = (complete?.["type"] === "tool-call" ? asString(complete["name"]) : void 0) ?? current?.name;
+    if (name5 === void 0) return [];
+    const rawArguments = (complete?.["type"] === "tool-call" && typeof complete["arguments"] === "string" ? complete["arguments"] : void 0) ?? current?.arguments ?? "{}";
+    const state = {
+      callId: resolvedCallId,
+      name: name5,
+      arguments: rawArguments,
+      facts: this.toolCallFacts(name5, rawArguments),
+      status: current?.status ?? "pending"
+    };
+    this.toolCalls.set(resolvedCallId, state);
+    if (current === void 0) return [this.toolCallCreated(state)];
+    return [{
+      sessionUpdate: "tool_call_update",
+      toolCallId: resolvedCallId,
+      title: state.facts.title,
+      kind: state.facts.kind,
+      rawInput: state.facts.rawInput,
+      locations: state.facts.locations
+    }];
+  }
   onAssistantMessage(data) {
     const updates = [];
     const key = this.stepKey(data);
@@ -779,11 +866,7 @@ var SessionProjection = class {
     }
     return updates;
   }
-  onToolCall(data) {
-    const callId = asString(data["callId"]);
-    const name5 = asString(data["name"]) ?? "tool";
-    if (callId === void 0) return [];
-    const rawArguments = typeof data["arguments"] === "string" ? data["arguments"] : "{}";
+  toolCallFacts(name5, rawArguments) {
     let parsedArgs = {};
     try {
       parsedArgs = JSON.parse(rawArguments);
@@ -791,30 +874,52 @@ var SessionProjection = class {
       parsedArgs = { arguments: rawArguments };
     }
     const presented = this.presentCall?.(name5, parsedArgs);
-    const facts = presented !== void 0 ? factsFromPresentCall(name5, rawArguments, presented) : classifyToolCall(name5, rawArguments);
-    this.toolCalls.set(callId, facts);
+    return presented !== void 0 ? factsFromPresentCall(name5, rawArguments, presented) : classifyToolCall(name5, rawArguments);
+  }
+  toolCallCreated(state) {
+    const { callId, name: name5, facts, status } = state;
     const displayTerminal = this.terminalOutput && facts.kind === "execute";
-    return [
-      {
-        sessionUpdate: "tool_call",
-        toolCallId: callId,
-        title: facts.title,
-        name: name5,
-        kind: facts.kind,
-        status: "in_progress",
-        rawInput: facts.rawInput,
-        ...facts.locations.length > 0 ? { locations: facts.locations } : {},
-        ...displayTerminal ? {
-          content: [{ type: "terminal", terminalId: callId }],
-          _meta: {
-            terminal_info: {
-              terminal_id: callId,
-              ...this.cwd !== void 0 ? { cwd: this.cwd } : {}
-            }
+    return {
+      sessionUpdate: "tool_call",
+      toolCallId: callId,
+      title: facts.title,
+      name: name5,
+      kind: facts.kind,
+      status,
+      rawInput: facts.rawInput,
+      ...facts.locations.length > 0 ? { locations: facts.locations } : {},
+      ...displayTerminal ? {
+        content: [{ type: "terminal", terminalId: callId }],
+        _meta: {
+          terminal_info: {
+            terminal_id: callId,
+            ...this.cwd !== void 0 ? { cwd: this.cwd } : {}
           }
-        } : {}
-      }
-    ];
+        }
+      } : {}
+    };
+  }
+  onToolCall(data) {
+    const callId = asString(data["callId"]);
+    const name5 = asString(data["name"]) ?? "tool";
+    if (callId === void 0) return [];
+    const rawArguments = typeof data["arguments"] === "string" ? data["arguments"] : "{}";
+    const facts = this.toolCallFacts(name5, rawArguments);
+    const current = this.toolCalls.get(callId);
+    const state = { callId, name: name5, arguments: rawArguments, facts, status: "in_progress" };
+    this.toolCalls.set(callId, state);
+    if (current === void 0) return [this.toolCallCreated(state)];
+    if (current.status === "in_progress" && current.arguments === rawArguments && current.name === name5) return [];
+    return [{
+      sessionUpdate: "tool_call_update",
+      toolCallId: callId,
+      title: facts.title,
+      name: name5,
+      kind: facts.kind,
+      status: "in_progress",
+      rawInput: facts.rawInput,
+      locations: facts.locations
+    }];
   }
   onToolResult(data) {
     const message = data["message"];
@@ -829,7 +934,8 @@ var SessionProjection = class {
       })() : void 0
     ) ?? asString(data["callId"]);
     if (callId === void 0) return [];
-    const facts = this.toolCalls.get(callId);
+    const state = this.toolCalls.get(callId);
+    const facts = state?.facts;
     const { failed, text, diffs } = extractToolResult(data);
     const content = diffs.map((diff) => ({
       type: "diff",
@@ -840,6 +946,9 @@ var SessionProjection = class {
     const isCommand = facts?.kind === "execute";
     if (this.terminalOutput && isCommand) {
       this.toolCalls.delete(callId);
+      for (const [key, value] of this.toolCallBlocks) {
+        if (value === callId) this.toolCallBlocks.delete(key);
+      }
       return [
         ...text.length > 0 ? [
           {
@@ -870,6 +979,9 @@ ${text.replace(/\n+$/, "")}
       content.push({ type: "content", content: block });
     }
     this.toolCalls.delete(callId);
+    for (const [key, value] of this.toolCallBlocks) {
+      if (value === callId) this.toolCallBlocks.delete(key);
+    }
     return [
       {
         sessionUpdate: "tool_call_update",
@@ -891,6 +1003,8 @@ ${text.replace(/\n+$/, "")}
         this.window.error = { message: r.error?.message ?? "model turn failed" };
       }
     }
+    this.toolCallBlocks.clear();
+    this.toolCalls.clear();
     return [];
   }
 };
@@ -2090,11 +2204,16 @@ async function apply3(ctx, config = {}) {
       'no credential found for this provider: call authenticate with `_meta["api-key"].apiKey` or `_meta.gateway`, use the browser method, run `dsh-acp login`, or save a key in the dsh Web UI (Settings \u2192 Models)'
     );
   };
-  const agentOptionsFor = (model, provider) => withInteractionMode({
-    ...provider !== void 0 ? { provider } : config.provider !== void 0 ? { provider: config.provider } : {},
-    ...model !== void 0 ? { model } : {},
-    ...config.maxTokens !== void 0 ? { maxTokens: config.maxTokens } : {}
-  }, clientInteractionMode);
+  const agentOptionsFor = (model, provider) => {
+    const defaults = defaultSelection();
+    const resolvedProvider = provider ?? config.provider ?? defaults.provider;
+    const resolvedModel = model ?? config.model ?? defaults.model;
+    return withInteractionMode({
+      ...resolvedProvider !== void 0 ? { provider: resolvedProvider } : {},
+      ...resolvedModel !== void 0 ? { model: resolvedModel } : {},
+      ...config.maxTokens !== void 0 ? { maxTokens: config.maxTokens } : {}
+    }, clientInteractionMode);
+  };
   const ownedRecord = (agent) => {
     const record = sessions.get(String(agent.session.id));
     return record?.agent === agent ? record : void 0;
@@ -2287,8 +2406,8 @@ async function apply3(ctx, config = {}) {
       return {
         currentModeId: record.modeId,
         availableModes: permission.names.map((name5) => {
-          const spec = permission.resolve(name5);
-          return { id: name5, name: spec.name, description: spec.description };
+          const presentation = permissionPresentation(name5);
+          return { id: name5, ...presentation };
         })
       };
     }
@@ -2364,6 +2483,25 @@ async function apply3(ctx, config = {}) {
     record.approvals = policy;
   };
   const permissionService = () => permissionPresets;
+  const permissionPresentation = (id) => {
+    const spec = permissionService().resolve(id);
+    const stock = MODE_LABELS[id];
+    const fallbackName = stock?.name ?? id.split("-").map((part) => part.length > 0 ? `${part[0].toUpperCase()}${part.slice(1)}` : part).join(" ");
+    return {
+      name: typeof spec.name === "string" && spec.name.trim().length > 0 ? spec.name : fallbackName,
+      description: typeof spec.description === "string" ? spec.description : stock?.description ?? ""
+    };
+  };
+  const saveDefaultPermission = async (modeId) => {
+    if (!permissionService().names.includes(modeId)) return;
+    try {
+      await ctx.get("settings")?.update(PERMISSION_SETTINGS_NAMESPACE, {
+        defaultPreset: modeId
+      });
+    } catch (error) {
+      logWarn(`permission switch applied to the session but was not saved as the default: ${String(error)}`);
+    }
+  };
   const applyMode = (record, sessionId, modeId) => {
     const permission = permissionService();
     if (permission.names.includes(modeId)) {
@@ -2414,8 +2552,8 @@ async function apply3(ctx, config = {}) {
     {
       const permission = permissionService();
       const levels = permission.names.length > 0 ? permission.names.map((name5) => {
-        const spec = permission.resolve(name5);
-        return { value: name5, name: spec.name, description: spec.description };
+        const presentation = permissionPresentation(name5);
+        return { value: name5, ...presentation };
       }) : SANDBOX_MODES2.map((mode) => {
         const label = MODE_LABELS[mode] ?? { name: mode, description: "" };
         return { value: mode, name: label.name, description: label.description };
@@ -3077,6 +3215,7 @@ async function apply3(ctx, config = {}) {
       async setSessionMode(params) {
         const record = await requireOrRestoreSession(params.sessionId);
         applyMode(record, params.sessionId, params.modeId);
+        await saveDefaultPermission(params.modeId);
         notify(params.sessionId, {
           sessionUpdate: "config_option_update",
           configOptions: await configOptions(record)
@@ -3090,6 +3229,7 @@ async function apply3(ctx, config = {}) {
         switch (params.configId) {
           case "mode": {
             applyMode(record, params.sessionId, value);
+            await saveDefaultPermission(value);
             break;
           }
           case "agent":

package/dist/stdio.js

@@ -34,6 +34,7 @@ import {
 } from "@agentclientprotocol/sdk";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
 import { ReasoningEffortId } from "@deepseek-ai/dsh-llm";
+import { PERMISSION_SETTINGS_NAMESPACE } from "@deepseek-ai/dsh-permission-presets";
 
 // src/version.ts
 import { createRequire } from "node:module";

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.4.24",
+  "version": "0.4.26",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/openma-ai/deepseek-harness-acp.git"

package/vendor/runtime.json

@@ -1,5 +1,5 @@
 {
   "archive": "dsh-runtime.tgz",
   "dsh": "0.1.1-rc.2",
-  "sha256": "bb94c7ba7f09bd7d890dd068bedc2f5f68542d7746ca1b3410c17ac9cf9a17f3"
+  "sha256": "f9f9276ec14fdd907146175d5c3b98d1e680eb27b9caaa37fd609908f197e70e"
 }