@clwnd/opencode 0.14.0 → 0.15.1

package/dist/index.js

@@ -631,12 +631,14 @@ function extractContent(prompt, sessionId) {
         }
         if (parts.length === 0) continue;
         if (sessionId) {
+          const norm = (s) => s.replace(/\s+/g, " ").trim();
           for (let j = parts.length - 1; j >= 0; j--) {
             if (parts[j].type !== "text") continue;
             const reminder = parts[j].text.match(/<system-reminder>[\s\S]*?<\/system-reminder>/)?.[0];
             if (reminder) {
+              const key = norm(reminder);
               const prev = lastReminder.get(sessionId);
-              if (prev === reminder) {
+              if (prev === key) {
                 const stripped = parts[j].text.replace(reminder, "").trim();
                 if (stripped) {
                   parts[j] = { type: "text", text: stripped };
@@ -645,7 +647,7 @@ function extractContent(prompt, sessionId) {
                 }
                 trace("reminder.stripped", { sid: sessionId });
               } else {
-                lastReminder.set(sessionId, reminder);
+                lastReminder.set(sessionId, key);
               }
             }
           }
@@ -740,6 +742,11 @@ function sanitizePrompt(text, word) {
 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];
@@ -817,6 +824,14 @@ async function getMcpServerConfigs(client) {
   }
 }
 var lastAllowedTools = /* @__PURE__ */ new Map();
+var lastSystemPromptHash = /* @__PURE__ */ new Map();
+var lastPermissionsHash = /* @__PURE__ */ new Map();
+var lastAllowedToolsHash = /* @__PURE__ */ new Map();
+function cheapHash(s) {
+  let h = 5381;
+  for (let i = 0; i < s.length; i++) h = (h << 5) + h + s.charCodeAt(i) | 0;
+  return h.toString(36) + ":" + s.length;
+}
 var AGENT_DENY = {
   plan: /* @__PURE__ */ new Set(["edit", "write"])
 };
@@ -939,6 +954,18 @@ 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) trace("aux.model.routed", { sid, primary: self.modelId, aux: effectiveModel });
+    const systemPromptHash = cheapHash(systemPrompt);
+    const permissionsHash = cheapHash(JSON.stringify(permissions));
+    const allowedToolsHash = cheapHash(allowedTools.join(","));
+    const sendSystemPrompt = lastSystemPromptHash.get(sid) !== systemPromptHash;
+    const sendPermissions = lastPermissionsHash.get(sid) !== permissionsHash;
+    const sendAllowedTools = lastAllowedToolsHash.get(sid) !== allowedToolsHash;
+    if (sendSystemPrompt) lastSystemPromptHash.set(sid, systemPromptHash);
+    if (sendPermissions) lastPermissionsHash.set(sid, permissionsHash);
+    if (sendAllowedTools) lastAllowedToolsHash.set(sid, allowedToolsHash);
+    trace("hum.dedup", { sid, sp: sendSystemPrompt, perm: sendPermissions, tools: sendAllowedTools });
     let permAskId = null;
     const isPermReturn = isBrokeredToolReturn(opts.prompt) && (() => {
       const lt = opts.prompt.findLast((m) => m.role === "tool");
@@ -983,12 +1010,17 @@ var ClwndModel = class {
         (p) => p.role === "assistant" && Array.isArray(p.content)
       ).reduce((acc, p) => acc + p.content.filter((c) => c.type === "tool-call").length, 0)
     });
+    let prevPetalCount = 0;
+    let elidePriorPetals = false;
     if (!skipGraft) {
-      const prev = sessionPetalCounts.get(sid) ?? 0;
+      prevPetalCount = 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 });
+      if (prevPetalCount > 0 && priorPetals.length < prevPetalCount * 0.5) {
+        trace("compaction.detected", { sid, prev: prevPetalCount, now: priorPetals.length });
         hum({ chi: "cancel", sid, reason: "compaction" });
+      } else if (prevPetalCount === priorPetals.length && prevPetalCount > 0) {
+        elidePriorPetals = true;
+        trace("priorPetals.elided", { sid, count: priorPetals.length });
       }
     }
     const externalTools = [];
@@ -1011,7 +1043,7 @@ var ClwndModel = class {
         chi: "prompt",
         sid,
         cwd,
-        modelId: self.modelId,
+        modelId: effectiveModel,
         listenOnly: true,
         dusk: duskIn(3e4)
       });
@@ -1025,16 +1057,16 @@ var ClwndModel = class {
         chi: "prompt",
         sid,
         cwd,
-        modelId: self.modelId,
+        modelId: effectiveModel,
         content,
         text,
-        systemPrompt,
-        permissions,
-        allowedTools,
+        ...sendSystemPrompt ? { systemPrompt } : {},
+        ...sendPermissions ? { permissions } : {},
+        ...sendAllowedTools ? { allowedTools } : {},
         listenOnly,
         skipGraft: skipGraft || void 0,
         ocServerUrl: self.config.pluginInput?.serverUrl?.toString(),
-        priorPetals,
+        ...elidePriorPetals ? {} : { priorPetals },
         externalTools: externalTools.length > 0 ? externalTools : void 0,
         mcpServerConfigs: await getMcpServerConfigs(this.config.client),
         visibleTools: allToolNames,

package/package.json

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