@openma/deepseek-harness-acp 0.4.1 → 0.4.3

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);
@@ -908,6 +954,7 @@ async function apply(ctx, config = {}) {
     delete record.selection;
     ensureSelection(record);
     setApprovalPolicy(record, record.approvals);
+    publishCommands(acpSessionId, record);
   };
   const setApprovalPolicy = (record, policy) => {
     try {
@@ -1039,18 +1086,64 @@ async function apply(ctx, config = {}) {
     }
     return result;
   };
-  const publishCommands = (sessionId) => {
-    notify(sessionId, {
-      sessionUpdate: "available_commands_update",
-      availableCommands: [
-        { name: "status", description: "Show adapter, model, mode, and token status" },
-        {
-          name: "login",
-          description: "Save a DeepSeek API key into the harness credential store (~/.dsh/.credentials.yaml)",
-          input: { hint: "<api-key>" }
-        },
-        { name: "logout", description: "Remove the API key stored in the harness credential store" }
-      ]
+  const BUILTIN_COMMANDS = [
+    { name: "status", description: "Show adapter, model, mode, and token status" },
+    {
+      name: "login",
+      description: "Save a DeepSeek API key into the harness credential store (~/.dsh/.credentials.yaml)",
+      input: { hint: "<api-key>" }
+    },
+    { name: "logout", description: "Remove the API key stored in the harness credential store" }
+  ];
+  const availableCommandsFor = async (record) => {
+    const list = [...BUILTIN_COMMANDS];
+    const seen = new Set(list.map((command) => command.name));
+    const commandsSvc = ctx.get("commands");
+    if (commandsSvc !== void 0) {
+      try {
+        for (const descriptor of commandsSvc.list(record.agent)) {
+          if (seen.has(descriptor.name)) continue;
+          seen.add(descriptor.name);
+          list.push({
+            name: descriptor.name,
+            description: descriptor.description,
+            ...descriptor.input !== void 0 ? { input: { hint: descriptor.input.hint } } : {}
+          });
+        }
+      } catch (error) {
+        logWarn(`command listing failed: ${String(error)}`);
+      }
+    }
+    const skillsSvc = ctx.get("skills");
+    if (skillsSvc !== void 0) {
+      try {
+        const skills = await skillsSvc.list({
+          ...record.agent.session.header.cwd !== void 0 ? { cwd: record.agent.session.header.cwd } : {},
+          scope: record.agent
+        });
+        for (const skill of skills) {
+          if (skill.invocation.userInvocable !== true) continue;
+          if (seen.has(skill.name)) continue;
+          seen.add(skill.name);
+          list.push({
+            name: skill.name,
+            description: skill.description,
+            input: { hint: "instructions for the skill" }
+          });
+        }
+      } catch (error) {
+        logDebug(`skill listing failed: ${String(error)}`);
+      }
+    }
+    return list;
+  };
+  const publishCommands = (sessionId, record) => {
+    const target = record ?? sessions.get(sessionId);
+    if (target === void 0) return;
+    void availableCommandsFor(target).then((availableCommands) => {
+      notify(sessionId, { sessionUpdate: "available_commands_update", availableCommands });
+    }).catch((error) => {
+      logWarn(`publishing commands failed: ${String(error)}`);
     });
   };
   const credentialStore = () => {
@@ -1143,7 +1236,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",
@@ -1213,6 +1309,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 },
@@ -1393,6 +1491,27 @@ async function apply(ctx, config = {}) {
           return respond(await loginText(trimmed.slice(commandMatch[0].length)));
         }
         if (commandMatch?.[1] === "logout") return respond(await logoutText());
+        if (commandMatch !== null && commandMatch[1] !== void 0) {
+          const commandsSvc = ctx.get("commands");
+          if (commandsSvc !== void 0) {
+            let execution;
+            try {
+              execution = await commandsSvc.execute(
+                record.agent,
+                trimmed,
+                new AbortController().signal
+              );
+            } catch (error) {
+              return respond(`\u26A0 /${commandMatch[1]} failed: ${errorChain2(error)}`);
+            }
+            if (execution !== void 0) {
+              const { result } = execution;
+              const text = result.text ?? (result.kind === "success" ? `/${commandMatch[1]} \u2713` : `/${commandMatch[1]} failed`);
+              publishCommands(params.sessionId, record);
+              return respond(result.kind === "error" ? `\u26A0 ${text}` : text);
+            }
+          }
+        }
         if (!await credentialPresent()) {
           return respond(
             [

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);
@@ -933,6 +979,7 @@ async function apply(ctx, config = {}) {
     delete record.selection;
     ensureSelection(record);
     setApprovalPolicy(record, record.approvals);
+    publishCommands(acpSessionId, record);
   };
   const setApprovalPolicy = (record, policy) => {
     try {
@@ -1064,18 +1111,64 @@ async function apply(ctx, config = {}) {
     }
     return result;
   };
-  const publishCommands = (sessionId) => {
-    notify(sessionId, {
-      sessionUpdate: "available_commands_update",
-      availableCommands: [
-        { name: "status", description: "Show adapter, model, mode, and token status" },
-        {
-          name: "login",
-          description: "Save a DeepSeek API key into the harness credential store (~/.dsh/.credentials.yaml)",
-          input: { hint: "<api-key>" }
-        },
-        { name: "logout", description: "Remove the API key stored in the harness credential store" }
-      ]
+  const BUILTIN_COMMANDS = [
+    { name: "status", description: "Show adapter, model, mode, and token status" },
+    {
+      name: "login",
+      description: "Save a DeepSeek API key into the harness credential store (~/.dsh/.credentials.yaml)",
+      input: { hint: "<api-key>" }
+    },
+    { name: "logout", description: "Remove the API key stored in the harness credential store" }
+  ];
+  const availableCommandsFor = async (record) => {
+    const list = [...BUILTIN_COMMANDS];
+    const seen = new Set(list.map((command) => command.name));
+    const commandsSvc = ctx.get("commands");
+    if (commandsSvc !== void 0) {
+      try {
+        for (const descriptor of commandsSvc.list(record.agent)) {
+          if (seen.has(descriptor.name)) continue;
+          seen.add(descriptor.name);
+          list.push({
+            name: descriptor.name,
+            description: descriptor.description,
+            ...descriptor.input !== void 0 ? { input: { hint: descriptor.input.hint } } : {}
+          });
+        }
+      } catch (error) {
+        logWarn(`command listing failed: ${String(error)}`);
+      }
+    }
+    const skillsSvc = ctx.get("skills");
+    if (skillsSvc !== void 0) {
+      try {
+        const skills = await skillsSvc.list({
+          ...record.agent.session.header.cwd !== void 0 ? { cwd: record.agent.session.header.cwd } : {},
+          scope: record.agent
+        });
+        for (const skill of skills) {
+          if (skill.invocation.userInvocable !== true) continue;
+          if (seen.has(skill.name)) continue;
+          seen.add(skill.name);
+          list.push({
+            name: skill.name,
+            description: skill.description,
+            input: { hint: "instructions for the skill" }
+          });
+        }
+      } catch (error) {
+        logDebug(`skill listing failed: ${String(error)}`);
+      }
+    }
+    return list;
+  };
+  const publishCommands = (sessionId, record) => {
+    const target = record ?? sessions.get(sessionId);
+    if (target === void 0) return;
+    void availableCommandsFor(target).then((availableCommands) => {
+      notify(sessionId, { sessionUpdate: "available_commands_update", availableCommands });
+    }).catch((error) => {
+      logWarn(`publishing commands failed: ${String(error)}`);
     });
   };
   const credentialStore = () => {
@@ -1168,7 +1261,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",
@@ -1238,6 +1334,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 },
@@ -1418,6 +1516,27 @@ async function apply(ctx, config = {}) {
           return respond(await loginText(trimmed.slice(commandMatch[0].length)));
         }
         if (commandMatch?.[1] === "logout") return respond(await logoutText());
+        if (commandMatch !== null && commandMatch[1] !== void 0) {
+          const commandsSvc = ctx.get("commands");
+          if (commandsSvc !== void 0) {
+            let execution;
+            try {
+              execution = await commandsSvc.execute(
+                record.agent,
+                trimmed,
+                new AbortController().signal
+              );
+            } catch (error) {
+              return respond(`\u26A0 /${commandMatch[1]} failed: ${errorChain2(error)}`);
+            }
+            if (execution !== void 0) {
+              const { result } = execution;
+              const text = result.text ?? (result.kind === "success" ? `/${commandMatch[1]} \u2713` : `/${commandMatch[1]} failed`);
+              publishCommands(params.sessionId, record);
+              return respond(result.kind === "error" ? `\u26A0 ${text}` : text);
+            }
+          }
+        }
         if (!await credentialPresent()) {
           return respond(
             [

package/package.json

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