@coda-console/claude 1.5.2 → 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';
@@ -41,6 +42,8 @@ const denied = { behavior: 'deny', message: 'Coda 没有在请求结束前给出
 // A child session's output that comes before its task, kept until the task names that session: all of it, since what streamed
 // counts as said, a message's streamed pieces as one.
 const CHUNKS = new Set(['agent_message_chunk', 'agent_thought_chunk']);
+// How many messages sent into a prompt (steer) may be waiting to be taken at once.
+const STEERING_LIMIT = 32;
 
 class InputStream {
   queue = []; wake = null; ended = false;
@@ -59,6 +62,9 @@ export class ClaudeSession {
   constructor({ sdk, env = process.env, environment = sdkEnvironment, initializationTimeoutMs = 60_000, onEnded = () => {} }) {
     Object.assign(this, { sdk, env, environment, initializationTimeoutMs, onEnded });
     this.phase = 'new'; this.input = new InputStream(); this.prompts = new Map(); this.withdrawals = new Set();
+    // The messages sent into the prompt's turn not yet taken (steer), the prompt whose own turn ended before they were, how
+    // the prompt ends once it is ending before they are taken (dropRest), and whether a native turn is going.
+    this.steering = new Set(); this.held = null; this.ending = null; this.turning = false;
     // The model services chosen in Coda (providers.mjs), and the service's model the query runs on: null on Claude's own.
     this.services = chosenServices(env); this.serviceModel = null;
     this.models = []; this.commands = []; this.terminal = null; this.current = { mode: 'default', model: undefined, effort: null };
@@ -70,18 +76,22 @@ export class ClaudeSession {
   connect(stream) {
     this.connection = agent({ name: 'coda-claude' })
       .onRequest('initialize', () => ({ protocolVersion: PROTOCOL_VERSION, agentInfo: SDK ? { name: 'claude-agent-sdk', version: SDK } : { name: 'coda-claude', version: '1' },
-        agentCapabilities: { loadSession: true, sessionCapabilities: { additionalDirectories: {}, systemPrompt: {} }, _meta: { coda: { waits: {} } } } }))
+        agentCapabilities: { loadSession: true, sessionCapabilities: { additionalDirectories: {}, systemPrompt: {} }, _meta: { coda: { waits: {} } } },
+        _meta: { steering: { supported: true } } }))
       // The SDK's own reading of these drops what its schema does not name, `systemPrompt` among them: they are read as sent.
       .onRequest('session/new', params => params ?? {}, ({ params }) => this.open(params))
       .onRequest('session/load', params => params ?? {}, ({ params }) => this.open(params, params.sessionId))
       .onRequest('session/set_config_option', ({ params }) => this.configure(params.configId, params.value))
       .onRequest('session/set_mode', async ({ params }) => { await this.configure('mode', params.modeId); return {}; })
       .onRequest('session/prompt', ({ params }) => this.prompt(params))
+      .onRequest('_session/steering', params => params ?? {}, ({ params }) => this.steer(params))
       .onNotification('session/cancel', ({ params }) => {
         if (params.sessionId !== this.sessionId) return;
         // While the session moves to another query there is none to interrupt: the turn waiting on the move is stopped there.
         if (this.rerouting) this.cancelling = true;
-        void this.query?.interrupt().catch(() => {});
+        // Messages sent into the turn and not taken yet (steer) are stopped with it: else Claude Code would run them after.
+        if (this.steering.size) this.dropRest({ stopReason: 'cancelled' });
+        else void this.query?.interrupt().catch(() => {});
       })
       .onRequest('_coda/wait/stop', params => params, ({ params }) => this.stopWait(params))
       .connect(stream);
@@ -243,9 +253,46 @@ export class ClaudeSession {
     const id = randomUUID(), content = prompt.filter(block => block.type === 'text').map(block => block.text).join('\n');
     const answered = new Promise((resolve, reject) => this.prompts.set(id, { resolve, reject }));
     this.input.push({ type: 'user', uuid: id, session_id: this.sessionId, parent_tool_use_id: null, message: { role: 'user', content } });
+    this.heard(content);
+    return answered;
+  }
+  // A message into the turn going (docs/agent-protocol.md「插话」): Claude Code takes one sent with priority `next` into the
+  // turn it runs at its next tool round, and runs one the turn ended before as a turn of its own right after, which the
+  // prompt waits for too (result): either way it is that prompt's. With no prompt of Coda's going, Coda sends it as the next.
+  // A result names at most 64 of the messages it took in (the SDK's user_message_uuids): few enough go in at a time that each is
+  // named; one more is Coda's to send as the next turn, as it is with no turn going.
+  steer({ prompt }) {
+    if (this.phase !== 'running' || !this.prompts.size || this.ending) return { outcome: 'promptRequired', reason: 'noRunningTurn' };
+    if (this.steering.size >= STEERING_LIMIT) return { outcome: 'promptRequired', reason: 'tooManyPending' };
+    const id = randomUUID(), content = prompt.filter(block => block.type === 'text').map(block => block.text).join('\n');
+    this.steering.add(id);
+    this.input.push({ type: 'user', uuid: id, session_id: this.sessionId, parent_tool_use_id: null, priority: 'next', message: { role: 'user', content } });
+    this.heard(content);
+    return { outcome: 'injected' };
+  }
+  // What was said into the prompt and is not taken yet is not to run after it ends, stopped or failed: Claude Code drops it
+  // (cancelQueued), and the prompt ends as `outcome` once nothing of it goes on — at the drop's receipt when no native turn
+  // is going (one held, whose own turn ended), else as the turn going ends (result).
+  dropRest(outcome) {
+    this.ending = outcome;
+    void this.query?.interrupt({ cancelQueued: true }).then(receipt => {
+      for (const id of receipt?.cancelled ?? []) this.steering.delete(id);
+      if (this.held && !this.turning) this.settle(this.held, this.ending);
+    }, () => {});
+  }
+  // The prompt answered: as it ended, and with nothing of it left to take.
+  settle(id, { stopReason, failure: error }) {
+    const prompt = this.prompts.get(id);
+    this.prompts.delete(id); this.held = null; this.ending = null; this.steering.clear();
+    if (!prompt) return;
+    // What ended before this turn ended was taken in by it.
+    this.waits.settled();
+    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) {
     this.titleContext = ((this.titleContext ?? '') + '\n' + content + '\n').slice(-1000);
     if (this.title) { this.title.append(this.titleContext); this.titleContext = ''; }
-    return answered;
   }
   async stopWait({ waitId }) {
     const taskId = this.phase === 'running' ? this.waits.stop(waitId) : null;
@@ -296,7 +343,7 @@ export class ClaudeSession {
   end(query, error) {
     if (this.phase === 'ended') return;
     const intended = this.phase === 'closing';
-    this.phase = 'ended'; this.input.close();
+    this.phase = 'ended'; this.input.close(); this.steering.clear(); this.held = null; this.ending = null;
     for (const withdrawn of this.withdrawals) withdrawn.abort();
     for (const { reject } of this.prompts.values()) reject(failure(error?.message ?? 'Claude 会话已结束'));
     this.prompts.clear();
@@ -312,13 +359,17 @@ 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) {
     switch (m.subtype) {
       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.
@@ -415,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);
@@ -444,20 +502,28 @@ export class ClaudeSession {
     const usage = m.usage ?? {}, windows = Object.values(m.modelUsage ?? {});
     this.update(this.sessionId, { sessionUpdate: 'usage_update', used: (usage.input_tokens ?? 0) + (usage.cache_read_input_tokens ?? 0) + (usage.cache_creation_input_tokens ?? 0),
       size: Math.max(0, ...windows.map(w => w.contextWindow ?? 0)), cost: { amount: m.total_cost_usd ?? 0, currency: 'USD' } });
-    const ids = m.user_message_uuids ?? (m.user_message_uuid ? [m.user_message_uuid] : []), id = ids.find(id => this.prompts.has(id));
+    this.turning = false;
+    const ids = m.user_message_uuids ?? (m.user_message_uuid ? [m.user_message_uuid] : []);
+    // A message sent into the prompt's turn (steer) is the prompt's, and so is the turn Claude Code runs it in when the prompt's
+    // own ended before taking it: the prompt is answered once none is left to take. Stopped or failed with some not taken
+    // yet, it ends once those are dropped (dropRest); one ending already ends as it was to.
+    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 prompt = this.prompts.get(id); this.prompts.delete(id);
-      // What ended before this turn ended was taken in by it.
-      this.waits.settled();
-      if (failed) prompt.reject(failure(errorText(m))); else prompt.resolve({ 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.5.2",
+  "version": "1.6.1",
   "categories": ["Agent"],
   "dependencies": {
     "@agentclientprotocol/sdk": "1.4.0",