@clwnd/opencode 0.1.0 → 0.3.0

package/dist/index.js

@@ -282,6 +282,53 @@ var generateId = createIdGenerator();
 var { btoa, atob } = globalThis;
 
 // provider.ts
+var MCP_PREFIX = "mcp__clwnd__";
+function mapToolName(name14) {
+  if (name14.startsWith(MCP_PREFIX)) return name14.slice(MCP_PREFIX.length);
+  return name14;
+}
+var INPUT_FIELD_MAP = {
+  read: { file_path: "filePath" },
+  edit: { file_path: "filePath", old_string: "oldString", new_string: "newString", replace_all: "replaceAll" },
+  write: { file_path: "filePath" },
+  bash: {},
+  // command, description, timeout are already correct
+  glob: {},
+  // pattern, path are already correct
+  grep: {}
+  // pattern, path, include are already correct
+};
+function mapToolInput(toolName, input) {
+  const ocName = mapToolName(toolName);
+  const fieldMap = INPUT_FIELD_MAP[ocName];
+  if (!fieldMap || Object.keys(fieldMap).length === 0) return input;
+  try {
+    const parsed = JSON.parse(input);
+    const mapped = {};
+    for (const [k, v] of Object.entries(parsed)) {
+      mapped[fieldMap[k] ?? k] = v;
+    }
+    return JSON.stringify(mapped);
+  } catch {
+    return input;
+  }
+}
+function parseToolResult(resultText) {
+  const metaMatch = resultText.match(/<!--clwnd-meta:(.*?)-->/s);
+  let title = "";
+  let metadata = {};
+  let output = resultText;
+  if (metaMatch) {
+    output = resultText.replace(/\n?<!--clwnd-meta:.*?-->/s, "").trim();
+    try {
+      const parsed = JSON.parse(metaMatch[1]);
+      title = parsed.title ?? "";
+      metadata = parsed.metadata ?? {};
+    } catch {
+    }
+  }
+  return { output, title, metadata };
+}
 function defaultSocketPath() {
   const runtime = process.env.XDG_RUNTIME_DIR;
   if (runtime) return `${runtime}/clwnd/clwnd.sock`;
@@ -296,15 +343,6 @@ function streamCall(msg) {
     unix: SOCK_PATH
   });
 }
-async function ipcCall(msg) {
-  const r = await fetch("http://localhost/", {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(msg),
-    unix: SOCK_PATH
-  });
-  if (!r.ok) throw new Error(`clwnd IPC ${r.status}`);
-}
 function extractText(prompt) {
   for (let i = prompt.length - 1; i >= 0; i--) {
     const m = prompt[i];
@@ -356,8 +394,6 @@ var ClwndModel = class {
       const abort = () => {
         if (resolved) return;
         resolved = true;
-        ipcCall({ action: "destroy", opencodeSessionId: sid }).catch(() => {
-        });
         reject(new Error("aborted"));
       };
       opts.abortSignal?.addEventListener("abort", abort);
@@ -394,16 +430,17 @@ var ClwndModel = class {
                 }
                 if (ct === "tool_call" && msg.toolCallId && msg.toolName) {
                   const accumulated = toolInputAccum.get(msg.toolCallId) ?? "{}";
+                  const mapped = mapToolInput(msg.toolName, accumulated);
                   let input = {};
                   try {
-                    input = JSON.parse(accumulated);
+                    input = JSON.parse(mapped);
                   } catch {
                     input = {};
                   }
                   toolCalls.push({
                     type: "tool-call",
                     toolCallId: msg.toolCallId,
-                    toolName: msg.toolName,
+                    toolName: mapToolName(msg.toolName),
                     input
                   });
                 }
@@ -496,8 +533,6 @@ var ClwndModel = class {
           }
         }
         opts.abortSignal?.addEventListener("abort", () => {
-          ipcCall({ action: "destroy", opencodeSessionId: sid }).catch(() => {
-          });
           close();
         });
         let resp;
@@ -559,7 +594,7 @@ var ClwndModel = class {
                 }
                 if (ct === "tool_input_start" && msg.toolCallId && msg.toolName) {
                   toolInputAccum.set(msg.toolCallId, "");
-                  emit({ type: "tool-input-start", id: msg.toolCallId, toolName: msg.toolName });
+                  emit({ type: "tool-input-start", id: msg.toolCallId, toolName: mapToolName(msg.toolName) });
                 }
                 if (ct === "tool_input_delta" && msg.toolCallId && msg.partialJson) {
                   const prev = toolInputAccum.get(msg.toolCallId) ?? "";
@@ -567,20 +602,35 @@ var ClwndModel = class {
                   emit({ type: "tool-input-delta", id: msg.toolCallId, delta: msg.partialJson });
                 }
                 if (ct === "tool_call" && msg.toolCallId && msg.toolName) {
-                  const accumulated = toolInputAccum.get(msg.toolCallId) ?? "{}";
+                  const ocToolName = mapToolName(msg.toolName);
+                  if (!toolInputAccum.has(msg.toolCallId)) {
+                    emit({ type: "tool-input-start", id: msg.toolCallId, toolName: ocToolName });
+                  }
+                  const accumulated = toolInputAccum.get(msg.toolCallId);
+                  let rawInput;
+                  if (accumulated) {
+                    rawInput = mapToolInput(msg.toolName, accumulated);
+                  } else if (msg.input && typeof msg.input === "object") {
+                    rawInput = mapToolInput(msg.toolName, JSON.stringify(msg.input));
+                  } else {
+                    rawInput = "{}";
+                  }
                   emit({
                     type: "tool-call",
                     toolCallId: msg.toolCallId,
-                    toolName: msg.toolName,
-                    input: accumulated,
+                    toolName: ocToolName,
+                    input: rawInput,
                     providerExecuted: true
                   });
                 }
-                if (ct === "tool_result" && msg.toolCallId) {
+                if (ct === "tool_result" && (msg.toolCallId || msg.toolUseId)) {
+                  const callId = msg.toolCallId ?? msg.toolUseId;
+                  const raw = msg.result ?? "";
+                  const { output, title, metadata } = parseToolResult(typeof raw === "string" ? raw : JSON.stringify(raw));
                   emit({
                     type: "tool-result",
-                    toolCallId: msg.toolCallId,
-                    result: { output: msg.result ?? "", title: "", metadata: {} },
+                    toolCallId: callId,
+                    result: { output, title, metadata },
                     providerExecuted: true
                   });
                 }
@@ -619,8 +669,6 @@ var ClwndModel = class {
         }
       },
       cancel() {
-        ipcCall({ action: "destroy", opencodeSessionId: sid }).catch(() => {
-        });
       }
     });
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clwnd/opencode",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "clwnd for opencode",
   "type": "module",
   "main": "dist/index.js",