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

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;
       }

package/src/ai/hunk-hashing.js

@@ -0,0 +1,161 @@
+// Copyright 2026 Tim Perkins (tjwp) | SPDX-License-Identifier: Apache-2.0
+
+const crypto = require('crypto');
+
+/**
+ * @typedef {Object} Hunk
+ * @property {string} header - Hunk header line, e.g. "@@ -10,5 +10,7 @@".
+ * @property {string[]} lines - Diff lines including their leading marker
+ *   ('+', '-', ' ', or the literal '\' marker).
+ */
+
+const LOCKFILE_BASENAMES = new Set([
+  'package-lock.json',
+  'pnpm-lock.yaml',
+  'yarn.lock',
+  'Cargo.lock',
+  'Pipfile.lock',
+  'poetry.lock',
+  'composer.lock',
+  'go.sum'
+]);
+
+const JS_TS_EXTENSIONS = new Set(['.js', '.jsx', '.ts', '.tsx', '.mjs', '.cjs']);
+const PYTHON_EXTENSIONS = new Set(['.py']);
+
+const JS_IMPORT_PATTERN = /^(?:import\b|from\s+\S+\s+import\b|(?:const|let|var)\s+\w+\s*=\s*require\()/;
+const PY_IMPORT_PATTERN = /^(?:import\b|from\s+\S+\s+import\b)/;
+const PACKAGE_JSON_VERSION_PATTERN = /^"([^"]+)"\s*:\s*"[~^>=<]*\d[\w.\-+*]*"\,?\s*$/;
+
+/**
+ * SHA-256 hex of `${filePath}\n${hunkContent}`.
+ * @param {string} filePath
+ * @param {string} hunkContent
+ * @returns {string}
+ */
+function hashHunk(filePath, hunkContent) {
+  return crypto.createHash('sha256').update(`${filePath}\n${hunkContent}`).digest('hex');
+}
+
+function getExtension(filePath) {
+  const slash = filePath.lastIndexOf('/');
+  const base = slash === -1 ? filePath : filePath.slice(slash + 1);
+  const dot = base.lastIndexOf('.');
+  if (dot <= 0) return '';
+  return base.slice(dot).toLowerCase();
+}
+
+function getBasename(filePath) {
+  const slash = filePath.lastIndexOf('/');
+  return slash === -1 ? filePath : filePath.slice(slash + 1);
+}
+
+function classifyLines(lines) {
+  const added = [];
+  const removed = [];
+  for (const line of lines) {
+    if (line.startsWith('\\')) continue;
+    if (line.startsWith('+')) added.push(line.slice(1));
+    else if (line.startsWith('-')) removed.push(line.slice(1));
+  }
+  return { added, removed };
+}
+
+function isImportOnlyReorder(added, removed, ext) {
+  let pattern;
+  if (JS_TS_EXTENSIONS.has(ext)) pattern = JS_IMPORT_PATTERN;
+  else if (PYTHON_EXTENSIONS.has(ext)) pattern = PY_IMPORT_PATTERN;
+  else return false;
+
+  if (added.length === 0 && removed.length === 0) return false;
+
+  const addedTrimmed = added.map((l) => l.trim());
+  const removedTrimmed = removed.map((l) => l.trim());
+
+  for (const line of addedTrimmed) {
+    if (!pattern.test(line)) return false;
+  }
+  for (const line of removedTrimmed) {
+    if (!pattern.test(line)) return false;
+  }
+
+  if (addedTrimmed.length !== removedTrimmed.length) return false;
+  const a = [...addedTrimmed].sort();
+  const r = [...removedTrimmed].sort();
+  for (let i = 0; i < a.length; i++) {
+    if (a[i] !== r[i]) return false;
+  }
+  return true;
+}
+
+function extractPackageJsonVersionKey(line) {
+  const match = PACKAGE_JSON_VERSION_PATTERN.exec(line);
+  return match ? match[1] : null;
+}
+
+function isVersionBumpChange(added, removed, basename) {
+  if (basename !== 'package.json' && !LOCKFILE_BASENAMES.has(basename)) return false;
+  if (added.length === 0 && removed.length === 0) return false;
+
+  if (LOCKFILE_BASENAMES.has(basename)) return true;
+
+  const addedKeys = [];
+  for (const line of added) {
+    const key = extractPackageJsonVersionKey(line.trim());
+    if (key === null) return false;
+    addedKeys.push(key);
+  }
+  const removedKeys = [];
+  for (const line of removed) {
+    const key = extractPackageJsonVersionKey(line.trim());
+    if (key === null) return false;
+    removedKeys.push(key);
+  }
+
+  if (addedKeys.length !== removedKeys.length) return false;
+  const a = [...addedKeys].sort();
+  const r = [...removedKeys].sort();
+  for (let i = 0; i < a.length; i++) {
+    if (a[i] !== r[i]) return false;
+  }
+  return true;
+}
+
+/**
+ * Classify a hunk as trivial under one of several heuristics.
+ *
+ * Callers that need generated-file detection should pass
+ *   isGeneratedFile: parser.isGenerated.bind(parser)
+ * where `parser` is the result of
+ *   await getGeneratedFilePatterns(worktreePath)
+ * from src/git/gitattributes.js. When `isGeneratedFile` is omitted, the
+ * generated-file rule is skipped silently.
+ * @param {Hunk} hunk
+ * @param {string} filePath
+ * @param {{ isGeneratedFile?: (filePath: string) => boolean }} [options]
+ * @returns {{ trivial: boolean, reason?: 'imports'|'version_bump'|'generated' }}
+ */
+function isTrivialHunk(hunk, filePath, options) {
+  const opts = options || {};
+
+  if (typeof opts.isGeneratedFile === 'function' && opts.isGeneratedFile(filePath) === true) {
+    return { trivial: true, reason: 'generated' };
+  }
+
+  const lines = hunk && Array.isArray(hunk.lines) ? hunk.lines : [];
+  const { added, removed } = classifyLines(lines);
+
+  const ext = getExtension(filePath);
+  if (isImportOnlyReorder(added, removed, ext)) {
+    return { trivial: true, reason: 'imports' };
+  }
+
+  const basename = getBasename(filePath);
+  if (isVersionBumpChange(added, removed, basename)) {
+    return { trivial: true, reason: 'version_bump' };
+  }
+
+  return { trivial: false };
+}
+
+module.exports = { hashHunk, isTrivialHunk };

