@coda-console/claude 1.4.0 → 1.5.0

package/agent/models.mjs

@@ -29,13 +29,26 @@ export function reportedModel(models, current, model) {
 
 const select = (id, name, category, currentValue, choices) => ({ id, name, category, type: 'select', currentValue,
   options: choices.map(c => ({ value: c.id, name: c.name, ...(c._meta ? { _meta: c._meta } : {}) })) });
+// The models, grouped by where they come from once a model service's are among them (ACP's select groups, Coda's
+// docs/agent-protocol.md「模型的分组」): Claude's own, then each service's, under its title. Claude's alone are one plain list.
+function modelSelect(currentValue, models) {
+  if (!models.some(model => model.service)) return select('model', '模型', 'model', currentValue, models);
+  const groups = [{ group: 'claude', name: 'Claude', options: [] }];
+  for (const model of models) {
+    const id = model.service ?? 'claude';
+    let group = groups.find(g => g.group === id);
+    if (!group) groups.push(group = { group: id, name: model.group || id, options: [] });
+    group.options.push({ value: model.id, name: model.name });
+  }
+  return { id: 'model', name: '模型', category: 'model', type: 'select', currentValue, options: groups.filter(g => g.options.length) };
+}
 // The effort that leaves it to the model, marked as the agent's own default (docs/agent-protocol.md): what Coda goes back to
 // when the session's effort is taken off.
 export const MODEL_EFFORT = 'default';
 // `current`: { mode, model, effort }. An effort not chosen is null: the model's own default.
 export function configOptions(models, current) {
   const efforts = models.find(m => m.id === current.model)?.efforts ?? [];
-  return [select('mode', '审批模式', 'mode', current.mode, MODES), select('model', '模型', 'model', current.model, models),
+  return [select('mode', '审批模式', 'mode', current.mode, MODES), modelSelect(current.model, models),
     ...(efforts.length ? [select('effort', '推理强度', 'thought_level', efforts.includes(current.effort) ? current.effort : MODEL_EFFORT,
       [{ id: MODEL_EFFORT, name: '模型默认', _meta: { coda: { default: true } } }, ...efforts.map(id => ({ id, name: id }))])] : [])];
 }

package/agent/providers.mjs

@@ -1,38 +1,39 @@
-// The model service chosen in Coda (`claude.modelProvider`, Coda's docs/plugins.md「模型服务」): another plugin's service that
-// speaks Anthropic Messages, from CODA_MODEL_PROVIDERS. The models its address lists (`<地址>/models`) join Claude's own, each
-// named by the service and the model; a session on one runs Claude Code with the service as its API (`serviceSettings`), set
-// for that session's process only.
+// The model services chosen in Coda (`claude.modelProviders`, Coda's docs/plugins.md「模型服务」): other plugins' services
+// that speak Anthropic Messages, from CODA_MODEL_PROVIDERS. The models each lists (`<地址>/models`) join Claude's own, a group
+// of the service's each (Coda's docs/agent-protocol.md「模型的分组」); a session on one runs Claude Code with its service as
+// its API (`serviceSettings`), set for that session's process only.
 import { readFileSync } from 'node:fs';
 import { authOverrides } from './auth.mjs';
 
-export const SETTING = 'claude.modelProvider';
+export const SETTING = 'claude.modelProviders';
 const log = text => process.stderr.write(`[claude-agent] ${text}\n`);
 const parse = text => { try { return JSON.parse(text || '{}'); } catch { return {}; } };
 const LIST_TIMEOUT = 8000;
 
-// The chosen service: its address, title and key (read from the file Coda keeps it in). Null when none is chosen, or the
-// one chosen is not on this machine or speaks another API.
-export function chosenService(env = process.env) {
-  const ref = parse(env.CODA_PLUGIN_SETTINGS)[SETTING];
-  if (!ref) return null;
-  const provided = parse(env.CODA_MODEL_PROVIDERS)[ref];
-  if (!provided?.url) { log(`模型服务 ${ref} 在这台机器上没有`); return null; }
-  if (provided.api !== 'anthropic-messages') { log(`模型服务 ${ref} 讲 ${provided.api}，Claude 只接 anthropic-messages 的`); return null; }
-  let key;
-  try { key = provided.keyFile ? readFileSync(provided.keyFile, 'utf8').trim() || undefined : undefined; }
-  catch (e) { log(`读不到模型服务 ${ref} 的 Key：${e.message}`); }
-  return { ref, title: provided.title || ref, url: provided.url, key };
+// The services chosen, in the order chosen: each its address, title and key (read from the file Coda keeps it in). One not
+// on this machine, or speaking another API, is left out.
+export function chosenServices(env = process.env) {
+  const refs = parse(env.CODA_PLUGIN_SETTINGS)[SETTING], provided = parse(env.CODA_MODEL_PROVIDERS);
+  return (Array.isArray(refs) ? refs : []).flatMap(ref => {
+    const service = provided[ref];
+    if (!service?.url) { log(`模型服务 ${ref} 在这台机器上没有`); return []; }
+    if (service.api !== 'anthropic-messages') { log(`模型服务 ${ref} 讲 ${service.api}，Claude 只接 anthropic-messages 的`); return []; }
+    let key;
+    try { key = service.keyFile ? readFileSync(service.keyFile, 'utf8').trim() || undefined : undefined; }
+    catch (e) { log(`读不到模型服务 ${ref} 的 Key：${e.message}`); }
+    return [{ ref, title: service.title || ref, url: service.url, key }];
+  });
 }
 
-// The models the service lists, asked as an Anthropic client asks (Coda's「检查可用模型」): `<服务>/<模型>`, named by the
-// model and the service. They have no effort to choose.
+// The models a service lists, asked as an Anthropic client asks (Coda's「检查可用模型」): `<服务>/<模型>`, named by the
+// model, in the service's group. They have no effort to choose.
 export async function serviceModels({ ref, title, url, key }, fetcher = fetch) {
   const at = `${url.replace(/\/+$/, '')}/models?limit=1000`;
   const response = await fetcher(at, { headers: key ? { 'x-api-key': key, 'anthropic-version': '2023-06-01' } : {}, signal: AbortSignal.timeout(LIST_TIMEOUT) });
   if (!response.ok) throw new Error(`${at} 回答 ${response.status}`);
   const body = await response.json();
   return (Array.isArray(body?.data) ? body.data : []).filter(model => typeof model?.id === 'string' && model.id)
-    .map(model => ({ id: `${ref}/${model.id}`, name: `${model.id} (${title})`, efforts: [], model: model.id }));
+    .map(model => ({ id: `${ref}/${model.id}`, name: model.id, efforts: [], model: model.id, service: ref, group: title }));
 }
 
 // The flag settings Claude Code runs a service's model with (above the machine's and the project's settings, its environment
@@ -45,9 +46,10 @@ export function serviceSettings({ url, key }, model) {
     CLAUDE_CODE_SUBAGENT_MODEL: model } };
 }
 
-// The service's models, listed with Claude's own: none when it cannot list them now.
-export async function listedModels(service) {
-  if (!service) return [];
-  try { return await serviceModels(service); }
-  catch (e) { log(`模型服务 ${service.ref} 列不出模型：${e.message}`); return []; }
+// The services' models, listed with Claude's own in the order the services are chosen: none of one that cannot list them now.
+export async function listedModels(services) {
+  return (await Promise.all(services.map(async service => {
+    try { return await serviceModels(service); }
+    catch (e) { log(`模型服务 ${service.ref} 列不出模型：${e.message}`); return []; }
+  }))).flat();
 }

package/agent/session.mjs

@@ -11,7 +11,7 @@ import { join } from 'node:path';
 import { agent, PROTOCOL_VERSION, RequestError } from '@agentclientprotocol/sdk';
 import { ClaudeSessionLimits, accountHash } from './limits.mjs';
 import { sdkEnvironment } from './auth.mjs';
-import { chosenService, listedModels, serviceSettings } from './providers.mjs';
+import { chosenServices, listedModels, serviceSettings } from './providers.mjs';
 import { SessionTitle } from './titles.mjs';
 import { MODEL_EFFORT, MODES, claudeModels, configOptions, reportedModel } from './models.mjs';
 import { permissionRequest } from './permissions.mjs';
@@ -59,8 +59,8 @@ 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 model service chosen in Coda (providers.mjs), and the model of it the query runs on: null on Claude's own.
-    this.service = chosenService(env); this.serviceModel = null;
+    // 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 };
     // Streamed text by API message, so that the complete message adds only what was not streamed; tool calls said.
     this.streams = new Map(); this.streamed = new Map(); this.tools = new Set(); this.children = new Set(); this.early = new Map(); this.compaction = null;
@@ -77,7 +77,12 @@ export class ClaudeSession {
       .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))
-      .onNotification('session/cancel', ({ params }) => { if (params.sessionId === this.sessionId) void this.query?.interrupt().catch(() => {}); })
+      .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(() => {});
+      })
       .onRequest('_coda/wait/stop', params => params, ({ params }) => this.stopWait(params))
       .connect(stream);
     this.client = this.connection.client;
