@khalilgharbaoui/opencode-claude-code-plugin 0.4.5 → 0.4.7

package/dist/index.js

@@ -2,7 +2,33 @@
 import { generateId } from "@ai-sdk/provider-utils";
 
 // src/logger.ts
+import { appendFileSync, mkdirSync, renameSync, statSync } from "fs";
+import { homedir } from "os";
+import { dirname, join } from "path";
 var DEBUG = process.env.DEBUG?.includes("opencode-claude-code") ?? false;
+var LOG_DIR = process.env.OPENCODE_CLAUDE_CODE_LOG_DIR ?? join(homedir(), ".local", "share", "opencode-claude-code");
+var LOG_FILE = join(LOG_DIR, "plugin.log");
+var MAX_LOG_BYTES = 5 * 1024 * 1024;
+var fileLoggingDisabled = false;
+function rotateIfNeeded() {
+  try {
+    const stat = statSync(LOG_FILE);
+    if (stat.size > MAX_LOG_BYTES) {
+      renameSync(LOG_FILE, `${LOG_FILE}.1`);
+    }
+  } catch {
+  }
+}
+function writeToFile(line) {
+  if (fileLoggingDisabled) return;
+  try {
+    mkdirSync(dirname(LOG_FILE), { recursive: true });
+    rotateIfNeeded();
+    appendFileSync(LOG_FILE, line + "\n", "utf8");
+  } catch {
+    fileLoggingDisabled = true;
+  }
+}
 function fmt(level, msg, data) {
   const ts = (/* @__PURE__ */ new Date()).toISOString();
   const base = `[${ts}] [opencode-claude-code] ${level}: ${msg}`;
@@ -11,21 +37,30 @@ function fmt(level, msg, data) {
   }
   return base;
 }
+function emit(level, msg, data, alwaysStderr = false) {
+  const line = fmt(level, msg, data);
+  if (alwaysStderr || DEBUG) {
+    console.error(line);
+  }
+  writeToFile(line);
+}
 var log = {
   info(msg, data) {
-    if (DEBUG) console.error(fmt("INFO", msg, data));
+    if (DEBUG) emit("INFO", msg, data);
+    else writeToFile(fmt("INFO", msg, data));
   },
   notice(msg, data) {
-    console.error(fmt("NOTICE", msg, data));
+    emit("NOTICE", msg, data, true);
   },
   warn(msg, data) {
-    console.error(fmt("WARN", msg, data));
+    emit("WARN", msg, data, true);
   },
   error(msg, data) {
-    console.error(fmt("ERROR", msg, data));
+    emit("ERROR", msg, data, true);
   },
   debug(msg, data) {
-    if (DEBUG) console.error(fmt("DEBUG", msg, data));
+    if (DEBUG) emit("DEBUG", msg, data);
+    else writeToFile(fmt("DEBUG", msg, data));
   }
 };
 
