@clwnd/opencode 0.15.6 → 0.16.0

package/dist/index.js

@@ -17,7 +17,8 @@ var DEFAULTS = {
   smallModel: "",
   permissionDusk: 6e4,
   droned: false,
-  droneModel: { providerID: "opencode-clwnd", modelID: "claude-haiku-4-5" }
+  droneModel: { providerID: "opencode-clwnd", modelID: "claude-haiku-4-5" },
+  ocCompaction: false
 };
 var CONFIG_PATHS = [
   join(process.env.XDG_CONFIG_HOME ?? join(process.env.HOME ?? "/", ".config"), "clwnd", "clwnd.json")
@@ -34,7 +35,8 @@ function loadConfig() {
         smallModel: raw.smallModel ?? DEFAULTS.smallModel,
         permissionDusk: raw.permissionDusk ?? DEFAULTS.permissionDusk,
         droned: raw.droned ?? DEFAULTS.droned,
-        droneModel: raw.droneModel ?? DEFAULTS.droneModel
+        droneModel: raw.droneModel ?? DEFAULTS.droneModel,
+        ocCompaction: raw.ocCompaction ?? DEFAULTS.ocCompaction
       };
       return cached;
     } catch {
@@ -388,11 +390,9 @@ function mapToolName(name) {
 var BROKERED_TOOLS = /* @__PURE__ */ new Set(["webfetch", "websearch", "todowrite"]);
 var KNOWN_TOOLS = /* @__PURE__ */ new Set([
   "read",
-  "edit",
-  "write",
+  "do_code",
+  "do_noncode",
   "bash",
-  "glob",
-  "grep",
   "webfetch",
   "websearch",
   "todowrite",
@@ -410,15 +410,18 @@ var KNOWN_TOOLS = /* @__PURE__ */ new Set([
   "notebookedit",
   "codesearch",
   "applypatch",
-  "ls"
+  "ls",
+  // Replaced-and-banned. Do not forward. Do not re-enable.
+  "edit",
+  "write",
+  "glob",
+  "grep"
 ]);
 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: {},
-  glob: {},
-  grep: {}
+  do_code: { file_path: "filePath", new_source: "newSource" },
+  do_noncode: { file_path: "filePath" },
+  bash: {}
 };
 function mapToolInput(toolName, input) {
   const ocName = mapToolName(toolName);
@@ -474,7 +477,7 @@ function defaultSocketPath() {
 var HUM_PATH = (process.env.CLWND_SOCKET ?? defaultSocketPath()) + ".hum";
 var humSocket = null;
 var humEcho = "";
-var humHearer = null;
+var humHearers = /* @__PURE__ */ new Map();
 var humAlive = false;
 var humReady = null;
 var humAwaken = awakenHum();
@@ -552,7 +555,11 @@ async function awakenHum() {
             trace("hum.pulse", { kind: msg.kind, sid: msg.sid });
             continue;
           }
-          if (humHearer) humHearer(msg);
+          const msgSid = typeof msg.sid === "string" ? msg.sid : void 0;
+          if (msgSid) {
+            const h = humHearers.get(msgSid);
+            if (h) h(msg);
+          }
         } catch {
         }
       }
@@ -594,15 +601,15 @@ function hum(msg) {
     writeLog("trace", "hum.send.failed", { err: String(e) });
   }
 }
-function humHear(onMessage) {
+function humHear(sid, onMessage) {
   return new Promise((resolve) => {
-    humHearer = (incoming) => {
+    humHearers.set(sid, (incoming) => {
       onMessage(incoming);
       if (incoming.chi === "finish" || incoming.chi === "error") {
-        humHearer = null;
+        humHearers.delete(sid);
         resolve();
       }
-    };
+    });
   });
 }
 function extractContent(prompt, sessionId) {
@@ -742,14 +749,6 @@ function sanitizePrompt(text, word) {
   while (kept.length > 0 && !kept[0].trim()) kept.shift();
   return kept.join("");
 }
-function isAuxiliaryCall(opts) {
-  return opts.tools === void 0;
-}
-function pickAuxModel(primary) {
-  if (/^claude-opus/i.test(primary)) return "claude-sonnet-4-6";
-  if (/^claude-sonnet/i.test(primary)) return "claude-haiku-4-5";
-  return primary;
-}
 function isBrokeredToolReturn(prompt) {
   if (prompt.length < 2) return false;
   const last = prompt[prompt.length - 1];
@@ -763,6 +762,7 @@ function isBrokeredToolReturn(prompt) {
 }
 var sessionLastAgent = /* @__PURE__ */ new Map();
 var sessionPetalCounts = /* @__PURE__ */ new Map();
+var sessionJustCompacted = /* @__PURE__ */ new Map();
 function detectAgent(sid, headers) {
   const raw = headers?.["x-clwnd-agent"] ?? null;
   if (!raw) return null;
@@ -833,18 +833,16 @@ var lastAllowedToolsHash = /* @__PURE__ */ new Map();
 var pendingPenny = {
   humDedup: 0,
   reminderStripped: 0,
-  priorPetalsElided: 0,
-  auxModelRouted: 0
+  priorPetalsElided: 0
 };
 function flushPenny() {
-  if (pendingPenny.humDedup === 0 && pendingPenny.reminderStripped === 0 && pendingPenny.priorPetalsElided === 0 && pendingPenny.auxModelRouted === 0) {
+  if (pendingPenny.humDedup === 0 && pendingPenny.reminderStripped === 0 && pendingPenny.priorPetalsElided === 0) {
     return void 0;
   }
   const snap = { ...pendingPenny };
   pendingPenny.humDedup = 0;
   pendingPenny.reminderStripped = 0;
   pendingPenny.priorPetalsElided = 0;
-  pendingPenny.auxModelRouted = 0;
   return snap;
 }
 function cheapHash(s) {
@@ -853,7 +851,7 @@ function cheapHash(s) {
   return h.toString(36) + ":" + s.length;
 }
 var AGENT_DENY = {
-  plan: /* @__PURE__ */ new Set(["edit", "write"])
+  plan: /* @__PURE__ */ new Set(["do_code", "do_noncode"])
 };
 function deriveAllowedTools(sid, opts) {
   const agent = opts.headers?.["x-clwnd-agent"] ?? "";
@@ -864,7 +862,7 @@ function deriveAllowedTools(sid, opts) {
   } catch {
   }
   const denied = AGENT_DENY[agentName] ?? /* @__PURE__ */ new Set();
-  const all = ["read", "edit", "write", "bash", "glob", "grep", "webfetch"];
+  const all = ["read", "do_code", "do_noncode", "bash", "webfetch"];
   const result = all.filter((t) => !denied.has(t));
   const key = result.join(",");
   const prev = lastAllowedTools.get(sid);
@@ -911,14 +909,6 @@ var ClwndModel = class {
         warnings: []
       };
     }
-    if (isAuxiliaryCall(opts)) {
-      return {
-        content: [{ type: "text", text: "" }],
-        usage: zeroUsage(),
-        finishReason: { unified: "stop", raw: "stop" },
-        warnings: []
-      };
-    }
     const { stream } = await this.doStream(opts);
     const reader = stream.getReader();
     const content = [];
@@ -960,7 +950,7 @@ var ClwndModel = class {
     } catch {
     }
     const isTitleGen = agentName === "title";
-    const isEmptyTools = !opts.tools || opts.tools.length === 0;
+    const isCompaction = agentName === "compaction";
     if (isTitleGen) {
       trace("title.skip", { method: "doStream", sid });
       return {
@@ -972,13 +962,8 @@ var ClwndModel = class {
         })
       };
     }
-    const skipGraft = isEmptyTools;
-    if (skipGraft) trace("graft.skip", { method: "doStream", sid, reason: "emptyTools", toolsLen: opts.tools?.length ?? "undefined" });
-    const effectiveModel = isEmptyTools ? pickAuxModel(self.modelId) : self.modelId;
-    if (effectiveModel !== self.modelId) {
-      pendingPenny.auxModelRouted++;
-      trace("aux.model.routed", { sid, primary: self.modelId, aux: effectiveModel });
-    }
+    const skipGraft = isCompaction;
+    if (skipGraft) trace("graft.skip", { method: "doStream", sid, reason: "compaction" });
     const systemPromptHash = cheapHash(systemPrompt);
     const permissionsHash = cheapHash(JSON.stringify(permissions));
     const allowedToolsHash = cheapHash(allowedTools.join(","));
@@ -996,7 +981,8 @@ var ClwndModel = class {
       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;
+          const loose = p;
+          const rawOutput = loose.output ?? loose.result;
           try {
             const outer = typeof rawOutput === "string" ? JSON.parse(rawOutput) : rawOutput;
             const inner = outer?.value ?? outer;
@@ -1039,15 +1025,21 @@ var ClwndModel = class {
     if (!skipGraft) {
       prevPetalCount = sessionPetalCounts.get(sid) ?? 0;
       sessionPetalCounts.set(sid, priorPetals.length);
-      if (prevPetalCount > 0 && priorPetals.length < prevPetalCount * 0.5) {
-        trace("compaction.detected", { sid, prev: prevPetalCount, now: priorPetals.length });
+      const dropped = prevPetalCount - priorPetals.length;
+      const justCompacted = sessionJustCompacted.get(sid) === true;
+      if (justCompacted || prevPetalCount > 0 && dropped >= 2) {
+        trace("compaction.detected", { sid, prev: prevPetalCount, now: priorPetals.length, dropped, reason: justCompacted ? "agent" : "petal-drop" });
         hum({ chi: "cancel", sid, reason: "compaction" });
+        sessionJustCompacted.delete(sid);
       } else if (prevPetalCount === priorPetals.length && prevPetalCount > 0) {
         elidePriorPetals = true;
         pendingPenny.priorPetalsElided++;
         trace("priorPetals.elided", { sid, count: priorPetals.length });
       }
     }
+    if (isCompaction) {
+      sessionJustCompacted.set(sid, true);
+    }
     const externalTools = [];
     const externalToolNames = /* @__PURE__ */ new Set();
     if (opts.tools) {
@@ -1059,9 +1051,10 @@ var ClwndModel = class {
         externalToolNames.add(name);
       }
     }
-    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(",") });
+    const ocToolNames = opts.tools ? opts.tools.filter((t) => t.type === "function").map((t) => t.name) : [];
+    trace("tools.available", { sid, count: ocToolNames.length, names: ocToolNames.join(",") });
     if (externalTools.length > 0) trace("external.tools.detected", { sid, names: [...externalToolNames].join(",") });
+    const visibleExternalNames = [...externalToolNames];
     let promptSent = false;
     if (listenOnly && humAlive) {
       const pd = flushPenny();
@@ -1069,7 +1062,7 @@ var ClwndModel = class {
         chi: "prompt",
         sid,
         cwd,
-        modelId: effectiveModel,
+        modelId: self.modelId,
         listenOnly: true,
         ...pd ? { pennyDelta: pd } : {},
         dusk: duskIn(3e4)
@@ -1085,7 +1078,7 @@ var ClwndModel = class {
         chi: "prompt",
         sid,
         cwd,
-        modelId: effectiveModel,
+        modelId: self.modelId,
         content,
         text,
         ...sendSystemPrompt ? { systemPrompt } : {},
@@ -1097,7 +1090,7 @@ var ClwndModel = class {
         ...elidePriorPetals ? {} : { priorPetals },
         externalTools: externalTools.length > 0 ? externalTools : void 0,
         mcpServerConfigs: await getMcpServerConfigs(this.config.client),
-        visibleTools: allToolNames,
+        visibleTools: visibleExternalNames,
         ...pd ? { pennyDelta: pd } : {},
         dusk: duskIn(3e4)
       });
@@ -1125,6 +1118,7 @@ var ClwndModel = class {
         function wilt() {
           if (done) return;
           done = true;
+          humHearers.delete(sid);
           try {
             controller.close();
           } catch {
@@ -1145,7 +1139,7 @@ var ClwndModel = class {
           return;
         }
         petal({ type: "stream-start", warnings: [] });
-        const humFade = humHear(onHummin);
+        const humFade = humHear(sid, onHummin);
         if (!promptSent) {
           hum({
             chi: "prompt",
@@ -1448,8 +1442,11 @@ var clwndPlugin = async (input) => {
     "chat.headers": async (ctx, output) => {
       output.headers["x-clwnd-agent"] = typeof ctx.agent === "string" ? ctx.agent : ctx.agent?.name ?? JSON.stringify(ctx.agent);
     },
-    // Permission tool — provider emits clwnd_permission with providerExecuted: false.
-    // OC executes via resolveTools() → ctx.ask() → TUI permission dialog.
+    // Custom tools registered with OC's tool registry. Each one delegates
+    // to clwnd's daemon via the same MCP HTTP endpoint that Claude CLI uses
+    // — JSON-RPC POST to http://127.0.0.1:29147/s/<sid> with method
+    // tools/call. No new transport, no new vocabulary: plugin tools and
+    // Claude CLI tools share the exact same executeTool() dispatch.
     tool: {
       clwnd_permission: tool({
         description: "Permission prompt for clwnd file system operations",
@@ -1462,7 +1459,7 @@ var clwndPlugin = async (input) => {
           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,
+            permission: args.tool === "do_code" || args.tool === "do_noncode" ? "edit" : args.tool,
             patterns: [args.path ?? "*"],
             metadata: { tool: args.tool, filepath: args.path },
             always: [args.path ?? "*"]
@@ -1472,10 +1469,68 @@ var clwndPlugin = async (input) => {
           trace("permission.tool.approved", { tool: args.tool, askId, elapsed, autoAllowed: elapsed < 100 });
           return JSON.stringify({ granted: true, tool: args.tool, askId });
         }
+      }),
+      do_code: tool({
+        description: `Author code in a code file via AST-grounded operations. Accepts: .ts/.tsx/.js/.jsx/.py/.go/.rs/.java/.cpp/... (code files only; non-code is rejected \u2014 use do_noncode for that). Five operations:
+- operation: 'create', new_source: '<code>'  \u2014 create a new file with new_source as its content. Re-parsed for syntax, rejected if invalid.
+- operation: 'replace', symbol: 'Class.method', new_source: '<full new source of that symbol>'  \u2014 byte-range splice replacing the symbol with new_source. Re-parsed.
+- operation: 'replace', new_source: '<whole file>'  \u2014 full-file rewrite, re-parsed.
+- operation: 'insert_after' | 'insert_before', symbol: 'NAME', new_source: '<new code block>'  \u2014 add a new symbol adjacent to an anchor. Re-parsed.
+- operation: 'delete', symbol: 'NAME'  \u2014 remove a symbol. Re-parsed.
+Before calling do_code on an existing file, run read(file_path) or read(file_path, symbol: '...') first \u2014 clwnd's staleness guard rejects edits whose baseline is older than the current mtime. There is no old_string/new_string vocabulary here \u2014 this is NOT a string replace tool.`,
+        args: {
+          file_path: tool.schema.string().describe("Absolute path to the code file"),
+          operation: tool.schema.enum(["create", "replace", "insert_before", "insert_after", "delete"]).optional().describe("Operation to perform (default: replace)"),
+          symbol: tool.schema.string().optional().describe("Target symbol name (required for insert/delete, optional for replace)"),
+          new_source: tool.schema.string().optional().describe("New source code (required for create/replace/insert)")
+        },
+        async execute(args, ctx) {
+          return callClwndTool("do_code", args, ctx.sessionID);
+        }
+      }),
+      do_noncode: tool({
+        description: `Author non-code files (configs, docs, JSON, YAML, Markdown, txt, \u2026). Rejects any file with a code extension \u2014 use do_code for those. Modes:
+- mode: 'write' (default) \u2014 create or overwrite with content
+- mode: 'append' \u2014 add content to the end of an existing file
+- mode: 'prepend' \u2014 add content to the start of an existing file
+For existing files, read(file_path) first so clwnd's staleness guard knows your baseline.`,
+        args: {
+          file_path: tool.schema.string().describe("Absolute path to the non-code file"),
+          content: tool.schema.string().describe("Content to write/append/prepend"),
+          mode: tool.schema.enum(["write", "append", "prepend"]).optional().describe("Write mode (default: write)")
+        },
+        async execute(args, ctx) {
+          return callClwndTool("do_noncode", args, ctx.sessionID);
+        }
       })
     }
   };
 };
+var CLWND_MCP_PORT = parseInt(process.env.CLWND_MCP_PORT ?? "29147") || 29147;
+var CLWND_MCP_HOST = process.env.CLWND_MCP_HOST ?? "127.0.0.1";
+async function callClwndTool(name, args, sessionID) {
+  const url = `http://${CLWND_MCP_HOST}:${CLWND_MCP_PORT}/s/${sessionID}`;
+  const body = {
+    jsonrpc: "2.0",
+    id: 1,
+    method: "tools/call",
+    params: { name, arguments: args }
+  };
+  try {
+    const response = await fetch(url, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(body)
+    });
+    if (!response.ok) return `Error: clwnd MCP endpoint returned HTTP ${response.status}`;
+    const data = await response.json();
+    if (data.error) return `Error: ${data.error.message}`;
+    const content = data.result?.content ?? [];
+    return content.filter((c) => c.type === "text").map((c) => c.text ?? "").join("\n") || "(no output)";
+  } catch (e) {
+    return `Error: failed to reach clwnd daemon at ${url} \u2014 ${e instanceof Error ? e.message : String(e)}`;
+  }
+}
 export {
   clwndPlugin,
   createClwnd

package/package.json

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