@amalgm/chat 0.2.8 → 0.2.9-main.34746990150

package/dist/usage/tokens.js

@@ -1,95 +1,62 @@
 /**
  * Token counting primitives owned by the usage module.
  */
-/** Coerce to a finite number, else 0. */
-export function n(value) {
-    const parsed = Number(value || 0);
-    return Number.isFinite(parsed) ? parsed : 0;
-}
 /**
  * Return the numeric value when finite and non-negative, otherwise null.
- * `Number(null)` is zero, so callers representing absence pass `undefined`.
+ * Absence is never a measured zero.
  */
 export function nonNegativeOrNull(value) {
+    if ((typeof value !== 'number' && typeof value !== 'string') || value === '')
+        return null;
     const parsed = Number(value);
     return Number.isFinite(parsed) && parsed >= 0 ? parsed : null;
 }
-/**
- * Engine `normalizeTokenList()`: coerce any of the accepted key spellings
- * into the canonical six-bucket list. `total` prefers an explicit
- * non-negative total (nested or flat), else the computed sum of the four
- * context buckets — `thought` is informational and never counted into the
- * computed total.
- */
+/** Unknown buckets stay unknown; reasoning is included in output, not added again. */
 export function normalizeTokenList(input = {}) {
-    const tokenList = (input.tokenList && typeof input.tokenList === 'object'
-        ? input.tokenList
-        : {});
-    const inputTokens = n(tokenList['input'] ?? tokenList['inputTokens'] ?? input.inputTokens);
-    const outputTokens = n(tokenList['output'] ?? tokenList['outputTokens'] ?? input.outputTokens);
-    const cacheReadTokens = n(tokenList['cacheRead'] ?? tokenList['cacheReadTokens'] ?? input.cacheReadTokens);
-    const cacheWriteTokens = n(tokenList['cacheWrite'] ?? tokenList['cacheWriteTokens'] ?? input.cacheWriteTokens);
-    const thoughtTokens = n(tokenList['thought'] ?? tokenList['thoughtTokens'] ?? input.thoughtTokens);
-    const computedTotal = inputTokens + outputTokens + cacheReadTokens + cacheWriteTokens;
-    const total = nonNegativeOrNull(tokenList['total'] ?? tokenList['totalTokens'] ?? input.totalTokens)
-        ?? computedTotal;
-    return {
-        input: inputTokens,
-        output: outputTokens,
-        cacheRead: cacheReadTokens,
-        cacheWrite: cacheWriteTokens,
-        thought: thoughtTokens,
-        total,
-    };
-}
-/**
- * Engine `hasTokenListBuckets()`: true when any bucket coerces to a finite
- * number. Mirrors the engine's `Number()` coercion exactly — `null`
- * coerces to 0 (finite → true), `undefined` to NaN (→ false).
- */
-export function hasTokenListBuckets(tokenList = {}) {
+    const list = (input.tokenList && typeof input.tokenList === 'object' ? input.tokenList : {});
+    const inputTokens = nonNegativeOrNull(list['input'] ?? list['inputTokens'] ?? input.inputTokens);
+    const output = nonNegativeOrNull(list['output'] ?? list['outputTokens'] ?? input.outputTokens);
+    const cacheRead = nonNegativeOrNull(list['cacheRead'] ?? list['cacheReadTokens'] ?? input.cacheReadTokens);
+    const cacheWrite = nonNegativeOrNull(list['cacheWrite'] ?? list['cacheWriteTokens'] ?? input.cacheWriteTokens);
+    const thought = nonNegativeOrNull(list['thought'] ?? list['thoughtTokens'] ?? input.thoughtTokens);
+    const explicitTotal = nonNegativeOrNull(list['total'] ?? list['totalTokens'] ?? input.totalTokens);
+    const buckets = [inputTokens, output, cacheRead, cacheWrite];
+    const total = explicitTotal ?? (buckets.every(value => value !== null)
+        ? buckets.reduce((sum, value) => sum + value, 0) : null);
+    return { input: inputTokens, output, cacheRead, cacheWrite, thought, total };
+}
+export function hasTokenListBuckets(list = {}) {
     return ['input', 'output', 'cacheRead', 'cacheWrite', 'thought', 'total']
-        .some((key) => Number.isFinite(Number(tokenList[key])));
+        .some(key => nonNegativeOrNull(list[key]) !== null);
 }
