@clwnd/opencode 0.11.0 → 0.12.1

package/dist/index.js

@@ -14,7 +14,6 @@ import { join } from "path";
 var DEFAULTS = {
   maxProcs: 4,
   idleTimeout: 3e4,
-  ocCompaction: false,
   smallModel: "",
   permissionDusk: 6e4,
   droned: false,
@@ -32,7 +31,6 @@ function loadConfig() {
       cached = {
         maxProcs: raw.maxProcs ?? DEFAULTS.maxProcs,
         idleTimeout: raw.idleTimeout ?? DEFAULTS.idleTimeout,
-        ocCompaction: raw.ocCompaction ?? DEFAULTS.ocCompaction,
         smallModel: raw.smallModel ?? DEFAULTS.smallModel,
         permissionDusk: raw.permissionDusk ?? DEFAULTS.permissionDusk,
         droned: raw.droned ?? DEFAULTS.droned,
@@ -381,6 +379,32 @@ function mapToolName(name) {
   return TOOL_NAME_MAP[name] ?? name;
 }
 var BROKERED_TOOLS = /* @__PURE__ */ new Set(["webfetch", "websearch", "todowrite"]);
+var KNOWN_TOOLS = /* @__PURE__ */ new Set([
+  "read",
+  "edit",
+  "write",
+  "bash",
+  "glob",
+  "grep",
+  "webfetch",
+  "websearch",
+  "todowrite",
+  "task",
+  "skill",
+  "todoread",
+  "taskoutput",
+  "taskstop",
+  "question",
+  "clwnd_permission",
+  "permission_prompt",
+  "cronCreate",
+  "cronDelete",
+  "cronList",
+  "notebookedit",
+  "codesearch",
+  "applypatch",
+  "ls"
+]);
 var INPUT_FIELD_MAP = {
   read: { file_path: "filePath" },
   edit: { file_path: "filePath", old_string: "oldString", new_string: "newString", replace_all: "replaceAll" },
@@ -652,6 +676,7 @@ function isBrokeredToolReturn(prompt) {
   return false;
 }
 var sessionLastAgent = /* @__PURE__ */ new Map();
+var sessionPetalCounts = /* @__PURE__ */ new Map();
 function detectAgent(sid, headers) {
   const raw = headers?.["x-clwnd-agent"] ?? null;
   if (!raw) return null;
@@ -694,6 +719,27 @@ async function getSessionPermissions(client, sessionId) {
     return [];
   }
 }
+var mcpConfigCache = null;
+async function getMcpServerConfigs(client) {
+  if (mcpConfigCache) return mcpConfigCache;
+  if (!client) return [];
+  try {
+    const resp = await client.config.get();
+    const mcp = resp.data?.mcp;
+    if (!mcp) return [];
+    const configs = [];
+    for (const [name, cfg] of Object.entries(mcp)) {
+      if (cfg.type === "local" && Array.isArray(cfg.command)) {
+        configs.push({ name, type: "local", command: cfg.command, environment: cfg.environment });
+      }
+    }
+    mcpConfigCache = configs;
+    if (configs.length > 0) trace("mcp.configs.loaded", { servers: configs.map((c) => c.name).join(",") });
+    return configs;
+  } catch {
+    return [];
+  }
+}
 var lastAllowedTools = /* @__PURE__ */ new Map();
 var AGENT_DENY = {
   plan: /* @__PURE__ */ new Set(["edit", "write"])
@@ -768,6 +814,8 @@ var ClwndModel = class {
   }
   async doStream(opts) {
     const sid = opts.headers?.["x-opencode-session"] ?? sigil(Date.now().toString());
+    const lastRole = opts.prompt.length > 0 ? opts.prompt[opts.prompt.length - 1].role : "none";
+    trace("doStream.enter", { sid, promptLen: opts.prompt.length, lastRole });
     const content = extractContent(opts.prompt, sid);
     const text = content.filter((p) => p.type === "text").map((p) => p.text).join("\n\n");
     const systemPrompt = extractSystemPrompt(opts.prompt);
@@ -777,8 +825,30 @@ var ClwndModel = class {
     const sap = /* @__PURE__ */ new Map();
     const permissions = await getSessionPermissions(this.config.client, sid);
     const allowedTools = deriveAllowedTools(sid, opts);
-    if (isAuxiliaryCall(opts) && !loadConfig().ocCompaction) {
-      trace("auxiliary.reject", { method: "doStream" });
+    const isAux = isAuxiliaryCall(opts);
+    if (isAux) trace("auxiliary.passthrough", { method: "doStream", sid });
+    let permAskId = null;
+    const isPermReturn = isBrokeredToolReturn(opts.prompt) && (() => {
+      const lt = opts.prompt.findLast((m) => m.role === "tool");
+      if (!lt || !Array.isArray(lt.content)) return false;
+      for (const p of lt.content) {
+        if (p.type === "tool-result" && p.toolCallId?.startsWith("perm-")) {
+          const rawOutput = p.output ?? p.result;
+          try {
+            const outer = typeof rawOutput === "string" ? JSON.parse(rawOutput) : rawOutput;
+            const inner = outer?.value ?? outer;
+            const str = typeof inner === "string" ? inner : JSON.stringify(inner ?? "");
+            const parsed = JSON.parse(str);
+            if (parsed.askId) permAskId = parsed.askId;
+          } catch {
+          }
+          return true;
+        }
+      }
+      return false;
+    })();
+    if (isBrokeredToolReturn(opts.prompt) && !isPermReturn) {
+      trace("brokered.return", { sid });
       return {
         stream: new ReadableStream({
           start(controller) {
@@ -788,36 +858,47 @@ var ClwndModel = class {
         })
       };
     }
-    if (isBrokeredToolReturn(opts.prompt)) {
-      trace("brokered.return", { sid });
-      let isPermissionReturn = false;
-      const lastTool = opts.prompt.findLast((m) => m.role === "tool");
-      if (lastTool && Array.isArray(lastTool.content)) {
-        for (const part of lastTool.content) {
-          if (part.type === "tool-result" && part.toolCallId?.startsWith("perm-")) {
-            isPermissionReturn = true;
-          }
-        }
+    const listenOnly = !!isPermReturn;
+    const priorPetals = opts.prompt.filter((m) => m.role === "user" || m.role === "assistant" || m.role === "tool");
+    trace("priorPetals", { sid, count: priorPetals.length, roles: priorPetals.map((m) => m.role).join(",") });
+    if (!isAux) {
+      const prev = sessionPetalCounts.get(sid) ?? 0;
+      sessionPetalCounts.set(sid, priorPetals.length);
+      if (prev > 0 && priorPetals.length < prev * 0.5) {
+        trace("compaction.detected", { sid, prev, now: priorPetals.length });
+        hum({ chi: "cancel", sid, reason: "compaction" });
       }
-      if (!isPermissionReturn) {
-        return {
-          stream: new ReadableStream({
-            start(controller) {
-              controller.enqueue({ type: "finish", finishReason: { unified: "stop", raw: "stop" }, usage: zeroUsage() });
-              controller.close();
-            }
-          })
-        };
+    }
+    const externalTools = [];
+    const externalToolNames = /* @__PURE__ */ new Set();
+    if (opts.tools) {
+      for (const t of opts.tools) {
+        if (t.type !== "function") continue;
+        const name = t.name;
+        if (KNOWN_TOOLS.has(name)) continue;
+        externalTools.push({ name, description: t.description, inputSchema: t.inputSchema });
+        externalToolNames.add(name);
       }
     }
-    const listenOnly = isBrokeredToolReturn(opts.prompt) && (() => {
-      const lt = opts.prompt.findLast((m) => m.role === "tool");
-      return lt && Array.isArray(lt.content) && lt.content.some((p) => p.type === "tool-result" && p.toolCallId?.startsWith("perm-"));
-    })();
-    const priorPetals = opts.prompt.filter((m) => m.role === "user" || m.role === "assistant" || m.role === "tool");
-    trace("priorPetals", { sid, count: priorPetals.length, roles: priorPetals.map((m) => m.role).join(",") });
+    const allToolNames = opts.tools ? opts.tools.filter((t) => t.type === "function").map((t) => t.name) : [];
+    trace("tools.available", { sid, count: allToolNames.length, names: allToolNames.join(",") });
+    if (externalTools.length > 0) trace("external.tools.detected", { sid, names: [...externalToolNames].join(",") });
     let promptSent = false;
-    if (!listenOnly && humAlive) {
+    if (listenOnly && humAlive) {
+      hum({
+        chi: "prompt",
+        sid,
+        cwd,
+        modelId: self.modelId,
+        listenOnly: true,
+        dusk: duskIn(3e4)
+      });
+      promptSent = true;
+      if (permAskId) {
+        trace("permission.hold.releasing", { sid, askId: permAskId });
+        hum({ chi: "release-permit", askId: permAskId, decision: "allow" });
+      }
+    } else if (!listenOnly && humAlive) {
       hum({
         chi: "prompt",
         sid,
@@ -829,8 +910,13 @@ var ClwndModel = class {
         permissions,
         allowedTools,
         listenOnly,
+        auxiliary: isAux || void 0,
+        // skip graft for compaction/title gen
         ocServerUrl: self.config.pluginInput?.serverUrl?.toString(),
         priorPetals,
+        externalTools: externalTools.length > 0 ? externalTools : void 0,
+        mcpServerConfigs: await getMcpServerConfigs(this.config.client),
+        visibleTools: allToolNames,
         dusk: duskIn(3e4)
       });
       promptSent = true;
@@ -839,6 +925,7 @@ var ClwndModel = class {
       async start(controller) {
         let done = false;
         const tendrils = /* @__PURE__ */ new Set();
+        const streamBrokered = new Set(BROKERED_TOOLS);
         const buds = [];
         const metaQueue = [];
         let textId = "t0";
@@ -908,6 +995,7 @@ var ClwndModel = class {
             const ct = raw.chunkType;
             if (ct === "text_start" || ct === "text_delta" && !textStarted) {
               if (!textStarted) {
+                textId = `t${Date.now()}`;
                 textStarted = true;
                 petal({ type: "text-start", id: textId });
               }
@@ -917,6 +1005,7 @@ var ClwndModel = class {
             }
             if (ct === "reasoning_start" || ct === "reasoning_delta" && !reasoningStarted) {
               if (!reasoningStarted) {
+                reasoningId = `r${Date.now()}`;
                 reasoningStarted = true;
                 petal({ type: "reasoning-start", id: reasoningId });
               }
@@ -929,6 +1018,14 @@ var ClwndModel = class {
               reasoningStarted = false;
             }
             if (ct === "tool_input_start" && raw.toolCallId && raw.toolName) {
+              if (textStarted) {
+                petal({ type: "text-end", id: textId });
+                textStarted = false;
+              }
+              if (reasoningStarted) {
+                petal({ type: "reasoning-end", id: reasoningId });
+                reasoningStarted = false;
+              }
               sap.set(raw.toolCallId, "");
               buds.push({ type: "tool-input-start", id: raw.toolCallId, toolName: mapToolName(raw.toolName) });
             }
@@ -951,7 +1048,7 @@ var ClwndModel = class {
               } else {
                 rawInput = "{}";
               }
-              const isBrokered = BROKERED_TOOLS.has(ocToolName);
+              const isBrokered = streamBrokered.has(ocToolName);
               if (isBrokered) tendrils.add(raw.toolCallId);
               buds.push({
                 type: "tool-call",
@@ -1177,18 +1274,17 @@ var clwndPlugin = async (input) => {
         },
         async execute(args, ctx) {
           trace("permission.tool.invoked", { tool: args.tool, path: args.path });
+          const t0 = Date.now();
           await ctx.ask({
             permission: args.tool === "edit" || args.tool === "write" ? "edit" : args.tool,
             patterns: [args.path ?? "*"],
             metadata: { tool: args.tool, filepath: args.path },
             always: [args.path ?? "*"]
           });
+          const elapsed = Date.now() - t0;
           const askId = args.askId;
-          trace("permission.tool.approved", { tool: args.tool, askId });
-          if (askId) {
-            hum({ chi: "release-permit", askId, decision: "allow" });
-          }
-          return `Permission granted for ${args.tool}`;
+          trace("permission.tool.approved", { tool: args.tool, askId, elapsed, autoAllowed: elapsed < 100 });
+          return JSON.stringify({ granted: true, tool: args.tool, askId });
         }
       })
     }

package/package.json

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