From 4a701b3065a829682fa95e43b25acd57e0e4263d Mon Sep 17 00:00:00 2001
From: Leandro Barbosa <leandrobar93@gmail.com>
Date: Fri, 13 Feb 2026 14:32:31 -0300
Subject: [PATCH] fix: allow claude CLI provider to run inside Claude Code
 sessions

Remove CLAUDECODE env var from subprocess environment to allow nesting.
Also parse stdout before checking exit code to handle stderr diagnostic
noise without losing valid JSON output (same pattern as codex provider).
---
 pkg/providers/claude_cli_provider.go | 30 +++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/pkg/providers/claude_cli_provider.go b/pkg/providers/claude_cli_provider.go
index a91795715..2006192e0 100644
--- a/pkg/providers/claude_cli_provider.go
+++ b/pkg/providers/claude_cli_provider.go
@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"os"
 	"os/exec"
 	"strings"
 )
@@ -41,13 +42,40 @@ func (p *ClaudeCliProvider) Chat(ctx context.Context, messages []Message, tools
 	if p.workspace != "" {
 		cmd.Dir = p.workspace
 	}
+
+	// Remove CLAUDECODE env var to allow nesting (Claude Code blocks
+	// subprocess launches when this variable is set).
+	env := os.Environ()
+	filtered := env[:0]
+	for _, e := range env {
+		if !strings.HasPrefix(e, "CLAUDECODE=") {
+			filtered = append(filtered, e)
+		}
+	}
+	cmd.Env = filtered
+
 	cmd.Stdin = bytes.NewReader([]byte(prompt))
 
 	var stdout, stderr bytes.Buffer
 	cmd.Stdout = &stdout
 	cmd.Stderr = &stderr
 
-	if err := cmd.Run(); err != nil {
+	err := cmd.Run()
+
+	// Parse JSON from stdout even if exit code is non-zero,
+	// because claude writes diagnostic noise to stderr but still
+	// produces valid JSON output.
+	if stdoutStr := stdout.String(); stdoutStr != "" {
+		resp, parseErr := p.parseClaudeCliResponse(stdoutStr)
+		if parseErr == nil && resp != nil && resp.Content != "" {
+			return resp, nil
+		}
+	}
+
+	if err != nil {
+		if ctx.Err() == context.Canceled {
+			return nil, ctx.Err()
+		}
 		if stderrStr := stderr.String(); stderrStr != "" {
 			return nil, fmt.Errorf("claude cli error: %s", stderrStr)
 		}