@coda-console/codex 1.8.2 → 1.8.4

package/agent/entry.mjs

@@ -23,6 +23,7 @@ import { servedCodexModels } from './providers.mjs';
 import { input, listen, relayedCodexStreams } from './relay.mjs';
 import { CodexWaits } from './waits.mjs';
 import { explainCodexError, reportedCodexFailures } from './errors.mjs';
+import { reportedCodexSleeps } from './sleep.mjs';
 
 const env = process.env;
 // A session starts read-only, unless its machine's configuration says otherwise.
@@ -62,7 +63,7 @@ const adapter = new URL(import.meta.resolve('@agentclientprotocol/codex-acp'));
 registerHooks({ load(url, context, nextLoad) {
   const loaded = nextLoad(url, context);
   if (url !== adapter.href) return loaded;
-  return { ...loaded, source: reportedCodexFailures(codexOptionsAsShown(relayedCodexStreams(orderedCodexTitles(followCodexProcessExit(continuedCodexSubagents(
-    promptRequiredCodexSteering(instructedCodexThreads(servedCodexModels(networkedCodexDevelopment(Buffer.from(loaded.source).toString('utf8'))))))))))) };
+  return { ...loaded, source: reportedCodexSleeps(reportedCodexFailures(codexOptionsAsShown(relayedCodexStreams(orderedCodexTitles(followCodexProcessExit(continuedCodexSubagents(
+    promptRequiredCodexSteering(instructedCodexThreads(servedCodexModels(networkedCodexDevelopment(Buffer.from(loaded.source).toString('utf8')))))))))))) };
 } });
 await import(adapter.href);

package/agent/sleep.mjs

@@ -0,0 +1,22 @@
+// Codex's interruptible clock.sleep is a native display item, not a shell command or an AIR async task.
+// Keep it in the adapter's normal session routing, including child sessions. waits.mjs turns this private metadata
+// into a Coda background wait; the public ACP update stays valid while crossing codex-acp's schema.
+export function codexSleepUpdate(item, state) {
+  return { sessionUpdate: 'session_info_update', _meta: { coda: { sleep: { id: item.id, durationMs: item.durationMs, state } } } };
+}
+
+export function reportedCodexSleeps(source) {
+  for (const [activity, state] of [['Started', 'waiting'], ['Completed', 'done']]) {
+    const before = `        return this.subagents.legacyActivity${activity}(event.item);\n      case "sleep":`;
+    if (source.split(before).length !== 2) throw new Error('codex-acp sleep patch no longer matches the locked adapter');
+    source = source.replace(before, `${before}\n        return codexSleepUpdate(event.item, "${state}");`);
+  }
+  return `import { codexSleepUpdate } from ${JSON.stringify(import.meta.url)};\n${source.replace(/^#![^\n]*\n/, '')}`;
+}
+
+export function sleepTitle(durationMs) {
+  for (const [unit, label] of [[3600000, '小时'], [60000, '分钟'], [1000, '秒']]) {
+    if (durationMs >= unit && durationMs % unit === 0) return `等待 ${durationMs / unit} ${label}`;
+  }
+  return `等待 ${durationMs / 1000} 秒`;
+}

package/agent/waits.mjs

@@ -4,6 +4,7 @@
 // Coda: every session it names to Coda is `X`, and each run of it a wait of its own. Coda's session instructions are checked
 // here and handed to the patched codex-acp in the request's `_meta` (instructions.mjs).
 import { INSTRUCTIONS, sessionInstructions } from './instructions.mjs';
+import { sleepTitle } from './sleep.mjs';
 
 const record = value => value && typeof value === 'object' && !Array.isArray(value);
 const string = value => typeof value === 'string' && value.length > 0;
