@in-the-loop-labs/pair-review 3.5.2 → 3.6.0

package/src/ai/claude-provider.js

@@ -12,6 +12,7 @@ const logger = require('../utils/logger');
 const { extractJSON } = require('../utils/json-extractor');
 const { CancellationError, isAnalysisCancelled } = require('../routes/shared');
 const { StreamParser, parseClaudeLine } = require('./stream-parser');
+const { wireAbortToChild, makeAbortError } = require('./abort-signal-wiring');
 
 // Directory containing bin scripts (git-diff-lines, etc.)
 const BIN_DIR = path.join(__dirname, '..', '..', 'bin');
@@ -286,7 +287,7 @@ class ClaudeProvider extends AIProvider {
    */
   async execute(prompt, options = {}) {
     return new Promise((resolve, reject) => {
-      const { cwd = process.cwd(), timeout = 300000, level = 'unknown', analysisId, registerProcess, onStreamEvent, logPrefix } = options;
+      const { cwd = process.cwd(), timeout = 300000, level = 'unknown', analysisId, registerProcess, onStreamEvent, logPrefix, abortSignal } = options;
 
       const levelPrefix = logPrefix || `[Level ${level}]`;
       logger.info(`${levelPrefix} Executing Claude CLI...`);
@@ -300,7 +301,12 @@ class ClaudeProvider extends AIProvider {
           ...this.extraEnv,
           PATH: `${BIN_DIR}:${process.env.PATH}`
         },
-        shell: this.useShell
+        shell: this.useShell,
+        // In shell mode the immediate child is `/bin/sh -c '...claude...'`.
+        // Detaching makes the shell its own process-group leader so
+        // wireAbortToChild can `process.kill(-pid, SIGTERM)` and reap the
+        // CLI grandchild along with the shell. No effect when shell:false.
+        detached: this.useShell
       });
 
       const pid = claude.pid;
@@ -314,6 +320,13 @@ class ClaudeProvider extends AIProvider {
         logger.info(`${levelPrefix} Registered process ${pid} for analysis ${analysisId}`);
       }
 
+      // Wire AbortSignal -> SIGTERM. Tour/summary jobs run through the
+      // BackgroundQueue which threads its per-job signal here so a user
+      // "Cancel" click stops burning tokens on the upstream CLI call.
+      // Pass shell: this.useShell so the helper signals the whole process
+      // group (group-kill) instead of just the shell wrapper.
+      const abortWiring = wireAbortToChild(claude, abortSignal, { logPrefix: levelPrefix, shell: this.useShell });
+
       let stdout = '';
       let stderr = '';
       let timeoutId = null;
@@ -321,10 +334,16 @@ class ClaudeProvider extends AIProvider {
       let lineBuffer = '';  // Buffer for incomplete JSONL lines
       let lineCount = 0;    // Count of JSONL events for progress tracking
 
+      // Centralize abort-listener cleanup in `settle` so it ALWAYS runs
+      // when this execute() returns — including when the timeout path
+      // settles before the child exits. Otherwise the abort listener
+      // outlives the call and leaks across the loop tour/summary
+      // generators run with a shared per-job signal.
       const settle = (fn, value) => {
         if (settled) return;
         settled = true;
         if (timeoutId) clearTimeout(timeoutId);
+        abortWiring.detach();
         fn(value);
       };
 
@@ -375,11 +394,24 @@ class ClaudeProvider extends AIProvider {
       claude.on('close', (code) => {
         if (settled) return;  // Already settled by timeout or error
 
+        // Note: abort listener detach is centralized in `settle` so it
+        // runs even when the timeout path settled first.
+
         // Flush any remaining stream parser buffer
         if (streamParser) {
           streamParser.flush();
         }
 
+        // BackgroundQueue-driven cancellation: the user clicked "Cancel
+        // Tour"/"Cancel Summaries", which aborted our signal and we sent
+        // SIGTERM via wireAbortToChild. Surface it as an AbortError so
+        // upstream callers can distinguish "user cancel" from real failure.
+        if (abortWiring.cancelled()) {
+          logger.info(`${levelPrefix} Claude CLI terminated by user cancel (exit code ${code})`);
+          settle(reject, makeAbortError(`${levelPrefix} Cancelled by user`));
+          return;
+        }
+
         // Check for cancellation signals (SIGTERM=143, SIGKILL=137)
         const isCancellationCode = code === 143 || code === 137;
         if (isCancellationCode && analysisId && isAnalysisCancelled(analysisId)) {
@@ -410,13 +442,23 @@ class ClaudeProvider extends AIProvider {
         const parsed = this.parseClaudeResponse(stdout, level, levelPrefix);
         if (parsed.success) {
           logger.success(`${levelPrefix} Successfully parsed JSON response`);
-          // Dump the parsed data for debugging
-          const dataPreview = JSON.stringify(parsed.data, null, 2);
-          logger.debug(`${levelPrefix} [parsed_data] ${dataPreview.substring(0, 3000)}${dataPreview.length > 3000 ? '...' : ''}`);
+          // Dump the parsed data for debugging.
+          // Skip for summary calls — they run per-file and the dump is per-call
+          // noise. The `[response]` line below already gives a useful one-liner.
+          const isSummaryCall = typeof levelPrefix === 'string' && levelPrefix.startsWith('[Summary');
+          if (!isSummaryCall) {
+            const dataPreview = JSON.stringify(parsed.data, null, 2);
+            logger.debug(`${levelPrefix} [parsed_data] ${dataPreview.substring(0, 3000)}${dataPreview.length > 3000 ? '...' : ''}`);
+          }
           // Log suggestion count if present
           if (parsed.data?.suggestions) {
             const count = Array.isArray(parsed.data.suggestions) ? parsed.data.suggestions.length : 0;
             logger.info(`${levelPrefix} [response] ${count} suggestions in parsed response`);
+          } else if (isSummaryCall && Array.isArray(parsed.data?.summaries)) {
+            const total = parsed.data.summaries.length;
+            const withText = parsed.data.summaries.filter((s) => s && typeof s.summary === 'string' && s.summary.length > 0).length;
+            const skipped = parsed.data.summaries.filter((s) => s && s.summary === null).length;
+            logger.info(`${levelPrefix} [response] ${total} summaries (${withText} with text, ${skipped} null)`);
           }
           settle(resolve, parsed.data);
         } else {
@@ -451,6 +493,7 @@ class ClaudeProvider extends AIProvider {
 
       // Handle errors
       claude.on('error', (error) => {
+        // Detach happens inside `settle` below.
         if (error.code === 'ENOENT') {
           logger.error(`${levelPrefix} Claude CLI not found. Please ensure Claude CLI is installed.`);
           settle(reject, new Error(`${levelPrefix} Claude CLI not found. ${ClaudeProvider.getInstallInstructions()}`));
@@ -756,7 +799,7 @@ class ClaudeProvider extends AIProvider {
       if (textContent) {
         logger.debug(`${levelPrefix} Extracted ${textContent.length} chars of text content from JSONL`);
         // Try to extract JSON from the accumulated text content
-        const extracted = extractJSON(textContent, level);
+        const extracted = extractJSON(textContent, level, levelPrefix);
         if (extracted.success) {
           return extracted;
         }
@@ -774,7 +817,7 @@ class ClaudeProvider extends AIProvider {
 
     } catch (parseError) {
       // stdout might not be valid JSONL at all, try extracting JSON from it
-      const extracted = extractJSON(stdout, level);
+      const extracted = extractJSON(stdout, level, levelPrefix);
       if (extracted.success) {
         return extracted;
       }

package/src/ai/codex-provider.js

@@ -13,6 +13,7 @@ const logger = require('../utils/logger');
 const { extractJSON } = require('../utils/json-extractor');
 const { CancellationError, isAnalysisCancelled } = require('../routes/shared');
 const { StreamParser, parseCodexLine } = require('./stream-parser');
+const { wireAbortToChild, makeAbortError } = require('./abort-signal-wiring');
 
 // Directory containing bin scripts (git-diff-lines, etc.)
 const BIN_DIR = path.join(__dirname, '..', '..', 'bin');
@@ -242,7 +243,7 @@ class CodexProvider extends AIProvider {
    */
   async execute(prompt, options = {}) {
     return new Promise((resolve, reject) => {
-      const { cwd = process.cwd(), timeout = 300000, level = 'unknown', analysisId, registerProcess, onStreamEvent, logPrefix } = options;
+      const { cwd = process.cwd(), timeout = 300000, level = 'unknown', analysisId, registerProcess, onStreamEvent, logPrefix, abortSignal } = options;
 
       const levelPrefix = logPrefix || `[Level ${level}]`;
       logger.info(`${levelPrefix} Executing Codex CLI...`);
@@ -255,7 +256,10 @@ class CodexProvider extends AIProvider {
           ...this.extraEnv,
           PATH: `${BIN_DIR}:${process.env.PATH}`
         },
-        shell: this.useShell
+        shell: this.useShell,
+        // Detach in shell mode so wireAbortToChild can group-kill via
+        // process.kill(-pid). See claude-provider for the rationale.
+        detached: this.useShell
       });
 
       const pid = codex.pid;
@@ -267,6 +271,10 @@ class CodexProvider extends AIProvider {
         logger.info(`${levelPrefix} Registered process ${pid} for analysis ${analysisId}`);
       }
 
+      // Wire AbortSignal -> SIGTERM for tour/summary cancellation.
+      // shell flag triggers group-kill so the CLI grandchild dies with the shell.
+      const abortWiring = wireAbortToChild(codex, abortSignal, { logPrefix: levelPrefix, shell: this.useShell });
+
       let stdout = '';
       let stderr = '';
       let timeoutId = null;
@@ -274,10 +282,15 @@ class CodexProvider extends AIProvider {
       let lineBuffer = '';  // Buffer for incomplete JSONL lines
       let lineCount = 0;    // Count of JSONL events for progress tracking
 
+      // Centralize detach in `settle` so the abort listener is removed
+      // regardless of which exit path (close/timeout/error) wins. Avoids
+      // leaking a listener on the per-job AbortSignal that tour/summary
+      // generators reuse across many provider.execute() calls.
       const settle = (fn, value) => {
         if (settled) return;
         settled = true;
         if (timeoutId) clearTimeout(timeoutId);
+        abortWiring.detach();
         fn(value);
       };
 
@@ -328,11 +341,20 @@ class CodexProvider extends AIProvider {
       codex.on('close', (code) => {
         if (settled) return;  // Already settled by timeout or error
 
+        // Detach is centralized in `settle`.
+
         // Flush any remaining stream parser buffer
         if (streamParser) {
           streamParser.flush();
         }
 
+        // BackgroundQueue-driven cancellation — mirror of claude-provider.
+        if (abortWiring.cancelled()) {
+          logger.info(`${levelPrefix} Codex CLI terminated by user cancel (exit code ${code})`);
+          settle(reject, makeAbortError(`${levelPrefix} Cancelled by user`));
+          return;
+        }
+
         // Check for cancellation signals (SIGTERM=143, SIGKILL=137)
         const isCancellationCode = code === 143 || code === 137;
         if (isCancellationCode && analysisId && isAnalysisCancelled(analysisId)) {
@@ -407,6 +429,7 @@ class CodexProvider extends AIProvider {
 
       // Handle errors
       codex.on('error', (error) => {
+        // Detach happens inside `settle`.
         if (error.code === 'ENOENT') {
           logger.error(`${levelPrefix} Codex CLI not found. Please ensure Codex CLI is installed.`);
           settle(reject, new Error(`${levelPrefix} Codex CLI not found. ${CodexProvider.getInstallInstructions()}`));
@@ -510,7 +533,7 @@ class CodexProvider extends AIProvider {
         // The accumulated agent_message text contains the AI's response
         // Try to extract JSON from it (the AI was asked to output JSON)
         logger.debug(`${levelPrefix} Extracted ${agentMessageText.length} chars of agent message text from JSONL`);
-        const extracted = extractJSON(agentMessageText, level);
+        const extracted = extractJSON(agentMessageText, level, levelPrefix);
         if (extracted.success) {
           return extracted;
         }
@@ -522,12 +545,12 @@ class CodexProvider extends AIProvider {
       }
 
       // No agent message found, try extracting JSON directly from stdout
-      const extracted = extractJSON(stdout, level);
+      const extracted = extractJSON(stdout, level, levelPrefix);
       return extracted;
 
     } catch (parseError) {
       // stdout might not be valid JSONL at all, try extracting JSON from it
-      const extracted = extractJSON(stdout, level);
+      const extracted = extractJSON(stdout, level, levelPrefix);
       if (extracted.success) {
         return extracted;
       }

package/src/ai/copilot-provider.js

@@ -12,6 +12,7 @@ const { AIProvider, registerProvider, quoteShellArgs } = require('./provider');
 const logger = require('../utils/logger');
 const { extractJSON } = require('../utils/json-extractor');
 const { CancellationError, isAnalysisCancelled } = require('../routes/shared');
+const { wireAbortToChild, makeAbortError } = require('./abort-signal-wiring');
 
 // Directory containing bin scripts (git-diff-lines, etc.)
 const BIN_DIR = path.join(__dirname, '..', '..', 'bin');
@@ -220,7 +221,7 @@ class CopilotProvider extends AIProvider {
     return new Promise((resolve, reject) => {
       // Note: Copilot does not support streaming — output is plain text returned on process exit, not JSONL.
       // onStreamEvent is therefore not destructured here (no StreamParser integration).
-      const { cwd = process.cwd(), timeout = 300000, level = 'unknown', analysisId, registerProcess, logPrefix } = options;
+      const { cwd = process.cwd(), timeout = 300000, level = 'unknown', analysisId, registerProcess, logPrefix, abortSignal } = options;
 
       const levelPrefix = logPrefix || `[Level ${level}]`;
       logger.info(`${levelPrefix} Executing Copilot CLI...`);
@@ -249,7 +250,9 @@ class CopilotProvider extends AIProvider {
           ...this.extraEnv,
           PATH: `${BIN_DIR}:${process.env.PATH}`
         },
-        shell: this.useShell
+        shell: this.useShell,
+        // Detach in shell mode so group-kill can reap the CLI grandchild.
+        detached: this.useShell
       });
 
       const pid = copilot.pid;
@@ -261,15 +264,21 @@ class CopilotProvider extends AIProvider {
         logger.info(`${levelPrefix} Registered process ${pid} for analysis ${analysisId}`);
       }
 
+      // Wire AbortSignal -> SIGTERM for tour/summary cancellation.
+      const abortWiring = wireAbortToChild(copilot, abortSignal, { logPrefix: levelPrefix, shell: this.useShell });
+
       let stdout = '';
       let stderr = '';
       let timeoutId = null;
       let settled = false;  // Guard against multiple resolve/reject calls
 
+      // Detach centralized in settle so timeout-then-close cannot leak
+      // an abort listener on the per-job AbortSignal.
       const settle = (fn, value) => {
         if (settled) return;
         settled = true;
         if (timeoutId) clearTimeout(timeoutId);
+        abortWiring.detach();
         fn(value);
       };
 
@@ -296,6 +305,15 @@ class CopilotProvider extends AIProvider {
       copilot.on('close', (code) => {
         if (settled) return;  // Already settled by timeout or error
 
+        // Detach is centralized in `settle`.
+
+        // BackgroundQueue-driven cancellation — mirror of claude-provider.
+        if (abortWiring.cancelled()) {
+          logger.info(`${levelPrefix} Copilot CLI terminated by user cancel (exit code ${code})`);
+          settle(reject, makeAbortError(`${levelPrefix} Cancelled by user`));
+          return;
+        }
+
         // Check for cancellation signals (SIGTERM=143, SIGKILL=137)
         const isCancellationCode = code === 143 || code === 137;
         if (isCancellationCode && analysisId && isAnalysisCancelled(analysisId)) {
@@ -320,7 +338,7 @@ class CopilotProvider extends AIProvider {
         }
 
         // Extract JSON from the response
-        const extracted = extractJSON(stdout, level);
+        const extracted = extractJSON(stdout, level, levelPrefix);
         if (extracted.success) {
           logger.success(`${levelPrefix} Successfully parsed JSON response`);
           settle(resolve, extracted.data);
@@ -352,6 +370,7 @@ class CopilotProvider extends AIProvider {
 
       // Handle errors
       copilot.on('error', (error) => {
+        // Detach happens inside `settle`.
         if (error.code === 'ENOENT') {
           logger.error(`${levelPrefix} Copilot CLI not found. Please ensure Copilot CLI is installed.`);
           settle(reject, new Error(`${levelPrefix} Copilot CLI not found. ${CopilotProvider.getInstallInstructions()}`));

package/src/ai/cursor-agent-provider.js

@@ -21,6 +21,7 @@ const logger = require('../utils/logger');
 const { extractJSON } = require('../utils/json-extractor');
 const { CancellationError, isAnalysisCancelled } = require('../routes/shared');
 const { StreamParser, parseCursorAgentLine } = require('./stream-parser');
+const { wireAbortToChild, makeAbortError } = require('./abort-signal-wiring');
 
 // Directory containing bin scripts (git-diff-lines, etc.)
 const BIN_DIR = path.join(__dirname, '..', '..', 'bin');
@@ -262,7 +263,7 @@ class CursorAgentProvider extends AIProvider {
    */
   async execute(prompt, options = {}) {
     return new Promise((resolve, reject) => {
-      const { cwd = process.cwd(), timeout = 300000, level = 'unknown', analysisId, registerProcess, onStreamEvent, logPrefix } = options;
+      const { cwd = process.cwd(), timeout = 300000, level = 'unknown', analysisId, registerProcess, onStreamEvent, logPrefix, abortSignal } = options;
 
       const levelPrefix = logPrefix || `[Level ${level}]`;
       logger.info(`${levelPrefix} Executing Cursor Agent CLI...`);
@@ -275,7 +276,8 @@ class CursorAgentProvider extends AIProvider {
           ...this.extraEnv,
           PATH: `${BIN_DIR}:${process.env.PATH}`
         },
-        shell: this.useShell
+        shell: this.useShell,
+        detached: this.useShell
       });
 
       const pid = agent.pid;
@@ -287,6 +289,9 @@ class CursorAgentProvider extends AIProvider {
         logger.info(`${levelPrefix} Registered process ${pid} for analysis ${analysisId}`);
       }
 
+      // Wire AbortSignal -> SIGTERM for tour/summary cancellation.
+      const abortWiring = wireAbortToChild(agent, abortSignal, { logPrefix: levelPrefix, shell: this.useShell });
+
       let stdout = '';
       let stderr = '';
       let timeoutId = null;
@@ -298,6 +303,7 @@ class CursorAgentProvider extends AIProvider {
         if (settled) return;
         settled = true;
         if (timeoutId) clearTimeout(timeoutId);
+        abortWiring.detach();
         fn(value);
       };
 
@@ -348,11 +354,20 @@ class CursorAgentProvider extends AIProvider {
       agent.on('close', (code) => {
         if (settled) return;  // Already settled by timeout or error
 
+        // Detach is centralized in `settle`.
+
         // Flush any remaining stream parser buffer
         if (streamParser) {
           streamParser.flush();
         }
 
+        // BackgroundQueue-driven cancellation — mirror of claude-provider.
+        if (abortWiring.cancelled()) {
+          logger.info(`${levelPrefix} Cursor Agent CLI terminated by user cancel (exit code ${code})`);
+          settle(reject, makeAbortError(`${levelPrefix} Cancelled by user`));
+          return;
+        }
+
         // Check for cancellation signals (SIGTERM=143, SIGKILL=137)
         const isCancellationCode = code === 143 || code === 137;
         if (isCancellationCode && analysisId && isAnalysisCancelled(analysisId)) {
@@ -431,6 +446,7 @@ class CursorAgentProvider extends AIProvider {
 
       // Handle errors
       agent.on('error', (error) => {
+        // Detach happens inside `settle`.
         if (error.code === 'ENOENT') {
           logger.error(`${levelPrefix} Cursor Agent CLI not found. Please ensure Cursor Agent CLI is installed.`);
           settle(reject, new Error(`${levelPrefix} Cursor Agent CLI not found. ${CursorAgentProvider.getInstallInstructions()}`));
@@ -529,7 +545,7 @@ class CursorAgentProvider extends AIProvider {
       // Primary: try to extract JSON from accumulated assistant text
       if (assistantText) {
         logger.debug(`${levelPrefix} Extracted ${assistantText.length} chars of assistant text from JSONL`);
-        const extracted = extractJSON(assistantText, level);
+        const extracted = extractJSON(assistantText, level, levelPrefix);
         if (extracted.success) {
           return extracted;
         }
@@ -540,7 +556,7 @@ class CursorAgentProvider extends AIProvider {
       // Fallback: try extracting JSON from the result event's text
       if (resultText) {
         logger.debug(`${levelPrefix} Trying result text: ${resultText.length} chars`);
-        const extracted = extractJSON(resultText, level);
+        const extracted = extractJSON(resultText, level, levelPrefix);
         if (extracted.success) {
           return extracted;
         }
@@ -550,7 +566,7 @@ class CursorAgentProvider extends AIProvider {
 
       // Last resort: try extracting JSON directly from raw stdout
       if (!assistantText && !resultText) {
-        const extracted = extractJSON(stdout, level);
+        const extracted = extractJSON(stdout, level, levelPrefix);
         return extracted;
       }
 
@@ -560,7 +576,7 @@ class CursorAgentProvider extends AIProvider {
 
     } catch (parseError) {
       // stdout might not be valid JSONL at all, try extracting JSON from it
-      const extracted = extractJSON(stdout, level);
+      const extracted = extractJSON(stdout, level, levelPrefix);
       if (extracted.success) {
         return extracted;
       }

package/src/ai/executable-provider.js

@@ -396,30 +396,15 @@ function createExecutableProviderClass(id, config) {
 
       // Find a mapping provider: prefer the user's configured default, fall back to
       // any registered non-executable provider. Never hardcode a specific provider.
-      let mappingProviderId = null;
-
-      // Try the user's configured default provider first
+      let preferredId = null;
       try {
         const config = await configModule.loadConfig();
-        const defaultId = configModule.getDefaultProvider(config);
-        const defaultClass = providerModule.getProviderClass(defaultId);
-        if (defaultClass && !defaultClass.isExecutable) {
-          mappingProviderId = defaultId;
-        }
+        preferredId = configModule.getDefaultProvider(config);
       } catch {
-        // Config or provider not available — fall through to fallback
+        // Config not available — fall through to fallback
       }
 
-      if (!mappingProviderId) {
-        // Fall back to any registered non-executable provider
-        for (const pid of providerModule.getRegisteredProviderIds()) {
-          const pClass = providerModule.getProviderClass(pid);
-          if (pClass && !pClass.isExecutable) {
-            mappingProviderId = pid;
-            break;
-          }
-        }
-      }
+      const mappingProviderId = providerModule.resolveNonExecutableProviderId(preferredId);
 
       if (!mappingProviderId) {
         throw new Error(`[${id}] No mapping provider available. Need at least one non-executable provider (e.g., claude) registered.`);

package/src/ai/gemini-provider.js

@@ -12,6 +12,7 @@ const logger = require('../utils/logger');
 const { extractJSON } = require('../utils/json-extractor');
 const { CancellationError, isAnalysisCancelled } = require('../routes/shared');
 const { StreamParser, parseGeminiLine } = require('./stream-parser');
+const { wireAbortToChild, makeAbortError } = require('./abort-signal-wiring');
 
 // Directory containing bin scripts (git-diff-lines, etc.)
 const BIN_DIR = path.join(__dirname, '..', '..', 'bin');
@@ -190,7 +191,7 @@ class GeminiProvider extends AIProvider {
    */
   async execute(prompt, options = {}) {
     return new Promise((resolve, reject) => {
-      const { cwd = process.cwd(), timeout = 300000, level = 'unknown', analysisId, registerProcess, onStreamEvent, logPrefix } = options;
+      const { cwd = process.cwd(), timeout = 300000, level = 'unknown', analysisId, registerProcess, onStreamEvent, logPrefix, abortSignal } = options;
 
       const levelPrefix = logPrefix || `[Level ${level}]`;
       logger.info(`${levelPrefix} Executing Gemini CLI...`);
@@ -203,7 +204,8 @@ class GeminiProvider extends AIProvider {
           ...this.extraEnv,
           PATH: `${BIN_DIR}:${process.env.PATH}`
         },
-        shell: this.useShell
+        shell: this.useShell,
+        detached: this.useShell
       });
 
       const pid = gemini.pid;
@@ -215,6 +217,9 @@ class GeminiProvider extends AIProvider {
         logger.info(`${levelPrefix} Registered process ${pid} for analysis ${analysisId}`);
       }
 
+      // Wire AbortSignal -> SIGTERM for tour/summary cancellation.
+      const abortWiring = wireAbortToChild(gemini, abortSignal, { logPrefix: levelPrefix, shell: this.useShell });
+
       let stdout = '';
       let stderr = '';
       let timeoutId = null;
@@ -226,6 +231,7 @@ class GeminiProvider extends AIProvider {
         if (settled) return;
         settled = true;
         if (timeoutId) clearTimeout(timeoutId);
+        abortWiring.detach();
         fn(value);
       };
 
@@ -276,11 +282,21 @@ class GeminiProvider extends AIProvider {
       gemini.on('close', (code) => {
         if (settled) return;  // Already settled by timeout or error
 
+        // Detach is centralized in `settle`.
+
         // Flush any remaining stream parser buffer
         if (streamParser) {
           streamParser.flush();
         }
 
+        // BackgroundQueue-driven cancellation — see claude-provider for
+        // the rationale; pattern is mirrored here.
+        if (abortWiring.cancelled()) {
+          logger.info(`${levelPrefix} Gemini CLI terminated by user cancel (exit code ${code})`);
+          settle(reject, makeAbortError(`${levelPrefix} Cancelled by user`));
+          return;
+        }
+
         // Check for cancellation signals (SIGTERM=143, SIGKILL=137)
         const isCancellationCode = code === 143 || code === 137;
         if (isCancellationCode && analysisId && isAnalysisCancelled(analysisId)) {
@@ -355,6 +371,7 @@ class GeminiProvider extends AIProvider {
 
       // Handle errors
       gemini.on('error', (error) => {
+        // Detach happens inside `settle`.
         if (error.code === 'ENOENT') {
           logger.error(`${levelPrefix} Gemini CLI not found. Please ensure Gemini CLI is installed.`);
           settle(reject, new Error(`${levelPrefix} Gemini CLI not found. ${GeminiProvider.getInstallInstructions()}`));
@@ -429,7 +446,7 @@ class GeminiProvider extends AIProvider {
         // The accumulated assistant text contains the AI's response
         // Try to extract JSON from it (the AI was asked to output JSON)
         logger.debug(`${levelPrefix} Extracted ${assistantText.length} chars of assistant message text from JSONL`);
-        const extracted = extractJSON(assistantText, level);
+        const extracted = extractJSON(assistantText, level, levelPrefix);
         if (extracted.success) {
           return extracted;
         }
@@ -441,12 +458,12 @@ class GeminiProvider extends AIProvider {
       }
 
       // No assistant message found, try extracting JSON directly from stdout
-      const extracted = extractJSON(stdout, level);
+      const extracted = extractJSON(stdout, level, levelPrefix);
       return extracted;
 
     } catch (parseError) {
       // stdout might not be valid JSONL at all, try extracting JSON from it
-      const extracted = extractJSON(stdout, level);
+      const extracted = extractJSON(stdout, level, levelPrefix);
       if (extracted.success) {
         return extracted;
       }