@luchenglong/cli-bridge 0.2.8 → 0.2.9

package/home-plugin/cli-bridge-indicator/lib/preset-declarations.mjs

@@ -19,13 +19,12 @@ import { dirname, join } from 'node:path'
 import { existsSync } from 'node:fs'
 import { fileURLToPath } from 'node:url'
 import { resolveScheduling } from '../../../core/scheduling.mjs'
-import { PROVIDER_IDS } from '../../../providers/registry.mjs'
+import { PROVIDER_IDS, PRESET_DIRS } from '../../../providers/registry.mjs'
 
 export const PKG_NAME = '@luchenglong/cli-bridge'
 
-// preset 目录名映射（与 scripts/build.mjs 的 PRESET_DIRS 一致；目录名带 -first 后缀是
+// preset 目录名映射：单一来源见 providers/registry.mjs 的 PRESET_DIRS（勿在此重复硬编码）。
 // 三个旧包时代的遗留布局，provider id 不带 —— 这里不映射就永远找不到 plugin-list）。
-const PRESET_DIRS = { agy: 'agy-first', codebuddy: 'codebuddy-first', mimo: 'mimo-first', opencode: 'opencode-first' }
 
 // 【成员预设】0.2.1 起 dsh-tool-subagent 的 config 不再接受 persona/toolFilter（apply()
 // 里显式 throw），角色人格只能作为独立 Agent Preset 存在、由委派行经 agentPreset 选择。

package/mcp/cli-bridge-mcp.mjs

@@ -28,13 +28,15 @@ import { resolveScheduling } from '../core/scheduling.mjs'
 import * as agyMcp from './providers/agy.mjs'
 import * as codebuddyMcp from './providers/codebuddy.mjs'
 import * as mimoMcp from './providers/mimo.mjs'
-import * as opencodeMcp from './providers/opencode.mjs'
+import * as opencodeMcp from './providers/opencode.mjs'
+import * as claudeMcp from './providers/claude.mjs'
+import * as codexMcp from './providers/codex.mjs'
 
 const SERVER_NAME = 'cli-bridge-mcp'
-const SERVER_VERSION = '0.2.8'
+const SERVER_VERSION = '0.2.9'
 const PROTOCOL = '2024-11-05'
 