@@ -117,7 +122,7 @@ export class ClaudeSession {
       // Coda's servers are stdio ones; the SDK keys them by name.
       const servers = Object.fromEntries(mcpServers.filter(server => typeof server.command === 'string').map(({ name, command, args = [], env = [] }) =>
         [name, { command, args, ...(env.length ? { env: Object.fromEntries(env.map(variable => [variable.name, variable.value])) } : {}) }]));
-      // What every query of the session starts with; a model of the chosen service runs in a query of its own (`reroute`).
+      // What every query of the session starts with; a model of a chosen service runs in a query of its own (`reroute`).
       this.launch = {
         // Skipping every approval is a mode the user may switch to later; the SDK refuses it unless allowed at start.
         permissionMode: 'default', allowDangerouslySkipPermissions: true, settingSources: ['user', 'project', 'local'],
@@ -141,7 +146,7 @@ export class ClaudeSession {
         onElicitation: (request, context) => this.elicitation(request, context),
         stderr: data => process.stderr.write(data),
       };
-      const listed = listedModels(this.service);
+      const listed = listedModels(this.services);
       this.start(resume ? { resume } : { sessionId: this.sessionId });
       const initialization = await this.initialized(), served = await listed;
       if (this.phase !== 'starting') throw failure('Claude 会话在初始化时结束', -32001);
@@ -159,14 +164,14 @@ export class ClaudeSession {
       throw error instanceof RequestError ? error : failure(error?.message || 'Claude 会话启动失败');
     }
   }
-  // A query of the session, reading a prompt stream of its own: on Claude's own models, or on `model` of the chosen
+  // A query of the session, reading a prompt stream of its own: on Claude's own models, or on `model` of a chosen
   // service, which it runs with that service as its API and that model for every role. One started after the session
   // opened goes on with the model, mode and effort chosen.
   start(at, model) {
     this.input = new InputStream();
     const entry = this.served(model);
     const settings = { ...this.launch.settings, ...(this.current.effort ? { effortLevel: this.current.effort } : {}),
-      ...(entry ? serviceSettings(this.service, entry.model) : {}) };
+      ...(entry ? serviceSettings(this.services.find(service => service.ref === entry.service), entry.model) : {}) };
     this.serviceModel = entry ? model : null;
     this.query = this.sdk.query({ prompt: this.input, options: { ...this.launch, ...at, settings,
       ...(this.phase === 'running' ? { permissionMode: this.current.mode, model: entry ? entry.model : this.current.model } : {}) } });
@@ -179,7 +184,7 @@ export class ClaudeSession {
       new Promise((_, reject) => { timer = setTimeout(() => reject(failure('Claude 初始化超时', -32001)), this.initializationTimeoutMs); })])
       .finally(() => clearTimeout(timer));
   }