@@ -16,7 +17,7 @@ export class CodexWaits {
   // `agentInfo`: the Codex it runs, said in place of codex-acp's own name and version.
   constructor({ agentInfo = null } = {}) {
     // The root session; Coda's requests whose answers are read here, by id; the waits said, by id.
-    this.root = null; this.asked = new Map(); this.waits = new Map(); this.agentInfo = agentInfo;
+    this.root = null; this.asked = new Map(); this.waits = new Map(); this.sleeps = new Map(); this.agentInfo = agentInfo;
   }
   // What Coda says: `agent`, what codex-acp is told; `coda`, what Coda is answered here.
   fromCoda(message) {
@@ -37,6 +38,7 @@ export class CodexWaits {
     }
     if (message.method === 'session/new') this.asked.set(message.id, 'session');
     else if (message.method === 'session/load' && string(message.params?.sessionId)) this.root = message.params.sessionId;
+    else if (message.method === 'session/prompt') this.asked.set(message.id, { prompt: message.params.sessionId });
     return { agent: [message], coda: [] };
   }
   // A command is stopped through the session that keeps it, the root; a subagent by cancelling its session.
@@ -52,12 +54,31 @@ export class CodexWaits {
   // What codex-acp says, as said to Coda.
   fromAgent(message) {
     if (!record(message)) return [];
-    if ('id' in message && !('method' in message)) return [this.answer(message)];
+    if ('id' in message && !('method' in message)) {
+      const sessionId = this.asked.get(message.id)?.prompt;
+      // Cancelling or failing a turn can skip the sleep's completed item. End its waits before ending the prompt.
+      const finished = sessionId ? this.finishSleeps(base(sessionId), message.error ? 'failed' : message.result?.stopReason === 'cancelled' ? 'cancelled' : 'done') : [];
+      return [...finished, this.answer(message)];
+    }
     if (record(message.params) && string(message.params.sessionId)) message = { ...message, params: { ...message.params, sessionId: base(message.params.sessionId) } };
     if (message.method !== 'session/update' || !record(message.params?.update)) return [message];
     const { sessionId, update: u } = message.params;
     const said = params => [{ jsonrpc: '2.0', method: '_coda/wait', params: { sessionId, ...params } }];
     switch (u.sessionUpdate) {
+      case 'session_info_update': {
+        const sleep = u._meta?.coda?.sleep;
+        if (!sleep) return [message];
+        const waitId = `sleep:${sleep.id}`;
+        if (sleep.state === 'waiting') {
+          if (!this.sleeps.has(sessionId)) this.sleeps.set(sessionId, new Set());
+          this.sleeps.get(sessionId).add(waitId);
+          return said({ waitId, kind: 'task', state: 'waiting', title: sleepTitle(sleep.durationMs),
+            detail: '等待结束后继续；发送消息并选择「立即插话」可提前继续。', stoppable: false });
+        }
+        if (!this.sleeps.get(sessionId)?.delete(waitId)) return [];
+        if (!this.sleeps.get(sessionId).size) this.sleeps.delete(sessionId);
+        return said({ waitId, state: 'done' });
+      }
       case 'subagent_spawned': {
         if (!string(u.subagentSessionId)) return [];
         const stoppable = u.capabilities?.cancel === true;
@@ -66,7 +87,10 @@ export class CodexWaits {
           childSessionId: base(u.subagentSessionId), stoppable });
       }
       case 'subagent_state_update':
-        return string(u.subagentSessionId) && SUBAGENT_END[u.state] ? said({ waitId: u.subagentSessionId, state: SUBAGENT_END[u.state] }) : [];
+        return string(u.subagentSessionId) && SUBAGENT_END[u.state] ? [
+          ...this.finishSleeps(base(u.subagentSessionId), SUBAGENT_END[u.state]),
+          ...said({ waitId: u.subagentSessionId, state: SUBAGENT_END[u.state] }),
+        ] : [];
       case 'async_task_spawned': {
         if (!string(u.asyncTaskId)) return [];
         const stoppable = u.canStop === true;
@@ -86,6 +110,11 @@ export class CodexWaits {
     }
     return [message];
   }
+  finishSleeps(sessionId, state) {
+    const pending = this.sleeps.get(sessionId) ?? [];
+    this.sleeps.delete(sessionId);
+    return [...pending].map(waitId => ({ jsonrpc: '2.0', method: '_coda/wait', params: { sessionId, waitId, state } }));
+  }
   answer(message) {
     const asked = this.asked.get(message.id);
     if (!asked) return message;

package/package.json

@@ -3,7 +3,7 @@
   "id": "codex",
   "displayName": "Codex",
   "description": "Codex Agent：Coda 自带的入口运行 codex-acp，报告子 Agent 与后台命令。额度与登录由账号来源插件接管；未接入账号来源时使用 Codex 自己的登录面板。",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "categories": ["Agent"],
   "dependencies": {
     "@agentclientprotocol/codex-acp": "1.12.0",

package/scripts/quota.mjs

@@ -15,11 +15,9 @@ const identity = (account, workspace) => {
   return email && typeof workspace === 'string' && workspace ? { identity: `codex:${hash(`${email}\n${hash(workspace)}`)}` } : {};
 };
 const unixTime = value => typeof value === 'number' && Number.isFinite(new Date(value * 1000).getTime()) ? new Date(value * 1000).toISOString() : null;
-// A credit's expiry as the clients write times (UTC+8), here because a figure's value is text.
-export function utc8(seconds) {
-  const d = new Date(seconds * 1000 + 8 * 3600_000);
-  return `${d.getUTCFullYear()}/${String(d.getUTCMonth() + 1).padStart(2, '0')}/${String(d.getUTCDate()).padStart(2, '0')} ${d.getUTCHours()}:${String(d.getUTCMinutes()).padStart(2, '0')}`;
-}
+// A credit's expiry in a figure's text: a time mark, which each client writes in its own time zone (Coda's
+// docs/agent-protocol.md「文字里的时刻」).
+const mark = seconds => `<t:${unixTime(seconds)}>`;
 
 // A bar per window of each limit, of what is left. A limit's name is said only when there are several.
 export function windows(result) {
@@ -54,11 +52,11 @@ export function card(account, result, workspace) {
   const items = windows(result), resets = credits(result);
   if (resets) {
     const first = resets.listed[0];
-    const lines = resets.listed.map((c, i) => ({ type: 'stat', label: `第 ${i + 1} 次`, value: c.expiresAt == null ? '不会过期' : `${utc8(c.expiresAt)} 到期` }));
+    const lines = resets.listed.map((c, i) => ({ type: 'stat', label: `第 ${i + 1} 次`, value: c.expiresAt == null ? '不会过期' : `${mark(c.expiresAt)} 到期` }));
     const room = CARD_ITEMS - items.length - (first ? 2 : 1);
     items.push({ type: 'stat', label: '完全重置', value: `剩余 ${resets.count} 次` }, ...lines.slice(0, Math.max(0, room)));
     if (first && resets.count > 0) items.unshift({ type: 'button', label: '使用完全重置', action: 'reset', args: { creditId: first.id },
-      confirm: `使用 ${line(name, 60)} 的完全重置？\n用最早到期的那一次（${first.expiresAt == null ? '不会过期' : `${utc8(first.expiresAt)} 到期，UTC+8`}）。成功后消耗 1 次，无法撤销。` });
+      confirm: `使用 ${line(name, 60)} 的完全重置？\n用最早到期的那一次（${first.expiresAt == null ? '不会过期' : `${mark(first.expiresAt)} 到期`}）。成功后消耗 1 次，无法撤销。` });
   }
   if (!items.length) items.push({ type: 'error', text: '暂时无法获取额度：Codex 没有给出额度窗口' });
   return { type: 'card', title: name, ...(line(account.planType) ? { subtitle: line(account.planType) } : {}), ...identity(account, workspace), items: items.slice(0, CARD_ITEMS) };