package/src/ai/index.js

@@ -13,6 +13,7 @@ const {
   registerProvider,
   getProviderClass,
   getRegisteredProviderIds,
+  resolveNonExecutableProviderId,
   getAllProvidersInfo,
   createProvider,
   testProviderAvailability,
@@ -60,6 +61,7 @@ module.exports = {
   registerProvider,
   getProviderClass,
   getRegisteredProviderIds,
+  resolveNonExecutableProviderId,
   getAllProvidersInfo,
 
   // Factory

package/src/ai/opencode-provider.js

@@ -18,6 +18,7 @@ const logger = require('../utils/logger');
 const { extractJSON } = require('../utils/json-extractor');
 const { CancellationError, isAnalysisCancelled } = require('../routes/shared');
 const { StreamParser, parseOpenCodeLine } = 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');
@@ -102,7 +103,7 @@ class OpenCodeProvider 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 OpenCode CLI...`);
@@ -128,7 +129,8 @@ class OpenCodeProvider extends AIProvider {
           ...this.extraEnv,
           PATH: `${BIN_DIR}:${process.env.PATH}`
         },
-        shell: this.useShell
+        shell: this.useShell,
+        detached: this.useShell
       });
 
       const pid = opencode.pid;
@@ -140,6 +142,9 @@ class OpenCodeProvider extends AIProvider {
         logger.info(`${levelPrefix} Registered process ${pid} for analysis ${analysisId}`);
       }
 
+      // Wire AbortSignal -> SIGTERM for tour/summary cancellation.
+      const abortWiring = wireAbortToChild(opencode, abortSignal, { logPrefix: levelPrefix, shell: this.useShell });
+
       let stdout = '';
       let stderr = '';
       let timeoutId = null;
@@ -151,6 +156,7 @@ class OpenCodeProvider extends AIProvider {
         if (settled) return;
         settled = true;
         if (timeoutId) clearTimeout(timeoutId);
+        abortWiring.detach();
         fn(value);
       };
 
@@ -201,11 +207,20 @@ class OpenCodeProvider extends AIProvider {
       opencode.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} OpenCode 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)) {
@@ -281,6 +296,7 @@ class OpenCodeProvider extends AIProvider {
 
       // Handle errors
       opencode.on('error', (error) => {
+        // Detach happens inside `settle`.
         if (error.code === 'ENOENT') {
           logger.error(`${levelPrefix} OpenCode CLI not found. Please ensure OpenCode CLI is installed.`);
           settle(reject, new Error(`${levelPrefix} OpenCode CLI not found. ${OpenCodeProvider.getInstallInstructions()}`));
@@ -491,7 +507,7 @@ class OpenCodeProvider extends AIProvider {
 
       if (textContent) {
         // 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;
         }
@@ -503,12 +519,12 @@ class OpenCodeProvider extends AIProvider {
       }
 
       // No text content 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/pi-provider.js

@@ -26,6 +26,7 @@ const logger = require('../utils/logger');
 const { extractJSON } = require('../utils/json-extractor');
 const { CancellationError, isAnalysisCancelled } = require('../routes/shared');
 const { createPiLineParser } = 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');
@@ -430,7 +431,7 @@ function appendPiChunkToLineBuffer(state, chunk, levelPrefix) {
  */
 function finalizePiResponseParsing({ textContent, rawOutput, rawOutputTruncated = false }, level, levelPrefix) {
   if (textContent) {
-    const extracted = extractJSON(textContent, level);
+    const extracted = extractJSON(textContent, level, levelPrefix);
     if (extracted.success) {
       return extracted;
     }
@@ -447,7 +448,7 @@ function finalizePiResponseParsing({ textContent, rawOutput, rawOutputTruncated
     };
   }
 
-  return extractJSON(rawOutput, level);
+  return extractJSON(rawOutput, level, levelPrefix);
 }
 
 class PiProvider extends AIProvider {
@@ -579,7 +580,7 @@ class PiProvider extends AIProvider {
    */
   async execute(prompt, options = {}) {
     return new Promise((resolve, reject) => {
-      const { cwd = process.cwd(), timeout = 900000, level = 'unknown', analysisId, registerProcess, onStreamEvent, logPrefix } = options;
+      const { cwd = process.cwd(), timeout = 900000, level = 'unknown', analysisId, registerProcess, onStreamEvent, logPrefix, abortSignal } = options;
 
       const levelPrefix = logPrefix || `[Level ${level}]`;
       logger.info(`${levelPrefix} Executing Pi CLI...`);
@@ -609,7 +610,8 @@ class PiProvider extends AIProvider {
           ...this.extraEnv,
           PATH: `${BIN_DIR}:${process.env.PATH}`
         },
-        shell: this.useShell
+        shell: this.useShell,
+        detached: this.useShell
       });
 
       // Close stdin immediately — prompt is delivered via @file, but some
@@ -626,6 +628,9 @@ class PiProvider extends AIProvider {
         logger.info(`${levelPrefix} Registered process ${pid} for analysis ${analysisId}`);
       }
 
+      // Wire AbortSignal -> SIGTERM for tour/summary cancellation.
+      const abortWiring = wireAbortToChild(pi, abortSignal, { logPrefix: levelPrefix, shell: this.useShell });
+
       const stderrCapture = {
         head: '',
         tail: '',
@@ -652,6 +657,7 @@ class PiProvider extends AIProvider {
         if (settled) return;
         settled = true;
         if (timeoutId) clearTimeout(timeoutId);
+        abortWiring.detach();
         fn(value);
       };
 
@@ -711,6 +717,15 @@ class PiProvider extends AIProvider {
         cleanupTmpFile();
         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} Pi 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)) {
@@ -810,6 +825,7 @@ class PiProvider extends AIProvider {
       // Handle errors
       pi.on('error', (error) => {
         cleanupTmpFile();
+        // Detach happens inside `settle`.
         if (error.code === 'ENOENT') {
           logger.error(`${levelPrefix} Pi CLI not found. Please ensure Pi CLI is installed.`);
           settle(reject, new Error(`${levelPrefix} Pi CLI not found. ${PiProvider.getInstallInstructions()}`));
@@ -994,7 +1010,7 @@ class PiProvider 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;
       }