claude2codex 0.3.5 → 0.3.7

package/README.md

@@ -231,7 +231,8 @@ Codex then enters its goal-continuation loop: after each turn, it checks "did I
 | `CODEX_MODEL` | Codex default | Model override |
 | `CODEX_APPROVAL_POLICY` | `never` | Approval policy (autonomous by default) |
 | `CODEX_PERMISSIONS` | Unset | Permissions profile passed to Codex |
-| `CODEX_JOB_TIMEOUT_MS` | `1800000` | Maximum job duration (30 min) |
+| `CODEX_JOB_TIMEOUT_MS` | `7200000` | Overall maximum job duration (2 hours) |
+| `C2C_IDLE_TIMEOUT_MS` | `1200000` | Timeout after no Codex notifications during a running attempt (20 min); `0` disables. Queued/dependency wait time excluded |
 | `CODEX_QUIET_MS` | `30000` | Quiet period before treating an active goal as finished |
 | `GOAL_OBJECTIVE_MAX` | `2000` | Maximum rendered goal-objective length; `codex_implement` rejects over-limit contracts at submit time |
 | `C2C_STATE_DIR` | `~/.claude2codex/jobs` | Persistent job registry (atomic per-job JSON files) |

package/README.zh-CN.md

@@ -252,7 +252,8 @@ Python 3.12，Poetry。从项目根目录运行。
 | `CODEX_MODEL`           | Codex 默认               | 模型覆盖                                                      |
 | `CODEX_APPROVAL_POLICY` | `never`                | 审批策略（默认自主执行）                                              |
 | `CODEX_PERMISSIONS`     | 未设置                    | 权限配置透传                                                    |
-| `CODEX_JOB_TIMEOUT_MS`  | `1800000`              | 单任务最大时长（30 分钟）                                            |
+| `CODEX_JOB_TIMEOUT_MS`  | `7200000`              | 单任务总时长硬上限（2 小时） |
+| `C2C_IDLE_TIMEOUT_MS` | `1200000` | 运行中的尝试连续无 Codex 通知时超时（20 分钟），`0` 禁用；排队和等待依赖的时间不计入 |
 | `CODEX_QUIET_MS`        | `30000`                | 判定活跃目标已完成前的静默等待时间                                         |
 | `GOAL_OBJECTIVE_MAX`    | `2000`                 | 渲染后 goal-objective 的最大长度；超限的合同会被 `codex_implement` 在提交时拒绝 |
 | `C2C_STATE_DIR`         | `~/.claude2codex/jobs` | 持久化任务注册表（每任务一个原子写入的 JSON 文件）                              |

package/dist/server.js

