pi-opencode-cli-bridge 0.2.6 → 0.2.7

package/README.md

@@ -123,6 +123,8 @@ Without an override, discovery selects active `opencode/` models whose reported
 6. Text markers such as `<pi_tool_call>{"name":"read","arguments":{"path":"example.txt"}}</pi_tool_call>` become Pi tool calls. Tool names must be in the current Pi tool list; execution then follows Pi's normal validation and permission pipeline. DeepSeek models sometimes write their native DSML tool-call blocks (`<｜DSML｜invoke name="...">`) as text instead; complete blocks are converted the same way, and an incomplete one fails the turn with a diagnostic instead of ending it silently.
 7. Successful continuation turns reuse an OpenCode session and send only the new transcript. Changes to the model, prompt, tools or transcript prefix start a fresh session.
 
+A turn containing only reasoning, with no answer or usable Pi tool call, also gets one fresh recovery attempt instead of silently ending the conversation. The model is asked to answer or request an available Pi tool; normal text answers and valid calls found in reasoning are unchanged. Reasoning-only and blocked-native failures share the same single retry and remaining turn timeout. If recovery fails, Pi receives an explicit error, not another thinking-only message.
+
 Pi's provider instrumentation hooks follow the CLI transport, not OpenCode's internal HTTP traffic:
 
 - `onPayload` receives `{ prompt }`, the exact text written to the CLI's standard input. Returning `{ prompt: "..." }` replaces it; any other non-`undefined` value fails the turn. A turn with a payload hook always starts a fresh OpenCode session.
@@ -130,7 +132,7 @@ Pi's provider instrumentation hooks follow the CLI transport, not OpenCode's int
 - `onProviderStreamEvent` receives each validated `--format json` event in order, and is awaited before the event is processed.
 - Provider-scoped `env` values are passed to the subprocess. The bridge's own configuration directory and update-check settings always take precedence.
 
-Reasoning variants, image support and token limits follow CLI discovery. Token usage is taken from CLI events when available, otherwise estimated, and includes both attempts when native-tool recovery is needed. Session records and temporary project directories are cleaned up on a best-effort basis.
+Reasoning variants, image support and token limits follow CLI discovery. Token usage is taken from CLI events when available, otherwise estimated, and includes both attempts when recovery is needed. Session records and temporary project directories are cleaned up on a best-effort basis.
 
 ## Security, privacy and limits
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-opencode-cli-bridge",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Bridge the OpenCode CLI into Pi Coding Agent",
   "type": "module",
   "main": "./src/index.ts",

package/src/index.ts

@@ -1518,7 +1518,7 @@ function streamOpenCodeAttempt(
   model: Model<Api>,
   context: Context,
   options: SimpleStreamOptions | undefined,
-  allowNativeRecovery: boolean,
+  allowRecovery: boolean,
 ): AssistantMessageEventStream {
   const stream = createAssistantMessageEventStream();
   const deadline = Date.now() + resolveTurnTimeoutMs(options?.timeoutMs);
@@ -1543,7 +1543,7 @@ function streamOpenCodeAttempt(
     let stdoutRemainder = "";
     let capturedSessionId: string | undefined;
     let opencodeToolUse: string | undefined;
-    let nativeToolFailure: Error | undefined;
+    let recoverableFailure: Error | undefined;
     // Text after the last blocked native call shows whether the model recovered in-run.
     let nativeTextMark = 0;
     let stepNativeCalls: (ParsedToolCall | undefined)[] = [];
@@ -1767,10 +1767,10 @@ function streamOpenCodeAttempt(
       }
       if (opencodeError) throw new Error(opencodeError);
       if (opencodeToolUse && !nativeCalls && !accumulatedText.slice(nativeTextMark).trim()) {
-        nativeToolFailure = new Error(
-          `OpenCode could not use the available Pi tools${allowNativeRecovery ? "" : " after one recovery attempt"} (blocked native tool: ${JSON.stringify(opencodeToolUse)}). Retry the request or select another OpenCode model.`,
+        recoverableFailure = new Error(
+          `OpenCode could not use the available Pi tools${allowRecovery ? "" : " after one recovery attempt"} (blocked native tool: ${JSON.stringify(opencodeToolUse)}). Retry the request or select another OpenCode model.`,
         );
-        throw nativeToolFailure;
+        throw recoverableFailure;
       }
 
       const toolCallResult = parseToolCallResponse(
@@ -1815,6 +1815,12 @@ function streamOpenCodeAttempt(
           );
         }
       }
+      if (toolCalls.length === 0 && !displayText.trim() && accumulatedThinking.trim()) {
+        recoverableFailure = new Error(
+          `OpenCode returned only reasoning without an answer or Pi tool call${allowRecovery ? "" : " after one recovery attempt"}. Retry the request or select another OpenCode model.`,
+        );
+        throw recoverableFailure;
+      }
       if (
         toolCalls.length === 0 &&
         !displayText.trim() &&
@@ -1943,12 +1949,14 @@ function streamOpenCodeAttempt(
       deleteOpenCodeSession(capturedSessionId);
       if (piState) dropOpencodeSession(piState);
       const remainingMs = deadline - Date.now();
-      if (nativeToolFailure && error === nativeToolFailure && allowNativeRecovery &&
-          !options?.signal?.aborted && remainingMs > 0 && context.tools?.length) {
+      if (recoverableFailure && error === recoverableFailure && allowRecovery &&
+          !options?.signal?.aborted && remainingMs > 0 && (!opencodeToolUse || context.tools?.length)) {
         setEstimatedUsage(model, output, prompt, accumulatedText + accumulatedThinking);
         const correction = [
-          `Your previous attempt used the disabled OpenCode native tool ${JSON.stringify(opencodeToolUse)}.`,
-          `Available Pi tools: ${context.tools.map(tool => tool.name).join(", ")}.`,
+          opencodeToolUse
+            ? `Your previous attempt used the disabled OpenCode native tool ${JSON.stringify(opencodeToolUse)}.`
+            : "Your previous attempt ended with reasoning only, without an answer or Pi tool call. Provide a final answer or request a Pi tool, not just a plan to act.",
+          `Available Pi tools: ${context.tools?.map(tool => tool.name).join(", ") || "none"}.`,
           "Complete the original request using only those Pi tools. Do not call any OpenCode native tool.",
           'Request Pi tools as <pi_tool_call>{"name":"tool_name","arguments":{}}</pi_tool_call> markers, or answer normally if no tool is needed.',
           "If Pi has no grep tool, request a search through Pi bash when it is available instead.",