@coda-console/claude 1.6.1 → 1.6.3

package/agent/session.mjs

@@ -42,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']);
+// What a turn says or does, as against what the session is (its settings, commands, title, usage).
+const SAYING = new Set([...CHUNKS, 'tool_call', 'tool_call_update', 'plan']);
 // How many messages sent into a prompt (steer) may be waiting to be taken at once.
 const STEERING_LIMIT = 32;
 
@@ -109,6 +111,8 @@ export class ClaudeSession {
       else early.push(update);
       return;
     }
+    // What a turn of Claude's own says comes after what it handles (`claim`).
+    if (sessionId === this.sessionId && SAYING.has(update.sessionUpdate)) this.waits.claim();
     this.notify('session/update', { sessionId, update });
   }
   registered(sessionId) {
@@ -306,13 +310,14 @@ export class ClaudeSession {
     this.begin();
     // A subagent's request is in its session.
     const sessionId = this.waits.childSession(context.agentID) ?? this.sessionId;
+    if (sessionId === this.sessionId) this.waits.claim();
     return toolName === 'AskUserQuestion'
       ? this.ask('elicitation/create', questionForm({ sessionId, toolCallId: context.toolUseID, input }), signal, { behavior: 'deny', message: '问答已失效' })
       : this.ask('session/request_permission', permissionRequest({ sessionId, toolName, input, context }), signal, denied);
   }
   elicitation(request, { signal }) {
     if (!['starting', 'running'].includes(this.phase)) return Promise.resolve({ action: 'cancel' });
-    this.begin();
+    this.begin(); this.waits.claim();
     return this.ask('elicitation/create', elicitationForm({ sessionId: this.sessionId, request }), signal, { action: 'cancel' });
   }
   // Asked of Coda until it answers; withdrawn (`$/cancel_request`) once the SDK no longer waits for the answer.
@@ -517,7 +522,7 @@ export class ClaudeSession {
       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) {
+    } else if (this.waits.handling || this.waits.unclaimed) {
       // 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 } : {});

package/agent/waits.mjs

@@ -4,7 +4,8 @@
 // What a subagent launches (`parent_task_id`) is told in that subagent's session, once a wait has told Coda that session.
 // A task that ends while no turn goes will wake Claude for its result: until a turn takes it up, or the session says idle,
 // it is still waited on. A turn Claude begins on its own handles what woke it (`takeUp`): what its opening message names,
-// else the tasks that ended, else the one wakeup due, else a wait of the turn's own; what it handles ends with that turn.
+// else the tasks that ended, else the one wakeup due, else a wait of the turn's own, told only once the turn says or asks
+// something (`claim`); what it handles ends with that turn.
 const FINAL = { completed: 'done', failed: 'failed', killed: 'cancelled', stopped: 'cancelled', ended: 'done' };
 const open = state => state === 'waiting' || state === 'handling';
 const cut = (value, limit) => typeof value === 'string' && value ? value.slice(0, limit) : undefined;
@@ -143,18 +144,27 @@ 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));
-    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');
-    else this.hold();
+    // 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(); } }
   hold() {
     const own = { waitId: `turn-${++this.turns}` };
     this.own.add(own);
@@ -164,6 +174,7 @@ export class ClaudeWaits {
   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).
+    this.unclaimed = false;
     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()) {

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