thinkpool-pair 0.7.364 → 0.7.366

package/codex-event-mapper.mjs

@@ -1,232 +1 @@
-// codex-event-mapper.mjs — maps a Codex `codex exec --json` event stream into
-// the ThinkPool bridge's runtime-agnostic room-event contract (the SAME kinds
-// claude-session.mjs emits). Pure logic over a sequential event stream: the
-// driver (codex-session.mjs) feeds it parsed JSONL events, it calls onEvent
-// with normalized events. Spec: docs/specs/2026-07-12-codex-driver.md.
-//
-// WHY A SEPARATE RUNTIME, NOT A TRANSLATOR (see spec §Why): Codex is itself an
-// openai-native agent loop (tools + sandbox); we map its OUTPUT, we do not
-// re-implement the loop or translate APIs. This keeps each runtime on its
-// maker-tuned loop with no tool_use↔function-call loss.
-//
-// Codex item taxonomy (live capture: bridge/fixtures/codex-read-write.jsonl):
-//   agent_message            → assistant { blocks:[{type:'text',text}] }
-//   reasoning                → assistant { blocks:[{type:'thinking',text}] }
-//   command_execution start  → assistant { blocks:[{type:'tool_use',name:'Bash',input:{command}}] }
-//   command_execution done   → tool_result { toolUseId, content, isError, durationMs }
-//   file_change start        → assistant { blocks:[{type:'tool_use',name:'Write'|'Edit',input:{path}}] }
-//   file_change done         → tool_result
-//   turn.completed (usage)   → result { subtype:'success', usage, model }
-//   turn.failed / error      → error { recoverable:true } (+ result on turn.failed)
-//
-// G1 (stable exec path): agent_message is burst-on-completion (no per-token
-// deltas). Tool activity DOES stream (item.started→item.completed). The opt-in
-// App Server adapter emits item/agentMessage/delta directly and suppresses the
-// completed-message duplicate before events reach this mapper.
-//
-// Risk: this module emits tool_use blocks with names ('Bash'/'Write'/'Edit') so
-// the existing risk classifier (claude-session.classifyRisk) and room rendering
-// apply unchanged. The stable exec path is observe-only; the opt-in App Server
-// path routes command/file approval requests through the shared room cards.
-import fs from 'node:fs'
-import { CODEX_COMMAND_CATALOG } from './codex-commands.mjs'
-import { normalizeEditKind, summarizeTextDiff } from './edit-diff.mjs'
-import { evidenceForToolResult } from './evidence-citations.mjs'
-
-const safeMcpPart = (value) => String(value || 'unknown').replace(/[^a-zA-Z0-9_-]/g, '_')
-const mcpToolName = (item) => `mcp__${safeMcpPart(item?.server)}__${safeMcpPart(item?.tool)}`
-const webSearchQuery = (item) => item?.query || item?.action?.query || item?.action?.url || ''
-const resultText = (value) => {
-  if (typeof value === 'string') return value
-  if (value == null) return ''
-  try { return JSON.stringify(value) } catch { return String(value) }
-}
-// Codex uses both `message: string` and `message: { message: string }` across
-// its exec/app-server error paths. Room events must keep `message` scalar: an
-// object persists successfully but crashes React when that transcript replays.
-const errorText = (value, fallback) => {
-  if (typeof value === 'string' && value.trim()) return value
-  if (value && typeof value === 'object' && typeof value.message === 'string' && value.message.trim()) return value.message
-  return resultText(value) || fallback
-}
-
-export class CodexEventMapper {
-  /**
-   * @param {{onEvent:(evt)=>void, model?:string|null, sessionId?:string|null}} opts
-   */
-  constructor({ onEvent, model = null, sessionId = null, fsImpl = fs, usageSnapshotForSession = () => null }) {
-    this._onEvent = onEvent
-    this._model = model || null
-    this._sessionId = sessionId || null
-    this._starts = new Map() // item.id → startMs (for durationMs)
-    this._fileBefore = new Map() // item.id → [{ path, kind, content }]
-    this._fs = fsImpl
-    this._systemSent = false
-    this._usageSnapshotForSession = usageSnapshotForSession
-    this._usageBaseline = null
-  }
-
-  /** Emit a room-event; never let a consumer throw into the stream. */
-  _emit(evt) { try { this._onEvent?.(evt) } catch { /* noop */ } }
-
-  setModel(model) { this._model = model || null }
-
-  setUsageBaseline(snapshot) { this._usageBaseline = snapshot || null }
-
-  /** Process one parsed Codex JSONL event. */
-  push(ev) {
-    if (!ev || typeof ev !== 'object') return
-    switch (ev.type) {
-      case 'thread.started': {
-        // /clear and permission-mode changes intentionally create a new native
-        // thread inside the same visible lane. Attribute subsequent usage and
-        // results to that new thread, never the previous one.
-        this._sessionId = ev.thread_id || this._sessionId || null
-        if (!this._systemSent) {
-          this._systemSent = true
-          // Codex App Server 0.144.1 has no slash-command discovery endpoint.
-          // Advertise only the explicit room-supported catalog, never guessed
-          // interactive-TUI commands.
-          this._emit({ kind: 'system', sessionId: this._sessionId, model: this._model, commands: CODEX_COMMAND_CATALOG })
-        }
-        return
-      }
-      case 'turn.started':
-        return
-
-      case 'item.started': {
-        const it = ev.item
-        if (!it) return
-        this._starts.set(it.id, Date.now())
-        if (it.type === 'command_execution') {
-          this._emit({ kind: 'assistant', blocks: [{ type: 'tool_use', id: it.id, name: 'Bash', input: { command: it.command || '' } }], parentToolUseId: null })
-        } else if (it.type === 'file_change') {
-          const before = (it.changes || []).map((c) => {
-            const kind = normalizeEditKind(c.kind)
-            let content = ''
-            if (kind !== 'add' && c.path) {
-              try { content = this._fs.readFileSync(c.path, 'utf8') } catch { /* missing/unreadable → empty */ }
-            }
-            return { path: c.path || '', kind, content }
-          })
-          this._fileBefore.set(it.id, before)
-        } else if (it.type === 'web_search') {
-          this._emit({ kind: 'assistant', blocks: [{ type: 'tool_use', id: it.id, name: 'WebSearch', input: { query: webSearchQuery(it) } }], parentToolUseId: null })
-        } else if (it.type === 'mcp_tool_call') {
-          this._emit({ kind: 'assistant', blocks: [{ type: 'tool_use', id: it.id, name: mcpToolName(it), input: it.arguments || {} }], parentToolUseId: null })
-        }
-        // agent_message / reasoning have no item.started (burst on completion).
-        return
-      }
-
-      case 'item.completed': {
-        const it = ev.item
-        if (!it) return
-        const start = this._starts.get(it.id)
-        const durationMs = start != null ? Date.now() - start : undefined
-        this._starts.delete(it.id)
-
-        if (it.type === 'agent_message') {
-          this._emit({ kind: 'assistant', blocks: [{ type: 'text', text: it.text || '' }], parentToolUseId: null })
-        } else if (it.type === 'reasoning') {
-          this._emit({ kind: 'assistant', blocks: [{ type: 'thinking', text: it.text || '', reasoningKind: 'summary' }], parentToolUseId: null })
-        } else if (it.type === 'command_execution') {
-          const bad = it.exit_code != null ? it.exit_code !== 0 : false
-          this._emit({ kind: 'tool_result', toolUseId: it.id, content: [{ type: 'text', text: it.aggregated_output || '' }], isError: bad, durationMs, parentToolUseId: null })
-        } else if (it.type === 'file_change') {
-          const before = this._fileBefore.get(it.id) || (it.changes || []).map((c) => ({ path: c.path || '', kind: c.kind || 'update', content: '' }))
-          this._fileBefore.delete(it.id)
-          const edits = before.map((c) => {
-            let next = ''
-            if (c.kind !== 'delete' && c.path) {
-              try { next = this._fs.readFileSync(c.path, 'utf8') } catch { /* deleted/unreadable → empty */ }
-            }
-            const summary = summarizeTextDiff(c.content, next, { context: 2, maxLines: 60 })
-            return {
-              file_path: c.path,
-              path: c.path,
-              kind: c.kind,
-              added: summary.added,
-              removed: summary.removed,
-              diff_preview: summary.preview,
-              old_string: c.content,
-              new_string: next,
-            }
-          })
-          const first = edits[0] || { file_path: '', path: '', old_string: '', new_string: '', kind: 'update' }
-          const name = edits.length > 1 ? 'MultiEdit' : first.kind === 'add' ? 'Write' : 'Edit'
-          const input = name === 'MultiEdit'
-            ? { edits }
-            : name === 'Write'
-              ? { file_path: first.file_path, path: first.path, content: first.new_string }
-              : first
-          this._emit({ kind: 'assistant', blocks: [{ type: 'tool_use', id: it.id, name, input }], parentToolUseId: null })
-          this._emit({ kind: 'tool_result', toolUseId: it.id, content: [{ type: 'text', text: `${name === 'Write' ? 'wrote' : 'edited'} ${first.path}` }], isError: false, durationMs, parentToolUseId: null })
-        } else if (it.type === 'web_search') {
-          const query = webSearchQuery(it)
-          this._emit({ kind: 'tool_result', toolUseId: it.id, toolInput: { query }, content: [{ type: 'text', text: query || 'search completed' }], isError: false, durationMs, parentToolUseId: null })
-        } else if (it.type === 'mcp_tool_call') {
-          const content = [{ type: 'text', text: it.error?.message || resultText(it.result) }]
-          const evidence = evidenceForToolResult(mcpToolName(it), content)
-          this._emit({ kind: 'tool_result', toolUseId: it.id, content, ...(evidence ? { evidence } : {}), isError: it.status === 'failed' || !!it.error, durationMs, parentToolUseId: null })
-        }
-        // plan_update remains an additive future event shape. Unknown
-        // items are ignored rather than risking a malformed transcript row.
-        return
-      }
-
-      case 'turn.completed': {
-        const u = ev.usage || {}
-        let snapshot = null
-        try { snapshot = this._usageSnapshotForSession(this._sessionId) } catch { /* unreadable rollout → omit meter */ }
-        const used = Number(snapshot?.context?.used)
-        const max = Number(snapshot?.context?.max)
-        if (Number.isFinite(used) && used >= 0 && Number.isFinite(max) && max > 0) {
-          this._emit({ kind: 'usage', ctx: { used, max, pct: Math.min(100, Math.max(0, Math.round((used / max) * 100))), over: used > max, model: this._model } })
-        }
-        // Codex's turn.completed values are lifetime thread totals, not turn
-        // deltas. Prefer the native rollout totals and subtract the pre-turn
-        // baseline. A fresh thread has no baseline, so its totals equal turn 1.
-        const totals = snapshot?.total || u
-        const before = this._usageBaseline?.total || {}
-        const totalInput = Math.max(0, (Number(totals.input_tokens) || 0) - (Number(before.input_tokens) || 0))
-        const cachedInput = Math.min(totalInput, Math.max(0, (Number(totals.cached_input_tokens) || 0) - (Number(before.cached_input_tokens) || 0)))
-        const out = Math.max(0, (Number(totals.output_tokens) || 0) - (Number(before.output_tokens) || 0))
-        this._usageBaseline = snapshot || null
-        this._emit({
-          kind: 'result',
-          subtype: 'success',
-          sessionId: this._sessionId,
-          model: this._model,
-          costUsd: null,
-          usage: {
-            // Claude-shape fields are mutually exclusive buckets. Codex reports
-            // cached_input_tokens as a subset of input_tokens, so subtract it.
-            input_tokens: totalInput - cachedInput,
-            cache_read_input_tokens: cachedInput,
-            cache_creation_input_tokens: 0,
-            output_tokens: out,
-          },
-          numTurns: 1,
-          durationMs: undefined,
-          denials: 0,
-          resultText: null,
-        })
-        return
-      }
-
-      case 'turn.failed': {
-        this._emit({ kind: 'error', message: errorText(ev.message ?? ev.error, 'codex turn failed'), recoverable: true })
-        this._emit({ kind: 'result', subtype: 'error_during_execution', sessionId: this._sessionId, model: this._model, costUsd: null, usage: null, numTurns: 1, durationMs: undefined, denials: 0, resultText: null })
-        return
-      }
-
-      case 'error':
-        this._emit({ kind: 'error', message: errorText(ev.message ?? ev.error, 'codex error'), recoverable: true })
-        return
-
-      default:
-        return
-    }
-  }
-}
+import t from"node:fs";import{CODEX_COMMAND_CATALOG as e}from"./codex-commands.mjs";import{normalizeEditKind as s,summarizeTextDiff as i}from"./edit-diff.mjs";import{evidenceForToolResult as n}from"./evidence-citations.mjs";const o=t=>String(t||"unknown").replace(/[^a-zA-Z0-9_-]/g,"_"),r=t=>`mcp__${o(t?.server)}__${o(t?.tool)}`,a=t=>t?.query||t?.action?.query||t?.action?.url||"",l=t=>{if("string"==typeof t)return t;if(null==t)return"";try{return JSON.stringify(t)}catch{return String(t)}},d=(t,e)=>"string"==typeof t&&t.trim()?t:t&&"object"==typeof t&&"string"==typeof t.message&&t.message.trim()?t.message:l(t)||e;export class CodexEventMapper{constructor({onEvent:e,model:s=null,sessionId:i=null,fsImpl:n=t,usageSnapshotForSession:o=()=>null}){this._onEvent=e,this._model=s||null,this._sessionId=i||null,this._starts=new Map,this._fileBefore=new Map,this._fs=n,this._systemSent=!1,this._usageSnapshotForSession=o,this._usageBaseline=null}_emit(t){try{this._onEvent?.(t)}catch{}}setModel(t){this._model=t||null}setUsageBaseline(t){this._usageBaseline=t||null}push(t){if(t&&"object"==typeof t)switch(t.type){case"thread.started":return this._sessionId=t.thread_id||this._sessionId||null,void(this._systemSent||(this._systemSent=!0,this._emit({kind:"system",sessionId:this._sessionId,model:this._model,commands:e})));case"turn.started":default:return;case"item.started":{const e=t.item;if(!e)return;if(this._starts.set(e.id,Date.now()),"command_execution"===e.type)this._emit({kind:"assistant",blocks:[{type:"tool_use",id:e.id,name:"Bash",input:{command:e.command||""}}],parentToolUseId:null});else if("file_change"===e.type){const t=(e.changes||[]).map(t=>{const e=s(t.kind);let i="";if("add"!==e&&t.path)try{i=this._fs.readFileSync(t.path,"utf8")}catch{}return{path:t.path||"",kind:e,content:i}});this._fileBefore.set(e.id,t)}else"web_search"===e.type?this._emit({kind:"assistant",blocks:[{type:"tool_use",id:e.id,name:"WebSearch",input:{query:a(e)}}],parentToolUseId:null}):"mcp_tool_call"===e.type&&this._emit({kind:"assistant",blocks:[{type:"tool_use",id:e.id,name:r(e),input:e.arguments||{}}],parentToolUseId:null});return}case"item.completed":{const e=t.item;if(!e)return;const s=this._starts.get(e.id),o=null!=s?Date.now()-s:void 0;if(this._starts.delete(e.id),"agent_message"===e.type)this._emit({kind:"assistant",blocks:[{type:"text",text:e.text||""}],parentToolUseId:null});else if("reasoning"===e.type)this._emit({kind:"assistant",blocks:[{type:"thinking",text:e.text||"",reasoningKind:"summary"}],parentToolUseId:null});else if("command_execution"===e.type){const t=null!=e.exit_code&&0!==e.exit_code;this._emit({kind:"tool_result",toolUseId:e.id,content:[{type:"text",text:e.aggregated_output||""}],isError:t,durationMs:o,parentToolUseId:null})}else if("file_change"===e.type){const t=this._fileBefore.get(e.id)||(e.changes||[]).map(t=>({path:t.path||"",kind:t.kind||"update",content:""}));this._fileBefore.delete(e.id);const s=t.map(t=>{let e="";if("delete"!==t.kind&&t.path)try{e=this._fs.readFileSync(t.path,"utf8")}catch{}const s=i(t.content,e,{context:2,maxLines:60});return{file_path:t.path,path:t.path,kind:t.kind,added:s.added,removed:s.removed,diff_preview:s.preview,old_string:t.content,new_string:e}}),n=s[0]||{file_path:"",path:"",old_string:"",new_string:"",kind:"update"},r=s.length>1?"MultiEdit":"add"===n.kind?"Write":"Edit",a="MultiEdit"===r?{edits:s}:"Write"===r?{file_path:n.file_path,path:n.path,content:n.new_string}:n;this._emit({kind:"assistant",blocks:[{type:"tool_use",id:e.id,name:r,input:a}],parentToolUseId:null}),this._emit({kind:"tool_result",toolUseId:e.id,content:[{type:"text",text:`${"Write"===r?"wrote":"edited"} ${n.path}`}],isError:!1,durationMs:o,parentToolUseId:null})}else if("web_search"===e.type){const t=a(e);this._emit({kind:"tool_result",toolUseId:e.id,toolInput:{query:t},content:[{type:"text",text:t||"search completed"}],isError:!1,durationMs:o,parentToolUseId:null})}else if("mcp_tool_call"===e.type){const t=[{type:"text",text:e.error?.message||l(e.result)}],s=n(r(e),t);this._emit({kind:"tool_result",toolUseId:e.id,content:t,...s?{evidence:s}:{},isError:"failed"===e.status||!!e.error,durationMs:o,parentToolUseId:null})}return}case"turn.completed":{const e=t.usage||{};let s=null;try{s=this._usageSnapshotForSession(this._sessionId)}catch{}const i=Number(s?.context?.used),n=Number(s?.context?.max);Number.isFinite(i)&&i>=0&&Number.isFinite(n)&&n>0&&this._emit({kind:"usage",ctx:{used:i,max:n,pct:Math.min(100,Math.max(0,Math.round(i/n*100))),over:i>n,model:this._model}});const o=s?.total||e,r=this._usageBaseline?.total||{},a=Math.max(0,(Number(o.input_tokens)||0)-(Number(r.input_tokens)||0)),l=Math.min(a,Math.max(0,(Number(o.cached_input_tokens)||0)-(Number(r.cached_input_tokens)||0))),d=Math.max(0,(Number(o.output_tokens)||0)-(Number(r.output_tokens)||0));return this._usageBaseline=s||null,void this._emit({kind:"result",subtype:"success",sessionId:this._sessionId,model:this._model,costUsd:null,usage:{input_tokens:a-l,cache_read_input_tokens:l,cache_creation_input_tokens:0,output_tokens:d},numTurns:1,durationMs:void 0,denials:0,resultText:null})}case"turn.failed":return this._emit({kind:"error",message:d(t.message??t.error,"codex turn failed"),recoverable:!0}),void this._emit({kind:"result",subtype:"error_during_execution",sessionId:this._sessionId,model:this._model,costUsd:null,usage:null,numTurns:1,durationMs:void 0,denials:0,resultText:null});case"error":return void this._emit({kind:"error",message:d(t.message??t.error,"codex error"),recoverable:!0})}}}

