auxilo-mcp 0.9.26 → 0.9.27

package/README.md

@@ -175,6 +175,10 @@ node mcp-server.js   # the MCP server (stdio)
 
 The live API runs on [Fly.io](https://fly.io) from the repo `Dockerfile`.
 
+### One machine
+
+The money ledgers are guarded by locks held in memory in one running process. The server is meant to run as one machine with one data volume. Do not run a second machine against the same data, and do not start an overlapping deploy where the old and new process both run against the same files at once — the locks on one machine cannot see or coordinate with a second one, so two processes writing the same ledger files at the same time can corrupt them or double-spend a balance. This must not change until the ledgers move to a shared store that more than one process can safely coordinate through.
+
 ## Links
 
 - Site: [auxilo.io](https://auxilo.io)

package/bin/auxilo-cli.js

@@ -180,8 +180,8 @@ const CONSENT_TEXT = `
       waits for operator review. A draft that any screen flags (sensitive,
       duplicate, uncertain quality) waits in your private queue for
       \`auxilo review\`. Auto-publish for learnings that pass every screen is
-      off unless you turn it on in your dashboard. Your share of a paid
-      unlock by another agent goes to your Auxilo account, 70% of what they
+      off unless you turn it on in your dashboard. Your earnings from a paid
+      unlock by another agent go to your Auxilo account, 70% of what they
       paid on a direct unlock and 60% via discovery. A repeat unlock by the
       same buyer within 30 days earns nothing. Earnings depend on whether
       other agents unlock your learnings and are not guaranteed. Earnings

package/mcp-server.js

@@ -77,7 +77,7 @@ function unlockPaymentRequired(status, data, http_endpoint) {
     status: 'payment_required',
     content_advisory: UNTRUSTED_PREVIEW_ADVISORY,
     cost: `${price} USDC on Base (set by contributor)`,
-    how_to_pay: 'Pass an x402 payment via the x_payment argument, or configure an API key with unlock credits (npx auxilo setup).',
+    how_to_pay: 'Pass an x402 payment via the x_payment argument, or configure an API key with a funded balance (npx auxilo setup).',
     http_endpoint,
     payment_details: fencePaymentChallenge(data),
   };
@@ -198,7 +198,7 @@ async function postBulkChunks(headers, decisions) {
 }
 
 const server = new Server(
-  { name: 'auxilo', version: '0.9.26' },
+  { name: 'auxilo', version: '0.9.27' },
   {
     capabilities: { tools: {} },
     instructions: `You are connected to Auxilo, a knowledge marketplace where AI agents buy and sell operational learnings.
@@ -217,7 +217,7 @@ RATE AFTER YOU USE: After unlocking and applying a learning from the Auxilo mark
 
 DEDUP BEFORE SUBMITTING: Search auxilo_knowledge for your topic before contributing to avoid duplicates.
 
-You earn 70% of every direct sale (60% discovery-driven). The builder who connected you earns a revenue share from your contributions.`
+When another agent unlocks one of your contributions, the builder who connected you earns 70% of what that agent paid on a direct unlock and 60% when Auxilo search surfaced it.`
   }
 );
 
@@ -298,7 +298,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
             },
             required: ['specificity', 'actionability', 'novelty', 'completeness', 'total'],
           },
-          contributor_wallet: { type: 'string', description: 'Your Base wallet (0x...) for revenue share' },
+          contributor_wallet: { type: 'string', description: 'Your Base wallet (0x...) for earnings' },
           unlock_price: { type: 'number', description: 'Price in USD to unlock this learning (min $0.05, default auto-calculated). Set higher for deep, high-value knowledge.' },
           contributor_agent: { type: 'string', description: 'Optional: identify yourself' },
           related_skills: { type: 'array', items: { type: 'string' }, description: 'Optional: related Auxilo skill IDs' },
