@khalilgharbaoui/opencode-claude-code-plugin 0.42.0 → 0.42.1

package/dist/index.js

@@ -3783,12 +3783,16 @@ async function fetchSessionParentId(sessionID) {
     return void 0;
   }
 }
-async function fetchSessionRunState(sessionID) {
+async function fetchSessionRunState(sessionID, directory) {
   if (!sessionID || sessionID === "default") return "unknown";
   const status = opencodeClient?.session?.status;
   if (!status) return "unknown";
   try {
-    const res = await status.call(opencodeClient.session);
+    const dir = directory ?? await fetchSessionDirectory(sessionID);
+    const res = await status.call(
+      opencodeClient.session,
+      dir ? { query: { directory: dir } } : void 0
+    );
     const data = res.data;
     if (!data || typeof data !== "object") return "unknown";
     const entry = data[sessionID];
@@ -3808,8 +3812,10 @@ async function settleSessionRunState(sessionID, options = {}) {
   const windowMs = options.windowMs ?? 1500;
   const started = Date.now();
   let last = "unknown";
+  let directory = options.directory;
   for (; ; ) {
-    const state = await fetchSessionRunState(sessionID);
+    directory ??= await fetchSessionDirectory(sessionID);
+    const state = await fetchSessionRunState(sessionID, directory ?? "");
     if (state === "busy") return "busy";
     if (state !== "unknown") last = state;
     if (Date.now() - started >= windowMs) return last;
@@ -8219,6 +8225,38 @@ Now continuing with the current message:
     }
   });
 }
+function getTrailingUserMessages(prompt, opts = {}) {
+  prompt = stripAccountFailoverParts(prompt);
+  if (opts.stripContextReminders) prompt = stripContextReminders(prompt).prompt;
+  let assistantIndex = -1;
+  for (let i = prompt.length - 1; i >= 0; i--) {
+    if (prompt[i].role === "assistant") {
+      assistantIndex = i;
+      break;
+    }
+  }
+  const messages = [];
+  for (let i = assistantIndex + 1; i < prompt.length; i++) {
+    const msg = prompt[i];
+    if (msg.role !== "user") continue;
+    if (parseSideQuestionContent(msg.content) !== null) continue;
+    const blocks = [];
+    if (typeof msg.content === "string") {
+      if (msg.content.trim()) blocks.push({ type: "text", text: msg.content });
+    } else if (Array.isArray(msg.content)) {
+      for (const part of msg.content) {
+        if (part.type === "text") {
+          if (part.text && part.text.trim()) blocks.push({ type: "text", text: part.text });
+        } else if (part.type === "file" || part.type === "image") {
+          const block = toImageBlock(part);
+          if (block) blocks.push(block);
+        }
+      }
+    }
+    if (blocks.length > 0) messages.push(blocks);
+  }
+  return { assistantIndex, messages };
+}
 
 // src/skill-bridge.ts
 import * as crypto3 from "crypto";
@@ -12502,6 +12540,7 @@ async function isProxyCallStillServed(callId) {
   return await fetchSessionRunState(session) === "busy";
 }
 setProxyDeadlineGuard(({ callId }) => isProxyCallStillServed(callId));
+var FORWARD_SETTLE_MS = 250;
 var CHILD_EXIT_STATUS_GRACE_MS = 250;
 var ClaudeCodeLanguageModel = class {
   specificationVersion = "v3";
@@ -13422,7 +13461,7 @@ var ClaudeCodeLanguageModel = class {
                   });
                   return;
                 }
-                log.info("abort between proxy tool boundaries; releasing pending calls", { sk, reason });
+                log.info("abort between proxy tool boundaries; releasing pending calls", { sk, reason, session: stopped });
                 void interruptTurn(stoppedProcess).then((idle) => {
                   log.info("interrupt sent for aborted turn", { sk, idle });
                 });
@@ -14253,6 +14292,34 @@ var ClaudeCodeLanguageModel = class {
           state.proc.on("error", procErrorHandler);
           if (hasMatchedPendingResults) {
             state.cliAskedForWork = true;
+            const forwardTrailingUserMessages = () => {
+              if (compactionMode || !state.activeProcess) return 0;
+              if (state.activeProcess.interactiveControl) return 0;
+              const trailing = getTrailingUserMessages(effectivePrompt, {
+                stripContextReminders: self.stripContextRemindersEnabled()
+              });
+              const sent = state.activeProcess.forwardedUserMessages?.assistantIndex === trailing.assistantIndex ? state.activeProcess.forwardedUserMessages.count : 0;
+              const fresh = trailing.messages.slice(sent);
+              if (fresh.length === 0) return 0;
+              state.activeProcess.forwardedUserMessages = {
+                assistantIndex: trailing.assistantIndex,
+                count: trailing.messages.length
+              };
+              for (const content of fresh) {
+                state.proc.stdin?.write(
+                  JSON.stringify({ type: "user", message: { role: "user", content } }) + "\n"
+                );
+              }
+              log.info("forwarded user messages that arrived beside tool results", {
+                sessionKey: sk,
+                messages: fresh.length
+              });
+              return fresh.length;
+            };
+            if (!state.unattendedTurnEnded && forwardTrailingUserMessages() > 0) {
+              await new Promise((resolve6) => setTimeout(resolve6, FORWARD_SETTLE_MS));
+              if (state.controllerClosed) return;
+            }
             for (const { call, result } of previousPendingProxyMatches) {
               if (result) {
                 const channelClosed = isPendingProxyCallChannelClosed(call);
@@ -14282,7 +14349,10 @@ var ClaudeCodeLanguageModel = class {
                 );
               }
             }
-            if (state.unattendedTurnEnded) deliverPendingCompletions(state);
+            if (state.unattendedTurnEnded) {
+              deliverPendingCompletions(state);
+              forwardTrailingUserMessages();
+            }
             const unemitted = getPendingProxyCalls(sk).filter(
               (call) => !call.emitted
             );
@@ -14311,7 +14381,10 @@ var ClaudeCodeLanguageModel = class {
             }
           }
           state.cliAskedForWork = true;
-          if (state.activeProcess) noteTurnStarted(state.activeProcess);
+          if (state.activeProcess) {
+            noteTurnStarted(state.activeProcess);
+            state.activeProcess.forwardedUserMessages = void 0;
+          }
           state.proc.stdin?.write(userMsg + "\n");
           log.debug("sent user message", { textLength: userMsg.length });
           armStartWatchdog(state);