-/** Engine `zeroTokenList()`: a fresh all-zero list. */
+/** Additive identity, used only for a proven empty accumulator. */
 export function zeroTokenList() {
     return { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, thought: 0, total: 0 };
 }
-/**
- * Engine `addTokenLists()`: bucket-wise sum, re-normalized (so `total` is
- * recomputed from the four context buckets, never carried over).
- */
+function combine(a, b, subtract) {
+    a = normalizeTokenList({ tokenList: a });
+    b = normalizeTokenList({ tokenList: b });
+    const bucket = (key) => {
+        const left = nonNegativeOrNull(a[key]);
+        const right = nonNegativeOrNull(b[key]);
+        if (left === null || right === null || (subtract && left < right))
+            return null;
+        return subtract ? left - right : left + right;
+    };
+    return { input: bucket('input'), output: bucket('output'), cacheRead: bucket('cacheRead'),
+        cacheWrite: bucket('cacheWrite'), thought: bucket('thought'), total: bucket('total') };
+}
 export function addTokenLists(a = {}, b = {}) {
-    return normalizeTokenList({
-        inputTokens: n(a.input) + n(b.input),
-        outputTokens: n(a.output) + n(b.output),
-        cacheReadTokens: n(a.cacheRead) + n(b.cacheRead),
-        cacheWriteTokens: n(a.cacheWrite) + n(b.cacheWrite),
-        thoughtTokens: n(a.thought) + n(b.thought),
-    });
+    return combine(a, b, false);
 }
-/**
- * Engine `subtractTokenLists()`: bucket-wise `after - before`, clamped at
- * 0 per bucket — a cumulative meter that reset (e.g. across compaction)
- * can never produce a negative delta.
- */
+/** A missing baseline or a counter reset cannot prove a delta. */
 export function subtractTokenLists(after = {}, before = {}) {
-    return normalizeTokenList({
-        inputTokens: Math.max(0, n(after.input) - n(before.input)),
-        outputTokens: Math.max(0, n(after.output) - n(before.output)),
-        cacheReadTokens: Math.max(0, n(after.cacheRead) - n(before.cacheRead)),
-        cacheWriteTokens: Math.max(0, n(after.cacheWrite) - n(before.cacheWrite)),
-        thoughtTokens: Math.max(0, n(after.thought) - n(before.thought)),
-    });
+    return combine(after, before, true);
 }
-/**
- * Total tokens for a usage record: tokenList total, else context size, else
- * the sum of the four buckets. Precedence uses `||`, exactly as the engine —
- * a zero total falls through to the next source.
- */
+/** Explicit totals and measured context are distinct from unknown token buckets. */
 export function totalUsageTokens(usage = {}) {
-    return (n(usage.tokenList?.total) ||
-        n(usage.inputContextSize) ||
-        n(usage.inputTokens) + n(usage.outputTokens) + n(usage.cacheReadTokens) + n(usage.cacheWriteTokens));
+    return nonNegativeOrNull(usage.tokenList?.total)
+        ?? nonNegativeOrNull(usage.inputContextSize)
+        ?? normalizeTokenList(usage).total;
 }
 //# sourceMappingURL=tokens.js.map

package/dist/usage/tokens.js.map

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

package/host/adapters/acp-prompt.js

@@ -0,0 +1,36 @@
+/** One ACP prompt loop preserves official updates and drains them before completion. */
+export async function* runAcpPrompt(session, prompt, { onUpdate, onResult } = {}) {
+  const queue = [];
+  let wake = null;
+  let finished = false;
+  let failure = null;
+  const wakeLoop = () => { if (wake) { wake(); wake = null; } };
+  const off = session.client.onNotification((message) => {
+    if (message.method !== 'session/update') return;
+    if (message.params?.sessionId && message.params.sessionId !== session.providerSessionId) return;
+    const update = message.params?.update;
+    if (!update) return;
+    onUpdate?.(message);
+    if (update.sessionUpdate === 'error') {
+      failure = new Error(update.message || 'ACP agent failed');
+    } else queue.push(update);
+    wakeLoop();
+  });
+  session.cancelRequested = false;
+  session.activePrompt = true;
+  session.client.request('session/prompt', { sessionId: session.providerSessionId, prompt }, 0)
+    .then(async result => { await onResult?.(result); })
+    .catch(error => { if (!session.cancelRequested) failure = error; })
+    .finally(() => { finished = true; wakeLoop(); });
+  try {
+    while (!finished || queue.length) {
+      if (queue.length) yield queue.shift();
+      else await new Promise(resolve => { wake = resolve; });
+    }
+    if (failure) throw failure;
+  } finally {
+    off();
+    session.activePrompt = false;
+    session.cancelRequested = false;
+  }
+}

