@coda-console/claude 1.6.0 → 1.6.1

package/agent/errors.mjs

@@ -0,0 +1,11 @@
+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.
+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 } = {}) {
+  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);
+}

package/agent/session.mjs

@@ -10,6 +10,7 @@ import { realpath, stat } from 'node:fs/promises';
 import { join } from 'node:path';
 import { agent, PROTOCOL_VERSION, RequestError } from '@agentclientprotocol/sdk';
 import { ClaudeSessionLimits, accountHash } from './limits.mjs';
+import { claudeFailure } from './errors.mjs';
 import { sdkEnvironment } from './auth.mjs';
 import { chosenServices, listedModels, serviceSettings } from './providers.mjs';
 import { SessionTitle } from './titles.mjs';
@@ -286,7 +287,7 @@ export class ClaudeSession {
     if (!prompt) return;
     // What ended before this turn ended was taken in by it.
     this.waits.settled();
-    if (error) prompt.reject(failure(error)); else prompt.resolve({ stopReason });
+    if (error) prompt.reject(error); else prompt.resolve({ stopReason });
   }
   // What is said to the session goes into what its title is made of.
   heard(content) {
@@ -358,7 +359,9 @@ export class ClaudeSession {
       case 'assistant': return this.assistant(m, parent);
       case 'user': return this.toolResults(m, parent);
       case 'result': return this.result(m);
-      case 'rate_limit_event': 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);
+      case 'rate_limit_event':
+        this.turnLimits = 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);
     }
   }
   system(m) {
@@ -366,6 +369,7 @@ export class ClaudeSession {
       case 'init': {
         if (m.session_id !== this.sessionId) return;
         this.turning = true;
+        this.turnError = null; this.turnLimits = null;
         this.terminal = m.terminal_slash_commands ?? [];
         // Its effort is the one applied, the model's own included: what was chosen stays what it was. A query on the
         // service's model reports it by that service's name for it.
@@ -462,6 +466,13 @@ export class ClaudeSession {
   assistant(m, parent) {
     const sessionId = parent ?? this.sessionId, apiId = m.message?.id, blocks = this.streamed.get(apiId);
     if (parent) this.waits.model(parent, m.message?.model);
+    // API failures are synthetic assistant messages, followed by a result (even subtype "success" can be is_error).
+    // The result ends the turn and reports its failure; sending the synthetic message as prose would look like an answer.
+    // A child's error belongs to that child, never to the parent's prompt.
+    if (!parent) {
+      this.turnError = m.error ? { error: m.error, message: text(m.message?.content) } : null;
+      if (m.error) return;
+    }
     for (const block of m.message?.content ?? []) {
       if (block.type === 'tool_use') {
         this.tools.add(block.id);
@@ -499,17 +510,20 @@ export class ClaudeSession {
     const steered = ids.filter(id => this.steering.delete(id)).length > 0;
     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;
+    this.turnError = null; this.turnLimits = null;
     if (id) {
-      const outcome = this.ending ?? (failed ? { failure: errorText(m) } : { stopReason: cancelled ? 'cancelled' : 'end_turn' });
+      const outcome = this.ending ?? (failed ? { failure: error } : { stopReason: cancelled ? 'cancelled' : 'end_turn' });
       if (this.ending || !this.steering.size) this.settle(id, outcome);
       else { this.held = id; if (cancelled || failed) this.dropRest(outcome); }
     } else if (this.waits.handling) {
-      // A turn of Claude's own has no reply to fail: what went wrong is said in it.
-      if (failed) this.chunk(this.sessionId, 'text', m.uuid, errorText(m));
-      this.waits.finished();
+      // A turn of Claude's own has no RPC reply to fail. End its own activity as failed with the reason, rather than
+      // saying the error as an answer and marking the work complete. The task that woke it retains its own outcome.
+      this.waits.finished(error ? { error: error.message, title: error.data?._meta?.coda?.failure?.kind === 'quota_exhausted' ? '额度不足' : undefined } : {});
     } else if (failed && this.prompts.size) {
       // A failure of the session itself names no input: none of those given can be said to have run.
-      for (const prompt of this.prompts.values()) prompt.reject(failure(errorText(m)));
+      for (const prompt of this.prompts.values()) prompt.reject(error);
       this.prompts.clear();
     }
     void this.title?.refresh(!failed && !cancelled);

package/agent/waits.mjs

@@ -161,7 +161,10 @@ export class ClaudeWaits {
     this.report(own, 'handling', { kind: 'task', title: 'Claude 自主继续', stoppable: false });
   }
   // That turn's end: what it handled ended with it, a recurring wakeup waits for its next time.
-  finished() {
+  finished({ error, title } = {}) {
+    // Processing a successful task's result can fail. Give that failure its own activity instead of changing the task's
+    // outcome, and leave recurring wakeups scheduled. There may already be a turn-owned activity (hold).
+    if (error && !this.own.size) this.hold();
     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;
@@ -169,7 +172,7 @@ export class ClaudeWaits {
       cron.at = nextRun(cron.schedule, this.now());
       this.report(cron, 'waiting', { at: cron.at === null ? undefined : new Date(cron.at).toISOString() });
     }
-    for (const own of this.own) this.report(own, 'done');
+    for (const own of this.own) this.report(own, error ? 'failed' : 'done', error ? { title, detail: cut(error, 4000) } : {});
     this.own.clear();
   }
   // A stop Coda asks of a wait: the task to stop when it still goes (null: none). One that ended and is yet to be taken in is

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.0",
+  "version": "1.6.1",
   "categories": ["Agent"],
   "dependencies": {
     "@agentclientprotocol/sdk": "1.4.0",