@clwnd/opencode 0.13.1 → 0.14.0

package/dist/index.js

@@ -152,6 +152,11 @@ var Drone = class _Drone {
     this.swallowThreshold = swallowThreshold;
     this.llmAssess = llmAssess;
   }
+  side;
+  onAction;
+  evaluate;
+  swallowThreshold;
+  llmAssess;
   states = /* @__PURE__ */ new Map();
   timers = /* @__PURE__ */ new Map();
   evaluating = /* @__PURE__ */ new Set();
@@ -661,8 +666,79 @@ function extractSystemPrompt(prompt) {
   }
   return parts.join("\n\n");
 }
+function sanitizePrompt(text, word) {
+  if (!text) return text;
+  text = text.replace(/<\/?\w[\w-]*\b[^>]*>/g, "");
+  if (!word) {
+    return text.replace(/^\n+/, "");
+  }
+  const needle = new RegExp(word.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), "i");
+  const lines = [];
+  {
+    let cursor = 0;
+    while (cursor < text.length) {
+      const nl = text.indexOf("\n", cursor);
+      if (nl === -1) {
+        lines.push(text.slice(cursor));
+        break;
+      }
+      lines.push(text.slice(cursor, nl + 1));
+      cursor = nl + 1;
+    }
+  }
+  const kindOf = (line) => {
+    const body = line.replace(/\n$/, "");
+    if (!body.trim()) return "blank";
+    if (/^\s*#/.test(body)) return "header";
+    if (/^\s*(?:[-*]|\d+\.)\s/.test(body)) return "list";
+    return "prose";
+  };
+  const isContinuation = (line) => {
+    const body = line.replace(/\n$/, "");
+    if (!body.trim()) return false;
+    return /^\s/.test(body) && !/^\s*(?:[-*]|\d+\.)\s/.test(body);
+  };
+  const units = [];
+  let i = 0;
+  while (i < lines.length) {
+    const k = kindOf(lines[i]);
+    if (k === "blank" || k === "header") {
+      units.push(lines[i]);
+      i++;
+      continue;
+    }
+    if (k === "list") {
+      let unit = lines[i];
+      i++;
+      while (i < lines.length && isContinuation(lines[i])) {
+        unit += lines[i];
+        i++;
+      }
+      units.push(unit);
+      continue;
+    }
+    let block = lines[i];
+    i++;
+    while (i < lines.length && kindOf(lines[i]) === "prose") {
+      block += lines[i];
+      i++;
+    }
+    const sentRe = /[.!?][ \t\n]+|\n/g;
+    let start = 0;
+    let m;
+    while ((m = sentRe.exec(block)) !== null) {
+      const end = m.index + m[0].length;
+      units.push(block.slice(start, end));
+      start = end;
+    }
+    if (start < block.length) units.push(block.slice(start));
+  }
+  const kept = units.filter((u) => !needle.test(u));
+  while (kept.length > 0 && !kept[0].trim()) kept.shift();
+  return kept.join("");
+}
 function isAuxiliaryCall(opts) {
-  return !opts.tools || !Array.isArray(opts.tools) || opts.tools.length === 0;
+  return opts.tools === void 0;
 }
 function isBrokeredToolReturn(prompt) {
   if (prompt.length < 2) return false;
@@ -779,11 +855,27 @@ var ClwndModel = class {
     this.config = config;
     this.modelId = modelId;
   }
+  config;
   specificationVersion = "v3";
   modelId;
   provider = "clwnd";
   supportedUrls = { "image/*": [] };
   async doGenerate(opts) {
+    const rawAgent = opts.headers?.["x-clwnd-agent"] ?? "";
+    let agentName = rawAgent;
+    try {
+      const p = JSON.parse(rawAgent);
+      if (p?.name) agentName = p.name;
+    } catch {
+    }
+    if (agentName === "title") {
+      return {
+        content: [{ type: "text", text: "" }],
+        usage: zeroUsage(),
+        finishReason: { unified: "stop", raw: "stop" },
+        warnings: []
+      };
+    }
     if (isAuxiliaryCall(opts)) {
       return {
         content: [{ type: "text", text: "" }],
@@ -818,15 +910,35 @@ var ClwndModel = class {
     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);
+    const systemPrompt = sanitizePrompt(extractSystemPrompt(opts.prompt), "opencode");
     detectAgent(sid, opts.headers);
     const cwd = (this.config.client ? await getSessionDirectory(this.config.client, sid) : null) ?? this.config.cwd ?? process.cwd();
     const self = this;
     const sap = /* @__PURE__ */ new Map();
     const permissions = await getSessionPermissions(this.config.client, sid);
     const allowedTools = deriveAllowedTools(sid, opts);
-    const isAux = isAuxiliaryCall(opts);
-    if (isAux) trace("auxiliary.passthrough", { method: "doStream", sid });
+    const rawAgent = opts.headers?.["x-clwnd-agent"] ?? "";
+    let agentName = rawAgent;
+    try {
+      const p = JSON.parse(rawAgent);
+      if (p?.name) agentName = p.name;
+    } catch {
+    }
+    const isTitleGen = agentName === "title";
+    const isEmptyTools = !opts.tools || opts.tools.length === 0;
+    if (isTitleGen) {
+      trace("title.skip", { method: "doStream", sid });
+      return {
+        stream: new ReadableStream({
+          start(controller) {
+            controller.enqueue({ type: "finish", finishReason: { unified: "stop", raw: "stop" }, usage: zeroUsage() });
+            controller.close();
+          }
+        })
+      };
+    }
+    const skipGraft = isEmptyTools;
+    if (skipGraft) trace("graft.skip", { method: "doStream", sid, reason: "emptyTools", toolsLen: opts.tools?.length ?? "undefined" });
     let permAskId = null;
     const isPermReturn = isBrokeredToolReturn(opts.prompt) && (() => {
       const lt = opts.prompt.findLast((m) => m.role === "tool");
@@ -860,8 +972,18 @@ var ClwndModel = class {
     }
     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) {
+    trace("priorPetals", {
+      sid,
+      count: priorPetals.length,
+      roles: priorPetals.map((m) => m.role).join(","),
+      hasToolUse: priorPetals.some(
+        (p) => p.role === "assistant" && Array.isArray(p.content) && p.content.some((c) => c.type === "tool-call")
+      ),
+      toolCallCount: priorPetals.filter(
+        (p) => p.role === "assistant" && Array.isArray(p.content)
+      ).reduce((acc, p) => acc + p.content.filter((c) => c.type === "tool-call").length, 0)
+    });
+    if (!skipGraft) {
       const prev = sessionPetalCounts.get(sid) ?? 0;
       sessionPetalCounts.set(sid, priorPetals.length);
       if (prev > 0 && priorPetals.length < prev * 0.5) {
@@ -910,8 +1032,7 @@ var ClwndModel = class {
         permissions,
         allowedTools,
         listenOnly,
-        auxiliary: isAux || void 0,
-        // skip graft for compaction/title gen
+        skipGraft: skipGraft || void 0,
         ocServerUrl: self.config.pluginInput?.serverUrl?.toString(),
         priorPetals,
         externalTools: externalTools.length > 0 ? externalTools : void 0,
@@ -976,6 +1097,7 @@ var ClwndModel = class {
             permissions,
             allowedTools,
             listenOnly,
+            skipGraft: skipGraft || void 0,
             ocServerUrl: self.config.pluginInput?.serverUrl?.toString(),
             priorPetals,
             dusk: duskIn(3e4)

package/package.json

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