@@ -262,7 +262,7 @@ var CodexAppServer = class {
    */
   async initialize() {
     const result = await this.request("initialize", {
-      clientInfo: { name: "claude2codex", title: "Claude\u2194Codex Contract Bridge", version: "0.3.5" },
+      clientInfo: { name: "claude2codex", title: "Claude\u2194Codex Contract Bridge", version: "0.3.7" },
       capabilities: { experimentalApi: true }
     });
     this.notify("initialized", {});
@@ -641,6 +641,7 @@ async function runAttempt(job, opts, timeoutMs) {
   let lastCodexError;
   let quietTimer;
   let stallTimer;
+  let idleTimer;
   let settle;
   const doneSignal = new Promise((res) => settle = res);
   const progress = (event, message) => opts.onProgress?.({ jobId: job.id, event, message });
@@ -675,6 +676,14 @@ async function runAttempt(job, opts, timeoutMs) {
       settle();
     }, cfg.quietMs);
   }
+  function armIdleTimer() {
+    clearTimeout(idleTimer);
+    if (cfg.idleTimeoutMs === 0) return;
+    idleTimer = setTimeout(() => {
+      finalize("timeout", `no Codex notification for ${cfg.idleTimeoutMs}ms (C2C_IDLE_TIMEOUT_MS)`);
+      settle();
+    }, cfg.idleTimeoutMs);
+  }
   function clearStallTimer() {
     clearTimeout(stallTimer);
     stallTimer = void 0;
@@ -708,15 +717,22 @@ async function runAttempt(job, opts, timeoutMs) {
       writeLog("info", "job_resumed", { job_id: job.id, stalled_for_ms: stalledForMs });
       progress("resumed", `job resumed after ${stalledForMs}ms`);
     }
+    armIdleTimer();
     job.lastActivityAt = now.toISOString();
     store.save(job);
     if (activeTurn) armStallTimer();
   }
   function finalize(state, error) {
+    clearTimeout(idleTimer);
     clearStallTimer();
+    if (state === "done" && job.turns === 0) {
+      state = "error";
+      error = "job ended without running a turn";
+    }
     finish(job, state, client, error);
   }
   function handleNotification(method, params) {
+    if (job.state !== "starting" && job.state !== "running") return;
     writeLog("debug", "codex_notification", {
       job_id: job.id,
       attempt: job.attempts ?? 1,
@@ -767,7 +783,7 @@ async function runAttempt(job, opts, timeoutMs) {
           tokens_used: job.goal?.tokensUsed ?? null
         });
         progress("goal_updated", `goal status=${job.goal?.status ?? "unknown"}`);
-        if (job.goal?.status && TERMINAL_GOAL_STATUSES.has(job.goal.status) && !activeTurn) {
+        if (job.goal?.status && TERMINAL_GOAL_STATUSES.has(job.goal.status) && !activeTurn && job.turns > 0) {
           finalize("done");
           settle();
         }
@@ -834,10 +850,11 @@ async function runAttempt(job, opts, timeoutMs) {
     if (!activeTurn) armQuietTimer();
   }
   const overallTimer = setTimeout(() => {
-    finalize("timeout", `job exceeded ${cfg.jobTimeoutMs}ms`);
+    finalize("timeout", `job exceeded ${cfg.jobTimeoutMs}ms (CODEX_JOB_TIMEOUT_MS)`);
     settle();
   }, timeoutMs);
   try {
+    armIdleTimer();
     await client.initialize();
     const threadParams = {
       cwd: cfg.cwd,
@@ -858,11 +875,11 @@ async function runAttempt(job, opts, timeoutMs) {
     if (!job.threadId) throw new Error(`could not determine thread id from ${JSON.stringify(threadRes).slice(0, 300)}`);
     store.save(job);
     log(job, "thread", `thread ${job.threadId} ${opts.resumeThreadId ? "resumed" : "started"}`);
-    if (opts.objective) {
+    if (opts.objective || opts.resumeThreadId) {
       try {
         const goalRes = await client.request("thread/goal/set", {
           threadId: job.threadId,
-          objective: opts.objective,
+          ...opts.objective ? { objective: opts.objective } : { status: "active" },
           ...opts.tokenBudget ? { tokenBudget: opts.tokenBudget } : {}
         });
         job.goalSet = true;
@@ -886,6 +903,7 @@ async function runAttempt(job, opts, timeoutMs) {
     const failure = processError ?? (error instanceof Error ? error : new Error(String(error)));
     return { error: failure, processFailure: client.exited };
   } finally {
+    clearTimeout(idleTimer);
     clearTimeout(overallTimer);
     clearTimeout(quietTimer);
     clearStallTimer();
@@ -925,7 +943,8 @@ function config(cwd) {
     model: process.env.CODEX_MODEL || void 0,
     approvalPolicy: process.env.CODEX_APPROVAL_POLICY ?? "never",
     permissions: process.env.CODEX_PERMISSIONS || void 0,
-    jobTimeoutMs: envInt("CODEX_JOB_TIMEOUT_MS", 18e5),
+    jobTimeoutMs: envInt("CODEX_JOB_TIMEOUT_MS", 72e5),
+    idleTimeoutMs: Math.max(0, envInt("C2C_IDLE_TIMEOUT_MS", 12e5)),
     quietMs: envInt("CODEX_QUIET_MS", 3e4),
     stallWarnMs: Math.max(0, envInt("C2C_STALL_WARN_MS", 12e4)),
     retries: Math.max(0, envInt("C2C_RETRIES", 1)),
@@ -968,7 +987,7 @@ var SERVER_INSTRUCTIONS = `When the user asks to delegate work to Codex (or to u
 If a Codex job itself fails (error, 0 tokens, no handoff), report it and wait; don't implement the task yourself unless the user explicitly asks.
 Full formats: the c2c-workflow prompt.`;
 var server = new McpServer(
-  { name: "c2c-codex", version: "0.3.5" },
+  { name: "c2c-codex", version: "0.3.7" },
   { instructions: SERVER_INSTRUCTIONS }
 );
 var reasoningEffort = z.enum(["low", "medium", "high", "xhigh", "max", "ultra"]);
@@ -1127,7 +1146,7 @@ server.registerTool(
   "codex_rework",
   {
     title: "Send a Delta Contract to Codex",
-    description: "Resume the Codex thread from a previous implement job and hand it a Delta Contract (review findings + failed success conditions). The existing thread goal re-engages, so the /goal loop continues until the objective passes. Returns a new job_id.",
+    description: "Resume the Codex thread from a previous implement job and hand it a Delta Contract (review findings + failed success conditions). The existing thread goal is reactivated, so the /goal loop continues until the objective passes. Returns a new job_id.",
     inputSchema: {
       job_id: z.string().optional().describe("The original implement job's id (preferred; resolves the thread to resume)."),
       thread_id: z.string().optional().describe("Codex thread id, if the job registry is gone (e.g. after a restart)."),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude2codex",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "type": "module",
   "description": "MCP server bridging Claude (architect/reviewer) and Codex (implementer) via Goal/Delta Contracts and Codex's thread-goal loop.",
   "bin": {