@raysonmeng/agentbridge 0.1.8 → 0.1.10

package/.claude-plugin/marketplace.json

@@ -12,7 +12,7 @@
     {
       "name": "agentbridge",
       "description": "Bridge Claude Code and Codex through a shared daemon, push channel delivery, and reply/get_messages tools.",
-      "version": "0.1.8",
+      "version": "0.1.10",
       "author": {
         "name": "AgentBridge Contributors",
         "email": "raysonmeng@qq.com"

package/README.md

@@ -155,8 +155,9 @@ After modifying AgentBridge source code, re-run `agentbridge dev` to sync change
 | Command | Description |
 |---------|-------------|
 | `abg init` | Install plugin, check dependencies (bun/claude/codex), generate `.agentbridge/config.json` |
-| `abg claude [args...]` | Start Claude Code with push channel enabled. Clears any killed sentinel from a previous `kill`. Pass-through args are forwarded to `claude` |
-| `abg codex [args...]` | Start Codex TUI connected to AgentBridge daemon. **Bare `abg codex` auto-resumes the pair's last thread; use `abg codex --new` for a fresh thread.** Manages TUI process lifecycle (pid tracking, cleanup). Pass-through args forwarded to `codex` |
+| `abg claude [args...]` | Start Claude Code with push channel enabled. **Runs with `--dangerously-skip-permissions` by default** (opt out: `--safe` or `AGENTBRIDGE_SAFE=1`). Clears any killed sentinel from a previous `kill`. Pass-through args are forwarded to `claude` |
+| `abg codex [args...]` | Start Codex TUI connected to AgentBridge daemon. **Bare `abg codex` auto-resumes the pair's last thread; use `abg codex --new` for a fresh thread. TUI launches run with `--yolo` by default** (opt out: `--safe` or `AGENTBRIDGE_SAFE=1`; non-TUI subcommands like `exec` are never touched). Manages TUI process lifecycle (pid tracking, cleanup). Pass-through args forwarded to `codex` |
+| `abg resume [claude\|codex]` | No target: print the resume commands for this directory's last Claude Code session and this pair's current Codex thread. With a target: resume that side directly (delegates to `abg claude --resume <id>` / `abg codex resume-current`) |
 | `abg pairs` | List registered pairs; `abg pairs rm <name\|id>` removes one, `abg pairs prune` deletes orphan state dirs |
 | `abg doctor [--json]` | Read-only diagnosis: env, daemon health/readiness, build drift, artifact alignment, TUI attachment, logs |
 | `abg budget [--json]` | Both agents' subscription quota snapshot (5h/weekly windows, drift, pause state) |
@@ -165,7 +166,7 @@ After modifying AgentBridge source code, re-run `agentbridge dev` to sync change
 | `abg --help` | Show help |
 | `abg --version` | Show version |
 
-The pair-aware commands (`claude`, `codex`, `kill`, `doctor`, `budget`) accept `--pair <name>` to target a specific pair — one pair per project directory by default, with ports allocated per pair in +10 strides from 4500.
+The pair-aware commands (`claude`, `codex`, `resume`, `kill`, `doctor`, `budget`) accept `--pair <name>` to target a specific pair — one pair per project directory by default, with ports allocated per pair in +10 strides from 4500.
 
 ### Owned flags
 
@@ -173,6 +174,7 @@ Some flags are automatically injected and cannot be manually specified:
 
 - `agentbridge claude` owns: `--channels`, `--dangerously-load-development-channels`
 - `agentbridge codex` owns: `--remote`, `--enable tui_app_server`
+- Both launchers consume the wrapper flag `--safe` (it is never forwarded): it disables the max-permission defaults for that launch. The defaults are also auto-suppressed when you pass any explicit permission flag yourself (`-a`/`--ask-for-approval`/`-s`/`--sandbox` for codex; `--permission-mode`/`--allow-dangerously-skip-permissions` for claude) — injecting `--yolo` next to an explicit approval policy is a hard codex CLI conflict.
 
 Passing these flags manually will result in a hard error with guidance to use the native command directly.
 

package/dist/cli.js

@@ -120,7 +120,7 @@ function parsePositiveIntEnv(name, fallback, log = () => {}, env = process.env)
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@raysonmeng/agentbridge",
-    version: "0.1.8",
+    version: "0.1.10",
     description: "Bridge between Claude Code and Codex \u2014 bidirectional agent communication via MCP Channel + JSON-RPC",
     type: "module",
     packageManager: "bun@1.3.11",
@@ -1165,8 +1165,8 @@ function formatBuildInfo(build) {
 var BUILD_INFO;
 var init_build_info = __esm(() => {
   BUILD_INFO = Object.freeze({
-    version: defineString("0.1.8", "0.0.0-source"),
-    commit: defineString("c80a7fd", "source"),
+    version: defineString("0.1.10", "0.0.0-source"),
+    commit: defineString("51a44cb", "source"),
     bundle: defineBundle("dist"),
     contractVersion: defineNumber(1, CONTRACT_VERSION)
   });
@@ -2441,6 +2441,46 @@ var init_trace_log = __esm(() => {
   RELEVANT_ENV_RE = /^(AGENTBRIDGE_|CODEX_)/;
 });
 
+// src/cli/max-permissions.ts
+function planMaxPermissions(args, suppressors, env = process.env) {
+  let safeFlag = false;
+  const rest = [];
+  for (const a of args) {
+    if (a === "--safe") {
+      safeFlag = true;
+      continue;
+    }
+    rest.push(a);
+  }
+  const safeMode = safeFlag || env.AGENTBRIDGE_SAFE === "1";
+  const userExpressedPreference = rest.some((a) => suppressors.some((s) => matchesSuppressor(a, s)));
+  return { args: rest, inject: !safeMode && !userExpressedPreference, safeMode };
+}
+function matchesSuppressor(token, suppressor) {
+  if (token === suppressor || token.startsWith(`${suppressor}=`))
+    return true;
+  if (/^-[A-Za-z]$/.test(suppressor) && !token.startsWith("--") && token.startsWith(suppressor) && token.length > suppressor.length) {
+    return true;
+  }
+  return false;
+}
+var CLAUDE_MAX_PERMISSION_FLAG = "--dangerously-skip-permissions", CLAUDE_MAX_PERMISSION_SUPPRESSORS, CODEX_MAX_PERMISSION_FLAG = "--yolo", CODEX_MAX_PERMISSION_SUPPRESSORS;
+var init_max_permissions = __esm(() => {
+  CLAUDE_MAX_PERMISSION_SUPPRESSORS = [
+    CLAUDE_MAX_PERMISSION_FLAG,
+    "--allow-dangerously-skip-permissions",
+    "--permission-mode"
+  ];
+  CODEX_MAX_PERMISSION_SUPPRESSORS = [
+    CODEX_MAX_PERMISSION_FLAG,
+    "--dangerously-bypass-approvals-and-sandbox",
+    "-a",
+    "--ask-for-approval",
+    "-s",
+    "--sandbox"
+  ];
+});
+
 // src/cli/claude.ts
 var exports_claude = {};
 __export(exports_claude, {
@@ -2457,7 +2497,9 @@ async function runClaude(args) {
     allowStrict: true,
     log: (msg) => console.error(msg)
   });
-  const { pairFlag, rest } = parsePairFlag(args);
+  const { pairFlag, rest: pairRest } = parsePairFlag(args);
+  const permissionPlan = planMaxPermissions(pairRest, CLAUDE_MAX_PERMISSION_SUPPRESSORS);
+  const rest = permissionPlan.args;
   checkOwnedFlagConflicts(rest, "agentbridge claude", OWNED_FLAGS);
   let pair;
   try {
@@ -2484,9 +2526,13 @@ async function runClaude(args) {
   await assertPairNotLive(lifecycle, pair);
   lifecycle.clearKilled();
   const channelEntry = `plugin:${PLUGIN_NAME}@${MARKETPLACE_NAME}`;
+  if (permissionPlan.inject) {
+    console.error(`[agentbridge] running with ${CLAUDE_MAX_PERMISSION_FLAG} (default; opt out with --safe or AGENTBRIDGE_SAFE=1)`);
+  }
   const fullArgs = [
     "--dangerously-load-development-channels",
     channelEntry,
+    ...permissionPlan.inject ? [CLAUDE_MAX_PERMISSION_FLAG] : [],
     ...rest
   ];
   const child = spawn2("claude", fullArgs, {
@@ -2588,6 +2634,7 @@ var init_claude = __esm(() => {
   init_env_guard();
   init_pair_resolver();
   init_trace_log();
+  init_max_permissions();
   OWNED_FLAGS = ["--channels", "--dangerously-load-development-channels"];
 });
 
@@ -3145,8 +3192,14 @@ function resolveCodexResumeArgs(parsed, pair, env = process.env) {
   }
   return { rest: parsed.rest, mode: "passthrough" };
 }
-function buildCodexArgs(userArgs, proxyUrl) {
-  const bridgeFlags = ["--enable", "tui_app_server", "--remote", proxyUrl];
+function buildCodexArgs(userArgs, proxyUrl, opts = {}) {
+  const bridgeFlags = [
+    "--enable",
+    "tui_app_server",
+    "--remote",
+    proxyUrl,
+    ...opts.yolo ? [CODEX_MAX_PERMISSION_FLAG] : []
+  ];
   const first = userArgs[0];
   if (!first || first.startsWith("-")) {
     return { fullArgs: [...bridgeFlags, ...userArgs], injectedBridgeFlags: true };
@@ -3172,7 +3225,8 @@ async function runCodex(args) {
     log: (msg) => console.error(msg)
   });
   const { pairFlag, rest } = parsePairFlag(args);
-  const wrapperArgs = parseAgentBridgeCodexArgs(rest);
+  const permissionPlan = planMaxPermissions(rest, CODEX_MAX_PERMISSION_SUPPRESSORS);
+  const wrapperArgs = parseAgentBridgeCodexArgs(permissionPlan.args);
   const agentsContract = checkAgentsMdContract(process.cwd());
   if (!agentsContract.fresh) {
     console.error(`[agentbridge] ${agentsContract.message}`);
@@ -3297,7 +3351,12 @@ async function runCodex(args) {
   if (resumeArgs.mode === "auto-resume" || resumeArgs.mode === "resume-current") {
     console.error(`[agentbridge] Resuming current Codex thread ${resumeArgs.thread.threadId}`);
   }
-  const { fullArgs } = buildCodexArgs(resumeArgs.rest, proxyUrl);
+  const { fullArgs, injectedBridgeFlags } = buildCodexArgs(resumeArgs.rest, proxyUrl, {
+    yolo: permissionPlan.inject
+  });
+  if (permissionPlan.inject && injectedBridgeFlags) {
+    console.error(`[agentbridge] running with ${CODEX_MAX_PERMISSION_FLAG} (default; opt out with --safe or AGENTBRIDGE_SAFE=1)`);
+  }
   const stderrTail = new StderrRingBuffer;
   const wrapperLogPath = stateDir.codexWrapperLogFile;
   const startedAt = Date.now();
@@ -3550,6 +3609,7 @@ var init_codex = __esm(() => {
   init_trace_log();
   init_process_lifecycle();
   init_claude();
+  init_max_permissions();
   OWNED_FLAGS2 = ["--remote"];
   TUI_SUBCOMMANDS = new Set(["resume", "fork"]);
   NON_TUI_SUBCOMMANDS = new Set([
@@ -3577,6 +3637,130 @@ var init_codex = __esm(() => {
   ]);
 });
 
+// src/claude-session.ts
+import { readdirSync as readdirSync4, statSync as statSync5 } from "fs";
+import { homedir as homedir5 } from "os";
+import { join as join12 } from "path";
+function encodeClaudeProjectDir(cwd) {
+  return cwd.replace(/[^a-zA-Z0-9]/g, "-");
+}
+function findLatestClaudeSession(cwd, claudeHome = process.env.CLAUDE_CONFIG_DIR || join12(homedir5(), ".claude")) {
+  const dir = join12(claudeHome, "projects", encodeClaudeProjectDir(cwd));
+  let entries;
+  try {
+    entries = readdirSync4(dir);
+  } catch {
+    return null;
+  }
+  let best = null;
+  for (const name of entries) {
+    if (!name.endsWith(".jsonl"))
+      continue;
+    const sessionId = name.slice(0, -".jsonl".length);
+    if (!SESSION_ID_PATTERN.test(sessionId))
+      continue;
+    const file = join12(dir, name);
+    let mtimeMs;
+    try {
+      const st = statSync5(file);
+      if (!st.isFile())
+        continue;
+      mtimeMs = st.mtimeMs;
+    } catch {
+      continue;
+    }
+    if (!best || mtimeMs > best.mtimeMs) {
+      best = { sessionId, file, mtimeMs };
+    }
+  }
+  return best;
+}
+var SESSION_ID_PATTERN;
+var init_claude_session = __esm(() => {
+  SESSION_ID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+});
+
+// src/cli/resume.ts
+var exports_resume = {};
+__export(exports_resume, {
+  runResume: () => runResume,
+  resolveResumeTargets: () => resolveResumeTargets
+});
+function resolveResumeTargets(opts = {}) {
+  const cwd = process.cwd();
+  const { pair } = resolvePairReadOnly(opts.pairFlag);
+  const claude = findLatestClaudeSession(cwd, opts.claudeHome);
+  const codex = readUsableCurrentThread({
+    stateDir: pair.stateDir,
+    pairId: pair.manual ? null : pair.pairId,
+    pairName: pair.name,
+    cwd
+  }, opts.env ?? process.env);
+  return {
+    pairName: pair.name,
+    claudeSessionId: claude?.sessionId ?? null,
+    codexThreadId: codex?.threadId ?? null
+  };
+}
+async function runResume(args) {
+  const { pairFlag, rest } = parsePairFlag(args);
+  const target = rest[0];
+  const extra = rest.slice(1);
+  const pairPrefix = pairFlag !== undefined ? ["--pair", pairFlag] : [];
+  if (target === "claude") {
+    const session = findLatestClaudeSession(process.cwd());
+    if (!session) {
+      console.error("[agentbridge] No Claude Code session found for this directory.");
+      console.error("[agentbridge] Start one with: abg claude");
+      process.exit(1);
+    }
+    console.error(`[agentbridge] Resuming Claude Code session ${session.sessionId}`);
+    const { runClaude: runClaude2 } = await Promise.resolve().then(() => (init_claude(), exports_claude));
+    await runClaude2([...pairPrefix, "--resume", session.sessionId, ...extra]);
+    return;
+  }
+  if (target === "codex") {
+    const { runCodex: runCodex2 } = await Promise.resolve().then(() => (init_codex(), exports_codex));
+    await runCodex2([...pairPrefix, "resume-current", ...extra]);
+    return;
+  }
+  if (target !== undefined) {
+    console.error(`Error: unknown resume target "${target}".`);
+    console.error("");
+    console.error("Usage:");
+    console.error("  abg resume           # print resume commands for this directory");
+    console.error("  abg resume claude    # resume the last Claude Code session here");
+    console.error("  abg resume codex     # resume this pair's current Codex thread");
+    process.exit(1);
+  }
+  const targets = resolveResumeTargets({ pairFlag });
+  const pairArg = pairFlag ? `--pair ${pairFlag} ` : "";
+  const lines = [];
+  if (targets.claudeSessionId) {
+    lines.push(`abg ${pairArg}claude --resume ${targets.claudeSessionId}`);
+  } else {
+    lines.push(`# no Claude Code session found for this directory (start one: abg ${pairArg}claude)`);
+  }
+  if (targets.codexThreadId) {
+    lines.push(`abg ${pairArg}codex resume ${targets.codexThreadId}`);
+  } else {
+    lines.push(`# no verified Codex thread for pair "${targets.pairName}" (start one: abg ${pairArg}codex --new)`);
+  }
+  console.log(lines.join(`
+`));
+  console.error("");
+  console.error("Tip: `abg resume claude` / `abg resume codex` runs these directly.");
+  console.error("(max-permission flags are applied by default; opt out with --safe or AGENTBRIDGE_SAFE=1)");
+  if (!targets.claudeSessionId && !targets.codexThreadId) {
+    process.exit(1);
+  }
+}
+var init_resume = __esm(() => {
+  init_claude_session();
+  init_pair_resolver();
+  init_thread_state();
+});
+
 // src/cli/kill.ts
 var exports_kill = {};
 __export(exports_kill, {
@@ -3585,7 +3769,7 @@ __export(exports_kill, {
   formatKillReport: () => formatKillReport
 });
 import { readFileSync as readFileSync10, unlinkSync as unlinkSync5 } from "fs";
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 async function runKill(args = []) {
   const argError = validateKillArgs(args);
   if (argError === "help") {
@@ -3637,7 +3821,7 @@ async function runKill(args = []) {
     for (const dirName of listPairDirsSafe(base)) {
       if (registeredIds.has(dirName))
         continue;
-      const stateDir = new StateDirResolver(join12(base, "pairs", dirName));
+      const stateDir = new StateDirResolver(join13(base, "pairs", dirName));
       results.push(await stopStateDir(`${dirName} (unregistered)`, stateDir, portsFromStateDir(stateDir)));
     }
     const legacy = detectLegacyRootDaemon(base);
@@ -3722,7 +3906,7 @@ No arguments stop this directory's registered pairs and any legacy-root daemon.
 }
 async function stopPairEntry(base, pair) {
   const ports = portsForEntry(pair);
-  const stateDir = new StateDirResolver(join12(base, "pairs", pair.pairId));
+  const stateDir = new StateDirResolver(join13(base, "pairs", pair.pairId));
   return stopStateDir(pair.pairId, stateDir, ports);
 }
 function listPairDirsSafe(base) {
@@ -3911,7 +4095,7 @@ var exports_pairs = {};
 __export(exports_pairs, {
   runPairs: () => runPairs
 });
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 async function runPairs(args = []) {
   const [command, ...rest] = args;
   if (command === "rm") {
@@ -4077,7 +4261,7 @@ async function collectRows() {
 }
 async function rowForPair(base, pair) {
   const ports = portsForEntry(pair);
-  const stateDir = new StateDirResolver(join13(base, "pairs", pair.pairId));
+  const stateDir = new StateDirResolver(join14(base, "pairs", pair.pairId));
   const lifecycle = new DaemonLifecycle({
     stateDir,
     controlPort: ports.controlPort,
@@ -4188,7 +4372,7 @@ import {
   mkdirSync as mkdirSync7,
   readFileSync as readFileSync11
 } from "fs";
-import { dirname as dirname5, join as join14 } from "path";
+import { dirname as dirname5, join as join15 } from "path";
 function isKickoffText(text) {
   if (!text)
     return false;
@@ -4219,7 +4403,7 @@ function extractFirstRealUserMessage(rolloutPath) {
 }
 function scanResumePollution(options = {}) {
   const codexHome2 = options.codexHome ?? codexHome();
-  const dbPath = options.dbPath ?? join14(codexHome2, "state_5.sqlite");
+  const dbPath = options.dbPath ?? join15(codexHome2, "state_5.sqlite");
   if (!existsSync11(dbPath)) {
     return { codexHome: codexHome2, dbPath, scanned: 0, candidates: [], applied: 0, renamed: 0, deleted: 0 };
   }
@@ -4313,12 +4497,12 @@ function scanResumePollution(options = {}) {
 }
 function backupCodexStateFiles(dbPath, now = new Date().toISOString()) {
   const safeStamp = now.replace(/[:.]/g, "-");
-  const base = join14(dirname5(dbPath), "agentbridge-backups", `resume-pollution-${safeStamp}`);
+  const base = join15(dirname5(dbPath), "agentbridge-backups", `resume-pollution-${safeStamp}`);
   mkdirSync7(base, { recursive: true });
   for (const path of [dbPath, `${dbPath}-wal`, `${dbPath}-shm`]) {
     if (!existsSync11(path))
       continue;
-    const target = join14(base, path.split("/").pop());
+    const target = join15(base, path.split("/").pop());
     mkdirSync7(dirname5(target), { recursive: true });
     copyFileSync(path, target);
   }
@@ -4366,9 +4550,9 @@ __export(exports_doctor, {
   runDoctor: () => runDoctor,
   formatDoctorReport: () => formatDoctorReport
 });
-import { existsSync as existsSync12, readFileSync as readFileSync12, readdirSync as readdirSync4, realpathSync as realpathSync3, statSync as statSync5 } from "fs";
-import { homedir as homedir5 } from "os";
-import { join as join15 } from "path";
+import { existsSync as existsSync12, readFileSync as readFileSync12, readdirSync as readdirSync5, realpathSync as realpathSync3, statSync as statSync6 } from "fs";
+import { homedir as homedir6 } from "os";
+import { join as join16 } from "path";
 async function runDoctor(args = []) {
   if (args[0] === "resume-pollution") {
     runResumePollution(args.slice(1));
@@ -4557,15 +4741,15 @@ function artifactAlignmentCheck() {
         stamps.push({ label: "global-cli", commit });
     } catch {}
   }
-  const cacheRoot = join15(homedir5(), ".claude", "plugins", "cache", "agentbridge", "agentbridge");
+  const cacheRoot = join16(homedir6(), ".claude", "plugins", "cache", "agentbridge", "agentbridge");
   try {
-    for (const version of readdirSync4(cacheRoot)) {
-      const commit = extractBundleCommit(join15(cacheRoot, version, "server", "daemon.js"));
+    for (const version of readdirSync5(cacheRoot)) {
+      const commit = extractBundleCommit(join16(cacheRoot, version, "server", "daemon.js"));
       if (commit)
         stamps.push({ label: `plugin-cache@${version}`, commit });
     }
   } catch {}
-  const repoBundle = join15(process.cwd(), "plugins", "agentbridge", "server", "daemon.js");
+  const repoBundle = join16(process.cwd(), "plugins", "agentbridge", "server", "daemon.js");
   if (existsSync12(repoBundle)) {
     const commit = extractBundleCommit(repoBundle);
     if (commit)
@@ -4607,7 +4791,7 @@ function logCheck(name, path) {
       hint: "\u65E5\u5FD7\u4F1A\u5728\u76F8\u5E94\u8FDB\u7A0B\u9996\u6B21\u542F\u52A8\u65F6\u521B\u5EFA\uFF1B\u8FDB\u7A0B\u4ECE\u672A\u542F\u52A8\u8FC7\u65F6\u8FD9\u662F\u6B63\u5E38\u7684\u3002"
     };
   }
-  const stat = statSync5(path);
+  const stat = statSync6(path);
   if (stat.size > LARGE_LOG_WARN_BYTES) {
     return {
       name,
@@ -4844,6 +5028,10 @@ async function main(command, restArgs) {
       const { runCodex: runCodex2 } = await Promise.resolve().then(() => (init_codex(), exports_codex));
       await runCodex2(restArgs);
       break;
+    case "resume":
+      const { runResume: runResume2 } = await Promise.resolve().then(() => (init_resume(), exports_resume));
+      await runResume2(restArgs);
+      break;
     case "kill":
       const { runKill: runKill2 } = await Promise.resolve().then(() => (init_kill(), exports_kill));
       await runKill2(restArgs);
@@ -4889,6 +5077,10 @@ Commands:
   claude [args...]   Start Claude Code with push channel enabled
   codex [args...]    Start Codex TUI connected to AgentBridge daemon
                      (bare command auto-resumes the last thread; --new starts fresh)
+  resume [claude|codex]
+                     No target: print resume commands for this directory's last
+                     Claude session + this pair's current Codex thread.
+                     With target: resume that side directly.
   pairs [rm <name|id> | prune [--dry-run]]
                      List pairs; remove one (rm), or delete orphan state dirs (prune)
   doctor [--json]    Diagnose env, daemon, build drift, logs, and current thread
@@ -4898,10 +5090,17 @@ Commands:
                      Stop this directory's pairs (default), every pair (all/--all), or one (--pair)
 
 Options:
-  --pair <name>      Run claude/codex/kill in a named pair. The name is scoped to
+  --pair <name>      Run claude/codex/resume/kill/doctor/budget in a named pair. The name is scoped to
                      the current directory, so the same name in another directory
                      is a separate pair. Goes BEFORE the command. Without it, the
                      pair name defaults to "main" for the current directory.
+  --safe             Disable the max-permission defaults for this launch.
+                     Goes AFTER the command (abg claude --safe); also auto-
+                     suppressed when you pass any explicit permission flag
+                     (-a/--sandbox for codex, --permission-mode for claude).
+                     (abg claude runs with --dangerously-skip-permissions and
+                     abg codex with --yolo by default; AGENTBRIDGE_SAFE=1 also
+                     disables both.)
   --help, -h         Show this help message
   --version, -v      Show version
 
@@ -4915,6 +5114,10 @@ Examples:
   abg init                     # First-time setup
   abg claude                   # Start the "main" pair for this directory
   abg codex                    # Connect Codex to this directory's "main" pair
+  abg resume                   # Print resume commands for both sides
+  abg resume claude            # Resume the last Claude Code session here
+  abg resume codex             # Resume this pair's current Codex thread
+  abg claude --safe            # One launch without the max-permission default
   abg --pair work claude       # Start a named pair "work" (this directory)
   abg --pair work codex        # Connect Codex to the "work" pair
   abg --pair review claude     # A second, parallel pair
@@ -4940,9 +5143,9 @@ function printVersion() {
 }
 var MARKETPLACE_NAME = "agentbridge", PLUGIN_NAME = "agentbridge", REFRESH_COMMANDS, NOTIFY_COMMANDS, PAIR_AWARE_COMMANDS;
 var init_cli = __esm(() => {
-  REFRESH_COMMANDS = new Set(["claude", "codex"]);
-  NOTIFY_COMMANDS = new Set(["claude", "codex", "init", "dev"]);
-  PAIR_AWARE_COMMANDS = new Set(["claude", "codex", "kill", "doctor", "budget"]);
+  REFRESH_COMMANDS = new Set(["claude", "codex", "resume"]);
+  NOTIFY_COMMANDS = new Set(["claude", "codex", "init", "dev", "resume"]);
+  PAIR_AWARE_COMMANDS = new Set(["claude", "codex", "kill", "doctor", "budget", "resume"]);
   if (import.meta.main) {
     const { command, restArgs } = parseTopLevel(process.argv.slice(2));
     main(command, restArgs).catch((err) => {

package/dist/daemon.js

@@ -17,8 +17,8 @@ function defineNumber(value, fallback) {
   return typeof value === "number" && Number.isFinite(value) ? value : fallback;
 }
 var BUILD_INFO = Object.freeze({
-  version: defineString("0.1.8", "0.0.0-source"),
-  commit: defineString("c80a7fd", "source"),
+  version: defineString("0.1.10", "0.0.0-source"),
+  commit: defineString("51a44cb", "source"),
   bundle: defineBundle("dist"),
   contractVersion: defineNumber(1, CONTRACT_VERSION)
 });
@@ -811,10 +811,19 @@ class CodexAdapter extends EventEmitter {
       this.log("Cannot steer: no turn in progress (use injectMessage)");
       return false;
     }
-    this.log(`Steering message into active Codex turn (${text.length} chars)`);
+    const expectedTurnId = this.currentSteerableTurnId();
+    if (!expectedTurnId) {
+      this.log("Cannot steer: no addressable active turn id (turn/started carried no id)");
+      return false;
+    }
+    this.log(`Steering message into active Codex turn ${expectedTurnId} (${text.length} chars)`);
     const requestId = this.nextInjectionId--;
     this.trackBridgeRequestId(requestId, "steer");
-    const params = { threadId: this.threadId, input: [{ type: "text", text }] };
+    const params = {
+      threadId: this.threadId,
+      expectedTurnId,
+      input: [{ type: "text", text }]
+    };
     try {
       this.appServerWs.send(JSON.stringify({
         method: "turn/steer",
@@ -1758,6 +1767,14 @@ class CodexAdapter extends EventEmitter {
     this.log(`Thread detected: ${threadId} (${reason})`);
     this.emit("ready", threadId);
   }
+  currentSteerableTurnId() {
+    let newest = null;
+    for (const id of this.activeTurnIds) {
+      if (!id.startsWith("unknown:"))
+        newest = id;
+    }
+    return newest;
+  }
   get turnPhase() {
     if (this.activeTurnIds.size > 0) {
       const allStalled = [...this.activeTurnIds].every((id) => this.currentlyStalledTurnIds.has(id));
@@ -1776,6 +1793,7 @@ class CodexAdapter extends EventEmitter {
   markTurnStarted(turnId) {
     const wasInProgress = this.turnInProgress;
     const turnKey = typeof turnId === "string" && turnId.length > 0 ? turnId : `unknown:${Date.now()}`;
+    this.activeTurnIds.delete(turnKey);
     this.activeTurnIds.add(turnKey);
     this.stalledTurnIds.delete(turnKey);
     this.currentlyStalledTurnIds.delete(turnKey);
@@ -3994,7 +4012,8 @@ codex.on("turnPhaseChanged", ({ phase, previous }) => {
 });
 codex.on("steerFailed", (reason) => {
   log(`Steer rejected by app-server: ${reason}`);
-  emitToClaude(systemMessage("system_steer_failed", `\u26A0\uFE0F Your steer message did NOT reach Codex (${reason}). The original turn continues unaffected \u2014 wait for it to finish, or resend as a normal reply.`));
+  const advice = codex.turnInProgress ? "wait for it to finish (\u2705), then send normally" : "the turn has ended \u2014 resend as a normal reply";
+  emitToClaude(systemMessage("system_steer_failed", `\u26A0\uFE0F Your steer message did NOT reach Codex (${reason}). The original turn continues unaffected \u2014 ${advice}.`));
 });
 codex.on("steerAccepted", () => {
   log("Steer accepted by app-server");
@@ -4255,11 +4274,12 @@ function handleControlMessage(ws, raw) {
         if (steered) {
           clearAttentionWindow();
         }
+        const steerFailureAdvice = codex.turnInProgress ? "Steer failed: the running turn cannot be steered right now \u2014 wait for it to finish (\u2705), then send normally." : "Steer failed: the turn may have just ended or the connection dropped \u2014 retry as a normal reply.";
         sendProtocolMessage(ws, {
           type: "claude_to_codex_result",
           requestId: message.requestId,
           success: steered,
-          error: steered ? undefined : "Steer failed: the turn may have just ended or the connection dropped \u2014 retry as a normal reply."
+          error: steered ? undefined : steerFailureAdvice
         });
         return;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raysonmeng/agentbridge",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Bridge between Claude Code and Codex — bidirectional agent communication via MCP Channel + JSON-RPC",
   "type": "module",
   "packageManager": "bun@1.3.11",

package/plugins/agentbridge/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "agentbridge",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Bridge Claude Code and Codex with a shared daemon, push channel delivery, and bidirectional reply tooling.",
   "author": {
     "name": "AgentBridge Contributors",

package/plugins/agentbridge/server/bridge-server.js

@@ -14227,8 +14227,8 @@ function defineNumber(value, fallback) {
   return typeof value === "number" && Number.isFinite(value) ? value : fallback;
 }
 var BUILD_INFO = Object.freeze({
-  version: defineString("0.1.8", "0.0.0-source"),
-  commit: defineString("c80a7fd", "source"),
+  version: defineString("0.1.10", "0.0.0-source"),
+  commit: defineString("51a44cb", "source"),
   bundle: defineBundle("plugin"),
   contractVersion: defineNumber(1, CONTRACT_VERSION)
 });

package/plugins/agentbridge/server/daemon.js

@@ -17,8 +17,8 @@ function defineNumber(value, fallback) {
   return typeof value === "number" && Number.isFinite(value) ? value : fallback;
 }
 var BUILD_INFO = Object.freeze({
-  version: defineString("0.1.8", "0.0.0-source"),
-  commit: defineString("c80a7fd", "source"),
+  version: defineString("0.1.10", "0.0.0-source"),
+  commit: defineString("51a44cb", "source"),
   bundle: defineBundle("plugin"),
   contractVersion: defineNumber(1, CONTRACT_VERSION)
 });
@@ -811,10 +811,19 @@ class CodexAdapter extends EventEmitter {
       this.log("Cannot steer: no turn in progress (use injectMessage)");
       return false;
     }
-    this.log(`Steering message into active Codex turn (${text.length} chars)`);
+    const expectedTurnId = this.currentSteerableTurnId();
+    if (!expectedTurnId) {
+      this.log("Cannot steer: no addressable active turn id (turn/started carried no id)");
+      return false;
+    }
+    this.log(`Steering message into active Codex turn ${expectedTurnId} (${text.length} chars)`);
     const requestId = this.nextInjectionId--;
     this.trackBridgeRequestId(requestId, "steer");
-    const params = { threadId: this.threadId, input: [{ type: "text", text }] };
+    const params = {
+      threadId: this.threadId,
+      expectedTurnId,
+      input: [{ type: "text", text }]
+    };
     try {
       this.appServerWs.send(JSON.stringify({
         method: "turn/steer",
@@ -1758,6 +1767,14 @@ class CodexAdapter extends EventEmitter {
     this.log(`Thread detected: ${threadId} (${reason})`);
     this.emit("ready", threadId);
   }
+  currentSteerableTurnId() {
+    let newest = null;
+    for (const id of this.activeTurnIds) {
+      if (!id.startsWith("unknown:"))
+        newest = id;
+    }
+    return newest;
+  }
   get turnPhase() {
     if (this.activeTurnIds.size > 0) {
       const allStalled = [...this.activeTurnIds].every((id) => this.currentlyStalledTurnIds.has(id));
@@ -1776,6 +1793,7 @@ class CodexAdapter extends EventEmitter {
   markTurnStarted(turnId) {
     const wasInProgress = this.turnInProgress;
     const turnKey = typeof turnId === "string" && turnId.length > 0 ? turnId : `unknown:${Date.now()}`;
+    this.activeTurnIds.delete(turnKey);
     this.activeTurnIds.add(turnKey);
     this.stalledTurnIds.delete(turnKey);
     this.currentlyStalledTurnIds.delete(turnKey);
@@ -3994,7 +4012,8 @@ codex.on("turnPhaseChanged", ({ phase, previous }) => {
 });
 codex.on("steerFailed", (reason) => {
   log(`Steer rejected by app-server: ${reason}`);
-  emitToClaude(systemMessage("system_steer_failed", `\u26A0\uFE0F Your steer message did NOT reach Codex (${reason}). The original turn continues unaffected \u2014 wait for it to finish, or resend as a normal reply.`));
+  const advice = codex.turnInProgress ? "wait for it to finish (\u2705), then send normally" : "the turn has ended \u2014 resend as a normal reply";
+  emitToClaude(systemMessage("system_steer_failed", `\u26A0\uFE0F Your steer message did NOT reach Codex (${reason}). The original turn continues unaffected \u2014 ${advice}.`));
 });
 codex.on("steerAccepted", () => {
   log("Steer accepted by app-server");
@@ -4255,11 +4274,12 @@ function handleControlMessage(ws, raw) {
         if (steered) {
           clearAttentionWindow();
         }
+        const steerFailureAdvice = codex.turnInProgress ? "Steer failed: the running turn cannot be steered right now \u2014 wait for it to finish (\u2705), then send normally." : "Steer failed: the turn may have just ended or the connection dropped \u2014 retry as a normal reply.";
         sendProtocolMessage(ws, {
           type: "claude_to_codex_result",
           requestId: message.requestId,
           success: steered,
-          error: steered ? undefined : "Steer failed: the turn may have just ended or the connection dropped \u2014 retry as a normal reply."
+          error: steered ? undefined : steerFailureAdvice
         });
         return;
       }