package/codex-images.mjs

@@ -1,69 +1 @@
-import fs from 'node:fs'
-import path from 'node:path'
-
-const IMAGE_MEDIA_TYPE = /^image\/[a-z0-9.+-]+$/i
-const SAFE_ID_PREFIX = /^[a-zA-Z0-9_-]{1,8}$/
-
-export const safeRoomFileName = (name) => String(name || 'file').replace(/[^a-zA-Z0-9._-]/g, '_').slice(-80)
-
-/**
- * Rebuild the deterministic room-upload path from bridge-owned facts.
- * `hostPath` is intentionally ignored: it is display metadata supplied by a
- * browser and must never grant Codex access to an arbitrary host file.
- */
-export function canonicalRoomFilePath(file, { updir } = {}) {
-  if (!file || !updir) return null
-  const idPrefix = String(file.id || '').slice(0, 8)
-  if (!SAFE_ID_PREFIX.test(idPrefix)) return null
-  const root = path.resolve(String(updir))
-  const candidate = path.resolve(root, `${idPrefix}-${safeRoomFileName(file.name)}`)
-  return candidate.startsWith(root + path.sep) ? candidate : null
-}
-
-export function nativeImageCandidates(files, { updir } = {}) {
-  if (!Array.isArray(files)) return []
-  const seen = new Set()
-  const candidates = []
-  for (const file of files) {
-    if (!IMAGE_MEDIA_TYPE.test(String(file?.mediaType || ''))) continue
-    const candidate = canonicalRoomFilePath(file, { updir })
-    if (!candidate || seen.has(candidate)) continue
-    seen.add(candidate)
-    candidates.push(candidate)
-  }
-  return candidates
-}
-
-const fileReady = async (filePath) => {
-  try { return (await fs.promises.stat(filePath)).isFile() }
-  catch { return false }
-}
-
-const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
-
-/**
- * `file-put` and `code-turn` are separate realtime broadcasts, so the turn can
- * arrive while the signed download is still in flight. Wait briefly for only
- * canonical image paths; timed-out images stay in the text prompt as ordinary
- * quoted paths instead of failing or delaying the turn indefinitely.
- */
-export async function waitForNativeImages(files, {
-  updir,
-  timeoutMs = 2000,
-  pollMs = 40,
-  isReady = fileReady,
-  sleep = delay,
-  now = Date.now,
-} = {}) {
-  const candidates = nativeImageCandidates(files, { updir })
-  if (!candidates.length) return []
-  const ready = new Set()
-  const deadline = now() + Math.max(0, timeoutMs)
-  while (true) {
-    const checks = await Promise.all(candidates.map(async (candidate) => [candidate, await isReady(candidate)]))
-    for (const [candidate, exists] of checks) if (exists) ready.add(candidate)
-    if (ready.size === candidates.length || now() >= deadline) break
-    await sleep(Math.min(Math.max(1, pollMs), Math.max(1, deadline - now())))
-  }
-  return candidates.filter((candidate) => ready.has(candidate))
-}
+import t from"node:fs";import e from"node:path";const a=/^image\/[a-z0-9.+-]+$/i,i=/^[a-zA-Z0-9_-]{1,8}$/;export const safeRoomFileName=t=>String(t||"file").replace(/[^a-zA-Z0-9._-]/g,"_").slice(-80);export function canonicalRoomFilePath(t,{updir:a}={}){if(!t||!a)return null;const n=String(t.id||"").slice(0,8);if(!i.test(n))return null;const r=e.resolve(String(a)),o=e.resolve(r,`${n}-${s=t.name,String(s||"file").replace(/[^a-zA-Z0-9._-]/g,"_").slice(-80)}`);var s;return o.startsWith(r+e.sep)?o:null}export function nativeImageCandidates(t,{updir:e}={}){if(!Array.isArray(t))return[];const i=new Set,n=[];for(const r of t){if(!a.test(String(r?.mediaType||"")))continue;const t=canonicalRoomFilePath(r,{updir:e});t&&!i.has(t)&&(i.add(t),n.push(t))}return n}const n=async e=>{try{return(await t.promises.stat(e)).isFile()}catch{return!1}},r=t=>new Promise(e=>setTimeout(e,t));export async function waitForNativeImages(t,{updir:e,timeoutMs:a=2e3,pollMs:i=40,isReady:o=n,sleep:s=r,now:c=Date.now}={}){const l=nativeImageCandidates(t,{updir:e});if(!l.length)return[];const m=new Set,u=c()+Math.max(0,a);for(;;){const t=await Promise.all(l.map(async t=>[t,await o(t)]));for(const[e,a]of t)a&&m.add(e);if(m.size===l.length||c()>=u)break;await s(Math.min(Math.max(1,i),Math.max(1,u-c())))}return l.filter(t=>m.has(t))}