package/host/adapters/acp.js

@@ -1,3 +1,5 @@
+import { usageFromAcpPrompt } from '../../dist/usage/index.js';
+import { runAcpPrompt } from './acp-prompt.js';
 /** Generic ACP agent adapter. Agent-specific launch data comes from the resolved revision. */
 
 import { PROTOCOL_VERSION } from '@agentclientprotocol/sdk';
@@ -155,47 +157,52 @@ export class AcpAdapter {
       permissionMode: contract.permissionMode,
       activePrompt: false,
     };
-    client.onRequest((method, params) => this.handleRequest(session, method, params));
-    const initialized = await client.request('initialize', {
-      protocolVersion: PROTOCOL_VERSION,
-      clientInfo: { name: 'amalgm-chat', version: '0.1.2' },
-      clientCapabilities: {
-        fs: { readTextFile: false, writeTextFile: false },
-        session: { configOptions: { boolean: {} } },
-      },
-    });
-    if (initialized?.protocolVersion !== PROTOCOL_VERSION) {
-      throw new UnsupportedExecutionInputError('acp', 'protocol', `agent negotiated version ${initialized?.protocolVersion}`);
-    }
-    session.capabilities = initialized.agentCapabilities || {};
-    const methodId = record(launch.authMethodIds)?.[contract.auth.mode];
-    if (methodId) await client.request('authenticate', { methodId }, 120000);
+    try {
+      client.onRequest((method, params) => this.handleRequest(session, method, params));
+      const initialized = await client.request('initialize', {
+        protocolVersion: PROTOCOL_VERSION,
+        clientInfo: { name: 'amalgm-chat', version: '0.1.2' },
+        clientCapabilities: {
+          fs: { readTextFile: false, writeTextFile: false },
+          session: { configOptions: { boolean: {} } },
+        },
+      });
+      if (initialized?.protocolVersion !== PROTOCOL_VERSION) {
+        throw new UnsupportedExecutionInputError('acp', 'protocol', `agent negotiated version ${initialized?.protocolVersion}`);
+      }
+      session.capabilities = initialized.agentCapabilities || {};
+      const methodId = record(launch.authMethodIds)?.[contract.auth.mode];
+      if (methodId) await client.request('authenticate', { methodId }, 120000);
 
-    const mcpServers = toAcpMcpServers(contract);
-    assertAcpMcpCapabilities('acp', session.capabilities, mcpServers);
-    const sessionParams = acpSessionParams('acp', session.capabilities, contract, mcpServers);
-    let response;
-    if (session.providerSessionId) {
-      if (session.capabilities.loadSession === true) {
-        response = await client.request('session/load', {
-          ...sessionParams,
-          sessionId: session.providerSessionId,
-        }, 600000);
-      } else if (session.capabilities.sessionCapabilities?.resume != null) {
-        response = await client.request('session/resume', {
-          ...sessionParams,
-          sessionId: session.providerSessionId,
-        }, 600000);
+      const mcpServers = toAcpMcpServers(contract);
+      assertAcpMcpCapabilities('acp', session.capabilities, mcpServers);
+      const sessionParams = acpSessionParams('acp', session.capabilities, contract, mcpServers);
+      let response;
+      if (session.providerSessionId) {
+        if (session.capabilities.loadSession === true) {
+          response = await client.request('session/load', {
+            ...sessionParams,
+            sessionId: session.providerSessionId,
+          }, 600000);
+        } else if (session.capabilities.sessionCapabilities?.resume != null) {
+          response = await client.request('session/resume', {
+            ...sessionParams,
+            sessionId: session.providerSessionId,
+          }, 600000);
+        } else {
+          throw new UnsupportedExecutionInputError('acp', 'resume', 'agent cannot load or resume its provider session');
+        }
       } else {
-        throw new UnsupportedExecutionInputError('acp', 'resume', 'agent cannot load or resume its provider session');
+        response = await client.request('session/new', sessionParams, 600000);
+        session.providerSessionId = response?.sessionId || null;
       }
-    } else {
-      response = await client.request('session/new', sessionParams, 600000);
-      session.providerSessionId = response?.sessionId || null;
+      if (!session.providerSessionId) throw new Error('ACP agent did not return a sessionId');
+      await applyConfiguration(client, session.providerSessionId, response, contract, launch);
+      return session;
+    } catch (error) {
+      client.close();
+      throw error;
     }
-    if (!session.providerSessionId) throw new Error('ACP agent did not return a sessionId');
-    await applyConfiguration(client, session.providerSessionId, response, contract, launch);
-    return session;
   }
 
   async handleRequest(session, method, params) {
@@ -221,6 +228,7 @@ export class AcpAdapter {
   }
 
   async stop(session) {
+    session.cancelRequested = true;
     if (session.activePrompt) {
       session.client.notify('session/cancel', { sessionId: session.providerSessionId });
     }
@@ -233,41 +241,12 @@ export class AcpAdapter {
     session.client.close();
   }
 
-  async *prompt(session, prompt, contract) {
+  async *prompt(session, prompt, contract, effects = {}) {
     assertAcpPromptCapabilities('acp', session.capabilities, prompt);
-    const queue = [];
-    let wake = null;
-    let finished = false;
-    let failure = null;
-    const wakeLoop = () => { if (wake) { wake(); wake = null; } };
-    const off = session.client.onNotification((message) => {
-      if (message.method !== 'session/update') return;
-      if (message.params?.sessionId && message.params.sessionId !== session.providerSessionId) return;
-      if (message.params?.update) queue.push(message.params.update);
-      wakeLoop();
-    });
-    session.activePrompt = true;
-    session.client.request('session/prompt', {
-      sessionId: session.providerSessionId,
-      prompt: acpPromptParts(prompt),
-    }, 0).then(() => {
-      finished = true;
-      wakeLoop();
-    }).catch((error) => {
-      failure = error;
-      finished = true;
-      wakeLoop();
-    });
-    try {
-      while (!finished || queue.length) {
-        if (queue.length) yield queue.shift();
-        else await new Promise((resolve) => { wake = resolve; });
-      }
-      if (failure) throw failure;
-    } finally {
-      off();
-      session.activePrompt = false;
-    }
+    yield* runAcpPrompt(session, acpPromptParts(prompt), { onResult: async result => {
+      const usage = usageFromAcpPrompt(result?.usage);
+      if (usage) await effects.recordUsage?.({ usage, raw: { source: 'acp.prompt_result', payload: result } });
+    } });
   }
 }
 

package/host/adapters/attachments.js

@@ -0,0 +1,37 @@
+import { createHash, randomUUID } from 'node:crypto';
+import { mkdir, rename, rm, writeFile } from 'node:fs/promises';
+import path from 'node:path';
+import { pathToFileURL } from 'node:url';
+
+/** Materialize file resources for native harnesses; generic ACP retains bytes. */
+export async function materializePromptAttachments(prompt, root) {
+  const parts = [];
+  for (const part of prompt.parts) {
+    if (part.type !== 'resource'
+      || /^(image|audio)\//.test(part.resource.mimeType || '')) {
+      parts.push(part);
+      continue;
+    }
+    const bytes = typeof part.resource.text === 'string'
+      ? Buffer.from(part.resource.text, 'utf8')
+      : Buffer.from(part.resource.blob, 'base64');
+    const hash = createHash('sha256').update(bytes).digest('hex');
+    let basename = part.resource.uri.split('/').pop() || 'attachment';
+    try { basename = decodeURIComponent(basename); } catch { /* A URI need not contain percent-encoded text. */ }
+    const safeName = path.basename(basename).replace(/[^a-zA-Z0-9._-]/g, '_');
+    const name = !safeName || /^\.+$/.test(safeName) ? 'attachment' : safeName;
+    const directory = path.join(root, 'attachments', hash);
+    await mkdir(directory, { recursive: true, mode: 0o700 });
+    const destination = path.join(directory, name);
+    const temporary = `${destination}.${randomUUID()}.tmp`;
+    try {
+      await writeFile(temporary, bytes, { flag: 'wx', mode: 0o600 });
+      await rename(temporary, destination);
+    } finally {
+      await rm(temporary, { force: true });
+    }
+    parts.push({ type: 'resource_link', uri: pathToFileURL(destination).href,
+      name: basename, ...(part.resource.mimeType ? { mimeType: part.resource.mimeType } : {}), size: bytes.length });
+  }
+  return { parts };
+}

package/host/adapters/claude.js

@@ -118,7 +118,7 @@ class ClaudeAdapter {
         ? { debug: true, debugFile: path.join(runtime.runtimeHome, 'claude-debug.log') }
         : {}),
       settingSources: [],
-      strictMcpConfig: false,
+      strictMcpConfig: true,
       ...extra,
     };
   }
@@ -151,6 +151,7 @@ class ClaudeAdapter {
       claudeUsageSnapshotFingerprints: new Set(),
     };
     const stderrChunks = [];
+    let latestContextSize = null;
     const captureStderr = (chunk) => {
       const text = redactSecrets(String(chunk || ''));
       if (!text) return;
@@ -184,7 +185,12 @@ class ClaudeAdapter {
         }
         const normalized = normalizeClaudeMessage(message, state);
         if (normalized.length > 0) {
-          for (const e of normalized) yield e;
+          for (const e of normalized) {
+            if (e.type === 'usage.final' && !message.parent_tool_use_id && e.usage?.inputContextSize != null) {
+              latestContextSize = e.usage.inputContextSize;
+            }
+            yield e;
+          }
           continue;
         }
         if (message.type === 'result') {
@@ -195,6 +201,7 @@ class ClaudeAdapter {
           for (const [index, usageRecord] of usageRecords.entries()) {
             yield usageFinal({
               ...usageRecord,
+              inputContextSize: usageRecord.inputContextSize ?? latestContextSize,
               costUsd: usageRecords.length === 1 ? message.total_cost_usd ?? null : null,
             }, {
               providerSessionId: state.providerSessionId,

package/host/adapters/codex.js

@@ -14,10 +14,11 @@ import { spawn, spawnSync } from 'node:child_process';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { zeroTokenList } from '../../dist/usage/index.js';
 import { createEventConstructors } from '../../dist/events/index.js';
 import { codexErrorMessage, createCodexNormalizer } from '../../dist/normalizers/codex.js';
 import { recordNativeEvent } from '../recorder.js';
-import { codexMcpSectionName, relayedMcpServers, toCodexMcpToml } from '../tooling/mcp-bundle.js';
+import { toCodexMcpToml } from '../tooling/mcp-bundle.js';
 import { bundledCodexBinary, bundledCodexPathDirs, executableExists, findOnPath } from '../tooling/native-binaries.js';
 import { syncCodexProviderAuth } from '../tooling/native-config.js';
 import { prepareHarnessRuntime } from '../tooling/runtime-home.js';
@@ -50,6 +51,7 @@ class JsonLineRpc {
     this.id = 1;
     this.pending = new Map();
     this.handlers = new Set();
+    this.failureHandlers = new Set();
     this.requestHandler = null;
     this.buffer = '';
     this.closed = false;
@@ -81,10 +83,12 @@ class JsonLineRpc {
   }
 
   failAll(err) {
+    if (this.closed) return;
     this.closed = true;
     this.closeError = err;
     for (const pending of this.pending.values()) pending.reject(err);
     this.pending.clear();
+    for (const handler of this.failureHandlers) handler(err);
   }
 
   rejectPending(id, err) {
@@ -187,6 +191,12 @@ class JsonLineRpc {
     this.requestHandler = handler;
   }
 
+  onFailure(handler) {
+    this.failureHandlers.add(handler);
+    if (this.closeError) handler(this.closeError);
+    return () => this.failureHandlers.delete(handler);
+  }
+
   close() {
     try { this.child.stdin.end(); } catch {}
     try {
@@ -446,10 +456,6 @@ function generatedCodexHookTrust(contract, renderers = defaultRenderers) {
   return lines.join('\n');
 }
 
-function generatedMcpSectionNames(contract) {
-  return relayedMcpServers(contract).map((server) => codexMcpSectionName(server.name));
-}
-
 function buildCodexConfig(contract, existingConfig, syncInfo, renderers = defaultRenderers) {
   const mcpToml = toCodexMcpToml(contract);
   const topLevelKeys = [
@@ -459,8 +465,11 @@ function buildCodexConfig(contract, existingConfig, syncInfo, renderers = defaul
   let config = removeTopLevelKeys(existingConfig, topLevelKeys);
   config = removeTomlSections(config, [
     ...(contract.authMethod === 'amalgm' ? ['model_providers.amalgm'] : []),
-    ...generatedMcpSectionNames(contract),
+    'mcp_servers',
   ]);
+  for (const feature of ['apps', 'plugins', 'remote_plugin']) {
+    config = ensureFeatureBoolean(config, feature, false);
+  }
   if (renderers.hasHooks(contract.agentConfig)) {
     config = ensureFeatureBoolean(config, 'codex_hooks', true);
   }
@@ -533,6 +542,7 @@ class CodexAdapter {
     writeConfig(contract, runtime.syncInfo, this.renderers);
     const binary = resolveBinary();
     const client = new JsonLineRpc({ binary, cwd: contract.cwd, env: codexEnv(runtime.env, binary) });
+    try {
     await client.request('initialize', { clientInfo: { name: 'amalgm-chat', version: '1.0.0' }, capabilities: { experimentalApi: true } });
     client.notify('initialized');
     const fullAccess = contract.permissionMode === 'full_access';
@@ -552,8 +562,8 @@ class CodexAdapter {
       permissionMode: contract.permissionMode,
       activeTurnId: null,
       activeTurnHadAssistant: false,
-      cancelCurrentTurn: null,
       cancelRequested: false,
+      codexCumulativeTokenList: contract.providerSessionId ? null : zeroTokenList(),
     };
     client.onRequest((method, params) => this.handleServerRequest(session, method, params));
     const thread = contract.providerSessionId
@@ -565,6 +575,10 @@ class CodexAdapter {
       : await client.request('thread/start', threadOptions);
     session.providerSessionId = thread.thread.id;
     return session;
+    } catch (error) {
+      client.close();
+      throw error;
+    }
   }
 
   async handleServerRequest(session, method, params) {
@@ -629,9 +643,10 @@ class CodexAdapter {
 
   async stop(session) {
     session.cancelRequested = true;
-    try { session.cancelCurrentTurn?.(); } catch {}
+    // A stop during dispatch must target the turn that dispatch actually accepts.
+    try { await session.startRequest; } catch { return; }
     if (!session.activeTurnId) return;
-    await session.client.request('turn/interrupt', { threadId: session.providerSessionId, turnId: session.activeTurnId }).catch(() => {});
+    await session.client.request('turn/interrupt', { threadId: session.providerSessionId, turnId: session.activeTurnId });
   }
 
   async destroy(session) { session.client.close(); }
@@ -644,11 +659,8 @@ class CodexAdapter {
     const wakeLoop = () => { if (wake) { wake(); wake = null; } };
     const push = (e) => { queue.push(e); wakeLoop(); };
     session.cancelRequested = false;
-    session.cancelCurrentTurn = () => {
-      if (complete) return;
-      complete = true;
-      push(done({ providerSessionId: session.providerSessionId, stopReason: 'cancelled' }));
-    };
+    session.activeTurnId = null;
+    session.activeTurnHadAssistant = false;
     // Subscription can synchronously deliver already-buffered provider
     // notifications. Everything the handler reads must therefore be fixed
     // before `on` opens that door.
@@ -689,8 +701,11 @@ class CodexAdapter {
         }, 500);
       }
     });
-    session.activeTurnId = null;
-    session.activeTurnHadAssistant = false;
+    const offFailure = session.client.onFailure((error) => {
+      if (complete) return;
+      complete = true;
+      push(errorEvent(error.message, { providerSessionId: session.providerSessionId }));
+    });
     const startRequest = compactCommand
       ? session.client.request('thread/compact/start', { threadId: session.providerSessionId })
       : session.client.request('turn/start', {
@@ -702,7 +717,7 @@ class CodexAdapter {
           serviceTier: serviceTierForContract(contract),
           approvalPolicy: contract.permissionMode === 'full_access' ? 'never' : 'on-request',
         });
-    startRequest.then((result) => {
+    session.startRequest = startRequest.then((result) => {
       if (compactCommand) return;
       session.activeTurnId = result?.turn?.id || session.activeTurnId;
       const resultError = result?.error || result?.turn?.error || result?.turn?.lastError;
@@ -710,6 +725,7 @@ class CodexAdapter {
       push(errorEvent(codexErrorMessage(resultError), { providerSessionId: session.providerSessionId }));
       push(done({ providerSessionId: session.providerSessionId, stopReason: 'error' }));
       complete = true;
+      return result;
     }).catch((err) => {
       if (session.cancelRequested) {
         push(done({ providerSessionId: session.providerSessionId, stopReason: 'cancelled' }));
@@ -728,7 +744,9 @@ class CodexAdapter {
     } finally {
       if (compactCompletionTimer) clearTimeout(compactCompletionTimer);
       off();
-      session.cancelCurrentTurn = null;
+      offFailure();
+      session.startRequest = null;
+      session.activeTurnId = null;
       session.cancelRequested = false;
     }
   }