@@ -362,7 +362,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
     },
     {
       name: 'auxilo_withdraw',
-      description: 'Check how your earnings are paid out, and how to receive any legacy accrued balance. HOW PAYOUT WORKS NOW: earnings from sales settled on-chain are paid directly to your linked, verified wallet at the moment of sale — there is no balance to withdraw for those, because Auxilo never holds your share. LEGACY BALANCE: earnings accrued before direct settlement sit in your account\'s pending balance; withdraw them from your dashboard at https://auxilo.io/dashboard (bank payout via Stripe; $0.50 minimum, $0.25 flat fee), where you sign in with the email on your account. This tool reports your current balances and payout status; it does not move funds. To be paid at sale time going forward: auxilo_accept_terms, then auxilo_verify_wallet, then auxilo_link_wallet.',
+      description: 'Check how your earnings are paid out, and how to receive any legacy accrued balance. HOW PAYOUT WORKS NOW: earnings from sales settled on-chain are paid directly to your linked, verified wallet at the moment of sale — there is no balance to withdraw for those, because Auxilo never holds your earnings. LEGACY BALANCE: earnings accrued before direct settlement sit in your account\'s pending balance; withdraw them from your dashboard at https://auxilo.io/dashboard (bank payout via Stripe; $0.50 minimum, $0.25 flat fee), where you sign in with the email on your account. This tool reports your current balances and payout status; it does not move funds. To be paid at sale time going forward: auxilo_accept_terms, then auxilo_verify_wallet, then auxilo_link_wallet.',
       inputSchema: {
         type: 'object',
         properties: {
@@ -408,7 +408,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
     },
     {
       name: 'auxilo_account_earnings',
-      description: 'View aggregate and per-learning earnings for your authenticated Auxilo account. Authenticates with your configured API key automatically, or pass a session_token (JWT). Returns total gross, contributor share, pending balance, total withdrawn, whether withdrawal is available (can_withdraw), and held_pending_assent — undisbursable receipts recorded before you accepted the current Terms, released to your withdrawable balance when you accept via auxilo_accept_terms. Earnings from on-chain-settled sales are paid to your wallet at sale time and appear in settlement history, not in pending balance. Free.',
+      description: 'View aggregate and per-learning earnings for your authenticated Auxilo account. Authenticates with your configured API key automatically, or pass a session_token (JWT). Returns total gross, contributor earnings, pending balance, total withdrawn, whether withdrawal is available (can_withdraw), and held_pending_assent — undisbursable receipts recorded before you accepted the current Terms, released to your withdrawable balance when you accept via auxilo_accept_terms. Earnings from on-chain-settled sales are paid to your wallet at sale time and appear in settlement history, not in pending balance. Free.',
       inputSchema: {
         type: 'object',
         properties: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auxilo-mcp",
-  "version": "0.9.26",
+  "version": "0.9.27",
   "mcpName": "io.github.silent-architects/auxilo",
   "description": "MCP server for Auxilo. Your agent stops solving the same problem twice: auto-extracted learnings, free self-unlocks, and earnings when other agents unlock yours.",
   "main": "mcp-server.js",

package/scripts/extract-local.js

@@ -15,6 +15,7 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const crypto = require('crypto');
 const {
   loadIndexForExtraction,
   readExtractionIndex,
@@ -373,9 +374,10 @@ function resolveExtractionModelIdentity(runModelResult) {
     && typeof runModelResult.identity.provider === 'string'
     && runModelResult.identity.provider
   ) {
-    return runModelResult.identity;
+    const identity = runModelResult.identity;
+    return { ...identity, model: identity.observed_model || null };
   }
-  return { provider: 'unknown', model: null, version: null, vendor: null };
+  return { provider: 'unknown', model: null, requested_model: null, observed_model: null, identity_unresolved: 'missing', version: null, vendor: null };
 }
 
 /**
@@ -402,6 +404,8 @@ async function defaultInvokeModel(transcript, invokeOpts, opts) {
     reasonCode: result.reasonCode,
     authStatus: result.authStatus,
     extractionModel: resolveExtractionModelIdentity(result),
+    ...(result.hold && { hold: result.hold }),
+    ...(result.deferred && { deferred: result.deferred }),
     ...(result.authDiscrepancy !== undefined && { authDiscrepancy: result.authDiscrepancy }),
     // EXTRACTION-RUN-LOG (0.9.15): additive passthrough for the one-line-per-run
     // provider summary logged at the end of extractLocally() below. Only
@@ -432,6 +436,9 @@ function defaultInvokeJudge(opts) {
       out: result.text,
       usage: result.usage,
       reason: result.reason,
+      identity: result.identity,
+      ...(result.hold && { hold: result.hold }),
+      ...(result.deferred && { deferred: result.deferred }),
       // EXTRACTION-RUN-LOG (0.9.15): threaded through so runAnchoredJudge below
       // can report the judge call's status/argv/CLI version on the run summary
       // log line. Additive — every existing invokeJudge stub in this repo's
@@ -526,11 +533,16 @@ async function runAnchoredJudge(candidates, indexState, opts = {}) {
       judgeReasonCode: result && result.reasonCode,
       judgeArgv: result && result.argv,
       judgeCliVersion: result && result.cliVersion,
+      ...(result && result.hold && { hold: result.hold }),
+      ...(result && result.deferred && { deferred: result.deferred }),
     };
   }
   const parsed = parseJudgeDecisions(result.out, input, rankings);
   const usage = judgeUsage(result.usage, prompt, result.out);
   const judgeMeta = {
+    identity: result.identity,
+    ...(result.hold && { hold: result.hold }),
+    ...(result.deferred && { deferred: result.deferred }),
     judgeAttempted: true,
     judgeReasonCode: result.reasonCode,
     judgeArgv: result.argv,
@@ -736,6 +748,8 @@ function logProviderRunSummary(opts, runId, modelResult, judged) {
 }
 
 async function extractLocally(transcript, sourceType, opts = {}) {
+  opts = { ...opts, source: sourceType || '', sessionId: opts.sessionId || opts.runId || crypto.randomUUID(),
+    jobSha: opts.jobSha || crypto.createHash('sha256').update(transcript).digest('hex'), routeContext: opts.routeContext || {} };
   if (sourceType && !EXTRACTABLE_SOURCES.has(sourceType)) {
     return { learnings: [], skipped: `local extraction not implemented for "${sourceType}" — agent contributes via auxilo_contribute` };
   }
@@ -780,6 +794,8 @@ async function extractLocally(transcript, sourceType, opts = {}) {
     return {
       learnings: [],
       skipped: reason,
+      ...(modelResult.hold && { hold: modelResult.hold }),
+      ...(modelResult.deferred && { deferred: modelResult.deferred }),
       ...(modelResult.reasonCode !== undefined && { reasonCode: modelResult.reasonCode }),
       ...(modelResult.authStatus !== undefined && { authStatus: modelResult.authStatus }),
       ...(modelResult.authDiscrepancy !== undefined && {
@@ -792,7 +808,9 @@ async function extractLocally(transcript, sourceType, opts = {}) {
   // own opts.invokeModel that doesn't report one (every existing test does
   // this) — extraction_model then simply never appears, byte-identical to
   // pre-PART-C behavior.
-  const extractionModel = modelResult.extractionModel || null;
+  const extractionModel = modelResult.extractionModel
+    ? { ...modelResult.extractionModel, model: modelResult.extractionModel.observed_model || null }
+    : null;
   const parsed = parseExtractionOutput(out, opts);
   const promptDropResult = applyPromptMemoryDrops(
     parsed.prompt_drops,
@@ -830,7 +848,10 @@ async function extractLocally(transcript, sourceType, opts = {}) {
       lexicalKept.push(drop.candidate);
     }
   }
-  const judged = await runAnchoredJudge(lexicalKept, filterState, opts);
+  const judged = modelResult.hold || modelResult.deferred
+    ? { kept: lexicalKept, dropped: [], called: false, prompt_tokens: 0, completion_tokens: 0,
+      ...(modelResult.hold && { hold: modelResult.hold }), ...(modelResult.deferred && { deferred: modelResult.deferred }) }
+    : await runAnchoredJudge(lexicalKept, filterState, opts);
   const allDropped = [
     ...promptDropResult.dropped,
     ...lexicalDropped,
@@ -846,6 +867,9 @@ async function extractLocally(transcript, sourceType, opts = {}) {
   logProviderRunSummary(opts, opts.runId, modelResult, judged);
   return {
     learnings: judged.kept,
+    ...(judged.hold && { hold: judged.hold }),
+    ...(judged.deferred && { deferred: judged.deferred }),
+    ...providers.finishJob(opts.routeContext),
     dedup_dropped: allDropped.length,
     drop_audit: allDropped.map((drop) => drop.audit),
     prompt_memory_tokens: promptMemory.estimated_tokens,

package/scripts/providers/byo-key.js

@@ -537,6 +537,7 @@ async function runModel(opts = {}) {
       usage: null,
       reason: 'cannot resolve ~/.auxilo/providers.json — the home directory did not resolve to an absolute path',
       reasonCode: 'provider-home-unresolved',
+      refusal: 'pre-invocation',
       authStatus: 'unknown',
     };
   }
@@ -552,6 +553,7 @@ async function runModel(opts = {}) {
       usage: null,
       reason: '~/.auxilo/providers.json is not owner-read-only; refusing to use the stored key until its permissions are fixed (chmod 600 ~/.auxilo/providers.json) or the file is removed (`auxilo provider clear`)',
       reasonCode: 'providers-file-mode-unsafe',
+      refusal: 'pre-invocation',
       authStatus: 'unknown',
     };
   }
@@ -563,6 +565,7 @@ async function runModel(opts = {}) {
       usage: null,
       reason: 'no BYO provider key configured — run `auxilo provider set`',
       reasonCode: 'provider-not-configured',
+      refusal: 'pre-invocation',
       authStatus: 'unknown',
     };
   }
@@ -575,8 +578,9 @@ async function runModel(opts = {}) {
       ok: false,
       text: '',
       usage: null,
-      reason: `configured base_url "${config.base_url}" is not https:// — refusing to send the transcript or the key over an insecure connection`,
+      reason: 'configured base URL is not https; refusing the request',
       reasonCode: 'provider-base-url-insecure',
+      refusal: 'pre-invocation',
       authStatus: 'unknown',
     };
   }
@@ -587,7 +591,7 @@ async function runModel(opts = {}) {
   const fetchImpl = typeof opts.fetchImpl === 'function' ? opts.fetchImpl : fetch;
   const timeoutMs = opts.timeoutMs || 120000;
 
-  const identity = { provider: 'byo-key', model: config.model, version: null, vendor };
+  const identity = { provider: 'byo-key', model: null, requested_model: config.model, observed_model: null, identity_unresolved: 'missing', version: null, vendor };
 
   const controller = typeof AbortController === 'function' ? new AbortController() : null;
   const timer = controller ? setTimeout(() => controller.abort(), timeoutMs) : null;
@@ -595,6 +599,8 @@ async function runModel(opts = {}) {
 
   try {
     let res;
+    const gate = require('./route-binding.js').invocationGate(opts);
+    if (gate) return gate;
     try {
       res = await fetchImpl(request.url, {
         method: 'POST',
@@ -611,7 +617,7 @@ async function runModel(opts = {}) {
         ok: false,
         text: '',
         usage: null,
-        reason: `BYO provider request failed: ${error.message}`,
+        reason: 'BYO provider request failed',
         reasonCode: 'provider-error',
         authStatus: 'unknown',
         identity,
@@ -634,7 +640,7 @@ async function runModel(opts = {}) {
         ok: false,
         text: '',
         usage: null,
-        reason: `BYO provider returned HTTP ${res.status}`,
+        reason: Number.isInteger(res.status) ? `BYO provider returned HTTP ${res.status}` : 'BYO provider request failed',
         reasonCode: 'provider-error',
         authStatus: 'unknown',
         identity,
@@ -660,13 +666,19 @@ async function runModel(opts = {}) {
         ok: false,
         text: '',
         usage: null,
-        reason: `BYO provider returned a non-JSON body: ${error.message}`,
+        reason: 'BYO provider returned a non-JSON body',
         reasonCode: 'provider-error',
         authStatus: 'unknown',
         identity,
       };
     }
 
+    const observed = data && (vendor === 'gemini' ? data.modelVersion : data.model);
+    if (typeof observed === 'string' && observed.trim()) {
+      identity.observed_model = observed;
+      identity.model = observed;
+      delete identity.identity_unresolved;
+    }
     return {
       ok: true,
       text: extractText(vendor, data),
@@ -675,6 +687,8 @@ async function runModel(opts = {}) {
       authStatus: 'unknown',
       identity,
     };
+  } catch {
+    return { ok: false, text: '', usage: null, reason: 'BYO provider request failed', reasonCode: 'provider-error', authStatus: 'unknown' };
   } finally {
     clearTimer();
   }
@@ -689,6 +703,7 @@ module.exports = {
   writeByoConfig,
   clearProvidersFile,
   resolveVendor,
+  baseUrlFor,
   DEFAULT_PROVIDERS_STATE_PATH,
   // Exported for direct unit coverage (test/byo-key-provider.test.js,
   // test/extract-w1-fix2.test.js) AND for scripts/providers/index.js, which

package/scripts/providers/claude-code.js

@@ -21,6 +21,7 @@ const { spawnSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const { invocationGate } = require('./route-binding.js');
 
 /** Leading major.minor.patch only; unreadable versions retain fallback behavior. */
 function versionParts(version) {
@@ -219,7 +220,7 @@ const SCRUBBED_CLIENT_ENV_VARS = Object.freeze([
 // SETTING_SOURCES_ARGS to both — the child loads none of user/project/local
 // settings, so the operator's own SessionStart hooks never fire.
 // Strict mode with no --mcp-config also excludes account-connected MCP servers.
-const EXTRACT_MODE_ARGV = Object.freeze(['-p', '--no-session-persistence', '--tools', '', ...SETTING_SOURCES_ARGS, '--strict-mcp-config']);
+const EXTRACT_MODE_ARGV = Object.freeze(['-p', '--output-format', 'json', '--no-session-persistence', '--tools', '', ...SETTING_SOURCES_ARGS, '--strict-mcp-config']);
 const JUDGE_MODE_ARGV = Object.freeze(['-p', '--output-format', 'json', '--no-session-persistence', '--tools', '', ...SETTING_SOURCES_ARGS, '--strict-mcp-config']);
 
 /**
@@ -402,9 +403,8 @@ function checkAuthStatus(opts = {}) {
   const spawnSyncImpl = typeof opts.spawnSyncImpl === 'function' ? opts.spawnSyncImpl : spawnSync;
   const bin = typeof opts.claudeBin === 'string' ? opts.claudeBin : resolveClaudeBin(opts);
   const version = versionParts(getClaudeCliVersion(bin, opts));
-  // Older CLIs treat `auth status` as a model prompt. Unknown versions retain
-  // the existing probe; only a known-old build can safely skip it here.
-  if (version && compareVersions(version, [2, 1, 41]) < 0) return 'unknown';
+  // Unknown and old versions can interpret this probe as a model prompt.
+  if (!version || compareVersions(version, [2, 1, 41]) < 0) return 'unknown';
   let res;
   try {
     res = spawnSyncImpl(bin, ['auth', 'status'], {
@@ -455,84 +455,108 @@ function detect(opts = {}) {
  * needs to await beyond the spawn itself); `runModel` wraps it in a resolved
  * Promise, per the provider.interface.js contract.
  */
-function runExtractMode(opts) {
-  const spawnSyncImpl = typeof opts.spawnSyncImpl === 'function' ? opts.spawnSyncImpl : spawnSync;
-  const bin = typeof opts.claudeBin === 'string' ? opts.claudeBin : resolveClaudeBin(opts);
-  if (cachedSettingSourcesUnsupported) return settingSourcesIsolationUnsupportedResult('unknown');
-  const authStatus = checkAuthStatus({ spawnSyncImpl, claudeBin: bin, ...opts });
-  if (authStatus === 'logged-out') {
-    return {
-      ok: false,
-      text: '',
-      usage: null,
-      reason: 'local model not authenticated in this context (run `claude auth login` once); skipping deterministic extraction',
-      reasonCode: 'cli-unauthenticated',
-      authStatus,
-    };
+function runExtractMode(opts) { return runCliMode(opts, 'extract'); }
+
+function decodeWrapper(stdout) {
+  let wrapper;
+  try { wrapper = JSON.parse(stdout); }
+  catch {
+    const values = [];
+    const lines = stdout.split('\n');
+    for (let i = 0; i < lines.length; i += 1) {
+      let value = lines[i].trim();
+      if (value.startsWith('{') || value.startsWith('[')) {
+        // Consume the whole container, including pretty-printed extra values.
+        // A line-only JSON.parse scan could silently overlook that second value.
+        let depth = 0; let quoted = false; let escaped = false; let closed = false;
+        const parts = [];
+        for (; i < lines.length; i += 1) {
+          const line = lines[i]; parts.push(line);
+          for (let j = 0; j < line.length; j += 1) {
+            const char = line[j];
+            if (quoted) {
+              if (escaped) escaped = false;
+              else if (char === '\\') escaped = true;
+              else if (char === '"') quoted = false;
+            } else if (char === '"') quoted = true;
+            else if (char === '{' || char === '[') depth += 1;
+            else if (char === '}' || char === ']') {
+              depth -= 1;
+              if (depth === 0) {
+                if (line.slice(j + 1).trim()) return { malformed: true };
+                closed = true; break;
+              }
+            }
+          }
+          if (closed) break;
+        }
+        if (!closed) return { malformed: true };
+        value = parts.join('\n');
+        try { values.push(JSON.parse(value)); } catch { return { malformed: true }; }
+      } else {
+        try { values.push(JSON.parse(value)); } catch { /* non-JSON diagnostic */ }
+      }
+      if (values.length > 1) return { malformed: true };
+    }
+    if (values.length !== 1 || !values[0] || values[0].type !== 'result') return { malformed: true };
+    [wrapper] = values;
   }
-  const prompt = typeof opts.prompt === 'string' ? opts.prompt : '';
-  const stdin = prompt + String(opts.input || '').slice(0, 200000);
-  // --no-session-persistence (EXTRACT-PER-CLIENT W1 FIX GIVENS): matches the
-  // judge spawn below — an extraction run leaves no session file behind either.
-  // --setting-sources '' (EXTRACTION-CHILD-HOOKS, 0.9.15): the child loads none
-  // of user/project/local settings, so the operator's own SessionStart hooks
-  // never fire and their output never reaches this prompt.
-  const argv = EXTRACT_MODE_ARGV;
+  if (!wrapper || wrapper.type !== 'result' || typeof wrapper.result !== 'string' || wrapper.is_error === true) {
+    return { unsuccessful: true, wrapper };
+  }
+  return { wrapper };
+}
+
+function wrapperIdentity(wrapper, cliVersion) {
+  const models = [...new Set(Object.values(wrapper.modelUsage || {}).map(entry => entry && entry.canonicalModel)
+    .filter(value => typeof value === 'string' && value.trim()))];
+  const observed = models.length === 1 ? models[0] : null;
+  return { provider: 'claude-code', model: observed, requested_model: null, observed_model: observed,
+    version: cliVersion || null, vendor: 'anthropic',
+    ...(observed === null && { identity_unresolved: models.length ? 'ambiguous' : 'missing' }) };
+}
+
+function runCliMode(opts, mode) {
+  const spawn = typeof opts.spawnSyncImpl === 'function' ? opts.spawnSyncImpl : spawnSync;
+  const bin = typeof opts.claudeBin === 'string' ? opts.claudeBin : resolveClaudeBin(opts);
+  if (cachedSettingSourcesUnsupported) return { ...settingSourcesIsolationUnsupportedResult('unknown'), refusal: 'pre-invocation' };
+  const authStatus = mode === 'extract' ? checkAuthStatus({ ...opts, claudeBin: bin }) : 'unknown';
+  const authReason = 'local model not authenticated in this context (run `claude auth login` once); skipping deterministic extraction';
+  if (authStatus === 'logged-out') return { ok: false, text: '', usage: null, reason: authReason,
+    reasonCode: 'cli-unauthenticated', authStatus, refusal: 'pre-invocation' };
+  const argv = mode === 'judge' ? JUDGE_MODE_ARGV : EXTRACT_MODE_ARGV;
   const cliVersion = getClaudeCliVersion(bin, opts);
+  const meta = { authStatus, argv, cliVersion };
+  const fail = (reasonCode, reason) => ({ ok: false, text: '', usage: null, reasonCode, reason, ...meta });
+  const gate = invocationGate(opts);
+  if (gate) return { ...gate, ...meta };
   let res;
   try {
-    // --no-session-persistence (EXTRACT-PER-CLIENT W1 FIX GIVENS): matches the
-    // judge spawn below — an extraction run leaves no session file behind either.
-    res = spawnSyncImpl(bin, argv, {
-      input: stdin,
-      encoding: 'utf-8',
-      env: claudeChildEnv(),
-      timeout: opts.timeoutMs || 120000,
-      maxBuffer: 20 * 1024 * 1024,
+    res = spawn(bin, argv, {
+      input: (typeof opts.prompt === 'string' ? opts.prompt : '') + (mode === 'extract' ? String(opts.input || '').slice(0, 200000) : ''),
+      encoding: 'utf-8', env: claudeChildEnv(), timeout: opts.timeoutMs || 120000, maxBuffer: 20 * 1024 * 1024,
     });
-  } catch (error) {
-    return { ok: false, text: '', usage: null, reason: `spawn failed (${bin}): ${error.message}`, reasonCode: 'unknown', authStatus, argv, cliVersion };
-  }
-  if (!res) {
-    return { ok: false, text: '', usage: null, reason: `spawn failed (${bin}): no process result`, reasonCode: 'unknown', authStatus, argv, cliVersion };
-  }
+  } catch { return fail('unknown', 'local model spawn failed'); }
+  if (!res) return fail('unknown', 'local model returned no process result');
   if (looksLikeUnsupportedSettingSourcesFlag(res)) {
     cachedSettingSourcesUnsupported = true;
     return { ...settingSourcesIsolationUnsupportedResult(authStatus), argv, cliVersion };
   }
-  const out = String(res.stdout || '');
-  if (res.error) {
-    return { ok: false, text: '', usage: null, reason: `spawn failed (${bin}): ${res.error.message}`, reasonCode: 'unknown', authStatus, argv, cliVersion };
-  }
-  const mcpRefusal = enterpriseMcpRefusal(res, authStatus);
-  if (mcpRefusal) return { ...mcpRefusal, argv, cliVersion };
-  // Claude prints auth failures ("API Error: 401 ... Please run /login") to stdout.
-  if (/Please run \/login|authentication_error|401/i.test(out) || /Please run \/login|authentication_error/i.test(String(res.stderr || ''))) {
-    return {
-      ok: false,
-      text: out,
-      usage: null,
-      reason: 'local model not authenticated in this context (run `claude auth login` once); skipping deterministic extraction',
-      reasonCode: 'cli-unauthenticated',
-      authStatus,
-      argv,
-      cliVersion,
-      ...(authStatus === 'logged-in' && { authDiscrepancy: true }),
-    };
-  }
-  if (res.status !== 0) {
-    return {
-      ok: false,
-      text: out,
-      usage: null,
-      reason: `local model exited ${res.status}: ${(out || String(res.stderr || '')).slice(0, 160)}`,
-      reasonCode: 'model-error',
-      authStatus,
-      argv,
-      cliVersion,
-    };
+  if (res.error || (res.signal && res.status === null)) return fail('unknown', 'local model invocation failed');
+  const mcp = enterpriseMcpRefusal(res, authStatus);
+  if (mcp) return { ...mcp, argv, cliVersion };
+  const stdout = String(res.stdout || '');
+  const decoded = decodeWrapper(stdout);
+  // A wrapper's result is content, never an authentication signal.
+  const authPattern = /Please run \/login|authentication_error/i;
+  if ((!decoded.wrapper && authPattern.test(stdout)) || authPattern.test(String(res.stderr || ''))) {
+    return { ...fail('cli-unauthenticated', authReason), ...(authStatus === 'logged-in' && { authDiscrepancy: true }) };
   }
-  return { ok: true, text: out, usage: null, reason: null, authStatus, argv, cliVersion };
+  if (res.status !== 0) return fail('model-error', 'local model exited unsuccessfully');
+  if (decoded.malformed) return fail('model-error', mode === 'judge' ? 'local judge returned malformed JSON wrapper' : 'local model returned malformed JSON wrapper');
+  if (decoded.unsuccessful) return fail('model-error', 'local model returned no successful result');
+  return { ok: true, text: decoded.wrapper.result, usage: normalizeJudgeUsage(decoded.wrapper.usage), reason: null,
+    ...meta, identity: wrapperIdentity(decoded.wrapper, cliVersion) };
 }
 
 /**
@@ -557,75 +581,7 @@ function normalizeJudgeUsage(rawUsage) {
 
 /** mode:'judge' — binary anchored-dedup decision. Argv byte-identical to pre-move plus
  * the same --setting-sources '' isolation the extraction spawn above gains (0.9.15). */
-function runJudgeMode(opts) {
-  const spawnSyncImpl = typeof opts.spawnSyncImpl === 'function' ? opts.spawnSyncImpl : spawnSync;
-  const bin = typeof opts.claudeBin === 'string' ? opts.claudeBin : resolveClaudeBin(opts);
-  if (cachedSettingSourcesUnsupported) return settingSourcesIsolationUnsupportedResult('unknown');
-  const prompt = typeof opts.prompt === 'string' ? opts.prompt : '';
-  const argv = JUDGE_MODE_ARGV;
-  const cliVersion = getClaudeCliVersion(bin, opts);
-  let res;
-  try {
-    res = spawnSyncImpl(bin, argv, {
-      input: prompt,
-      encoding: 'utf8',
-      env: claudeChildEnv(),
-      timeout: opts.timeoutMs || 120000,
-      maxBuffer: 20 * 1024 * 1024,
-    });
-  } catch (error) {
-    return { ok: false, text: '', usage: null, reason: `judge spawn failed (${bin}): ${error.message}`, reasonCode: 'unknown', authStatus: 'unknown', argv, cliVersion };
-  }
-  if (!res) {
-    return { ok: false, text: '', usage: null, reason: `judge spawn failed (${bin}): no process result`, reasonCode: 'unknown', authStatus: 'unknown', argv, cliVersion };
-  }
-  if (looksLikeUnsupportedSettingSourcesFlag(res)) {
-    cachedSettingSourcesUnsupported = true;
-    return { ...settingSourcesIsolationUnsupportedResult('unknown'), argv, cliVersion };
-  }
-  const stdout = String(res.stdout || '');
-  if (res.error) {
-    return { ok: false, text: '', usage: null, reason: `judge spawn failed (${bin}): ${res.error.message}`, reasonCode: 'unknown', authStatus: 'unknown', argv, cliVersion };
-  }
-  const mcpRefusal = enterpriseMcpRefusal(res, 'unknown');
-  if (mcpRefusal) return { ...mcpRefusal, argv, cliVersion };
-  if (/Please run \/login|authentication_error|401/i.test(stdout) || /Please run \/login|authentication_error/i.test(String(res.stderr || ''))) {
-    return { ok: false, text: '', usage: null, reason: 'local judge model is not authenticated', reasonCode: 'cli-unauthenticated', authStatus: 'unknown', argv, cliVersion };
-  }
-  if (res.status !== 0) {
-    return {
-      ok: false,
-      text: '',
-      usage: null,
-      reason: `local judge exited ${res.status}: ${(stdout || String(res.stderr || '')).slice(0, 160)}`,
-      reasonCode: 'model-error',
-      authStatus: 'unknown',
-      argv,
-      cliVersion,
-    };
-  }
-  let wrapper;
-  try {
-    wrapper = JSON.parse(stdout);
-  } catch {
-    // Some CLI builds append a non-JSON MCP SDK diagnostic to stdout. Recover
-    // only a single result value; an extra JSON value of ANY type is ambiguous.
-    const values = [];
-    for (const rawLine of stdout.split('\n')) {
-      const line = rawLine.trim();
-      if (!line) continue;
-      try { values.push(JSON.parse(line)); } catch { /* discard non-JSON noise */ }
-    }
-    if (values.length !== 1 || !values[0] || typeof values[0] !== 'object' || values[0].type !== 'result') {
-      return { ok: false, text: '', usage: null, reason: 'local judge returned malformed JSON wrapper', reasonCode: 'model-error', authStatus: 'unknown', argv, cliVersion };
-    }
-    [wrapper] = values;
-  }
-  if (!wrapper || typeof wrapper.result !== 'string' || wrapper.is_error === true) {
-    return { ok: false, text: '', usage: null, reason: 'local judge returned no successful result', reasonCode: 'model-error', authStatus: 'unknown', argv, cliVersion };
-  }
-  return { ok: true, text: wrapper.result, usage: normalizeJudgeUsage(wrapper.usage), reason: null, authStatus: 'unknown', argv, cliVersion };
-}
+function runJudgeMode(opts) { return runCliMode(opts, 'judge'); }
 
 /**
  * runModel(opts) — the provider.interface.js contract. Checks the billing-helper
@@ -633,7 +589,7 @@ function runJudgeMode(opts) {
  * its existing pre-spawn auth short-circuit, mode:'judge' spawns directly as it
  * always has (auth failure there is only knowable post-hoc, from the output).
  */
-async function runModel(opts = {}) {
+function runModelImpl(opts) {
   if (detectBillingHelperConfigured(opts)) {
     return {
       ok: false,
@@ -641,6 +597,7 @@ async function runModel(opts = {}) {
       usage: null,
       reason: 'a foreign-billing CLI helper is configured — extraction declines to run under it',
       reasonCode: 'cli-billing-helper-configured',
+      refusal: 'pre-invocation',
       authStatus: 'unknown',
     };
   }
@@ -648,6 +605,11 @@ async function runModel(opts = {}) {
   return mode === 'judge' ? runJudgeMode(opts) : runExtractMode(opts);
 }
 
+async function runModel(opts = {}) {
+  try { return runModelImpl(opts); }
+  catch { return { ok: false, text: '', usage: null, reasonCode: 'unknown', reason: 'local model invocation failed', authStatus: 'unknown' }; }
+}
+
 /**
  * Legacy-shaped synchronous entry point — extractWithClaudeCode(transcript, opts).
  * Kept (not deleted) because test/ext-0806b-silent-skip.test.js imports it
@@ -663,6 +625,7 @@ function extractWithClaudeCode(transcript, opts = {}) {
       out: '',
       reason: 'a foreign-billing CLI helper is configured — extraction declines to run under it',
       reasonCode: 'cli-billing-helper-configured',
+      refusal: 'pre-invocation',
       authStatus: 'unknown',
     };
   }