@openma/deepseek-harness-acp 0.4.0 → 0.4.2

package/dist/bridge.js

@@ -265,8 +265,14 @@ var SessionProjection = class {
   toolCalls = /* @__PURE__ */ new Map();
   window = emptyWindow();
   lastContextUse;
-  constructor(contextWindow) {
+  /** Client renders `_meta.terminal_output` display terminals (Zed extension). */
+  terminalOutput;
+  /** Session working directory, advertised on display terminals. */
+  cwd;
+  constructor(contextWindow, options) {
     this.contextWindow = contextWindow;
+    this.terminalOutput = options?.terminalOutput ?? false;
+    this.cwd = options?.cwd;
   }
   /** Reset per-prompt accumulators; call when a new `session/prompt` starts. */
   beginPrompt() {
@@ -395,6 +401,7 @@ var SessionProjection = class {
     const rawArguments = typeof data["arguments"] === "string" ? data["arguments"] : "{}";
     const facts = classifyToolCall(name3, rawArguments);
     this.toolCalls.set(callId, facts);
+    const displayTerminal = this.terminalOutput && facts.kind === "execute";
     return [
       {
         sessionUpdate: "tool_call",
@@ -404,7 +411,16 @@ var SessionProjection = class {
         kind: facts.kind,
         status: "in_progress",
         rawInput: facts.rawInput,
-        ...facts.locations.length > 0 ? { locations: facts.locations } : {}
+        ...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 } : {}
+            }
+          }
+        } : {}
       }
     ];
   }
@@ -421,6 +437,7 @@ var SessionProjection = class {
       })() : void 0
     ) ?? asString(data["callId"]);
     if (callId === void 0) return [];