package/codex-mcp-http.mjs

@@ -1,131 +1 @@
-// Expose one bridge-owned, in-process MCP server to a Codex CLI child.
-// Claude's Agent SDK consumes createSdkMcpServer() directly; Codex is a
-// separate process and needs a transport. This private loopback endpoint keeps
-// the handlers in the bridge, preserving the same room registry and gates.
-import http from 'node:http'
-import { randomUUID } from 'node:crypto'
-import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js'
-
-export function withMcpSessionFactory(createSessionServer) {
-  if (typeof createSessionServer !== 'function') throw new TypeError('MCP session factory must be a function')
-  return Object.assign(createSessionServer(), { createSessionServer })
-}
-
-export async function startCodexMcpHttp({ sdkServer, host = '127.0.0.1' } = {}) {
-  const createSessionServer = sdkServer?.createSessionServer
-  const initialInstance = sdkServer?.instance
-  if (!initialInstance?.connect || typeof createSessionServer !== 'function') {
-    throw new TypeError('Codex MCP requires an SDK MCP server and createSessionServer factory')
-  }
-
-  const secretPath = `/mcp/${randomUUID()}`
-  // Stateful sessions are required: this SDK's stateless transport rejects the
-  // `notifications/initialized` POST sent by every MCP client. A transport is
-  // single-initialize, though, while Codex App Server -> exec fallback and Hermes
-  // crash recovery both start a new client against the same lane endpoint.
-  // Keep exactly one active child session per lane. A new initialize atomically
-  // retires the old server+transport before receiving its own isolated instance.
-  let active = null
-  let handoffChain = Promise.resolve()
-
-  const retireActive = () => {
-    const current = active
-    active = null
-    if (!current) return Promise.resolve()
-    // Detach first, then clean up in the background. In production an App
-    // Server MCP transport remained stuck in close while its watchdog fallback
-    // was already waiting to initialize `codex exec`; awaiting this cleanup
-    // consumed the replacement client's entire 30-second handshake budget.
-    return Promise.allSettled([
-      current.instance.close(),
-      current.transport.close(),
-    ])
-  }
-
-  const beginSession = async () => {
-    void retireActive()
-    const next = createSessionServer()
-    const instance = next?.instance
-    if (!instance?.connect) throw new TypeError('Codex MCP session factory did not return an SDK MCP server instance')
-    const transport = new StreamableHTTPServerTransport({ sessionIdGenerator: () => randomUUID() })
-    await instance.connect(transport)
-    active = { instance, transport }
-    return active
-  }
-
-  const serializeHandoff = (task) => {
-    const run = handoffChain.then(task, task)
-    handoffChain = run.catch(() => {})
-    return run
-  }
-
-  const server = http.createServer(async (req, res) => {
-    if (req.url !== secretPath) {
-      res.writeHead(404).end('not found')
-      return
-    }
-    try {
-      const sessionId = req.headers['mcp-session-id']
-      let target = active
-      if (!sessionId) {
-        if (req.method !== 'POST') {
-          res.writeHead(400).end('missing session')
-          return
-        }
-        // Serialize replacement initialize requests through their response
-        // boundary. This removes the window where two simultaneous children
-        // both observe no active session and orphan each other's transport.
-        await serializeHandoff(async () => {
-          target = await beginSession()
-          await target.transport.handleRequest(req, res)
-        })
-        return
-      } else if (!target?.transport?.sessionId || sessionId !== target.transport.sessionId) {
-        res.writeHead(404).end('session not found')
-        return
-      }
-      await target.transport.handleRequest(req, res)
-    } catch {
-      if (!res.headersSent) res.writeHead(500)
-      res.end()
-    }
-  })
-
-  try {
-    await new Promise((resolve, reject) => {
-      server.once('error', reject)
-      server.listen(0, host, resolve)
-    })
-  } catch (error) {
-    await retireActive()
-    throw error
-  }
-  const address = server.address()
-  const url = `http://${host}:${address.port}${secretPath}`
-
-  let closed = false
-  return {
-    url,
-    async handoff() {
-      if (closed) return
-      await serializeHandoff(async () => { void retireActive() })
-    },
-    async close() {
-      if (closed) return
-      closed = true
-      const closing = retireActive()
-      // A retired SDK server may itself be wedged. Closing the loopback listener
-      // must not keep the bridge process alive indefinitely on shutdown.
-      await Promise.allSettled([
-        Promise.race([
-          closing,
-          new Promise((resolve) => {
-            const timer = setTimeout(resolve, 1000)
-            timer.unref?.()
-          }),
-        ]),
-        new Promise((resolve) => server.close(resolve)),
-      ])
-    },
-  }
-}
+import e from"node:http";import{randomUUID as t}from"node:crypto";import{StreamableHTTPServerTransport as r}from"@modelcontextprotocol/sdk/server/streamableHttp.js";export function withMcpSessionFactory(e){if("function"!=typeof e)throw new TypeError("MCP session factory must be a function");return Object.assign(e(),{createSessionServer:e})}export async function startCodexMcpHttp({sdkServer:n,host:o="127.0.0.1"}={}){const s=n?.createSessionServer,a=n?.instance;if(!a?.connect||"function"!=typeof s)throw new TypeError("Codex MCP requires an SDK MCP server and createSessionServer factory");const i=`/mcp/${t()}`;let c=null,d=Promise.resolve();const l=()=>{const e=c;return c=null,e?Promise.allSettled([e.instance.close(),e.transport.close()]):Promise.resolve()},p=e=>{const t=d.then(e,e);return d=t.catch(()=>{}),t},u=e.createServer(async(e,n)=>{if(e.url===i)try{const o=e.headers["mcp-session-id"];let a=c;if(!o)return"POST"!==e.method?void n.writeHead(400).end("missing session"):void await p(async()=>{a=await(async()=>{l();const e=s(),n=e?.instance;if(!n?.connect)throw new TypeError("Codex MCP session factory did not return an SDK MCP server instance");const o=new r({sessionIdGenerator:()=>t()});return await n.connect(o),c={instance:n,transport:o},c})(),await a.transport.handleRequest(e,n)});if(!a?.transport?.sessionId||o!==a.transport.sessionId)return void n.writeHead(404).end("session not found");await a.transport.handleRequest(e,n)}catch{n.headersSent||n.writeHead(500),n.end()}else n.writeHead(404).end("not found")});try{await new Promise((e,t)=>{u.once("error",t),u.listen(0,o,e)})}catch(e){throw await l(),e}const f=u.address(),w=`http://${o}:${f.port}${i}`;let m=!1;return{url:w,async handoff(){m||await p(async()=>{l()})},async close(){if(m)return;m=!0;const e=l();await Promise.allSettled([Promise.race([e,new Promise(e=>{const t=setTimeout(e,1e3);t.unref?.()})]),new Promise(e=>u.close(e))])}}}