@the-open-engine/zeroshot 6.36.0 → 6.38.0

package/cli/index.js

@@ -73,6 +73,11 @@ const {
   resolveEffectiveRunPlan,
 } = require('../lib/start-cluster');
 const { requirePreflight } = require('../src/preflight');
+const {
+  exitCodeForResult,
+  isForegroundStatusSettled,
+  writeForegroundResult,
+} = require('../src/foreground-benchmark-run');
 const {
   createUnsupportedProviderCapabilityError,
   serializeTaskStartupError,
@@ -251,6 +256,17 @@ function shouldRunDetached(options) {
   return options.detach && !process.env.ZEROSHOT_DAEMON;
 }
 
+function requireForegroundResultMode(options) {
+  if (!options.resultFile) return;
+  if (shouldRunDetached(options) || process.env.ZEROSHOT_DAEMON) {
+    throw new Error('--result-file requires foreground execution without --detach');
+  }
+  if (options.pr || options.ship) {
+    throw new Error('--result-file is incompatible with --pr and --ship delivery');
+  }
+  process.env.ZEROSHOT_TASK_EXECUTION_CONTEXT = 'benchmark';
+}
+
 function printDetachedClusterStart(plan, clusterId, logPath) {
   const runMode = runModeFromPlan(plan);
   console.log(runMode ? `Started ${clusterId} (${runMode})` : `Started ${clusterId}`);
@@ -605,65 +621,83 @@ function createForegroundCleanup({
   return { stop, stopWithFlush };
 }
 
-function setupForegroundSigintHandler({ orchestrator, clusterId, cleanup, stopChecking }) {
-  const handler = async () => {
+function setupForegroundSignalHandler({ orchestrator, clusterId, cleanup, settle, handleSigterm }) {
+  let handling = false;
+  const handler = async (signal) => {
+    if (handling) return;
+    handling = true;
     cleanup.stop();
-    stopChecking();
-    console.log(chalk.dim('\n\n--- Interrupted ---'));
+    console.log(chalk.dim(`\n\n--- Interrupted (${signal}) ---`));
 
     try {
       console.log(chalk.dim(`Stopping cluster ${clusterId}...`));
       await orchestrator.stop(clusterId);
       console.log(chalk.dim(`Cluster ${clusterId} stopped.`));
+      settle({ cancelled: true });
     } catch (stopErr) {
-      console.error(chalk.red(`Failed to stop cluster: ${stopErr.message}`));
+      settle(null, stopErr);
     }
-
-    process.exit(0);
   };
 
-  process.on('SIGINT', handler);
+  const onSigint = () => handler('SIGINT');
+  const onSigterm = () => handler('SIGTERM');
+  process.on('SIGINT', onSigint);
+  if (handleSigterm) process.on('SIGTERM', onSigterm);
   return () => {
-    process.off('SIGINT', handler);
+    process.off('SIGINT', onSigint);
+    if (handleSigterm) process.off('SIGTERM', onSigterm);
   };
 }
 
-function waitForClusterCompletion(orchestrator, clusterId, cleanup) {
-  return new Promise((resolve) => {
+function waitForClusterCompletion(orchestrator, clusterId, cleanup, handleSigterm) {
+  return new Promise((resolve, reject) => {
     let checkInterval;
+    let settled = false;
+    let terminalObservedAt = null;
+    let removeSignals = () => {};
     const stopChecking = () => {
       if (checkInterval) {
         clearInterval(checkInterval);
       }
     };
-    const removeSigint = setupForegroundSigintHandler({
+    const settle = (result, error) => {
+      if (settled) return;
+      settled = true;
+      stopChecking();
+      removeSignals();
+      if (error) reject(error);
+      else resolve(result);
+    };
+    removeSignals = setupForegroundSignalHandler({
       orchestrator,
       clusterId,
       cleanup,
-      stopChecking,
+      settle,
+      handleSigterm,
     });
 
-    const finish = (finalizer) => {
-      stopChecking();
-      removeSigint();
-      finalizer();
-      resolve();
-    };
-
     checkInterval = setInterval(() => {
       try {
         const status = orchestrator.getStatus(clusterId);
-        if (status.state !== 'running') {
-          finish(cleanup.stopWithFlush);
+        if (isForegroundStatusSettled(status)) {
+          cleanup.stopWithFlush();
+          settle({ cancelled: false });
+        } else if (['stopped', 'killed'].includes(status.state)) {
+          terminalObservedAt ??= Date.now();
+          if (Date.now() - terminalObservedAt > 30_000) {
+            cleanup.stop();
+            settle(null, new Error('foreground agent processes did not settle after terminal'));
+          }
         }
-      } catch {
-        finish(cleanup.stop);
+      } catch (error) {
+        cleanup.stop();
+        settle(null, error);
       }
     }, 500);
   });
 }
 
-async function streamClusterInForeground(cluster, orchestrator, clusterId, plan) {
+async function streamClusterInForeground(cluster, orchestrator, clusterId, plan, handleSigterm) {
   const sendersWithOutput = new Set();
   const processedMessageIds = new Set();
 
@@ -696,8 +730,34 @@ async function streamClusterInForeground(cluster, orchestrator, clusterId, plan)
     sendersWithOutput,
   });
 
-  await waitForClusterCompletion(orchestrator, clusterId, cleanup);
-  console.log(chalk.dim(`\nCluster ${clusterId} completed.`));
+  const result = await waitForClusterCompletion(orchestrator, clusterId, cleanup, handleSigterm);
+  const label = result.cancelled ? 'cancelled' : 'finished';
+  console.log(chalk.dim(`\nCluster ${clusterId} ${label}.`));
+  return result;
+}
+
+async function finishForegroundRun({ cluster, orchestrator, clusterId, plan, resultPath }) {
+  try {
+    const foreground = await streamClusterInForeground(
+      cluster,
+      orchestrator,
+      clusterId,
+      plan,
+      Boolean(resultPath)
+    );
+    if (!resultPath) return;
+    const receipt = writeForegroundResult({
+      orchestrator,
+      cluster,
+      clusterId,
+      resultPath,
+      cancelled: foreground.cancelled,
+    });
+    process.exitCode = exitCodeForResult(receipt);
+    console.log(chalk.dim(`Result ${receipt.outcome} committed to ${resultPath}`));
+  } finally {
+    orchestrator.close();
+  }
 }
 
 function setupDaemonCleanup(orchestrator, clusterId) {
@@ -2662,6 +2722,10 @@ program
     'fast'
   )
   .option('-d, --detach', 'Run in background (default: attach to first agent)')
+  .option(
+    '--result-file <path>',
+    'Atomically write a closed foreground result receipt (incompatible with --detach)'
+  )
   .addHelpText(
     'after',
     `
@@ -2768,6 +2832,7 @@ Force provider flags: -G (GitHub), -L (GitLab), -J (Jira), -D (DevOps), -N (Line
       }
 
       const { generateName } = require('../src/name-generator');
+      requireForegroundResultMode(effectiveOptions);
       if (shouldRunDetached(effectiveOptions)) {
         const clusterId = generateName('cluster');
         await spawnDetachedCluster(effectiveOptions, effectiveRunPlan, clusterId, stdinText);
@@ -2811,8 +2876,13 @@ Force provider flags: -G (GitHub), -L (GitLab), -J (Jira), -D (DevOps), -N (Line
       }
 
       if (!process.env.ZEROSHOT_DAEMON) {
-        await streamClusterInForeground(cluster, orchestrator, clusterId, effectiveRunPlan);
-        orchestrator.close();
+        await finishForegroundRun({
+          cluster,
+          orchestrator,
+          clusterId,
+          plan: effectiveRunPlan,
+          resultPath: effectiveOptions.resultFile,
+        });
       }
       setupDaemonCleanup(orchestrator, clusterId);
     } catch (error) {

package/cli/lib/setup-scanner-worker.js

@@ -1,9 +1,8 @@
 const fs = require('fs');
-const os = require('os');
-const path = require('path');
 const { parentPort, workerData } = require('worker_threads');
 
 const { commandExists, getCommandPath } = require('../../lib/provider-detection');
+const { resolveProviderCredentialPaths } = require('../../lib/provider-credential-path');
 const { getProviderMetadata, resolveProviderCommand } = require('../../lib/provider-names');
 const { execSync } = require('../../src/lib/safe-exec');
 
@@ -41,19 +40,13 @@ function probeIssue() {
   return checkGhAuth();
 }
 
-function expandCredentialPath(value) {
-  if (value === '~') return os.homedir();
-  if (value.startsWith('~/')) return path.join(os.homedir(), value.slice(2));
-  return value;
-}
-
 function hasCredentialEvidence(metadata) {
   const hasEnvironment = metadata.credentialEnvKeys.some((key) => {
     const value = process.env[key];
     return typeof value === 'string' && value.trim().length > 0;
   });
   if (hasEnvironment) return true;
-  return metadata.credentialPaths.some((item) => fs.existsSync(expandCredentialPath(item)));
+  return resolveProviderCredentialPaths(metadata).some((item) => fs.existsSync(item));
 }
 
 function providerAuthStatus(id, metadata, available) {

package/lib/agent-cli-provider/adapters/claude-recovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-recovery.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/claude-recovery.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,oBAAoB,yDAAyD,CAAC;AAC3F,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAE3D,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,GACZ,kBAAkB,GAAG,IAAI,CAG3B;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAGvF;AAED,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,wBAAwB,GAAG,IAAI,CAGjC;AAED,wBAAgB,wCAAwC,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAElF"}
+{"version":3,"file":"claude-recovery.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/claude-recovery.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,oBAAoB,yDAAyD,CAAC;AAC3F,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAE3D,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,GACZ,kBAAkB,GAAG,IAAI,CAG3B;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAIvF;AAED,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,wBAAwB,GAAG,IAAI,CAGjC;AAED,wBAAgB,wCAAwC,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAElF"}

package/lib/agent-cli-provider/adapters/claude-recovery.js

@@ -17,9 +17,11 @@ function detectProviderStreamingModeError(provider, line) {
     return detectClaudeStreamingModeError(line);
 }
 function detectProviderFatalError(provider, line) {
-    if (!isClaudeProvider(provider))
-        return null;
-    return detectClaudeFatalError(line);
+    if (isClaudeProvider(provider))
+        return detectClaudeFatalError(line);
+    if (provider.toLowerCase() === 'pi')
+        return detectPiFatalError(line);
+    return null;
 }
 function recoverProviderStructuredOutput(provider, sessionId) {
     if (!isClaudeProvider(provider))
@@ -65,6 +67,18 @@ function detectClaudeFatalError(line) {
     }
     return null;
 }
+function detectPiFatalError(line) {
+    if (typeof line !== 'string')
+        return null;
+    const message = line.trim();
+    if (/\bno api key found\b/i.test(message)) {
+        return 'Pi authentication required: run /login';
+    }
+    if (/\bmodel\b.*\bnot found\b/i.test(message)) {
+        return 'Pi model not found: run pi --list-models';
+    }
+    return null;
+}
 function findSessionJsonlPath(sessionId) {
     const claudeDir = process.env.CLAUDE_CONFIG_DIR || (0, node_path_1.join)((0, node_os_1.homedir)(), '.claude');
     const projectsDir = (0, node_path_1.join)(claudeDir, 'projects');

package/lib/agent-cli-provider/adapters/claude-recovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"claude-recovery.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/claude-recovery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"claude-recovery.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/claude-recovery.ts"],"names":[],"mappings":"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"}

package/lib/agent-cli-provider/adapters/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,2BAA2B,EAC3B,WAAW,EACX,mBAAmB,EACnB,iBAAiB,EACjB,cAAc,EACd,UAAU,EACV,WAAW,EACX,eAAe,EACf,UAAU,EACV,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,wBAAwB,EACxB,gCAAgC,EAChC,+BAA+B,EAC/B,wCAAwC,EACxC,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,GAC9B,MAAM,mBAAmB,CAAC;AAgB3B,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,GAAG,eAAe,CAIpF;AAED,wBAAgB,oBAAoB,IAAI,SAAS,UAAU,EAAE,CAE5D;AAED,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,iBAAiB,GAAG,MAAM,EACxC,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,2BAA2B,GACpC,WAAW,CAUb;AAED,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,iBAAiB,GAAG,MAAM,EACxC,KAAK,EAAE,MAAM,GACZ,SAAS,WAAW,EAAE,CAmBxB;AAED,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,iBAAiB,GAAG,MAAM,EACxC,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,IAAI,CAKf;AAED,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,iBAAiB,GAAG,MAAM,EACxC,KAAK,EAAE,UAAU,EACjB,SAAS,CAAC,EAAE,cAAc,GACzB,iBAAiB,CAEnB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,iBAAiB,GAAG,MAAM,EACxC,KAAK,EAAE,OAAO,GACb,mBAAmB,CAErB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,2BAA2B,EAC3B,WAAW,EACX,mBAAmB,EACnB,iBAAiB,EACjB,cAAc,EACd,UAAU,EACV,WAAW,EACX,eAAe,EACf,UAAU,EACV,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,wBAAwB,EACxB,gCAAgC,EAChC,+BAA+B,EAC/B,wCAAwC,EACxC,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,GAC9B,MAAM,mBAAmB,CAAC;AAgB3B,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,GAAG,eAAe,CAIpF;AAED,wBAAgB,oBAAoB,IAAI,SAAS,UAAU,EAAE,CAE5D;AAED,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,iBAAiB,GAAG,MAAM,EACxC,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,2BAA2B,GACpC,WAAW,CAUb;AAED,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,iBAAiB,GAAG,MAAM,EACxC,KAAK,EAAE,MAAM,GACZ,SAAS,WAAW,EAAE,CAyBxB;AAED,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,iBAAiB,GAAG,MAAM,EACxC,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,IAAI,CAKf;AAED,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,iBAAiB,GAAG,MAAM,EACxC,KAAK,EAAE,UAAU,EACjB,SAAS,CAAC,EAAE,cAAc,GACzB,iBAAiB,CAEnB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,iBAAiB,GAAG,MAAM,EACxC,KAAK,EAAE,OAAO,GACb,mBAAmB,CAErB"}

package/lib/agent-cli-provider/adapters/index.js

@@ -62,6 +62,13 @@ function parseProviderChunk(providerName, chunk) {
             events.push(event);
         }
     }
+    const finalEvent = adapter.finishParsing?.(state);
+    if (finalEvent) {
+        if (isOutputEventArray(finalEvent))
+            events.push(...finalEvent);
+        else
+            events.push(finalEvent);
+    }
     return events;
 }
 function extractProviderSessionId(providerName, line) {

package/lib/agent-cli-provider/adapters/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/index.ts"],"names":[],"mappings":"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"}

package/lib/agent-cli-provider/adapters/pi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pi.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/pi.ts"],"names":[],"mappings":"AAYA,OAAO,EAUL,KAAK,eAAe,EAIrB,MAAM,UAAU,CAAC;AA2OlB,eAAO,MAAM,SAAS,EAAE,eAkBvB,CAAC"}
+{"version":3,"file":"pi.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/pi.ts"],"names":[],"mappings":"AAMA,OAAO,EASL,KAAK,eAAe,EAGrB,MAAM,UAAU,CAAC;AA8NlB,eAAO,MAAM,SAAS,EAAE,eAmBvB,CAAC"}

package/lib/agent-cli-provider/adapters/pi.js

@@ -3,50 +3,93 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.piAdapter = void 0;
 const schema_1 = require("../schema");
 const contract_errors_1 = require("../contract-errors");
-const assistant_stream_1 = require("../assistant-stream");
 const json_1 = require("../json");
+const credentials_1 = require("../pi/credentials");
+const events_1 = require("../pi/events");
+const release_1 = require("../pi/release");
 const common_1 = require("./common");
 const MODEL_CATALOG = {};
 const LEVEL_MAPPING = {
-    level1: { rank: 1, model: null },
-    level2: { rank: 2, model: null },
-    level3: { rank: 3, model: null },
+    level1: { rank: 1, model: null, reasoningEffort: 'low' },
+    level2: { rank: 2, model: null, reasoningEffort: 'medium' },
+    level3: { rank: 3, model: null, reasoningEffort: 'high' },
 };
-const IGNORED_EVENT_TYPES = new Set([
-    'session',
-    'agent_start',
-    'agent_end',
-    'turn_start',
-    'queue_update',
-    'compaction_start',
-    'compaction_end',
-    'auto_retry_start',
-    'auto_retry_end',
-]);
-function detectCliFeatures(helpText) {
+function supportsFlag(help, assumeCurrent, versionMatches, pattern) {
+    return versionMatches && (assumeCurrent || pattern.test(help));
+}
+function detectCliFeatures(helpText, versionText) {
     const help = helpText ?? '';
-    const unknown = !help;
+    const versionMatches = (0, common_1.isCliVersionAtLeast)(versionText, release_1.PI_SUPPORTED_VERSION);
+    const assumeCurrent = !help && versionMatches;
     return {
         provider: 'pi',
-        supportsJsonMode: unknown ? true : /--mode\b/.test(help) && /\bjson\b/.test(help),
-        supportsModel: unknown ? true : /--model\b/.test(help),
-        supportsNoSession: unknown ? true : /--no-session\b/.test(help),
-        supportsNoExtensions: unknown ? true : /--no-extensions\b/.test(help),
-        supportsNoSkills: unknown ? true : /--no-skills\b/.test(help),
-        supportsNoPromptTemplates: unknown ? true : /--no-prompt-templates\b/.test(help),
-        supportsNoContextFiles: unknown ? true : /--no-context-files\b/.test(help),
-        supportsNoApprove: unknown ? true : /--no-approve\b/.test(help),
-        unknown,
+        versionMatches,
+        supportsJsonMode: supportsFlag(help, assumeCurrent, versionMatches, /--mode\b/) &&
+            (assumeCurrent || /\bjson\b/.test(help)),
+        supportsModel: supportsFlag(help, assumeCurrent, versionMatches, /--model\b/),
+        supportsThinking: supportsFlag(help, assumeCurrent, versionMatches, /--thinking\b/),
+        supportsNoSession: supportsFlag(help, assumeCurrent, versionMatches, /--no-session\b/),
+        supportsNoExtensions: supportsFlag(help, assumeCurrent, versionMatches, /--no-extensions\b/),
+        supportsNoSkills: supportsFlag(help, assumeCurrent, versionMatches, /--no-skills\b/),
+        supportsNoPromptTemplates: supportsFlag(help, assumeCurrent, versionMatches, /--no-prompt-templates\b/),
+        supportsNoContextFiles: supportsFlag(help, assumeCurrent, versionMatches, /--no-context-files\b/),
+        supportsNoApprove: supportsFlag(help, assumeCurrent, versionMatches, /--no-approve\b/),
+        unknown: !help || !(versionText ?? '').trim(),
     };
 }
+function assertRequiredControls(options) {
+    const features = (0, common_1.optionFeatures)(options);
+    if (features.versionMatches !== true) {
+        throw (0, contract_errors_1.contractError)({
+            code: 'invalid-field',
+            field: 'options.cliFeatures.versionMatches',
+            exitCode: 2,
+            message: `Pi ${release_1.PI_SUPPORTED_VERSION} or newer is required for the agent_settled JSON protocol. ` +
+                `Upgrade with: npm install -g --ignore-scripts ` +
+                `@earendil-works/pi-coding-agent@${release_1.PI_SUPPORTED_VERSION}`,
+        });
+    }
+    const required = [
+        ['supportsJsonMode', '--mode json'],
+        ['supportsNoSession', '--no-session'],
+        ['supportsNoSkills', '--no-skills'],
+        ['supportsNoPromptTemplates', '--no-prompt-templates'],
+        ['supportsNoContextFiles', '--no-context-files'],
+        ['supportsNoApprove', '--no-approve'],
+    ];
+    for (const [field, flag] of required) {
+        if (features[field] !== false)
+            continue;
+        throw (0, contract_errors_1.contractError)({
+            code: 'invalid-field',
+            field: `options.cliFeatures.${field}`,
+            exitCode: 2,
+            message: `Pi ${release_1.PI_SUPPORTED_VERSION}+ support for ${flag} is required for Zeroshot execution.`,
+        });
+    }
+    if (options.modelSpec?.model && features.supportsModel === false) {
+        throw (0, contract_errors_1.contractError)({
+            code: 'invalid-field',
+            field: 'options.cliFeatures.supportsModel',
+            exitCode: 2,
+            message: `Pi ${release_1.PI_SUPPORTED_VERSION}+ support for --model is required for explicit model selection.`,
+        });
+    }
+    if (options.modelSpec?.reasoningEffort && features.supportsThinking === false) {
+        throw (0, contract_errors_1.contractError)({
+            code: 'invalid-field',
+            field: 'options.cliFeatures.supportsThinking',
+            exitCode: 2,
+            message: `Pi ${release_1.PI_SUPPORTED_VERSION}+ support for --thinking is required for reasoning effort.`,
+        });
+    }
+}
 function addRequiredArgs(args, options) {
     const features = (0, common_1.optionFeatures)(options);
     if (features.supportsJsonMode !== false)
         args.push('--mode', 'json');
     if (features.supportsNoSession !== false)
         args.push('--no-session');
-    if (features.supportsNoExtensions !== false)
-        args.push('--no-extensions');
     if (features.supportsNoSkills !== false)
         args.push('--no-skills');
     if (features.supportsNoPromptTemplates !== false)
@@ -61,6 +104,9 @@ function addOptionalArgs(args, options) {
     if (options.modelSpec?.model && features.supportsModel !== false) {
         args.push('--model', options.modelSpec.model);
     }
+    if (options.modelSpec?.reasoningEffort && features.supportsThinking !== false) {
+        args.push('--thinking', options.modelSpec.reasoningEffort);
+    }
 }
 function failClosedUnsupportedSessionControl(options) {
     const hasResumeSessionId = options.resumeSessionId !== undefined;
@@ -71,29 +117,28 @@ function failClosedUnsupportedSessionControl(options) {
         code: 'invalid-field',
         field,
         exitCode: 2,
-        message: 'Pi CLI does not support resume/continue session control; fail closed and start a fresh run instead.',
+        message: 'Pi CLI does not support resume/continue session control with a task-owned identity boundary.',
     });
 }
 function collectWarnings(options) {
-    const features = (0, common_1.optionFeatures)(options);
     const warnings = [];
     if (options.jsonSchema) {
         warnings.push((0, common_1.warning)('pi', 'pi-jsonschema', 'Pi CLI does not support provider-native JSON schema; appending schema instructions to the prompt.'));
     }
-    if (features.supportsJsonMode === false) {
-        warnings.push((0, common_1.warning)('pi', 'pi-json-mode', 'Pi CLI does not advertise --mode json; continuing anyway.'));
-    }
     return warnings;
 }
 function buildCommand(context, options = {}) {
     failClosedUnsupportedSessionControl(options);
+    assertRequiredControls(options);
     const finalContext = options.jsonSchema
         ? (0, schema_1.appendJsonSchemaPrompt)(context, options.jsonSchema)
         : context;
     const args = [];
     addRequiredArgs(args, options);
     addOptionalArgs(args, options);
-    args.push(finalContext);
+    // Pi has no `--` end-of-options sentinel and interprets leading `-`/`@` positional values as
+    // flags or file arguments. A leading space keeps arbitrary Zeroshot context in prompt mode.
+    args.push(` ${finalContext}`);
     return (0, common_1.commandSpec)({
         binary: 'pi',
         args,
@@ -102,65 +147,6 @@ function buildCommand(context, options = {}) {
         warnings: collectWarnings(options),
     });
 }
-function createPiState() {
-    return {
-        ...(0, common_1.createParserState)('pi'),
-        lastAssistantText: '',
-        lastAssistantThinking: '',
-    };
-}
-function parsePiTurnEnd(event, state) {
-    const message = (0, json_1.getRecord)(event, 'message');
-    const events = message === null ? [] : [...(0, assistant_stream_1.emitAssistantSnapshot)(message, state)];
-    events.push((0, assistant_stream_1.parseTurnEndResult)(event, { failureMessage: 'Pi turn failed' }));
-    return events;
-}
-function parseMessageEvent(type, event, state) {
-    if (type === 'message_start') {
-        (0, assistant_stream_1.resetAssistantSnapshot)((0, json_1.getRecord)(event, 'message'), state);
-        return null;
-    }
-    if (type === 'message_update') {
-        const assistantMessageEvent = (0, json_1.getRecord)(event, 'assistantMessageEvent');
-        if (assistantMessageEvent !== null) {
-            const assistantEvent = (0, assistant_stream_1.parseAssistantDelta)(assistantMessageEvent, state);
-            if (assistantEvent !== null)
-                return assistantEvent;
-        }
-        const message = (0, json_1.getRecord)(event, 'message');
-        return message === null ? null : (0, assistant_stream_1.emitAssistantSnapshot)(message, state);
-    }
-    if (type !== 'message_end')
-        return undefined;
-    const message = (0, json_1.getRecord)(event, 'message');
-    return message === null ? null : (0, assistant_stream_1.emitAssistantSnapshot)(message, state);
-}
-function parseToolEvent(type, event, state) {
-    if (type === 'tool_execution_start')
-        return (0, assistant_stream_1.parseToolExecutionStart)(event, state);
-    if (type === 'tool_execution_update')
-        return (0, assistant_stream_1.parseToolExecutionUpdate)(event, state);
-    if (type === 'tool_execution_end')
-        return (0, assistant_stream_1.parseToolExecutionEnd)(event, state);
-    return undefined;
-}
-function parseEvent(line, state) {
-    const parsed = (0, json_1.tryParseJson)(line);
-    if (!(0, json_1.isRecord)(parsed))
-        return null;
-    const type = (0, json_1.getString)(parsed, 'type');
-    if (type === null || IGNORED_EVENT_TYPES.has(type))
-        return null;
-    const messageEvent = parseMessageEvent(type, parsed, state);
-    if (messageEvent !== undefined)
-        return messageEvent;
-    const toolEvent = parseToolEvent(type, parsed, state);
-    if (toolEvent !== undefined)
-        return toolEvent;
-    if (type === 'turn_end')
-        return parsePiTurnEnd(parsed, state);
-    return null;
-}
 function resolveModelSpec(level, overrides) {
     return (0, common_1.resolveModelSpecWithConfig)({
         mapping: LEVEL_MAPPING,
@@ -190,7 +176,9 @@ function classifyError(error) {
         /\b(cancelled|canceled|aborted|interrupted)\b/i,
         /\brun\s*\/login\b/i,
         /\bmissing api key\b/i,
+        /\bno api key found\b/i,
         /\bno valid authentication\b/i,
+        /\bmodel\b.*\bnot found\b/i,
         /\bunknown option\b/i,
         /\bfailed to load\b/i,
         /\bcannot find module\b/i,
@@ -201,8 +189,8 @@ exports.piAdapter = {
     id: 'pi',
     displayName: 'Pi',
     binary: 'pi',
-    adapterVersion: '1',
-    credentialEnvKeys: [],
+    adapterVersion: '2',
+    credentialEnvKeys: credentials_1.PI_CREDENTIAL_ENV_KEYS,
     modelCatalog: MODEL_CATALOG,
     levelMapping: LEVEL_MAPPING,
     defaultLevel: 'level2',
@@ -210,8 +198,9 @@ exports.piAdapter = {
     defaultMinLevel: 'level1',
     detectCliFeatures,
     buildCommand,
-    parseEvent,
-    createParserState: createPiState,
+    parseEvent: events_1.parsePiEvent,
+    finishParsing: events_1.finishPiParsing,
+    createParserState: events_1.createPiParserState,
     resolveModelSpec,
     validateModelId,
     classifyError,