@@ -1460,13 +1495,22 @@ function rejectAllPendingProxyCallsForSession(sessionKey2, error) {
 // src/claude-code-language-model.ts
 import { readFileSync as readFileSync2, writeFileSync as writeFileSync3 } from "fs";
 import { unlink as unlink2 } from "fs/promises";
-import { homedir as homedir2, tmpdir as tmpdir2 } from "os";
+import { homedir as homedir3, tmpdir as tmpdir2 } from "os";
 import { randomUUID as randomUUID2 } from "crypto";
-import { dirname as dirname2, join as join4 } from "path";
+import { dirname as dirname3, join as join5 } from "path";
 function hasNewUserContent(prompt) {
   for (let i = prompt.length - 1; i >= 0; i--) {
     const msg = prompt[i];
     if (msg.role === "assistant") return false;
+    if (msg.role === "tool") {
+      const content2 = msg.content;
+      if (Array.isArray(content2)) {
+        for (const part of content2) {
+          if (part?.type === "tool-result") return true;
+        }
+      }
+      continue;
+    }
     if (msg.role !== "user") continue;
     const content = msg.content;
     if (typeof content === "string") {
@@ -1528,9 +1572,10 @@ function shouldAutoContinueIncompleteTurn(state, snapshot) {
     return { continue: false, reason: "max-elapsed" };
   }
   const text = normalizeVisibleText(snapshot.text);
+  const lastText = normalizeVisibleText(snapshot.lastVisibleText);
   if (looksLikeQuestion(text)) return { continue: false, reason: "question" };
   if (looksLikeBlocker(text)) return { continue: false, reason: "blocker" };
-  if (looksLikeFinalAnswer(text)) {
+  if (looksLikeFinalAnswer(lastText)) {
     return { continue: false, reason: "final-answer" };
   }
   const hadActivity = snapshot.hadReasoning || snapshot.hadToolActivity || snapshot.hadProxyActivity;
@@ -1565,9 +1610,9 @@ function readPromptFileIfPresent(path5) {
 function nearestWorkspaceAgentsPrompt(cwd) {
   let dir = cwd;
   while (true) {
-    const content = readPromptFileIfPresent(join4(dir, "AGENTS.md"));
+    const content = readPromptFileIfPresent(join5(dir, "AGENTS.md"));
     if (content) return content;
-    const parent = dirname2(dir);
+    const parent = dirname3(dir);
     if (parent === dir) return void 0;
     dir = parent;
   }
@@ -1582,15 +1627,15 @@ blocker. The user can interrupt or abort at any time; turn endings should
 mark meaningful checkpoints, not every completed substep.`;
 function buildAppendedSystemPrompt(cwd, includeMultiStepHint = true) {
   const parts = [];
-  const configRoot = process.env.XDG_CONFIG_HOME ?? join4(homedir2(), ".config");
-  const globalAgents = readPromptFileIfPresent(join4(configRoot, "opencode", "AGENTS.md"));
+  const configRoot = process.env.XDG_CONFIG_HOME ?? join5(homedir3(), ".config");
+  const globalAgents = readPromptFileIfPresent(join5(configRoot, "opencode", "AGENTS.md"));
   const workspaceAgents = nearestWorkspaceAgentsPrompt(cwd);
   if (globalAgents) parts.push(globalAgents);
   if (workspaceAgents && workspaceAgents !== globalAgents) parts.push(workspaceAgents);
   if (includeMultiStepHint) parts.push(MULTI_STEP_TASK_HINT);
   const content = parts.join("\n\n");
   if (!content) return void 0;
-  const path5 = join4(tmpdir2(), `opencode-cc-sys-${randomUUID2()}.md`);
+  const path5 = join5(tmpdir2(), `opencode-cc-sys-${randomUUID2()}.md`);
   try {
     writeFileSync3(path5, content, "utf8");
     return path5;
@@ -2492,6 +2537,7 @@ ${plan}
           let resultFallbackTimer = null;
           let hasReceivedContent = false;
           let visibleTextSinceContinue = "";
+          let lastVisibleTextSinceContinue = "";
           let hadReasoningSinceContinue = false;
           let hadToolActivitySinceContinue = false;
           let hadProxyActivitySinceContinue = false;
@@ -2575,6 +2621,10 @@ ${plan}
           };
           const noteVisibleText = (text) => {
             visibleTextSinceContinue += text;
+            lastVisibleTextSinceContinue += text;
+          };
+          const resetLastVisibleTextBlock = () => {
+            lastVisibleTextSinceContinue = "";
           };
           const noteReasoning = () => {
             hadReasoningSinceContinue = true;
@@ -2587,6 +2637,7 @@ ${plan}
           };
           const resetAutoContinueWindow = () => {
             visibleTextSinceContinue = "";
+            lastVisibleTextSinceContinue = "";
             hadReasoningSinceContinue = false;
             hadToolActivitySinceContinue = false;
             hadProxyActivitySinceContinue = false;
@@ -2632,6 +2683,7 @@ ${plan}
                 }
                 if (block.type === "text") {
                   textBlockIndices.add(idx);
+                  resetLastVisibleTextBlock();
                   if (block.text) {
                     if (!currentTextId) startTextBlock();
                     controller.enqueue({
@@ -2816,6 +2868,7 @@ ${plan}
                 }
                 for (const block of msg.message.content) {
                   if (block.type === "text" && block.text) {
+                    resetLastVisibleTextBlock();
                     const blockId = startTextBlock();
                     controller.enqueue({
                       type: "text-delta",
@@ -3026,6 +3079,7 @@ ${plan}
                   autoContinueState,
                   {
                     text: visibleTextSinceContinue,
+                    lastVisibleText: lastVisibleTextSinceContinue,
                     hadReasoning: hadReasoningSinceContinue,
                     hadToolActivity: hadToolActivitySinceContinue,
                     hadProxyActivity: hadProxyActivitySinceContinue,
@@ -3035,6 +3089,7 @@ ${plan}
                 if (autoDecision.continue) {
                   const signature = continuationSignature({
                     text: visibleTextSinceContinue,
+                    lastVisibleText: lastVisibleTextSinceContinue,
                     hadReasoning: hadReasoningSinceContinue,
                     hadToolActivity: hadToolActivitySinceContinue,
                     hadProxyActivity: hadProxyActivitySinceContinue,
@@ -3043,11 +3098,12 @@ ${plan}
                   autoContinueState.noProgressCount = signature === autoContinueState.lastSignature ? autoContinueState.noProgressCount + 1 : 0;
                   autoContinueState.lastSignature = signature;
                   autoContinueState.attempts++;
-                  log.info("auto-continuing incomplete claude result", {
+                  log.notice("auto-continuing incomplete claude result", {
                     sessionKey: sk,
                     reason: autoDecision.reason,
                     attempts: autoContinueState.attempts,
                     textLength: visibleTextSinceContinue.length,
+                    lastTextLength: lastVisibleTextSinceContinue.length,
                     hadReasoning: hadReasoningSinceContinue,
                     hadToolActivity: hadToolActivitySinceContinue,
                     hadProxyActivity: hadProxyActivitySinceContinue
@@ -3057,10 +3113,15 @@ ${plan}
                   proc.stdin?.write(makeAutoContinueMessage() + "\n");
                   return;
                 }
-                log.info("auto-continuation stopped", {
+                log.notice("auto-continuation stopped", {
                   sessionKey: sk,
                   reason: autoDecision.reason,
-                  attempts: autoContinueState.attempts
+                  attempts: autoContinueState.attempts,
+                  textLength: visibleTextSinceContinue.length,
+                  lastTextLength: lastVisibleTextSinceContinue.length,
+                  hadReasoning: hadReasoningSinceContinue,
+                  hadToolActivity: hadToolActivitySinceContinue,
+                  hadProxyActivity: hadProxyActivitySinceContinue
                 });
                 for (const [idx, reasoningId] of reasoningIds) {
                   if (reasoningStarted.get(idx)) {
@@ -3568,8 +3629,8 @@ import {
   rmSync as rmSync2,
   writeFileSync as writeFileSync4
 } from "fs";
-import { homedir as homedir3 } from "os";
-import { join as join5, resolve as resolve2 } from "path";
+import { homedir as homedir4 } from "os";
+import { join as join6, resolve as resolve2 } from "path";
 import { fileURLToPath } from "url";
 var STALE_PACKAGE_NAME = "opencode-claude-code-plugin";
 var SUSPECT_DESCRIPTION_TOKEN = "Claude Code";
@@ -3577,14 +3638,14 @@ var alreadyRan = false;
 function candidateCacheRoots() {
   const xdg = process.env.XDG_CACHE_HOME;
   return [
-    xdg ? join5(xdg, "opencode") : null,
-    join5(homedir3(), ".cache", "opencode"),
-    join5(homedir3(), "Library", "Caches", "opencode")
+    xdg ? join6(xdg, "opencode") : null,
+    join6(homedir4(), ".cache", "opencode"),
+    join6(homedir4(), "Library", "Caches", "opencode")
   ].filter((p) => Boolean(p));
 }
 function userOpencodeJsonPath() {
-  const xdgConfig = process.env.XDG_CONFIG_HOME ?? join5(homedir3(), ".config");
-  return join5(xdgConfig, "opencode", "opencode.json");
+  const xdgConfig = process.env.XDG_CONFIG_HOME ?? join6(homedir4(), ".config");
+  return join6(xdgConfig, "opencode", "opencode.json");
 }
 function userIntendsToUseUnscoped() {
   const cfg = userOpencodeJsonPath();
@@ -3627,7 +3688,7 @@ function cleanupStaleUnscopedInstall() {
 }
 function cleanupOne(cacheRoot, ourDir) {
   if (!existsSync3(cacheRoot)) return;
-  const stalePath = join5(cacheRoot, "node_modules", STALE_PACKAGE_NAME);
+  const stalePath = join6(cacheRoot, "node_modules", STALE_PACKAGE_NAME);
   if (!existsSync3(stalePath)) return;
   let realStalePath = stalePath;
   try {
@@ -3635,7 +3696,7 @@ function cleanupOne(cacheRoot, ourDir) {
   } catch {
   }
   if (ourDir && realStalePath === ourDir) return;
-  const pkgJsonPath = join5(stalePath, "package.json");
+  const pkgJsonPath = join6(stalePath, "package.json");
   if (!existsSync3(pkgJsonPath)) return;
   let pkg = {};
   try {
@@ -3655,7 +3716,7 @@ function cleanupOne(cacheRoot, ourDir) {
     });
     return;
   }
-  const cachePkgJson = join5(cacheRoot, "package.json");
+  const cachePkgJson = join6(cacheRoot, "package.json");
   if (!existsSync3(cachePkgJson)) return;
   try {
     const cfg = JSON.parse(readFileSync3(cachePkgJson, "utf8"));