@clwnd/opencode 0.4.3 → 0.5.1

package/dist/index.js

@@ -283,10 +283,19 @@ var { btoa, atob } = globalThis;
 
 // provider.ts
 var MCP_PREFIX = "mcp__clwnd__";
+var TOOL_NAME_MAP = {
+  WebFetch: "webfetch",
+  WebSearch: "websearch",
+  TodoWrite: "todowrite",
+  AskUserQuestion: "question",
+  Task: "task",
+  Skill: "skill"
+};
 function mapToolName(name14) {
   if (name14.startsWith(MCP_PREFIX)) return name14.slice(MCP_PREFIX.length);
-  return name14;
+  return TOOL_NAME_MAP[name14] ?? name14;
 }
+var BROKERED_TOOLS = /* @__PURE__ */ new Set(["webfetch", "websearch", "todowrite"]);
 var INPUT_FIELD_MAP = {
   read: { file_path: "filePath" },
   edit: { file_path: "filePath", old_string: "oldString", new_string: "newString", replace_all: "replaceAll" },
@@ -300,6 +309,21 @@ var INPUT_FIELD_MAP = {
 };
 function mapToolInput(toolName, input) {
   const ocName = mapToolName(toolName);
+  if (ocName === "todowrite") {
+    try {
+      const parsed = JSON.parse(input);
+      if (parsed.todos && Array.isArray(parsed.todos)) {
+        parsed.todos = parsed.todos.map((t) => ({
+          content: t.content ?? "",
+          status: t.status ?? "pending",
+          priority: t.priority ?? "medium"
+        }));
+      }
+      return JSON.stringify(parsed);
+    } catch {
+      return input;
+    }
+  }
   const fieldMap = INPUT_FIELD_MAP[ocName];
   if (!fieldMap || Object.keys(fieldMap).length === 0) return input;
   try {
@@ -347,6 +371,25 @@ function isAuxiliaryCall(opts) {
   const hasTools = Array.isArray(opts.tools) && opts.tools.length > 0;
   return !hasTools;
 }
+var OC_TO_MCP = {
+  read: "read",
+  edit: "edit",
+  write: "write",
+  bash: "bash",
+  glob: "glob",
+  grep: "grep",
+  apply_patch: "edit",
+  webfetch: "webfetch"
+};
+function deriveAllowedTools(opts) {
+  if (!Array.isArray(opts.tools)) return ["read", "edit", "write", "bash", "glob", "grep"];
+  const ocTools = new Set(opts.tools.map((t) => t.name));
+  const allowed = [];
+  for (const [ocName, mcpName] of Object.entries(OC_TO_MCP)) {
+    if (ocTools.has(ocName)) allowed.push(mcpName);
+  }
+  return [...new Set(allowed)];
+}
 function extractText(prompt) {
   for (let i = prompt.length - 1; i >= 0; i--) {
     const m = prompt[i];
@@ -416,6 +459,7 @@ var ClwndModel = class {
     const warnings = [];
     const cwd = this.config.cwd ?? process.cwd();
     const permissions = isTitle ? [] : await getSessionPermissions(this.config.client, sid);
+    const allowedTools = isTitle ? [] : deriveAllowedTools(opts);
     let reasoning = "";
     let responseText = "";
     const toolCalls = [];
@@ -435,7 +479,8 @@ var ClwndModel = class {
         modelId: this.modelId,
         text,
         systemPrompt,
-        permissions
+        permissions,
+        allowedTools
       }).then(async (resp) => {
         if (!resp.body) {
           abort();
@@ -540,6 +585,7 @@ var ClwndModel = class {
     const self = this;
     const toolInputAccum = /* @__PURE__ */ new Map();
     const permissions = isTitle ? [] : await getSessionPermissions(this.config.client, sid);
+    const allowedTools = isTitle ? [] : deriveAllowedTools(opts);
     const stream = new ReadableStream({
       async start(controller) {
         const textId = generateId();
@@ -548,6 +594,7 @@ var ClwndModel = class {
         let reader = null;
         let textStarted = false;
         let reasoningStarted = false;
+        const brokeredCallIds = /* @__PURE__ */ new Set();
         function emit(part) {
           if (done) return;
           try {
@@ -580,7 +627,8 @@ var ClwndModel = class {
             modelId: self.modelId,
             text,
             systemPrompt,
-            permissions
+            permissions,
+            allowedTools
           });
         } catch (e) {
           emit({ type: "error", error: new Error(String(e)) });
@@ -653,16 +701,19 @@ var ClwndModel = class {
                   } else {
                     rawInput = "{}";
                   }
+                  const isBrokered = BROKERED_TOOLS.has(ocToolName);
+                  if (isBrokered) brokeredCallIds.add(msg.toolCallId);
                   emit({
                     type: "tool-call",
                     toolCallId: msg.toolCallId,
                     toolName: ocToolName,
                     input: rawInput,
-                    providerExecuted: true
+                    providerExecuted: !isBrokered
                   });
                 }
                 if (ct === "tool_result" && (msg.toolCallId || msg.toolUseId)) {
                   const callId = msg.toolCallId ?? msg.toolUseId;
+                  if (brokeredCallIds.has(callId)) continue;
                   const raw = msg.result ?? "";
                   const { output, title, metadata } = parseToolResult(typeof raw === "string" ? raw : JSON.stringify(raw));
                   emit({
@@ -684,9 +735,10 @@ var ClwndModel = class {
                 const cacheRead = u?.cache_read_input_tokens ?? 0;
                 const cacheWrite = u?.cache_creation_input_tokens ?? 0;
                 const inputBase = u?.input_tokens ?? u?.inputTokens ?? 0;
+                const fr = brokeredCallIds.size > 0 ? "tool-calls" : msg.finishReason ?? "stop";
                 emit({
                   type: "finish",
-                  finishReason: msg.finishReason ?? "stop",
+                  finishReason: fr,
                   usage: {
                     inputTokens: inputBase + cacheRead + cacheWrite,
                     outputTokens: u?.output_tokens ?? u?.outputTokens,

package/package.json

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