-  // The model chosen is of another service than the query's (Claude's own, or the chosen service's): the session goes on in a
+  // The model chosen is of another service than the query's (Claude's own, or a chosen service's): the session goes on in a
   // query started for it, resuming what the last one said. Before a turn, as Coda sets a session's model before each.
   async reroute() {
     const previous = this.query;
@@ -198,9 +203,9 @@ export class ClaudeSession {
       throw error instanceof RequestError ? error : failure(error?.message || 'Claude 会话启动失败');
     }
   }
-  // The chosen service's model that `model` is; null for one of Claude's own.
+  // The chosen services' model that `model` is; null for one of Claude's own.
   served(model) { return this.models.find(m => m.id === model && m.model) ?? null; }
-  // Whether the next turn runs in another query than this one: on the service's models, or back on Claude's own.
+  // Whether the next turn runs in another query than this one: on another service's model, or back on Claude's own.
   rerouted() { return (this.served(this.current.model)?.id ?? null) !== this.serviceModel; }
   async configure(configId, value) {
     if (this.phase !== 'running') throw failure('Claude 会话未在运行', -32001);
@@ -209,7 +214,7 @@ export class ClaudeSession {
       await this.query.setPermissionMode(value); this.current.mode = value;
     } else if (configId === 'model') {
       if (!this.models.some(model => model.id === value)) throw failure('模型不可用', -32602);
-      // Between Claude's own models the query switches; to or from the service's, the next turn runs in another one, and
+      // Between Claude's own models the query switches; to or from a service's, the next turn runs in another one, and
       // what this one still runs would end with it.
       const switching = (this.served(value)?.id ?? null) !== this.serviceModel;
       if (switching && (this.prompts.size || this.waits.pending)) throw failure('后台任务、子 Agent 或定时唤醒还没结束，结束后才能换到这个模型', -32602);
@@ -229,7 +234,12 @@ export class ClaudeSession {
   // Answered when the native result that names this input arrives; accepting it into the input says nothing yet.
   async prompt({ prompt }) {
     if (this.phase !== 'running') throw failure('Claude 会话未在运行', -32001);
-    if (this.rerouted()) await (this.rerouting ??= this.reroute().finally(() => { this.rerouting = null; }));
+    if (this.rerouted()) {
+      if (!this.rerouting) { this.cancelling = false; this.rerouting = this.reroute().finally(() => { this.rerouting = null; }); }
+      await this.rerouting;
+      // Stopped while it moved: the input is not given to the new query.
+      if (this.cancelling) { this.cancelling = false; return { stopReason: 'cancelled' }; }
+    }
     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 } });
@@ -311,7 +321,7 @@ export class ClaudeSession {
         if (m.session_id !== this.sessionId) return;
         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 the service's name for it.
+        // service's model reports it by that service's name for it.
         this.current = { ...this.current, model: this.serviceModel ?? reportedModel(this.models, this.current.model, m.model), mode: m.permissionMode ?? this.current.mode };
         if (!this.title) {
           const sessionId = this.sessionId;

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.4.0",
+  "version": "1.5.0",
   "dependencies": {
     "@agentclientprotocol/sdk": "1.4.0",
     "@anthropic-ai/claude-agent-sdk": "0.3.296"
@@ -35,12 +35,16 @@
     "configuration": {
       "title": "Claude",
       "properties": {
-        "claude.modelProvider": {
-          "type": "string",
-          "format": "coda-model-provider",
+        "claude.modelProviders": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "format": "coda-model-provider",
+            "modelApis": ["anthropic-messages"]
+          },
           "title": "模型服务",
           "order": 1,
-          "description": "选一个插件提供的模型服务（如 Magpie），它列出的模型和 Claude 自己的模型一起出现在会话的模型里；选中它的模型，那个会话就走这个服务，Claude 自己的模型照旧。只接 Anthropic 接口（anthropic-messages）的服务。"
+          "description": "勾选插件提供的模型服务（如 Magpie），每个服务各成一组，它列出的模型和 Claude 自己的模型一起出现在会话的模型里；选中哪个服务的模型，那个会话就走那个服务，Claude 自己的模型照旧。只列 Anthropic 接口（anthropic-messages）的服务。"
         }
       }
     },