@openma/deepseek-harness-acp 0.4.25 → 0.4.27

package/README.md

@@ -171,6 +171,15 @@ Optional wire behavior follows ACP's extension conventions:
    extension must still get normal sessions, prompts, updates, cancellation,
    auth, and config options.
 
+#### DSH tool result values
+
+The [ACP metadata registry][metadata-registry] is the authoritative list of
+every `_meta` field this adapter reads or emits. It records direction, carrier,
+shape, negotiation requirements, and replay behavior, including native DSH
+tool values at `_meta.dsh.toolResult.value`.
+
+[metadata-registry]: https://github.com/openma-ai/deepseek-harness-acp/blob/main/docs/metadata.md
+
 The current package applies this pattern to the built-in `_dsh/cordis/*`
 family used by the TUI for Client capability discovery, dynamic Package
 lifecycle, and package-private Host/Client RPC. It is an explicit, versioned
@@ -217,7 +226,7 @@ another provider.
 - **Live model catalog** — providers × models from the running composition (third-party providers added in the Web UI appear immediately), plus reasoning-effort selection that follows your product default.
 - **Slash commands** — adapter built-ins (`/status`, `/model`) plus the harness command registry (`/compact`, `/goal`, `/permission`, `/plan`, …) executed without a model turn, plus **skills** (`/skill-name` — the harness's own invocation gesture). Login and logout are ACP methods, not chat commands.
 - **Plans & usage** — `todo_write` snapshots as ACP plans; token accounting as `usage_update` and per-turn usage.
-- **Sessions** — `session/load` with full history replay, `session/list`, silent restore when a client prompts an old session after an agent restart, titles as `session_info_update`. Multi-root sessions are not advertised: non-empty `additionalDirectories` on `session/new` or `session/load` return `Invalid params` until [dsh supports multiple workspace roots](https://github.com/deepseek-ai/deepseek-harness/discussions/2474).
+- **Sessions** — `session/resume` restores a durable session without replaying its transcript; `session/load` remains the full-history path. Also supports `session/list`, silent restore when a client prompts an old session after an agent restart, and titles as `session_info_update`. Multi-root sessions are not advertised: non-empty `additionalDirectories` on `session/new`, `session/resume`, or `session/load` return `Invalid params` until [dsh supports multiple workspace roots](https://github.com/deepseek-ai/deepseek-harness/discussions/2474).
 - **MCP servers** — per-session `mcpServers` mount `@deepseek-ai/dsh-mcp-client` instances (stdio + streamable HTTP); tools join as `mcp__<server>__<tool>`; a failing server never takes the session down.
 - **Real cancellation** — `session/cancel` interrupts the live turn through the harness agent.
 

package/dist/bridge.js

@@ -419,6 +419,28 @@ function diffsFromToolMeta(meta) {
   }
   return result;
 }
+function acknowledgementId(text, prefix) {
+  if (!text.startsWith(prefix)) return void 0;
+  const id = text.slice(prefix.length);
+  if (id.length === 0 || id.trim() !== id || id.includes(" ") || id.includes("	") || id.includes("\n")) {
+    return void 0;
+  }
+  return id;
+}
+function typedToolAcknowledgement(state, text, failed) {
+  if (state === void 0 || failed) return void 0;
+  if (state.name === "bash" || state.name === "pwsh") {
+    const jobId = acknowledgementId(text, "started background job ");
+    return jobId === void 0 ? void 0 : { kind: "background", jobId };
+  }
+  if (state.name === "subagent") {
+    const jobId = acknowledgementId(text, "started background subagent job ");
+    if (jobId !== void 0) return { kind: "background", jobId };
+    const subagentId = acknowledgementId(text, "started subagent ");
+    if (subagentId !== void 0) return { kind: "continuable", subagentId };
+  }
+  return void 0;
+}
 function extractToolResult(data) {
   let failed = data["error"] !== void 0 && data["error"] !== null;
   const parts = [];
@@ -532,6 +554,8 @@ var SessionProjection = class {
   title;
   streamedText = /* @__PURE__ */ new Set();
   streamedReasoning = /* @__PURE__ */ new Set();
+  /** Structured tool values observed live before DSH omits them from its durable event. */
+  toolResultValues = /* @__PURE__ */ new Map();
   /** 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();
@@ -551,6 +575,10 @@ var SessionProjection = class {
     this.presentCall = options?.presentCall;
     this.subagent = options?.subagent;
   }
+  /** Stage one live `tools/result` value for the matching durable `tool/result` event. */
+  recordToolResult(callId, value) {
+    this.toolResultValues.set(callId, value);
+  }
   /** Reset per-prompt accumulators; call when a new `session/prompt` starts. */
   beginPrompt() {
     this.window = emptyWindow();
@@ -941,6 +969,18 @@ var SessionProjection = class {
     const state = this.toolCalls.get(callId);
     const facts = state?.facts;
     const { failed, text, diffs } = extractToolResult(data);
+    const hasLiveValue = this.toolResultValues.has(callId);
+    const liveValue = this.toolResultValues.get(callId);
+    this.toolResultValues.delete(callId);
+    const toolResultValue = hasLiveValue ? liveValue : typedToolAcknowledgement(state, text, failed);
+    const toolResultMeta = toolResultValue === void 0 ? void 0 : {
+      dsh: {
+        toolResult: {
+          value: toolResultValue
+        }
+      }
+    };
+    const rawOutput = text.length > 0 ? { output: text, isError: failed } : void 0;
     const content = diffs.map((diff) => ({
       type: "diff",
       path: diff.path,
@@ -965,8 +1005,9 @@ var SessionProjection = class {
           sessionUpdate: "tool_call_update",
           toolCallId: callId,
           status: failed ? "failed" : "completed",
-          ...text.length > 0 ? { rawOutput: { output: text, isError: failed } } : {},
+          ...rawOutput !== void 0 ? { rawOutput } : {},
           _meta: {
+            ...toolResultMeta ?? {},
             terminal_exit: { terminal_id: callId, exit_code: failed ? 1 : 0, signal: null }
           }
         }
@@ -992,7 +1033,8 @@ ${text.replace(/\n+$/, "")}
         toolCallId: callId,
         status: failed ? "failed" : "completed",
         ...content.length > 0 ? { content } : {},
-        ...text.length > 0 ? { rawOutput: { output: text, isError: failed } } : {}
+        ...rawOutput !== void 0 ? { rawOutput } : {},
+        ...toolResultMeta !== void 0 ? { _meta: toolResultMeta } : {}
       }
     ];
   }
@@ -1009,11 +1051,28 @@ ${text.replace(/\n+$/, "")}
     }
     this.toolCallBlocks.clear();
     this.toolCalls.clear();
+    this.toolResultValues.clear();
     return [];
   }
 };
 
 // src/bridge/history.ts
+function buildResumeMetadata(events) {
+  let title;
+  let contextWindow;
+  for (const event of events) {
+    if (event.type === "session/title") {
+      const value = event.data?.["title"];
+      if (typeof value === "string" && value.length > 0) title = value;
+      continue;
+    }
+    if (event.type === "request/context") {
+      const value = event.data?.["contextWindow"];
+      if (typeof value === "number" && value > 0) contextWindow = value;
+    }
+  }
+  return { title, contextWindow };
+}
 function userMessage(data) {
   if (data === void 0) return void 0;
   const source = data["source"];
@@ -2257,8 +2316,10 @@ async function apply3(ctx, config = {}) {
     } catch (error) {
       throw invalidParams(`session not found: ${sessionId} (${errorChain2(error)})`);
     }
-    const replay = buildReplay(events);
+    let restored;
     if (options.replay) {
+      const replay = buildReplay(events);
+      restored = replay;
       for (const update of replay.updates) notify(sessionId, update);
       if (replay.title !== void 0) {
         notify(sessionId, {
@@ -2266,6 +2327,8 @@ async function apply3(ctx, config = {}) {
           title: replay.title
         });
       }
+    } else {
+      restored = buildResumeMetadata(events);
     }
     const presets = presetsService();
     const storedPreset = presetFromLog(storedHeader, events);
@@ -2276,11 +2339,11 @@ async function apply3(ctx, config = {}) {
       ...presetSetup(presets, presetId) !== void 0 ? { setup: presetSetup(presets, presetId) } : {}
     });
     const cwd = options.cwd ?? storedHeader?.cwd;
-    const projection = new SessionProjection(replay.contextWindow, {
+    const projection = new SessionProjection(restored.contextWindow, {
       terminalOutput: clientTerminalOutput,
       ...cwd !== void 0 ? { cwd } : {}
     });
-    projection.title = replay.title;
+    projection.title = restored.title;
     const record = registerRecord(
       sessionId,
       handle.agent,
@@ -2874,6 +2937,11 @@ async function apply3(ctx, config = {}) {
     watchSubagentParent(agent);
     return record;
   };
+  ctx.on("tools/result", (exec, result) => {
+    if (exec.parent !== void 0 || exec.agent === void 0 || result.isError) return;
+    const projection = ownedRecord(exec.agent)?.projection ?? subagentByChild.get(String(exec.agent.session.id))?.projection;
+    projection?.recordToolResult(String(exec.callId), result.value);
+  });
   ctx.on("session/event", (session, event) => {
     const sessionId = String(session.header.id);
     const record = sessions.get(sessionId);
@@ -2961,7 +3029,7 @@ async function apply3(ctx, config = {}) {
             // mcp-client's second transport. Legacy SSE does not.
             mcpCapabilities: { http: true, sse: false },
             auth: { logout: {} },
-            sessionCapabilities: { list: {} }
+            sessionCapabilities: { list: {}, resume: {} }
           },
           authMethods: advertisedAuthMethods(
             providers,
@@ -3076,6 +3144,20 @@ async function apply3(ctx, config = {}) {
           ...options.length > 0 ? { configOptions: options } : {}
         };
       },
+      async resumeSession(params) {
+        assertOpen();
+        await requireCredential(config.provider);
+        validateCwd(params.cwd);
+        validateAdditionalDirectories(params.additionalDirectories);
+        syncMcpServers(params.mcpServers, params.cwd);
+        requirePersistence();
+        const record = await restoreSession(params.sessionId, { replay: false, cwd: params.cwd });
+        const options = await configOptions(record);
+        return {
+          modes: modeState(record),
+          ...options.length > 0 ? { configOptions: options } : {}
+        };
+      },
       async listSessions(params) {
         assertOpen();
         const persistence = requirePersistence();

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

@@ -421,6 +421,28 @@ function diffsFromToolMeta(meta) {
   }
   return result;
 }
+function acknowledgementId(text, prefix) {
+  if (!text.startsWith(prefix)) return void 0;
+  const id = text.slice(prefix.length);
+  if (id.length === 0 || id.trim() !== id || id.includes(" ") || id.includes("	") || id.includes("\n")) {
+    return void 0;
+  }
+  return id;
+}
+function typedToolAcknowledgement(state, text, failed) {
+  if (state === void 0 || failed) return void 0;
+  if (state.name === "bash" || state.name === "pwsh") {
+    const jobId = acknowledgementId(text, "started background job ");
+    return jobId === void 0 ? void 0 : { kind: "background", jobId };
+  }
+  if (state.name === "subagent") {
+    const jobId = acknowledgementId(text, "started background subagent job ");
+    if (jobId !== void 0) return { kind: "background", jobId };
+    const subagentId = acknowledgementId(text, "started subagent ");
+    if (subagentId !== void 0) return { kind: "continuable", subagentId };
+  }
+  return void 0;
+}
 function extractToolResult(data) {
   let failed = data["error"] !== void 0 && data["error"] !== null;
   const parts = [];
@@ -534,6 +556,8 @@ var SessionProjection = class {
   title;
   streamedText = /* @__PURE__ */ new Set();
   streamedReasoning = /* @__PURE__ */ new Set();
+  /** Structured tool values observed live before DSH omits them from its durable event. */
+  toolResultValues = /* @__PURE__ */ new Map();
   /** 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();
@@ -553,6 +577,10 @@ var SessionProjection = class {
     this.presentCall = options?.presentCall;
     this.subagent = options?.subagent;
   }
+  /** Stage one live `tools/result` value for the matching durable `tool/result` event. */
+  recordToolResult(callId, value) {
+    this.toolResultValues.set(callId, value);
+  }
   /** Reset per-prompt accumulators; call when a new `session/prompt` starts. */
   beginPrompt() {
     this.window = emptyWindow();
@@ -943,6 +971,18 @@ var SessionProjection = class {
     const state = this.toolCalls.get(callId);
     const facts = state?.facts;
     const { failed, text, diffs } = extractToolResult(data);
+    const hasLiveValue = this.toolResultValues.has(callId);
+    const liveValue = this.toolResultValues.get(callId);
+    this.toolResultValues.delete(callId);
+    const toolResultValue = hasLiveValue ? liveValue : typedToolAcknowledgement(state, text, failed);
+    const toolResultMeta = toolResultValue === void 0 ? void 0 : {
+      dsh: {
+        toolResult: {
+          value: toolResultValue
+        }
+      }
+    };
+    const rawOutput = text.length > 0 ? { output: text, isError: failed } : void 0;
     const content = diffs.map((diff) => ({
       type: "diff",
       path: diff.path,
@@ -967,8 +1007,9 @@ var SessionProjection = class {
           sessionUpdate: "tool_call_update",
           toolCallId: callId,
           status: failed ? "failed" : "completed",
-          ...text.length > 0 ? { rawOutput: { output: text, isError: failed } } : {},
+          ...rawOutput !== void 0 ? { rawOutput } : {},
           _meta: {
+            ...toolResultMeta ?? {},
             terminal_exit: { terminal_id: callId, exit_code: failed ? 1 : 0, signal: null }
           }
         }
@@ -994,7 +1035,8 @@ ${text.replace(/\n+$/, "")}
         toolCallId: callId,
         status: failed ? "failed" : "completed",
         ...content.length > 0 ? { content } : {},
-        ...text.length > 0 ? { rawOutput: { output: text, isError: failed } } : {}
+        ...rawOutput !== void 0 ? { rawOutput } : {},
+        ...toolResultMeta !== void 0 ? { _meta: toolResultMeta } : {}
       }
     ];
   }
@@ -1011,11 +1053,28 @@ ${text.replace(/\n+$/, "")}
     }
     this.toolCallBlocks.clear();
     this.toolCalls.clear();
+    this.toolResultValues.clear();
     return [];
   }
 };
 
 // src/bridge/history.ts
+function buildResumeMetadata(events) {
+  let title;
+  let contextWindow;
+  for (const event of events) {
+    if (event.type === "session/title") {
+      const value = event.data?.["title"];
+      if (typeof value === "string" && value.length > 0) title = value;
+      continue;
+    }
+    if (event.type === "request/context") {
+      const value = event.data?.["contextWindow"];
+      if (typeof value === "number" && value > 0) contextWindow = value;
+    }
+  }
+  return { title, contextWindow };
+}
 function userMessage(data) {
   if (data === void 0) return void 0;
   const source = data["source"];
@@ -2259,8 +2318,10 @@ async function apply3(ctx, config = {}) {
     } catch (error) {
       throw invalidParams(`session not found: ${sessionId} (${errorChain2(error)})`);
     }
-    const replay = buildReplay(events);
+    let restored;
     if (options.replay) {
+      const replay = buildReplay(events);
+      restored = replay;
       for (const update of replay.updates) notify(sessionId, update);
       if (replay.title !== void 0) {
         notify(sessionId, {
@@ -2268,6 +2329,8 @@ async function apply3(ctx, config = {}) {
           title: replay.title
         });
       }
+    } else {
+      restored = buildResumeMetadata(events);
     }
     const presets = presetsService();
     const storedPreset = presetFromLog(storedHeader, events);
@@ -2278,11 +2341,11 @@ async function apply3(ctx, config = {}) {
       ...presetSetup(presets, presetId) !== void 0 ? { setup: presetSetup(presets, presetId) } : {}
     });
     const cwd = options.cwd ?? storedHeader?.cwd;
-    const projection = new SessionProjection(replay.contextWindow, {
+    const projection = new SessionProjection(restored.contextWindow, {
       terminalOutput: clientTerminalOutput,
       ...cwd !== void 0 ? { cwd } : {}
     });
-    projection.title = replay.title;
+    projection.title = restored.title;
     const record = registerRecord(
       sessionId,
       handle.agent,
@@ -2876,6 +2939,11 @@ async function apply3(ctx, config = {}) {
     watchSubagentParent(agent);
     return record;
   };
+  ctx.on("tools/result", (exec, result) => {
+    if (exec.parent !== void 0 || exec.agent === void 0 || result.isError) return;
+    const projection = ownedRecord(exec.agent)?.projection ?? subagentByChild.get(String(exec.agent.session.id))?.projection;
+    projection?.recordToolResult(String(exec.callId), result.value);
+  });
   ctx.on("session/event", (session, event) => {
     const sessionId = String(session.header.id);
     const record = sessions.get(sessionId);
@@ -2963,7 +3031,7 @@ async function apply3(ctx, config = {}) {
             // mcp-client's second transport. Legacy SSE does not.
             mcpCapabilities: { http: true, sse: false },
             auth: { logout: {} },
-            sessionCapabilities: { list: {} }
+            sessionCapabilities: { list: {}, resume: {} }
           },
           authMethods: advertisedAuthMethods(
             providers,
@@ -3078,6 +3146,20 @@ async function apply3(ctx, config = {}) {
           ...options.length > 0 ? { configOptions: options } : {}
         };
       },
+      async resumeSession(params) {
+        assertOpen();
+        await requireCredential(config.provider);
+        validateCwd(params.cwd);
+        validateAdditionalDirectories(params.additionalDirectories);
+        syncMcpServers(params.mcpServers, params.cwd);
+        requirePersistence();
+        const record = await restoreSession(params.sessionId, { replay: false, cwd: params.cwd });
+        const options = await configOptions(record);
+        return {
+          modes: modeState(record),
+          ...options.length > 0 ? { configOptions: options } : {}
+        };
+      },
       async listSessions(params) {
         assertOpen();
         const persistence = requirePersistence();

package/dist/server.js

@@ -415,6 +415,28 @@ function diffsFromToolMeta(meta) {
   }
   return result;
 }
+function acknowledgementId(text, prefix) {
+  if (!text.startsWith(prefix)) return void 0;
+  const id = text.slice(prefix.length);
+  if (id.length === 0 || id.trim() !== id || id.includes(" ") || id.includes("	") || id.includes("\n")) {
+    return void 0;
+  }
+  return id;
+}
+function typedToolAcknowledgement(state, text, failed) {
+  if (state === void 0 || failed) return void 0;
+  if (state.name === "bash" || state.name === "pwsh") {
+    const jobId = acknowledgementId(text, "started background job ");
+    return jobId === void 0 ? void 0 : { kind: "background", jobId };
+  }
+  if (state.name === "subagent") {
+    const jobId = acknowledgementId(text, "started background subagent job ");
+    if (jobId !== void 0) return { kind: "background", jobId };
+    const subagentId = acknowledgementId(text, "started subagent ");
+    if (subagentId !== void 0) return { kind: "continuable", subagentId };
+  }
+  return void 0;
+}
 function extractToolResult(data) {
   let failed = data["error"] !== void 0 && data["error"] !== null;
   const parts = [];
@@ -528,6 +550,8 @@ var SessionProjection = class {
   title;
   streamedText = /* @__PURE__ */ new Set();
   streamedReasoning = /* @__PURE__ */ new Set();
+  /** Structured tool values observed live before DSH omits them from its durable event. */
+  toolResultValues = /* @__PURE__ */ new Map();
   /** 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();
@@ -547,6 +571,10 @@ var SessionProjection = class {
     this.presentCall = options?.presentCall;
     this.subagent = options?.subagent;
   }
+  /** Stage one live `tools/result` value for the matching durable `tool/result` event. */
+  recordToolResult(callId, value) {
+    this.toolResultValues.set(callId, value);
+  }
   /** Reset per-prompt accumulators; call when a new `session/prompt` starts. */
   beginPrompt() {
     this.window = emptyWindow();
@@ -937,6 +965,18 @@ var SessionProjection = class {
     const state = this.toolCalls.get(callId);
     const facts = state?.facts;
     const { failed, text, diffs } = extractToolResult(data);
+    const hasLiveValue = this.toolResultValues.has(callId);
+    const liveValue = this.toolResultValues.get(callId);
+    this.toolResultValues.delete(callId);
+    const toolResultValue = hasLiveValue ? liveValue : typedToolAcknowledgement(state, text, failed);
+    const toolResultMeta = toolResultValue === void 0 ? void 0 : {
+      dsh: {
+        toolResult: {
+          value: toolResultValue
+        }
+      }
+    };
+    const rawOutput = text.length > 0 ? { output: text, isError: failed } : void 0;
     const content = diffs.map((diff) => ({
       type: "diff",
       path: diff.path,
@@ -961,8 +1001,9 @@ var SessionProjection = class {
           sessionUpdate: "tool_call_update",
           toolCallId: callId,
           status: failed ? "failed" : "completed",
-          ...text.length > 0 ? { rawOutput: { output: text, isError: failed } } : {},
+          ...rawOutput !== void 0 ? { rawOutput } : {},
           _meta: {
+            ...toolResultMeta ?? {},
             terminal_exit: { terminal_id: callId, exit_code: failed ? 1 : 0, signal: null }
           }
         }
@@ -988,7 +1029,8 @@ ${text.replace(/\n+$/, "")}
         toolCallId: callId,
         status: failed ? "failed" : "completed",
         ...content.length > 0 ? { content } : {},
-        ...text.length > 0 ? { rawOutput: { output: text, isError: failed } } : {}
+        ...rawOutput !== void 0 ? { rawOutput } : {},
+        ...toolResultMeta !== void 0 ? { _meta: toolResultMeta } : {}
       }
     ];
   }
@@ -1005,11 +1047,28 @@ ${text.replace(/\n+$/, "")}
     }
     this.toolCallBlocks.clear();
     this.toolCalls.clear();
+    this.toolResultValues.clear();
     return [];
   }
 };
 
 // src/bridge/history.ts
+function buildResumeMetadata(events) {
+  let title;
+  let contextWindow;
+  for (const event of events) {
+    if (event.type === "session/title") {
+      const value = event.data?.["title"];
+      if (typeof value === "string" && value.length > 0) title = value;
+      continue;
+    }
+    if (event.type === "request/context") {
+      const value = event.data?.["contextWindow"];
+      if (typeof value === "number" && value > 0) contextWindow = value;
+    }
+  }
+  return { title, contextWindow };
+}
 function userMessage(data) {
   if (data === void 0) return void 0;
   const source = data["source"];
@@ -2253,8 +2312,10 @@ async function apply3(ctx, config = {}) {
     } catch (error) {
       throw invalidParams(`session not found: ${sessionId} (${errorChain2(error)})`);
     }
-    const replay = buildReplay(events);
+    let restored;
     if (options.replay) {
+      const replay = buildReplay(events);
+      restored = replay;
       for (const update of replay.updates) notify(sessionId, update);
       if (replay.title !== void 0) {
         notify(sessionId, {
@@ -2262,6 +2323,8 @@ async function apply3(ctx, config = {}) {
           title: replay.title
         });
       }
+    } else {
+      restored = buildResumeMetadata(events);
     }
     const presets = presetsService();
     const storedPreset = presetFromLog(storedHeader, events);
@@ -2272,11 +2335,11 @@ async function apply3(ctx, config = {}) {
       ...presetSetup(presets, presetId) !== void 0 ? { setup: presetSetup(presets, presetId) } : {}
     });
     const cwd = options.cwd ?? storedHeader?.cwd;
-    const projection = new SessionProjection(replay.contextWindow, {
+    const projection = new SessionProjection(restored.contextWindow, {
       terminalOutput: clientTerminalOutput,
       ...cwd !== void 0 ? { cwd } : {}
     });
-    projection.title = replay.title;
+    projection.title = restored.title;
     const record = registerRecord(
       sessionId,
       handle.agent,
@@ -2870,6 +2933,11 @@ async function apply3(ctx, config = {}) {
     watchSubagentParent(agent);
     return record;
   };
+  ctx.on("tools/result", (exec, result) => {
+    if (exec.parent !== void 0 || exec.agent === void 0 || result.isError) return;
+    const projection = ownedRecord(exec.agent)?.projection ?? subagentByChild.get(String(exec.agent.session.id))?.projection;
+    projection?.recordToolResult(String(exec.callId), result.value);
+  });
   ctx.on("session/event", (session, event) => {
     const sessionId = String(session.header.id);
     const record = sessions.get(sessionId);
@@ -2957,7 +3025,7 @@ async function apply3(ctx, config = {}) {
             // mcp-client's second transport. Legacy SSE does not.
             mcpCapabilities: { http: true, sse: false },
             auth: { logout: {} },
-            sessionCapabilities: { list: {} }
+            sessionCapabilities: { list: {}, resume: {} }
           },
           authMethods: advertisedAuthMethods(
             providers,
@@ -3072,6 +3140,20 @@ async function apply3(ctx, config = {}) {
           ...options.length > 0 ? { configOptions: options } : {}
         };
       },
+      async resumeSession(params) {
+        assertOpen();
+        await requireCredential(config.provider);
+        validateCwd(params.cwd);
+        validateAdditionalDirectories(params.additionalDirectories);
+        syncMcpServers(params.mcpServers, params.cwd);
+        requirePersistence();
+        const record = await restoreSession(params.sessionId, { replay: false, cwd: params.cwd });
+        const options = await configOptions(record);
+        return {
+          modes: modeState(record),
+          ...options.length > 0 ? { configOptions: options } : {}
+        };
+      },
       async listSessions(params) {
         assertOpen();
         const persistence = requirePersistence();

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.4.25",
+  "version": "0.4.27",
   "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": "4a2d5d44fca9ef7c5afcd986309f4a6f5b4605a8d45f1197645297e3f7f5ae85"
+  "sha256": "a144a57cdb63bd5bc0152cc392534fd14fdf947922e68cda16d8f1d0243356e7"
 }