implement session fallback and improve CLI compatibility

Author: sahksas

src/api/providers/__tests__/claude-code.spec.ts

@@ -121,9 +121,30 @@ describe("ClaudeCodeHandler", () => {
 				messages,
 				path: mockOptions.claudeCodePath,
 				modelId: mockOptions.apiModelId,
+				taskId: undefined,
 			})
 		})
 
+		it("should call runClaudeCode with taskId from metadata", async () => {
+			const testTaskId = "test-task-123"
+			const messageGenerator = handler.createMessage(systemPrompt, messages, { taskId: testTaskId })
+			const iterator = messageGenerator[Symbol.asyncIterator]()
+
+			// Trigger close immediately to end the iteration
+			setImmediate(() => {
+				mockProcess._simulateClose(0)
+			})
+
+			await iterator.next()
+
+			expect(mockRunClaudeCode).toHaveBeenCalledWith({
+				systemPrompt,
+				messages,
+				path: mockOptions.claudeCodePath,
+				modelId: mockOptions.apiModelId,
+				taskId: testTaskId,
+			})
+		})
 		it("should handle successful Claude Code output", async () => {
 			const messageGenerator = handler.createMessage(systemPrompt, messages)
 			const chunks: any[] = []

src/api/providers/claude-code.ts

@@ -22,13 +22,15 @@ export class ClaudeCodeHandler extends BaseProvider implements ApiHandler {
 		metadata?: ApiHandlerCreateMessageMetadata,
 	): ApiStream {
 		let claudeProcess: ChildProcess | null = null
+		let retryWithoutSession = false
 
 		try {
 			claudeProcess = runClaudeCode({
 				systemPrompt,
 				messages,
 				path: this.options.claudeCodePath,
 				modelId: this.getModel().id,
+				taskId: retryWithoutSession ? undefined : metadata?.taskId,
 			})
 
 			// Listen for abort signal if provided
@@ -87,6 +89,61 @@ export class ClaudeCodeHandler extends BaseProvider implements ApiHandler {
 				}
 
 				if (exitCode !== null && exitCode !== 0) {
+					// Detect session-related errors and execute fallback processing
+					if (
+						errorOutput.includes("No conversation found with session ID") &&
+						!retryWithoutSession &&
+						metadata?.taskId
+					) {
+						// Retry without session
+						retryWithoutSession = true
+						claudeProcess = runClaudeCode({
+							systemPrompt,
+							messages,
+							path: this.options.claudeCodePath,
+							modelId: this.getModel().id,
+							taskId: undefined,
+						})
+
+						// Reinitialize process
+						dataQueue.length = 0
+						errorOutput = ""
+						exitCode = null
+						processError = null
+
+						// Set up event listeners for the new process
+						claudeProcess.stdout?.on("data", (data: Buffer) => {
+							const output = data.toString()
+							const lines = output.split("\n").filter((line: string) => line.trim() !== "")
+							for (const line of lines) {
+								dataQueue.push(line)
+							}
+						})
+
+						claudeProcess.stderr?.on("data", (data: Buffer) => {
+							errorOutput += data.toString()
+						})
+
+						claudeProcess.on("close", (code: number | null) => {
+							exitCode = code
+						})
+
+						claudeProcess.on("error", (error: Error) => {
+							processError = error
+						})
+
+						// Reset abort signal
+						if (metadata?.signal) {
+							metadata.signal.addEventListener("abort", () => {
+								if (claudeProcess && !claudeProcess.killed) {
+									claudeProcess.kill("SIGTERM")
+								}
+							})
+						}
+
+						continue
+					}
+
 					throw new Error(
 						`Claude Code process exited with code ${exitCode}.${errorOutput ? ` Error output: ${errorOutput.trim()}` : ""}`,
 					)

src/integrations/claude-code/__tests__/run.spec.ts

@@ -38,7 +38,9 @@ describe("runClaudeCode", () => {
 			"/usr/local/bin/claude",
 			expect.arrayContaining([
 				"-p",
-				"System: Test system prompt\n\nUser: Test message",
+				JSON.stringify(params.messages),
+				"--system-prompt",
+				params.systemPrompt,
 				"--verbose",
 				"--output-format",
 				"stream-json",

src/integrations/claude-code/run.ts

@@ -14,9 +14,9 @@ function validateMessageContent(content: string): void {
 		/\x1b\[/, // ANSI escape sequences
 		/\$\(/, // Command substitution
 		/`/, // Backticks for command substitution
-		/\|\|/, // Logical OR that could chain commands
-		/&&/, // Logical AND that could chain commands
-		/;/, // Command separator
+		/\s\|\|\s/, // Logical OR that could chain commands (with spaces to avoid matching //)
+		/\s&&\s/, // Logical AND that could chain commands (with spaces)
+		/;\s*\w/, // Command separator followed by word character
 		/\n\s*[\w-]*\$\s/, // Newline followed by shell prompt patterns (e.g., "user$ ", "$ ")
 	]
 
@@ -104,15 +104,16 @@ export function runClaudeCode({
 	messages,
 	path,
 	modelId,
+	taskId,
 }: {
 	systemPrompt: string
 	messages: Anthropic.Messages.MessageParam[]
 	path?: string
 	modelId?: string
+	taskId?: string
 }) {
 	const claudePath = path || "claude"
 	const workspacePath = getCwd()
-	const sessionId = SessionManager.getSessionId(workspacePath)
 
 	// Serialize messages to JSON format for Claude CLI
 	const serializedMessages = safeSerializeMessages(messages)
@@ -132,8 +133,11 @@ export function runClaudeCode({
 		args.push("--model", modelId)
 	}
 
-	// Note: Removed -r option as it requires an existing session ID from Claude CLI
-	// Each call will be treated as a new conversation for now
+	// Add -r option for session continuity only if taskId is explicitly provided
+	// This avoids the "No conversation found" error for new sessions
+	if (taskId) {
+		args.push("-r", taskId)
+	}
 
 	try {
 		return execa(claudePath, args, {