+    const facts = this.toolCalls.get(callId);
     const { failed, text, diffs } = extractToolResult(data);
     const content = diffs.map((diff) => ({
       type: "diff",
@@ -428,8 +445,36 @@ var SessionProjection = class {
       ...diff.oldText !== null ? { oldText: diff.oldText } : {},
       newText: diff.newText
     }));
+    const isCommand = facts?.kind === "execute";
+    if (this.terminalOutput && isCommand) {
+      this.toolCalls.delete(callId);
+      return [
+        ...text.length > 0 ? [
+          {
+            sessionUpdate: "tool_call_update",
+            toolCallId: callId,
+            _meta: { terminal_output: { terminal_id: callId, data: text } }
+          }
+        ] : [],
+        {
+          sessionUpdate: "tool_call_update",
+          toolCallId: callId,
+          status: failed ? "failed" : "completed",
+          ...text.length > 0 ? { rawOutput: { output: text, isError: failed } } : {},
+          _meta: {
+            terminal_exit: { terminal_id: callId, exit_code: failed ? 1 : 0, signal: null }
+          }
+        }
+      ];
+    }
     if (text.length > 0 && diffs.length === 0) {
-      const block = { type: "text", text };
+      const block = {
+        type: "text",
+        text: isCommand ? `\`\`\`sh
+${text.replace(/\n+$/, "")}
+\`\`\`
+` : text
+      };
       content.push({ type: "content", content: block });
     }
     this.toolCalls.delete(callId);
@@ -591,6 +636,7 @@ async function apply(ctx, config = {}) {
   const sessions = /* @__PURE__ */ new Map();
   let closed = false;
   let conn;
+  let clientTerminalOutput = false;
   const modelCandidates = () => {
     const seen = /* @__PURE__ */ new Set();
     if (config.model !== void 0) seen.add(config.model);
@@ -960,6 +1006,24 @@ async function apply(ctx, config = {}) {
   };
   const configOptions = async (record) => {
     const result = [];
+    {
+      const permission = permissionService();
+      const levels = permission !== void 0 && permission.names.length > 0 ? permission.names.map((name3) => {
+        const spec = permission.resolve(name3);
+        return { value: name3, name: spec.name, description: spec.description };
+      }) : SANDBOX_MODES2.map((mode) => {
+        const label = MODE_LABELS[mode] ?? { name: mode, description: "" };
+        return { value: mode, name: label.name, description: label.description };
+      });
+      result.push({
+        type: "select",
+        id: "mode",
+        name: "Permissions",
+        category: "mode",
+        currentValue: record.modeId,
+        options: levels
+      });
+    }
     const models = await modelChoices(record);
     if (models.length >= 2) {
       result.push({
@@ -1125,7 +1189,10 @@ async function apply(ctx, config = {}) {
     const record = {
       agent,
       dispose,
-      projection: projection ?? new SessionProjection(),
+      projection: projection ?? new SessionProjection(void 0, {
+        terminalOutput: clientTerminalOutput,
+        ...agent.session.header.cwd !== void 0 ? { cwd: agent.session.header.cwd } : {}
+      }),
       modeId,
       model,
       approvals: modeId === "danger-full-access" ? "never" : "ask",
@@ -1195,6 +1262,8 @@ async function apply(ctx, config = {}) {
       initialize(params) {
         const hasPersistence = ctx.get("sessionPersistence") !== void 0;
         const requested = params.protocolVersion;
+        const capsMeta = params.clientCapabilities?.["_meta"];
+        clientTerminalOutput = capsMeta !== null && typeof capsMeta === "object" ? capsMeta["terminal_output"] === true : false;
         return Promise.resolve({
           protocolVersion: typeof requested === "number" && requested >= 1 && requested < PROTOCOL_VERSION ? requested : PROTOCOL_VERSION,
           agentInfo: { name: "dsh-acp", title: "DeepSeek Harness", version: VERSION },
@@ -1434,6 +1503,10 @@ async function apply(ctx, config = {}) {
         const value = typeof params.value === "string" ? params.value : void 0;
         if (value === void 0) throw invalidParams(`invalid value: ${String(params.value)}`);
         switch (params.configId) {
+          case "mode": {
+            applyMode(record, params.sessionId, value);
+            break;
+          }
           case "preset": {
             await switchPreset(record, params.sessionId, value);
             break;

package/dist/index.js

@@ -290,8 +290,14 @@ var SessionProjection = class {
   toolCalls = /* @__PURE__ */ new Map();
   window = emptyWindow();
   lastContextUse;
-  constructor(contextWindow) {
+  /** Client renders `_meta.terminal_output` display terminals (Zed extension). */
+  terminalOutput;
+  /** Session working directory, advertised on display terminals. */
+  cwd;
+  constructor(contextWindow, options) {
     this.contextWindow = contextWindow;
+    this.terminalOutput = options?.terminalOutput ?? false;
+    this.cwd = options?.cwd;
   }
   /** Reset per-prompt accumulators; call when a new `session/prompt` starts. */
   beginPrompt() {
@@ -420,6 +426,7 @@ var SessionProjection = class {
     const rawArguments = typeof data["arguments"] === "string" ? data["arguments"] : "{}";
     const facts = classifyToolCall(name3, rawArguments);
     this.toolCalls.set(callId, facts);
+    const displayTerminal = this.terminalOutput && facts.kind === "execute";
     return [
       {
         sessionUpdate: "tool_call",
@@ -429,7 +436,16 @@ var SessionProjection = class {
         kind: facts.kind,
         status: "in_progress",
         rawInput: facts.rawInput,
-        ...facts.locations.length > 0 ? { locations: facts.locations } : {}
+        ...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 } : {}
+            }
+          }
+        } : {}
       }
     ];
   }
@@ -446,6 +462,7 @@ var SessionProjection = class {
       })() : void 0
     ) ?? asString(data["callId"]);
     if (callId === void 0) return [];
+    const facts = this.toolCalls.get(callId);
     const { failed, text, diffs } = extractToolResult(data);
     const content = diffs.map((diff) => ({
       type: "diff",
@@ -453,8 +470,36 @@ var SessionProjection = class {
       ...diff.oldText !== null ? { oldText: diff.oldText } : {},
       newText: diff.newText
     }));
+    const isCommand = facts?.kind === "execute";
+    if (this.terminalOutput && isCommand) {
+      this.toolCalls.delete(callId);
+      return [
+        ...text.length > 0 ? [
+          {
+            sessionUpdate: "tool_call_update",
+            toolCallId: callId,
+            _meta: { terminal_output: { terminal_id: callId, data: text } }
+          }
+        ] : [],
+        {
+          sessionUpdate: "tool_call_update",
+          toolCallId: callId,
+          status: failed ? "failed" : "completed",
+          ...text.length > 0 ? { rawOutput: { output: text, isError: failed } } : {},
+          _meta: {
+            terminal_exit: { terminal_id: callId, exit_code: failed ? 1 : 0, signal: null }
+          }
+        }
+      ];
+    }
     if (text.length > 0 && diffs.length === 0) {
-      const block = { type: "text", text };
+      const block = {
+        type: "text",
+        text: isCommand ? `\`\`\`sh
+${text.replace(/\n+$/, "")}
+\`\`\`
+` : text
+      };
       content.push({ type: "content", content: block });
     }
     this.toolCalls.delete(callId);
@@ -616,6 +661,7 @@ async function apply(ctx, config = {}) {
   const sessions = /* @__PURE__ */ new Map();
   let closed = false;
   let conn;
+  let clientTerminalOutput = false;
   const modelCandidates = () => {
     const seen = /* @__PURE__ */ new Set();
     if (config.model !== void 0) seen.add(config.model);
@@ -985,6 +1031,24 @@ async function apply(ctx, config = {}) {
   };
   const configOptions = async (record) => {
     const result = [];
+    {
+      const permission = permissionService();
+      const levels = permission !== void 0 && permission.names.length > 0 ? permission.names.map((name3) => {
+        const spec = permission.resolve(name3);
+        return { value: name3, name: spec.name, description: spec.description };
+      }) : SANDBOX_MODES2.map((mode) => {
+        const label = MODE_LABELS[mode] ?? { name: mode, description: "" };
+        return { value: mode, name: label.name, description: label.description };
+      });
+      result.push({
+        type: "select",
+        id: "mode",
+        name: "Permissions",
+        category: "mode",
+        currentValue: record.modeId,
+        options: levels
+      });
+    }
     const models = await modelChoices(record);
     if (models.length >= 2) {
       result.push({
@@ -1150,7 +1214,10 @@ async function apply(ctx, config = {}) {
     const record = {
       agent,
       dispose,
-      projection: projection ?? new SessionProjection(),
+      projection: projection ?? new SessionProjection(void 0, {
+        terminalOutput: clientTerminalOutput,
+        ...agent.session.header.cwd !== void 0 ? { cwd: agent.session.header.cwd } : {}
+      }),
       modeId,
       model,
       approvals: modeId === "danger-full-access" ? "never" : "ask",
@@ -1220,6 +1287,8 @@ async function apply(ctx, config = {}) {
       initialize(params) {
         const hasPersistence = ctx.get("sessionPersistence") !== void 0;
         const requested = params.protocolVersion;
+        const capsMeta = params.clientCapabilities?.["_meta"];
+        clientTerminalOutput = capsMeta !== null && typeof capsMeta === "object" ? capsMeta["terminal_output"] === true : false;
         return Promise.resolve({
           protocolVersion: typeof requested === "number" && requested >= 1 && requested < PROTOCOL_VERSION ? requested : PROTOCOL_VERSION,
           agentInfo: { name: "dsh-acp", title: "DeepSeek Harness", version: VERSION },
@@ -1459,6 +1528,10 @@ async function apply(ctx, config = {}) {
         const value = typeof params.value === "string" ? params.value : void 0;
         if (value === void 0) throw invalidParams(`invalid value: ${String(params.value)}`);
         switch (params.configId) {
+          case "mode": {
+            applyMode(record, params.sessionId, value);
+            break;
+          }
           case "preset": {
             await switchPreset(record, params.sessionId, value);
             break;
@@ -2061,7 +2134,7 @@ async function bootAcpProfile(host, overrides) {
   let rootConfigPath = join2(ownRoot(), "profile-root.cordis.yml");
   let bareModuleBaseUrl = pathToFileURL2(dshDir + sep2).href;
   const distBridge = join2(ownRoot(), "dist", "bridge.js");
-  const bridgeEntry = existsSync2(distBridge) ? distBridge : join2(ownRoot(), "src", "bundle.ts");
+  const bridgeEntry = import.meta.url.endsWith(".ts") || !existsSync2(distBridge) ? join2(ownRoot(), "src", "bundle.ts") : distBridge;
   const realProfileDir = join2(home, "profiles", "acp");
   if (existsSync2(join2(realProfileDir, "package.json"))) {
     appBoot.healProfilesModuleFallback(dshPkgPath);

package/package.json

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