@ycodium-ai/agent-dsh 0.2.2634 → 0.2.2664

package/dist/index.js

@@ -23543,11 +23543,21 @@ var AcpExecutorRequestError = class extends AcpExecutorError {
   }
 };
 var AcpConnectionClosedError = class extends Error {
-  constructor(message = "ACP connection closed") {
-    super(message);
+  constructor(message = "ACP connection closed", options) {
+    super(message, options);
     this.name = "AcpConnectionClosedError";
   }
 };
+async function withStartupStderr(error62, stderrTail) {
+  if (!(error62 instanceof AcpConnectionClosedError) || stderrTail === void 0) return error62;
+  const tail = await stderrTail();
+  if (tail.length === 0) return error62;
+  return new AcpConnectionClosedError(`${error62.message}
+Agent stderr (last lines):
+${tail}`, {
+    cause: error62
+  });
+}
 
 // ../../packages/ycodium-acp-executor/src/jsonrpc.ts
 function isRecord2(value) {
@@ -24463,7 +24473,9 @@ function findAcpEffortConfig(configOptions) {
 function acpModelChoicesFromConfigOptions(configOptions) {
   if (!Array.isArray(configOptions)) return void 0;
   const records = configOptions.filter(isRecord3);
-  const modelOption = records.find((option) => normalizedField(option, "category") === "model");
+  const modelOption = records.find((option) => normalizedField(option, "category") === "model") ?? records.find(
+    (option) => normalizedField(option, "id") === "model" && normalizedField(option, "type") === "select"
+  );
   if (modelOption === void 0) return void 0;
   if (!asString(modelOption["id"])?.trim()) return void 0;
   return flattenChoices(modelOption["options"], asString(modelOption["currentValue"])?.trim());
@@ -24812,7 +24824,7 @@ function extractModelConfigId(sessionResponse) {
       return opt.id.trim();
     }
   }
-  return void 0;
+  return configOptions.find((opt) => opt.id.trim() === "model" && opt.type === "select") ? "model" : void 0;
 }
 function findSessionConfigOption(configOptions, configId) {
   if (!configOptions) {
@@ -25209,6 +25221,13 @@ function readAcpText(source, key) {
   const trimmed = value.trim();
   return trimmed.length > 0 ? trimmed : void 0;
 }
+function textFromContentBlocks(blocks) {
+  const parts = blocks.flatMap(
+    (block) => isRecord5(block) && block["type"] === "text" && typeof block["text"] === "string" ? [block["text"]] : []
+  );
+  const joined = parts.join("");
+  return joined.trim().length > 0 ? joined : void 0;
+}
 function parseSessionUpdateEvent(params) {
   const upd = params.update;
   const events = [];
@@ -25292,6 +25311,28 @@ function parseSessionUpdateEvent(params) {
       }
       break;
     }
+    case "compaction_update": {
+      const compactionId = readAcpText(upd, "compactionId");
+      const status = readAcpText(upd, "status");
+      if (compactionId === void 0 || status === void 0) break;
+      const rawSummary = upd["summary"];
+      events.push({
+        _tag: "CompactionUpdated",
+        compactionId,
+        status,
+        summary: rawSummary === void 0 ? void 0 : Array.isArray(rawSummary) ? textFromContentBlocks(rawSummary) ?? null : null,
+        error: readAcpText(upd, "error")
+      });
+      break;
+    }
+    case "compaction_summary_chunk": {
+      const compactionId = readAcpText(upd, "compactionId");
+      const content = isRecord5(upd["content"]) ? upd["content"] : void 0;
+      const text = content?.["type"] === "text" ? content["text"] : void 0;
+      if (compactionId === void 0 || typeof text !== "string" || text.length === 0) break;
+      events.push({ _tag: "CompactionSummaryChunk", compactionId, text });
+      break;
+    }
     default:
       break;
   }
@@ -25388,6 +25429,97 @@ function createAcpExecutor(options) {
     if (settledPromptKeys.length > SETTLED_PROMPT_KEY_LIMIT) settledPromptKeys.shift();
   };
   const toolCalls = /* @__PURE__ */ new Map();
+  const compactions = /* @__PURE__ */ new Map();
+  let manualCompaction;
+  const COMPACTION_SUMMARY_MAX_CHARS = 8e3;
+  const nowMs = () => options.nowMs?.() ?? Date.now();
+  const emitCompactionState = (record2, state) => {
+    const summary = record2.summary?.trim() ?? "";
+    const truncated = summary.length > COMPACTION_SUMMARY_MAX_CHARS;
+    emit({
+      type: "thread.state.changed",
+      ...stamp(),
+      provider: options.provider,
+      threadId: options.threadId,
+      ...activeTurnId !== void 0 ? { turnId: activeTurnId } : {},
+      payload: {
+        state,
+        compaction: {
+          compactionId: record2.snapshotId,
+          trigger: record2.trigger,
+          ...state === "compacted" ? { durationMs: Math.max(0, nowMs() - record2.startedAtMs) } : {},
+          ...summary.length > 0 ? {
+            summary: truncated ? summary.slice(0, COMPACTION_SUMMARY_MAX_CHARS) : summary,
+            ...truncated ? { summaryTruncated: true } : {}
+          } : {}
+        }
+      }
+    });
+  };
+  const applyCompactionUpdate = (event) => {
+    let record2 = compactions.get(event.compactionId);
+    if (record2 === void 0) {
+      if (manualCompaction !== void 0 && !manualCompaction.adopted) {
+        manualCompaction.adopted = true;
+        record2 = manualCompaction;
+      } else {
+        record2 = {
+          snapshotId: randomId(),
+          trigger: "automatic",
+          startedAtMs: nowMs(),
+          summary: void 0,
+          announced: false,
+          finished: false,
+          adopted: false
+        };
+      }
+      compactions.set(event.compactionId, record2);
+    }
+    if (event.summary !== void 0) record2.summary = event.summary ?? void 0;
+    switch (event.status) {
+      case "in_progress":
+        if (!record2.announced) {
+          record2.announced = true;
+          emitCompactionState(record2, "compacting");
+        }
+        return;
+      case "completed":
+        record2.announced = true;
+        record2.finished = true;
+        compactions.delete(event.compactionId);
+        emitCompactionState(record2, "compacted");
+        return;
+      case "failed":
+      case "cancelled":
+        record2.finished = true;
+        compactions.delete(event.compactionId);
+        emit({
+          type: "runtime.warning",
+          ...stamp(),
+          provider: options.provider,
+          threadId: options.threadId,
+          ...activeTurnId !== void 0 ? { turnId: activeTurnId } : {},
+          payload: {
+            message: event.error ?? `Context compaction ${event.status}`,
+            detail: { code: `context-compaction-${event.status}` }
+          }
+        });
+        return;
+      default:
+        return;
+    }
+  };
+  const shownToolCallIds = /* @__PURE__ */ new Set();
+  const SHOWN_TOOL_CALL_LIMIT = 256;
+  const rememberShownToolCall = (toolCallId) => {
+    shownToolCallIds.add(toolCallId);
+    if (shownToolCallIds.size <= SHOWN_TOOL_CALL_LIMIT) return;
+    for (const id of shownToolCallIds) {
+      if (toolCalls.has(id)) continue;
+      shownToolCallIds.delete(id);
+      return;
+    }
+  };
   let assistantSegment = { nextSegmentIndex: 0 };
   let modeState;
   let availableCommands = [];
@@ -25474,7 +25606,6 @@ function createAcpExecutor(options) {
     }
     for (const event of parsed.events) {
       if (event._tag === "ToolCallUpdated") {
-        closeActiveAssistantSegment(activeTurnId);
         const tracked = toolCalls.get(event.toolCall.toolCallId);
         const previous = tracked?.state;
         const nextToolCall = mergeToolCallState(previous, event.toolCall);
@@ -25493,9 +25624,35 @@ function createAcpExecutor(options) {
             skippedSinceEmit: decision.skippedSinceEmit
           });
         }
-        if (!decision.emit) {
+        const hookResult = hooks.onToolCallUpdated?.({
+          toolCallId: nextToolCall.toolCallId,
+          status: nextToolCall.status,
+          title: nextToolCall.title,
+          kind: nextToolCall.kind,
+          rawInput: nextToolCall.data["rawInput"],
+          rawOutput: nextToolCall.data["rawOutput"],
+          meta: params.update._meta,
+          turnId: activeTurnId
+        });
+        const taskEvents = hookResult === void 0 ? [] : "events" in hookResult ? hookResult.events : hookResult;
+        const handledByHook = hookResult !== void 0 && "events" in hookResult && hookResult.handled === true;
+        for (const taskEvent of taskEvents) {
+          emit({
+            type: taskEvent.type,
+            ...stamp(),
+            provider: options.provider,
+            threadId: options.threadId,
+            ...taskEvent.turnId !== void 0 ? { turnId: taskEvent.turnId } : {},
+            payload: taskEvent.payload
+          });
+        }
+        if (handledByHook || !decision.emit) {
           continue;
         }
+        if (!shownToolCallIds.has(nextToolCall.toolCallId)) {
+          rememberShownToolCall(nextToolCall.toolCallId);
+          closeActiveAssistantSegment(activeTurnId);
+        }
         emit(
           makeAcpToolCallEvent({
             stamp: stamp(),
@@ -25508,7 +25665,21 @@ function createAcpExecutor(options) {
         );
         continue;
       }
+      if (event._tag === "CompactionUpdated") {
+        applyCompactionUpdate(event);
+        continue;
+      }
+      if (event._tag === "CompactionSummaryChunk") {
+        const record2 = compactions.get(event.compactionId);
+        if (record2 !== void 0 && !record2.finished) {
+          record2.summary = (record2.summary ?? "") + event.text;
+        }
+        continue;
+      }
       if (event._tag === "ContentDelta") {
+        if (manualCompaction !== void 0) {
+          continue;
+        }
         if (event.streamKind === "reasoning_text") {
           if (event.text.trim().length === 0) {
             continue;
@@ -25751,7 +25922,9 @@ function createAcpExecutor(options) {
     },
     onNotification: (notification) => {
       if (notification.method === "session/update") {
-        handleSessionUpdate(notification.params);
+        const params = notification.params;
+        const transformed = hooks.transformSessionUpdate ? hooks.transformSessionUpdate(params) : params;
+        if (transformed !== void 0) handleSessionUpdate(transformed);
         return;
       }
       if (settleFromNotification(notification.method, notification.params)) return;
@@ -25885,13 +26058,15 @@ function createAcpExecutor(options) {
       options.mcpServers ?? [],
       initialized.agentCapabilities
     );
+    const additionalDirectories = options.additionalDirectories !== void 0 && options.additionalDirectories.length > 0 ? { additionalDirectories: options.additionalDirectories } : {};
     let setup;
     let nextSessionId;
     if (options.resumeSessionId && options.resumeMethod === "session/resume") {
       setup = await connection.request("session/resume", {
         sessionId: options.resumeSessionId,
         cwd: options.cwd,
-        mcpServers
+        mcpServers,
+        ...additionalDirectories
       });
       nextSessionId = options.resumeSessionId;
     } else if (options.resumeSessionId) {
@@ -25900,7 +26075,8 @@ function createAcpExecutor(options) {
         setup = await connection.request("session/load", {
           sessionId: options.resumeSessionId,
           cwd: options.cwd,
-          mcpServers
+          mcpServers,
+          ...additionalDirectories
         });
       } finally {
         sessionLoadInFlight = false;
@@ -25913,7 +26089,8 @@ function createAcpExecutor(options) {
     } else {
       const created = await connection.request("session/new", {
         cwd: options.cwd,
-        mcpServers
+        mcpServers,
+        ...additionalDirectories
       });
       nextSessionId = created.sessionId;
       setup = created;
@@ -25987,13 +26164,13 @@ function createAcpExecutor(options) {
         startInFlight = void 0;
         return result;
       },
-      (error62) => {
+      async (error62) => {
         startInFlight = void 0;
         if (isLive(expectedGeneration) && !startResult) {
           status = "idle";
           generation = expectedGeneration;
         }
-        throw error62;
+        throw await withStartupStderr(error62, options.stderrTail);
       }
     );
     return startInFlight;
@@ -26061,6 +26238,36 @@ function createAcpExecutor(options) {
       interruptedTurnIds.delete(input2.turnId);
     }
   };
+  const sendPromptRpc = async (sessionId2, promptParts) => {
+    const settlementHooks = hooks.promptSettlement;
+    const promptKey = settlementHooks === void 0 ? void 0 : randomId();
+    const promptRpc = connection.request("session/prompt", {
+      sessionId: sessionId2,
+      prompt: promptParts,
+      ...settlementHooks !== void 0 && promptKey !== void 0 ? settlementHooks.requestFields(promptKey) : {}
+    });
+    if (settlementHooks === void 0 || promptKey === void 0) {
+      return await promptRpc;
+    } else {
+      const { promise: early, resolve: settleEarly } = Promise.withResolvers();
+      pendingSettlement = { promptKey, sessionId: sessionId2, settle: settleEarly };
+      try {
+        const outcome = await Promise.race([
+          promptRpc.then((value) => {
+            const key = settlementHooks.responseKey?.(value);
+            if (key !== void 0) rememberSettledPromptKey(key);
+            return { response: value };
+          }),
+          early
+        ]);
+        if (outcome.error !== void 0) throw outcome.error;
+        return outcome.response;
+      } finally {
+        pendingSettlement = void 0;
+        void promptRpc.catch(() => void 0);
+      }
+    }
+  };
   const prompt = async (input2) => {
     failIfDisposed();
     const started = requireStarted();
@@ -26111,35 +26318,8 @@ function createAcpExecutor(options) {
         expectedGeneration: started.generation
       });
       closeActiveAssistantSegment(turnId);
-      const settlementHooks = hooks.promptSettlement;
-      const promptKey = settlementHooks === void 0 ? void 0 : randomId();
-      const promptRpc = connection.request("session/prompt", {
-        sessionId: started.sessionId,
-        prompt: promptParts,
-        ...settlementHooks !== void 0 && promptKey !== void 0 ? settlementHooks.requestFields(promptKey) : {}
-      });
       try {
-        if (settlementHooks === void 0 || promptKey === void 0) {
-          response = await promptRpc;
-        } else {
-          const { promise: early, resolve: settleEarly } = Promise.withResolvers();
-          pendingSettlement = { promptKey, sessionId: started.sessionId, settle: settleEarly };
-          try {
-            const outcome = await Promise.race([
-              promptRpc.then((value) => {
-                const key = settlementHooks.responseKey?.(value);
-                if (key !== void 0) rememberSettledPromptKey(key);
-                return { response: value };
-              }),
-              early
-            ]);
-            if (outcome.error !== void 0) throw outcome.error;
-            response = outcome.response;
-          } finally {
-            pendingSettlement = void 0;
-            void promptRpc.catch(() => void 0);
-          }
-        }
+        response = await sendPromptRpc(started.sessionId, promptParts);
       } catch (error62) {
         if (disposed) {
           throw new AcpExecutorDisposedError();
@@ -26303,6 +26483,74 @@ function createAcpExecutor(options) {
     };
     apply();
   };
+  const compact = async (input2) => {
+    failIfDisposed();
+    const started = requireStarted();
+    const trimmedName = input2.commandName.trim();
+    const commandName = trimmedName.startsWith("/") ? trimmedName.slice(1) : trimmedName;
+    if (!availableCommands.some((command) => command.name === commandName)) {
+      throw new AcpExecutorError(
+        "command-unavailable",
+        `The agent has not advertised the /${commandName} command`
+      );
+    }
+    if (promptsInFlight > 0 || promptMutex.isLocked || manualCompaction !== void 0) {
+      throw new AcpExecutorError(
+        "busy",
+        "Cannot compact while a turn or another compaction is running"
+      );
+    }
+    const record2 = {
+      snapshotId: randomId(),
+      trigger: "manual",
+      startedAtMs: nowMs(),
+      summary: void 0,
+      announced: true,
+      finished: false,
+      adopted: false
+    };
+    await promptMutex.acquire();
+    manualCompaction = record2;
+    const emitSessionState = (state) => {
+      emit({
+        type: "session.state.changed",
+        ...stamp(),
+        provider: options.provider,
+        threadId: options.threadId,
+        payload: { state, reason: "compaction" }
+      });
+    };
+    try {
+      failIfDisposed();
+      emitSessionState("compacting");
+      emitCompactionState(record2, "compacting");
+      let response;
+      try {
+        response = await sendPromptRpc(started.sessionId, [
+          { type: "text", text: `/${commandName}` }
+        ]);
+      } catch (error62) {
+        if (disposed) throw new AcpExecutorDisposedError();
+        throw error62;
+      }
+      await connection.awaitInboundIdle();
+      if (response.stopReason === "cancelled") {
+        return;
+      }
+      if (!record2.finished) {
+        record2.finished = true;
+        emitCompactionState(record2, "compacted");
+      }
+    } finally {
+      for (const [agentId, tracked] of compactions) {
+        if (tracked === record2) compactions.delete(agentId);
+      }
+      manualCompaction = void 0;
+      promptMutex.release();
+      notifyPromptSettled();
+      if (!disposed) emitSessionState("ready");
+    }
+  };
   const setNativeMode = async (modeId) => {
     failIfDisposed();
     const started = startResult;
@@ -26390,6 +26638,7 @@ function createAcpExecutor(options) {
     respondToRequest,
     respondToUserInput,
     setNativeMode,
+    compact,
     dispose
   };
 }
@@ -26612,6 +26861,7 @@ import * as NodeFS from "node:fs";
 import * as NodeOS2 from "node:os";
 import * as NodePath2 from "node:path";
 import {
+  describeExecutorSpawnFailure,
   ExecutorSpawnRefusedError
 } from "@ycodium-ai/plugin-api/executor";
 import { nodeStreamsFromHandle } from "@ycodium-ai/plugin-api/process-stdin";
@@ -26770,7 +27020,7 @@ async function probeDshModels(input2) {
     });
   } catch (error62) {
     if (error62 instanceof ExecutorSpawnRefusedError) throw error62;
-    return { kind: "not-started", detail: failureDetail(error62) };
+    return { kind: "not-started", ...describeExecutorSpawnFailure(error62) };
   }
   let handshake;
   try {
@@ -26874,7 +27124,7 @@ var createDshInstance = (config2, host) => {
         return {
           installed: false,
           version: null,
-          readiness: "error",
+          readiness: "not-installed",
           auth: { status: "unknown" },
           detail: "DeepSeek Harness program path is not configured"
         };
@@ -26887,7 +27137,9 @@ var createDshInstance = (config2, host) => {
         return {
           installed: outcome.kind === "failed",
           version: version2,
-          readiness: "error",
+          // 起不起得来答的是装没装：找不到、路径不存在、不可执行是 not-installed，别的启动失败与
+          // 握不上手都是 error。
+          readiness: outcome.kind === "not-started" ? outcome.readiness : "error",
           auth: { status: "unknown" },
           ...outcome.detail === void 0 ? {} : { detail: outcome.detail },
           // 装着但握不上手时界面照样画权限格，不报档就退回宿主四档。
@@ -26926,12 +27178,13 @@ var createDshInstance = (config2, host) => {
         owner: { bindingId: host.bindingId },
         ...Object.keys(env).length > 0 ? { env } : {}
       });
-      const { readable, writable } = nodeStreamsFromHandle2(handle);
+      const { readable, writable, stderrTail } = nodeStreamsFromHandle2(handle);
       const resume = input2.discardResumeCursor === true ? void 0 : parseAcpResumeCursor(input2.resumeCursor, RESUME_SCHEMA_VERSION);
       const requestedModelId = modelIdFromSelection(input2.modelSelection);
       const executor = createAcpExecutor({
         readable,
         writable,
+        stderrTail,
         cwd,
         threadId: input2.threadId,
         provider: DSH_DRIVER_KIND,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-dsh",
-  "version": "0.2.2634",
+  "version": "0.2.2664",
   "description": "DeepSeek Harness executor: dsh CLI over Agent Client Protocol stdio.",
   "keywords": [
     "ycodium",
@@ -21,9 +21,9 @@
     "@types/node": "24.12.4",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.2634",
-    "ycodium-acp-executor": "0.2.2634",
-    "ycodium-executor-testing": "0.0.0"
+    "@ycodium-ai/plugin-api": "0.2.2664",
+    "ycodium-executor-testing": "0.0.0",
+    "ycodium-acp-executor": "0.2.2664"
   },
   "ycodium": {
     "plugin": "./dist/index.js",