@coda-console/claude 1.6.2 → 1.6.4

package/agent/errors.mjs

@@ -1,11 +1,21 @@
 import { RequestError } from '@agentclientprotocol/sdk';
 
 // Only failed turns come here. Claude Code's synthetic assistant error and the subscription's rejected window are
-// evidence, ordinary assistant text and a bare HTTP 429 are not. Keep the provider's reset time/recovery advice intact.
+// evidence, ordinary assistant text and a bare HTTP 429 are not. Keep the provider's recovery advice intact (its reset time
+// said as a time mark: `marked`).
 const exhausted = message => /^(?:You've (?:hit|reached) your (?:session|weekly|5-hour|7-day|usage) limit\b|(?:Your )?[Cc]redit balance is too low\b|You're out of (?:usage credits|extra usage)\b|Your org is out of usage\b)/.test(message);
 
-export function claudeFailure(message, { error, limits } = {}) {
+// Claude Code says when the window that limits now resets in the time zone of the machine it runs on ("resets 5:10am
+// (Australia/Sydney)"), not of whoever reads it. With that window's reset known (`window`: the latest rate_limit_info,
+// which the CLI sends only as a window moves), the reason says it as a time mark instead, which each client writes in
+// its own time zone (Coda's docs/agent-protocol.md「文字里的时刻」).
+const windowReset = /^(You've (?:hit|reached) your [^·]+ · resets )[^·()]+ \([^()]+\)/;
+const marked = (message, window) => window?.status === 'rejected' && Number.isSafeInteger(window.resetsAt) && window.resetsAt > 0
+  ? message.replace(windowReset, (_, said) => `${said}<t:${new Date(window.resetsAt * 1000).toISOString()}>`) : message;
+
+export function claudeFailure(message, { error, limits, window } = {}) {
   const quota = (!error || ['rate_limit', 'billing_error'].includes(error)) &&
     (exhausted(message) || (error === 'rate_limit' && limits?.status === 'rejected'));
-  return new RequestError(-32603, message, quota ? { _meta: { coda: { failure: { kind: 'quota_exhausted' } } } } : undefined);
+  const data = quota ? { _meta: { coda: { failure: { kind: 'quota_exhausted' } } } } : undefined;
+  return new RequestError(-32603, quota ? marked(message, window) : message, data);
 }

package/agent/session.mjs

@@ -365,7 +365,7 @@ export class ClaudeSession {
       case 'user': return this.toolResults(m, parent);
       case 'result': return this.result(m);
       case 'rate_limit_event':
-        this.turnLimits = m.rate_limit_info;
+        this.turnLimits = this.window = m.rate_limit_info;
         if (this.env.CODA_PLUGIN_STATE) new ClaudeSessionLimits({ path: join(this.env.CODA_PLUGIN_STATE, 'limits.json') }).observe(m.rate_limit_info, this.account ?? null);
     }
   }
@@ -516,7 +516,7 @@ export class ClaudeSession {
     const id = ids.find(id => this.prompts.has(id)) ?? (steered ? this.held : undefined);
     const cancelled = interrupted(m), failed = !cancelled && (m.is_error || m.subtype !== 'success');
     const error = failed ? claudeFailure(m.errors?.length || m.result ? errorText(m) : this.turnError?.message || errorText(m),
-      { error: this.turnError?.error, limits: this.turnLimits }) : null;
+      { error: this.turnError?.error, limits: this.turnLimits, window: this.window }) : null;
     this.turnError = null; this.turnLimits = null;
     if (id) {
       const outcome = this.ending ?? (failed ? { failure: error } : { stopReason: cancelled ? 'cancelled' : 'end_turn' });

package/agent/waits.mjs

@@ -144,24 +144,24 @@ export class ClaudeWaits {
   takeUp({ origin, text } = {}) {
     const pending = [...this.tasks.values()].filter(task => task.final !== undefined && task.state === 'waiting');
     const crons = [...this.crons.values()].filter(cron => open(cron.state));
-    let handled = [];
-    if (origin?.kind === 'task-notification') handled = origin.subkind === 'scheduled-trigger' ? crons.filter(cron => cron.prompt && cron.prompt === text)
-      : [...this.tasks.values()].filter(task => origin.runId && task.runId === origin.runId && open(task.state));
-    // A message a subagent sent (SendMessage: its report handed back, or word of how it goes) is that subagent's. Taken up for
-    // what it said, not for its end (`messaged`): the subagent ends as its end is told, not with this turn.
-    if (origin?.kind === 'peer') {
-      handled = [...this.tasks.values()].filter(task => origin.senderTaskId && task.taskId === origin.senderTaskId && open(task.state));
-      for (const task of handled) task.messaged = true;
-    }
-    if (!handled.length) handled = pending.sort((a, b) => a.endedAt - b.endedAt);
-    if (!handled.length) {
+    // What its opening message names: the wakeup that fired, the run a notice is of, the subagent a message is from.
+    const named = origin?.kind === 'task-notification' ? origin.subkind === 'scheduled-trigger' ? crons.filter(cron => cron.prompt && cron.prompt === text)
+      : [...this.tasks.values()].filter(task => origin.runId && task.runId === origin.runId)
+      : origin?.kind === 'peer' ? [...this.tasks.values()].filter(task => origin.senderTaskId && task.taskId === origin.senderTaskId) : [];
+    // Handled means ended (Coda places its card there and lets it be stopped no more): a subagent's message is the report it
+    // handed back only once it has ended; one still running says how it goes (SendMessage).
+    let handled = origin?.kind === 'peer' ? named.filter(task => pending.includes(task)) : named.filter(wait => open(wait.state));
+    // One that names nothing known is taken for what else ended, else the one wakeup due. One that names what was taken in
+    // already (Claude Code's turn for the notice of a subagent whose report an earlier turn read) or what still runs is not.
+    if (!named.length) handled = pending.sort((a, b) => a.endedAt - b.endedAt);
+    if (!named.length && !handled.length) {
       // Which came due is not told: the one due, or else the only one there is.
       const due = crons.filter(cron => cron.at !== null && cron.at <= this.now() + 60_000);
       if ((due.length || crons.length) === 1) handled = due.length ? due : crons;
     }
     if (handled.length) for (const wait of handled) this.report(wait, 'handling');
-    // Nothing it names: told as a wait of its own once it says or asks something. One that says nothing is not told at all,
-    // as Claude Code's turn for the notice of a subagent whose report an earlier turn took in, which reaches no model.
+    // Nothing to take up: told as a wait of its own once it says or asks something. One that says nothing is not told at
+    // all, as that turn for a notice, which reaches no model.
     else this.unclaimed = true;
   }
   claim() { if (this.unclaimed) { this.unclaimed = false; this.hold(); } }
@@ -176,12 +176,7 @@ export class ClaudeWaits {
     // outcome, and leave recurring wakeups scheduled. There may already be a turn-owned activity (hold).
     this.unclaimed = false;
     if (error && !this.own.size) this.hold();
-    for (const task of this.tasks.values()) {
-      if (task.state !== 'handling') continue;
-      const messaged = task.messaged; task.messaged = false;
-      if (messaged && task.final === undefined) { this.report(task, 'waiting'); continue; }
-      this.report(task, task.final ?? 'done'); task.final = undefined;
-    }
+    for (const task of this.tasks.values()) if (task.state === 'handling') { this.report(task, task.final ?? 'done'); task.final = undefined; }
     for (const cron of this.crons.values()) {
       if (cron.state !== 'handling') continue;
       if (cron.final !== undefined || !cron.recurring) { this.report(cron, 'done'); continue; }

package/package.json

@@ -3,7 +3,7 @@
   "id": "claude",
   "displayName": "Claude",
   "description": "Claude SDK Agent：Coda 基于 Claude Agent SDK 写的 ACP 入口，一个进程一个 SDK 会话；资源页的「Claude」面板显示会话报告的额度，可从 Coda 登录。",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "categories": ["Agent"],
   "dependencies": {
     "@agentclientprotocol/sdk": "1.4.0",