-const PROVIDERS = [agyMcp, codebuddyMcp, mimoMcp, opencodeMcp]
+const PROVIDERS = [agyMcp, codebuddyMcp, mimoMcp, opencodeMcp, claudeMcp, codexMcp]
 
 function detectHomeDir() {
   if (process.env.DSH_HOME) return process.env.DSH_HOME

package/mcp/providers/claude.mjs

@@ -0,0 +1,231 @@
+// mcp/providers/claude.mjs — claude MCP 工具面（契约 §4）。
+// framing/生命周期归 keystone 统一服务器 mcp/cli-bridge-mcp.mjs。
+//
+// 与 opencode 面结构同构：直接 spawn claude（原生 exe 直接用；npm 的 .cmd 经 shell:true，
+// Windows 限制；.js/.mjs 目标经 process.execPath 包装，供测试 fixture 使用）。
+// 无 ctx.emit：状态走快照文件 {homeDir}/cli-bridge-mcp-claude.json（bridge-kit
+// buildMcpBridgePayload + 原子写 tmp→rename；写失败静默，绝不影响工具结果）。
+//
+// 工具名/schema 从描述符取（单一来源，防两处漂移），描述与 background 语义按 MCP 面重写：
+// MCP 没有 DSH jobs，background 参数在该形态无意义，故 schema 里裁掉。
+import { spawn as nodeSpawn } from 'node:child_process'
+import { readFileSync } from 'node:fs'
+import { resolve as resolvePath, dirname } from 'node:path'
+
+import defineProvider, { resolveExePrefix } from '../../providers/claude.mjs'
+import { splitExeSpec, quoteShellArg } from '../../providers/claude-exe.mjs'
+import { createStatusEngine, createLineStream, buildMcpBridgePayload, isLimited, renderStatus } from '../../core/bridge-kit.mjs'
+import { packageVersion } from '../version.mjs'
+
+export const meta = { id: 'claude', label: 'CLAUDE', version: packageVersion() }
+
+const SETTINGS_FILE_NAME = 'cli-bridge-settings.json'
+
+// 统一设置文件分区读（MCP 子进程无 ctx.get，只读 env/文件）—— 设置面板里的
+// binPath/defaultModel 在 MCP 形态同样生效（与 preset 行为一致）。
+function resolveSettingsFile(env) {
+  try {
+    if (env.CLI_BRIDGE_SETTINGS_FILE) return env.CLI_BRIDGE_SETTINGS_FILE
+    if (env.DSH_HOME) return resolvePath(env.DSH_HOME, SETTINGS_FILE_NAME)
+    if (process.platform === 'win32' && env.APPDATA) return resolvePath(env.APPDATA, 'DSH Desktop', 'dsh-home', SETTINGS_FILE_NAME)
+    if (env.HOME) return resolvePath(env.HOME, '.dsh', SETTINGS_FILE_NAME)
+  } catch (e) { }
+  return null
+}
+function readPartition(env) {
+  const p = resolveSettingsFile(env)
+  if (!p) return { partition: null, path: null, home: null }
+  try {
+    const all = JSON.parse(readFileSync(p, 'utf8'))
+    return { partition: (all && typeof all === 'object' && all.claude) ? all.claude : null, path: p, home: dirname(p) }
+  } catch (e) {
+    return { partition: null, path: p, home: dirname(p) }
+  }
+}
+
+const provider = defineProvider({
+  env: process.env,
+  process,
+  nodeChild: { spawn: nodeSpawn },
+  readSettings: () => readPartition(process.env)
+})
+
+let lastIo = null
+function publishSnapshot(snapshot) {
+  const io = lastIo
+  if (!io) return
+  try {
+    const target = io.path.join(io.homeDir, 'cli-bridge-mcp-claude.json')
+    const payload = buildMcpBridgePayload(snapshot, process.pid, Date.now())
+    const tmp = target + '.' + process.pid + '.tmp'
+    try { io.fs.mkdirSync(io.path.dirname(target), { recursive: true }) } catch (e) {}
+    io.fs.writeFileSync(tmp, JSON.stringify(payload), 'utf8')
+    io.fs.renameSync(tmp, target)
+  } catch (e) { /* 灯数据尽力而为，绝不影响工具调用 */ }
+}
+const engine = createStatusEngine({ provider, publish: publishSnapshot })
+provider.engine = engine
+
+function exePrefix() { return resolveExePrefix(process.env, '') }
+function resolveCwd(a) {
+  if (a && a.cwd) return resolvePath(String(a.cwd))
+  return process.env.CLAUDE_MCP_CWD || process.cwd()
+}
+
+// ── spawn（实时折叠走 bridge-kit 行流；.cmd 走 shell）─────────────────────────
+function runClaude(args) {
+  return new Promise((resolve) => {
+    const built = provider.buildArgv(exePrefix(), args, { planActive: false, defaultMode: 'auto' })
+    const cwd = resolveCwd(args)
+    const cmd = built.argv[0]
+    const argv = built.argv.slice(1)
+    const isShell = /\.(cmd|bat)$/i.test(cmd)
+    const spawnCmd = isShell ? [cmd].concat(argv).map(quoteShellArg).join(' ') : cmd
+    let child
+    try {
+      child = nodeSpawn(spawnCmd, isShell ? [] : argv, { cwd, stdio: ['ignore', 'pipe', 'pipe'], windowsHide: true, shell: isShell })
+    } catch (e) {
+      resolve({ ok: false, status: 'SPAWN_ERROR', response: '', sessionId: null, durationSeconds: null, numTurns: null, totalTokens: null, exitCode: null, mode: built.mode, backend: null, stderr: String(e && e.message || e) })
+      return
+    }
+    engine.begin(cwd)
+    let out = ''
+    let err = ''
+    let killed = false
+    const timer = setTimeout(() => { killed = true; try { child.kill() } catch (e) {} }, (built.timeoutSec + 60) * 1000)
+    const stream = createLineStream((ln) => {
+      const t = ln.trim()
+      if (!t.startsWith('{')) return
+      try { engine.foldEvent(JSON.parse(t), cwd) } catch (e) {}
+    })
+    child.stdout.on('data', (d) => {
+      out += d
+      if (out.length > 4000000) out = out.slice(-2000000)
+      stream.pushChunk(String(d))
+    })
+    child.stderr.on('data', (d) => { err += d; if (err.length > 1000000) err = err.slice(-500000) })
+    child.on('error', (e) => {
+      clearTimeout(timer)
+      stream.flush()
+      const res = { ok: false, status: 'CLAUDE_UNAVAILABLE', response: '', sessionId: null, durationSeconds: null, numTurns: null, totalTokens: null, exitCode: null, mode: built.mode, backend: null, stderr: 'claude spawn failed: ' + String(e && e.message || e) }
+      engine.end(res, cwd)
+      resolve(res)
+    })
+    child.on('close', (code) => {
+      clearTimeout(timer)
+      stream.flush()
+      const outcome = { exitCode: killed ? 124 : code }
+      let res = provider.buildResult(provider.parseJson(out), outcome, built.mode, err, out, null)
+      if (killed && !res.ok) {
+        res.status = 'HUNG_TIMEOUT'
+        res.stderr = (res.stderr ? res.stderr + ' ' : '') + '[killed by DSH timeout guard after ' + built.timeoutSec + 's; if this was a long-running task raise timeoutSec]'
+      }
+      engine.end(res, cwd)
+      resolve(res)
+    })
+  })
+}
+
+function textResult(res) {
+  const head = 'claude ' + (res.ok ? 'OK' : 'FAILED') + ' [status=' + res.status +
+    (res.sessionId ? ' session=' + res.sessionId : '') +
+    (res.modelUsed ? ' model=' + res.modelUsed : '') +
+    (res.durationSeconds != null ? ' ' + res.durationSeconds + 's' : '') + ']'
+  let note = ''
+  if (!res.ok && isLimited(res)) note = '\n\n[Note: this looks like a rate-limit / network failure. Do NOT retry claude in a loop; finish the task with your own tools, or ask the user.]'
+  const hint = provider.failureHint(res)
+  const body = res.response || (res.stderr ? '[stderr] ' + res.stderr : (res.rawStdout ? '[raw] ' + res.rawStdout : ''))
+  return head + (body ? '\n\n' + body : '') + (hint ? '\n\n' + hint : '') + note
+}
+
+// ── 工具面 ────────────────────────────────────────────────────────────────────
+function mcpSchema(name) {
+  const src = provider.tools[name].inputSchema
+  const clone = JSON.parse(JSON.stringify(src))
+  if (clone.properties) delete clone.properties.background
+  return clone
+}
+
+export function tools(env) {
+  const d = provider.tools
+  return [
+    {
+      name: d.run.name,
+      description: 'Dispatch a coding/build/debug/investigation task to the local Claude Code CLI and return its final answer. claude runs fully non-interactively (permissions approved, never blocks on a prompt) and streams live steps. Prefer it for implementation, multi-file edits, refactors and debugging; use your own tools for quick read-only lookups and final build/test verification. While it runs, call claude_status to watch what claude is doing live.',
+      inputSchema: mcpSchema('run')
+    },
+    {
+      name: d.continue.name,
+      description: 'Continue an existing claude session with a follow-up prompt, reusing claude context (passes --resume <sessionId>, or --continue with latest=true).',
+      inputSchema: mcpSchema('continue')
+    },
+    {
+      name: d.status.name,
+      description: 'Read a live snapshot of what the local claude agent is currently doing. Returns one section per project (working directory): running count, the current step (tool name + arguments being executed, or agent_response thinking/typing), the recent step trail, and the last completed run status + session id. Optional cwd filters to a single project.',
+      inputSchema: JSON.parse(JSON.stringify(d.status.inputSchema))
+    },
+    {
+      name: 'claude_models',
+      description: 'List the models the current claude account/endpoint really supports, read LIVE from the server (probes it once with a deliberately invalid model id and parses the "The supported API model names are …" answer). Use it to pick a model before claude_run. Returns ok:false with an actionable error when no live roster can be read — it never invents a list and never presents ANTHROPIC_*_MODEL aliases as the usable set.',
+      inputSchema: (function () {
+        const et = (provider.extraTools || [])[0]
+        return JSON.parse(JSON.stringify(et ? et.inputSchema : { type: 'object', properties: {} }))
+      })()
+    }
+  ]
+}
+
+export async function call(name, args, io) {
+  if (io) lastIo = io
+  if (!lastIo) return 'claude error: MCP io not initialized'
+  const a = args || {}
+  if (name === 'claude_status') {
+    const snap = engine.statusSnapshot()
+    if (a.cwd) {
+      snap.projects = snap.projects.filter((p) => p.cwd === String(a.cwd))
+      const g = snap.projects[0]
+      if (g) Object.assign(snap, { state: g.state, running: g.running, current: g.current, trail: g.trail, lastStatus: g.lastStatus, lastAt: g.lastAt, lastSessionId: g.lastSessionId, lastBackend: g.lastBackend, fallbackActive: g.fallbackActive, updatedAt: g.updatedAt })
+    }
+    return renderStatus(snap, provider)[0].text
+  }
+  if (name === 'claude_models') {
+    const et = (provider.extraTools || [])[0]
+    const res = await provider.listModels(a)
+    if (et && typeof et.render === 'function') return et.render(a, res)[0].text
+    return res.ok ? 'claude models: ' + res.models.map((m) => m.id).join(', ') : 'claude_models failed: ' + String(res.error || 'unknown')
+  }
+  if (!a.prompt || !String(a.prompt).trim()) return 'claude error: prompt is required'
+  const mapped = Object.assign({}, a)
+  if (name === 'claude_continue') {
+    if (!mapped.sessionId && mapped.latest) mapped.continueLatest = true
+  }
+  const res = await runClaude(mapped)
+  return textResult(res)
+}
+
+export function check(env) {
+  const ts = tools(env)
+  const names = ts.map((t) => t.name)
+  for (const req of ['claude_run', 'claude_continue', 'claude_status', 'claude_models']) {
+    if (names.indexOf(req) < 0) throw new Error('claude mcp: missing tool ' + req)
+  }
+  for (const t of ts) {
+    if (!t.name || !t.description || !t.inputSchema || t.inputSchema.type !== 'object') throw new Error('claude mcp: bad tool def ' + JSON.stringify(t && t.name))
+  }
+  // MCP 面必须覆盖 descriptor 三件套（名字同源，提示词连续性红线）。
+  for (const k of ['run', 'continue', 'status']) {
+    if (names.indexOf(provider.tools[k].name) < 0) throw new Error('claude mcp: tools surface missing descriptor name ' + provider.tools[k].name)
+  }
+  // background 在 MCP 形态无 jobs 语义 → 必须裁掉（防止智能体误以为可后台派发丢结果）。
+  if (ts[0].inputSchema.properties && ts[0].inputSchema.properties.background) throw new Error('claude mcp: run schema must not advertise background')
+  // argv 契约漂移锁（实测 Claude Code 2.0.76 的 flag 集）。
+  const b = provider.buildArgv(['claude'], { prompt: 'x' }, { planActive: false })
+  for (const f of ['-p', 'x', '--output-format', 'stream-json', '--verbose', '--dangerously-skip-permissions']) {
+    if (b.argv.indexOf(f) < 0) throw new Error('claude mcp: argv contract drift: ' + f)
+  }
+  const b2 = provider.buildArgv(['claude'], { prompt: 'x', mode: 'plan' }, {})
+  if (b2.argv.indexOf('--permission-mode') < 0 || b2.argv.indexOf('plan') < 0) throw new Error('claude mcp: plan mode must pass --permission-mode plan')
+  const b3 = provider.buildArgv(['claude'], { prompt: 'x', sessionId: 'sid-1' }, {})
+  if (b3.argv.indexOf('--resume') < 0 || b3.argv.indexOf('sid-1') < 0) throw new Error('claude mcp: resume must pass --resume <id>')
+  return true
+}

package/mcp/providers/codex.mjs

@@ -0,0 +1,239 @@
+// mcp/providers/codex.mjs — codex MCP 工具面（契约 §4）。
+// framing/生命周期归 keystone 统一服务器 mcp/cli-bridge-mcp.mjs。
+//
+// 与 opencode/agy 面结构同构：直接 spawn codex（CODEX_BIN 覆盖；.js/.mjs 目标经
+// process.execPath 包装，供测试夹具使用）。无 ctx.emit：状态走快照文件
+// {homeDir}/cli-bridge-mcp-codex.json（bridge-kit buildMcpBridgePayload + 原子写 tmp→rename）。
+//
+// codex 面的两处特有事实（实测 codex-cli 0.98.0）：
+//   • 续聊走 `codex exec resume <thread_id> <prompt>`，且 resume **不接受 -C/-s/-o/-add-dir**；
+//     所以 cwd 只由 spawn 的 cwd 决定，argv 里的沙箱经 -c sandbox_mode 落地。
+//   • 模型清单没有 CLI 子命令，只能走 HTTP /models（descriptor 的 codex_models 负责），
+//     这里只做工具面转接，不复制解析逻辑。
+import { spawn as nodeSpawn } from 'node:child_process'
+import { resolve as resolvePath } from 'node:path'
+import { readFileSync } from 'node:fs'
+import { dirname } from 'node:path'
+
+import defineProvider, { codexResolveExePrefix, codexExeCandidates } from '../../providers/codex.mjs'
+import { codexShimRejectReason } from '../../providers/codex-cli.mjs'
+import { createStatusEngine, createLineStream, buildMcpBridgePayload, isLimited, renderStatus } from '../../core/bridge-kit.mjs'
+import { packageVersion } from '../version.mjs'
+
+export const meta = { id: 'codex', label: 'CODEX', version: packageVersion() }
+
+// ── 统一设置文件分区读（MCP 子进程无 ctx.get，只读 env/文件）───────────────────
+// 与 opencode/mimo 面同规则：注入 descriptor 的 readSettings，使面板里指定的
+// binPath/defaultModel/sandboxMode 在 MCP 形态同样生效（三形态行为一致）。
+const SETTINGS_FILE_NAME = 'cli-bridge-settings.json'
+
+function resolveSettingsFile(env) {
+  try {
+    if (env.CLI_BRIDGE_SETTINGS_FILE) return env.CLI_BRIDGE_SETTINGS_FILE
+    if (env.DSH_HOME) return resolvePath(env.DSH_HOME, SETTINGS_FILE_NAME)
+    if (process.platform === 'win32' && env.APPDATA) return resolvePath(env.APPDATA, 'DSH Desktop', 'dsh-home', SETTINGS_FILE_NAME)
+    if (env.HOME) return resolvePath(env.HOME, '.dsh', SETTINGS_FILE_NAME)
+  } catch (e) { /* 无 env 能力 */ }
+  return null
+}
+
+function readPartition(env) {
+  const p = resolveSettingsFile(env)
+  if (!p) return { partition: null, path: null, home: null }
+  try {
+    const all = JSON.parse(readFileSync(p, 'utf8'))
+    return { partition: (all && typeof all === 'object' && all.codex) ? all.codex : null, path: p, home: dirname(p) }
+  } catch (e) {
+    return { partition: null, path: p, home: dirname(p) }
+  }
+}
+
+const provider = defineProvider({
+  env: process.env,
+  process,
+  nodeChild: { spawn: nodeSpawn },
+  readSettings: () => readPartition(process.env)
+})
+
+let lastIo = null
+function publishSnapshot(snapshot) {
+  const io = lastIo
+  if (!io) return
+  try {
+    const target = io.path.join(io.homeDir, 'cli-bridge-mcp-codex.json')
+    const payload = buildMcpBridgePayload(snapshot, process.pid, Date.now())
+    const tmp = target + '.' + process.pid + '.tmp'
+    try { io.fs.mkdirSync(io.path.dirname(target), { recursive: true }) } catch (e) { /* 目录已存在 */ }
+    io.fs.writeFileSync(tmp, JSON.stringify(payload), 'utf8')
+    io.fs.renameSync(tmp, target)
+  } catch (e) { /* 灯数据尽力而为，绝不影响工具调用 */ }
+}
+
+// provider.engine 在 attach 后才存在；MCP 形态不 attach，用本模块的 engine。
+const engine = createStatusEngine({ provider, publish: publishSnapshot })
+provider.engine = engine
+
+// ── exe / cwd 解析 ────────────────────────────────────────────────────────────
+function exePrefix() {
+  return codexResolveExePrefix(process.env, '')
+}
+
+function resolveCwd(a) {
+  if (a && a.cwd) return resolvePath(String(a.cwd))
+  return process.env.CODEX_BRIDGE_CWD || process.cwd()
+}
+
+function baseResult(over) {
+  return Object.assign({
+    ok: false, status: 'ERROR', response: '', sessionId: null, durationSeconds: null,
+    numTurns: null, totalTokens: null, exitCode: null, mode: 'auto', backend: null, stderr: ''
+  }, over)
+}
+
+// ── spawn（实时折叠走 bridge-kit 行流）────────────────────────────────────────
+function runCodex(args) {
+  return new Promise((resolve) => {
+    const a = args || {}
+    const built = provider.buildArgv(exePrefix(), a, { planActive: false, defaultMode: 'auto' })
+    const cwd = resolveCwd(a)
+    // .cmd/.bat shim：无 shell 的 spawn 解析不了它，走 shell 会二次解释 prompt。
+    const shim = codexShimRejectReason(built.argv[0]) || codexShimRejectReason(built.argv[1])
+    if (shim) {
+      const res = baseResult({ status: 'CODEX_UNAVAILABLE', mode: built.mode, stderr: shim })
+      engine.begin(cwd); engine.end(res, cwd)
+      resolve(res)
+      return
+    }
+    let child
+    try {
+      child = nodeSpawn(built.argv[0], built.argv.slice(1), { cwd, stdio: ['ignore', 'pipe', 'pipe'], windowsHide: true })
+    } catch (e) {
+      resolve(baseResult({ status: 'SPAWN_ERROR', mode: built.mode, stderr: String(e && e.message || e) }))
+      return
+    }
+    engine.begin(cwd)
+    let out = ''
+    let err = ''
+    let killed = false
+    const timer = setTimeout(() => { killed = true; try { child.kill() } catch (e) { /* 已退出 */ } }, (built.timeoutSec + 60) * 1000)
+    const stream = createLineStream((ln) => {
+      const t = ln.trim()
+      if (t.charAt(0) !== '{') return
+      try { engine.foldEvent(JSON.parse(t), cwd) } catch (e) { /* 坏行跳过 */ }
+    })
+    child.stdout.on('data', (d) => {
+      out += d
+      if (out.length > 4000000) out = out.slice(-2000000)
+      stream.pushChunk(String(d))
+    })
+    child.stderr.on('data', (d) => { err += d; if (err.length > 1000000) err = err.slice(-500000) })
+    child.on('error', (e) => {
+      clearTimeout(timer)
+      stream.flush()
+      const res = baseResult({ status: 'CODEX_UNAVAILABLE', mode: built.mode, stderr: 'codex spawn failed: ' + String(e && e.message || e) })
+      engine.end(res, cwd)
+      resolve(res)
+    })
+    child.on('close', (code) => {
+      clearTimeout(timer)
+      stream.flush()
+      const outcome = { exitCode: killed ? 124 : code }
+      let res = provider.buildResult(provider.parseJson(out), outcome, built.mode, err, out, null)
+      if (killed && !res.ok) {
+        res.status = 'HUNG_TIMEOUT'
+        res.stderr = (res.stderr ? res.stderr + ' ' : '') + '[killed by DSH timeout guard after ' + built.timeoutSec + 's; if this was a long-running script (build/test) raise timeoutSec]'
+      }
+      engine.end(res, cwd)
+      resolve(res)
+    })
+  })
+}
+
+function textResult(res) {
+  if (res.fallback) {
+    return 'codex unavailable (' + res.reason + '). Use native tools / the local model for this task; do not retry codex.'
+  }
+  const limited = !res.ok && isLimited(res)
+  const head = 'codex ' + (res.ok ? 'OK' : 'FAILED') + ' [status=' + res.status +
+    (res.sessionId ? ' session=' + res.sessionId : '') +
+    (res.totalTokens != null ? ' tokens=' + res.totalTokens : '') + ']'
+  const hint = typeof provider.failureHint === 'function' ? provider.failureHint(res) : ''
+  let note = ''
+  if (limited) note = '\n\n[Note: this looks like a rate-limit / network failure. Do NOT retry codex in a loop; finish the task with your own tools, or ask the user.]'
+  const body = res.response || (res.stderr ? '[stderr] ' + res.stderr : (res.rawStdout ? '[raw] ' + res.rawStdout : ''))
+  return head + (body ? '\n\n' + body : '') + (hint ? '\n\n' + hint : '') + note
+}
+
+// ── 工具面（与描述符同源：名字/schema 一律从 descriptor 取，禁止第二份定义）──────
+function toolList(env) {
+  const d = provider.tools
+  const extra = provider.extraTools || []
+  return [d.run, d.continue, d.status].concat(extra.map((t) => ({ name: t.name, description: t.description, inputSchema: t.inputSchema })))
+    .map((t) => Object.assign({}, t))
+}
+
+export function tools(env) {
+  return toolList(env)
+}
+
+export async function call(name, args, io) {
+  if (io) lastIo = io
+  if (!lastIo) return 'codex error: MCP io not initialized'
+  const a = args || {}
+  const d = provider.tools
+  if (name === d.status.name) {
+    const snap = provider.statusToolLogic(a)
+    if (a.cwd) {
+      // statusToolLogic 已经按 cwd 过滤并升格顶层字段，这里直接渲染。
+    }
+    return renderStatus(snap, provider)[0].text
+  }
+  if (name === (provider.extraTools[0] && provider.extraTools[0].name)) {
+    const res = await provider.extraTools[0].logic(a)
+    const rendered = provider.extraTools[0].render(a, res)
+    return rendered[0].text
+  }
+  if (!a.prompt || !String(a.prompt).trim()) return 'codex error: prompt is required'
+  const mapped = Object.assign({}, a)
+  if (name === d.continue.name) {
+    // continue 的会话语义：sessionId 优先，否则 latest → exec resume --last。
+    if (!mapped.sessionId && mapped.latest) mapped.continueLatest = true
+  }
+  const res = await runCodex(mapped)
+  return textResult(res)
+}
+
+export function check(env) {
+  const ts = tools(env)
+  const names = ts.map((t) => t.name)
+  for (const t of ts) {
+    if (!t.name || !t.description || !t.inputSchema || t.inputSchema.type !== 'object') throw new Error('codex mcp: bad tool def ' + JSON.stringify(t && t.name))
+  }
+  // MCP 面必须覆盖 descriptor 三件套（名字一致，提示词连续性红线）。
+  for (const k of ['run', 'continue', 'status']) {
+    if (!names.includes(provider.tools[k].name)) throw new Error('codex mcp: tools surface missing descriptor name ' + provider.tools[k].name)
+  }
+  // argv 契约漂移锁（实测 codex-cli 0.98.0 的旗集）。
+  const b = provider.buildArgv(['codex'], { prompt: 'x' }, { planActive: false })
+  for (const f of ['exec', '--json', '--skip-git-repo-check']) {
+    if (b.argv.indexOf(f) < 0) throw new Error('codex mcp: argv contract drift: ' + f)
+  }
+  // ⚠️ codex exec 没有 -a；出现即参数错误（实测 clap: unexpected argument '-a'）。
+  if (b.argv.indexOf('-a') >= 0 || b.argv.indexOf('--ask-for-approval') >= 0) throw new Error('codex mcp: codex exec rejects -a/--ask-for-approval; use -c approval_policy')
+  // resume 子命令不接受 -C/-s/-L：argv 必须改成 -c sandbox_mode。
+  const r = provider.buildArgv(['codex'], { prompt: 'x', sessionId: 'sid-1' }, { planActive: false })
+  for (const f of ['resume', 'sid-1', '--json']) {
+    if (r.argv.indexOf(f) < 0) throw new Error('codex mcp: resume argv contract drift: ' + f)
+  }
+  for (const f of ['-C', '-s', '--add-dir']) {
+    if (r.argv.indexOf(f) >= 0) throw new Error('codex mcp: resume must not emit ' + f + ' (codex exec resume rejects it)')
+  }
+  if (r.argv.indexOf('-c') < 0 || String(r.argv[r.argv.indexOf('-c') + 1] || '').indexOf('sandbox_mode=') < 0) {
+    throw new Error('codex mcp: resume must set the sandbox through -c sandbox_mode')
+  }
+  // 模型清单在 MCP 面必须点名真实端点而非本地目录（红线：不把本地目录冒充实时）。
+  const mt = ts.find((t) => /_models$/.test(t.name))
+  if (!mt) throw new Error('codex mcp: missing codex_models tool')
+  if (!/live/.test(String(mt.description))) throw new Error('codex mcp: codex_models must document the live source')
+  return true
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@luchenglong/cli-bridge",
-  "version": "0.2.8",
-  "description": "CLI Bridge for DeepSeek Harness (DSH): one package bridging four local coding-CLI agents — agy (Google Antigravity CLI), Tencent CodeBuddy Code, Xiaomi MiMo (MiMoCode / MiMo Desktop), and OpenCode. Each provider keeps its own agent preset (cordis-agy / codebuddy-first / cordis-mimo / opencode-first), tools (agy_run / codebuddy_run / mimo_run / opencode_run + continue + status), rate-limit/network fallback dialog, and zero-dependency MCP server, unified under a single home-level status light, one settings file, and one bundle patch. Merges agy-first-bridge, codebuddy-first-bridge and mimo-first-bridge.",
+  "version": "0.2.9",
+  "description": "CLI Bridge for DeepSeek Harness (DSH): one package bridging six local coding-CLI agents — agy (Google Antigravity CLI), Tencent CodeBuddy Code, Xiaomi MiMo (MiMoCode), OpenCode, Claude Code, and OpenAI Codex CLI. Each provider keeps its own agent preset (cordis-agy / codebuddy-first / cordis-mimo / opencode-first / claude-first / codex-first), tools (<id>_run / <id>_continue / <id>_status, plus per-provider model listing), rate-limit/network fallback dialog, and zero-dependency MCP server, unified under a single home-level status light, one settings file, and one bundle patch. Merges agy-first-bridge, codebuddy-first-bridge and mimo-first-bridge.",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -20,10 +20,14 @@
     "./providers/codebuddy": "./providers/codebuddy.mjs",
     "./providers/mimo": "./providers/mimo.mjs",
     "./providers/opencode": "./providers/opencode.mjs",
+    "./providers/claude": "./providers/claude.mjs",
+    "./providers/codex": "./providers/codex.mjs",
     "./preset-agy": "./preset/agy-first/cli-bridge.mjs",
     "./preset-codebuddy": "./preset/codebuddy-first/cli-bridge.mjs",
     "./preset-mimo": "./preset/mimo-first/cli-bridge.mjs",
     "./preset-opencode": "./preset/opencode-first/cli-bridge.mjs",
+    "./preset-claude": "./preset/claude-first/cli-bridge.mjs",
+    "./preset-codex": "./preset/codex-first/cli-bridge.mjs",
     "./package.json": "./package.json"
   },
   "dsh": {