talon-agent 3.34.0 → 3.35.0

package/src/backend/remote-server/model-catalog/presentation.ts

@@ -115,261 +115,302 @@ export interface RemoteModelPresentation {
   ): string;
 }
 
-export function createRemoteModelPresentation(
-  options: RemotePresentationOptions,
-): RemoteModelPresentation {
-  const {
-    label,
-    getCatalog,
-    maxCallbackIdLength,
-    allowCallbackSeparators,
-    quickPickLimit,
-    groupThreshold = 60,
-  } = options;
+/** `RemotePresentationOptions` with defaults applied — what every renderer takes. */
+type Knobs = Required<RemotePresentationOptions>;
 
-  function isCallbackSafeModelID(modelID: string): boolean {
-    if (modelID.length > maxCallbackIdLength) return false;
-    if (allowCallbackSeparators) return true;
-    return !modelID.includes(":") && !modelID.includes("/");
-  }
+const LIST_PREVIEW = 24;
+const FREE_PREVIEW = 8;
 
-  function getQuickPickModels(
-    catalog: RemoteModelCatalog,
-    currentModelID?: string,
-  ): Array<RemoteModelCatalogEntry> {
-    const picks: Array<RemoteModelCatalogEntry> = [];
-    const seen = new Set<string>();
+function isCallbackSafeModelID(knobs: Knobs, modelID: string): boolean {
+  if (modelID.length > knobs.maxCallbackIdLength) return false;
+  if (knobs.allowCallbackSeparators) return true;
+  return !modelID.includes(":") && !modelID.includes("/");
+}
 
-    const tryAdd = (model: RemoteModelCatalogEntry | undefined) => {
-      if (!model || seen.has(model.id) || !isCallbackSafeModelID(model.id))
-        return;
-      picks.push(model);
-      seen.add(model.id);
-    };
+/** `• <selection> — <name> (<provider> · <price> · <ctx> · <availability>)` */
+function describeModel(
+  model: RemoteModelCatalogEntry,
+  catalog: RemoteModelCatalog,
+): string {
+  const tags = [
+    model.providerName,
+    model.free ? "free" : `$${model.costInput}/${model.costOutput}`,
+    `${formatCtxWindow(model.contextWindow)} ctx`,
+    getAvailabilityLabel(model),
+  ];
+  return `• ${getRemoteModelSelectionValue(model, catalog)} — ${model.name} (${tags.join(" · ")})`;
+}
 
-    if (currentModelID) {
-      const currentModel = resolveRemoteModelInput(currentModelID, catalog);
-      if (currentModel.kind === "exact") {
-        tryAdd(currentModel.model);
-      } else if (currentModel.kind === "ambiguous") {
-        tryAdd(currentModel.matches[0]);
-      }
-    }
+function describeProvider(
+  provider: RemoteModelCatalog["providers"][number],
+): string {
+  const detail = provider.connected
+    ? "connected"
+    : provider.loginRequired
+      ? `login: ${provider.authMethods.join(", ")}`
+      : provider.envRequired
+        ? `env: ${provider.envKeys.join(", ")}`
+        : provider.source;
+  return `• ${provider.name} (${provider.id}) — ${detail} · ${provider.modelCount} models`;
+}
 
-    for (const model of catalog.connectedFreeModels) {
-      if (picks.length >= quickPickLimit) break;
-      tryAdd(model);
-    }
+function getQuickPickModels(
+  knobs: Knobs,
+  catalog: RemoteModelCatalog,
+  currentModelID?: string,
+): Array<RemoteModelCatalogEntry> {
+  const picks: Array<RemoteModelCatalogEntry> = [];
+  const seen = new Set<string>();
+
+  const tryAdd = (model: RemoteModelCatalogEntry | undefined) => {
+    if (!model || seen.has(model.id) || !isCallbackSafeModelID(knobs, model.id))
+      return;
+    picks.push(model);
+    seen.add(model.id);
+  };
 
-    if (picks.length < quickPickLimit) {
-      for (const model of catalog.connectedModels) {
-        if (picks.length >= quickPickLimit) break;
-        tryAdd(model);
-      }
+  if (currentModelID) {
+    const currentModel = resolveRemoteModelInput(currentModelID, catalog);
+    if (currentModel.kind === "exact") {
+      tryAdd(currentModel.model);
+    } else if (currentModel.kind === "ambiguous") {
+      tryAdd(currentModel.matches[0]);
     }
+  }
 
-    return picks;
+  for (const model of catalog.connectedFreeModels) {
+    if (picks.length >= knobs.quickPickLimit) break;
+    tryAdd(model);
   }
 
-  async function getSettingsPresentation(
-    activeModel: string,
-    options: RemotePickerOptions = {},
-  ): Promise<RemotePickerResult> {
-    const callbackPrefix = options.callbackPrefix ?? "settings:model:";
-    const navPrefix = options.navCallbackPrefix ?? "settings:models";
-    const catalog = await getCatalog();
-    const current = getRemoteModelInfo(catalog, activeModel);
+  if (picks.length < knobs.quickPickLimit) {
+    for (const model of catalog.connectedModels) {
+      if (picks.length >= knobs.quickPickLimit) break;
+      tryAdd(model);
+    }
+  }
 
-    const filter = options.filter === "free" ? "free" : "all";
-    const selectable = catalog.connectedModels.filter((m) =>
-      isCallbackSafeModelID(m.id),
-    );
-    const freeCount = selectable.filter((m) => m.free).length;
-    const scoped = selectable.filter(
-      (m) =>
-        (filter === "all" || m.free) &&
-        (!options.provider || m.providerID === options.provider),
-    );
+  return picks;
+}
 
-    // A remote catalog can run to hundreds of models, and only the first
-    // page's worth ever fit on screen — so offer the provider list as the
-    // way in when nothing narrower was asked for and the flat list would be
-    // unreadable anyway.
-    const providers = catalog.connectedProviders;
-    const asGroups =
-      !options.provider &&
-      providers.length > 1 &&
-      scoped.length > groupThreshold;
+/** One page of the picker: provider chips when the flat list is unreadable, models otherwise. */
+type PickerPage = {
+  asGroups: boolean;
+  page: number;
+  totalPages: number;
+  providers: RemoteModelCatalog["connectedProviders"];
+  models: Array<RemoteModelCatalogEntry>;
+};
 
-    const pageSize = Math.max(1, options.pageSize ?? quickPickLimit);
-    const source = asGroups ? providers : scoped;
-    const totalPages = Math.max(1, Math.ceil(source.length / pageSize));
-    const page = Math.min(Math.max(1, options.page ?? 1), totalPages);
-    const slice = source.slice((page - 1) * pageSize, page * pageSize);
+function pagePicker(
+  knobs: Knobs,
+  catalog: RemoteModelCatalog,
+  scoped: Array<RemoteModelCatalogEntry>,
+  options: RemotePickerOptions,
+): PickerPage {
+  // A remote catalog can run to hundreds of models, and only the first
+  // page's worth ever fit on screen — so offer the provider list as the
+  // way in when nothing narrower was asked for and the flat list would be
+  // unreadable anyway.
+  const providers = catalog.connectedProviders;
+  const asGroups =
+    !options.provider &&
+    providers.length > 1 &&
+    scoped.length > knobs.groupThreshold;
+  const pageSize = Math.max(1, options.pageSize ?? knobs.quickPickLimit);
+  const source = asGroups ? providers : scoped;
+  const totalPages = Math.max(1, Math.ceil(source.length / pageSize));
+  const page = Math.min(Math.max(1, options.page ?? 1), totalPages);
+  const from = (page - 1) * pageSize;
+  return {
+    asGroups,
+    page,
+    totalPages,
+    providers: asGroups ? providers.slice(from, from + pageSize) : [],
+    models: asGroups ? [] : scoped.slice(from, from + pageSize),
+  };
+}
 
-    const modelButtons: Array<ModelButton> = asGroups
-      ? (slice as typeof providers).map((p) => ({
-          text: `${p.name} (${p.modelCount})`,
-          callback_data: `${navPrefix}:provider:${p.id}`,
-        }))
-      : (slice as typeof scoped).map((m) => {
-          const btnLabel =
-            m.id.length <= 20 ? m.id : m.name.length <= 20 ? m.name : m.id;
-          const txt = m.free ? `${btnLabel} ★` : btnLabel;
-          const sel =
-            current &&
-            m.id === current.id &&
-            m.providerID === current.providerID;
-          return {
-            text: sel ? `✓ ${txt}` : txt,
-            callback_data: `${callbackPrefix}${m.id}`,
-          };
-        });
-    if (!asGroups) {
-      modelButtons.push({
-        text: "Reset",
-        callback_data: `${callbackPrefix}reset`,
-      });
-    }
+function pickerButtons(
+  paged: PickerPage,
+  current: RemoteModelCatalogEntry | undefined,
+  callbackPrefix: string,
+  navPrefix: string,
+): Array<ModelButton> {
+  if (paged.asGroups) {
+    return paged.providers.map((p) => ({
+      text: `${p.name} (${p.modelCount})`,
+      callback_data: `${navPrefix}:provider:${p.id}`,
+    }));
+  }
+  const buttons = paged.models.map((m) => {
+    const btnLabel =
+      m.id.length <= 20 ? m.id : m.name.length <= 20 ? m.name : m.id;
+    const txt = m.free ? `${btnLabel} ★` : btnLabel;
+    const sel =
+      current && m.id === current.id && m.providerID === current.providerID;
+    return {
+      text: sel ? `✓ ${txt}` : txt,
+      callback_data: `${callbackPrefix}${m.id}`,
+    };
+  });
+  buttons.push({ text: "Reset", callback_data: `${callbackPrefix}reset` });
+  return buttons;
+}
 
-    const details: Array<string> = [];
-    if (current) {
-      details.push(
-        `Provider: ${current.providerName} · ${getAvailabilityLabel(current)}`,
-      );
-      details.push(
-        `Context: ${formatCtxWindow(current.contextWindow)} · reasoning ${current.reasoning ? "yes" : "no"} · tools ${current.toolcall ? "yes" : "no"}`,
-      );
-    }
-    const np = catalog.connectedProviders.length;
-    const nm = catalog.connectedModels.length;
+function pickerDetails(
+  knobs: Knobs,
+  catalog: RemoteModelCatalog,
+  current: RemoteModelCatalogEntry | undefined,
+): Array<string> {
+  const details: Array<string> = [];
+  if (current) {
     details.push(
-      `${label}: ${np} provider${np === 1 ? "" : "s"} connected · ${nm} model${nm === 1 ? "" : "s"} usable`,
+      `Provider: ${current.providerName} · ${getAvailabilityLabel(current)}`,
+    );
+    details.push(
+      `Context: ${formatCtxWindow(current.contextWindow)} · reasoning ${current.reasoning ? "yes" : "no"} · tools ${current.toolcall ? "yes" : "no"}`,
     );
-    if (catalog.loginProviders.length > 0) {
-      const preview = catalog.loginProviders
-        .slice(0, 4)
-        .map((p) => p.name)
-        .join(", ");
-      details.push(
-        `Login available: ${preview}${catalog.loginProviders.length > 4 ? "…" : ""}`,
-      );
-    }
-    details.push("Hint: use /model <name> to switch.");
-    return {
-      modelButtons,
-      modelDetails: details,
-      view: asGroups ? "groups" : "models",
-      page,
-      totalPages,
-      filter,
-      freeCount,
-      totalCount: selectable.length,
-      ...(options.provider ? { provider: options.provider } : {}),
-    };
   }
+  const np = catalog.connectedProviders.length;
+  const nm = catalog.connectedModels.length;
+  details.push(
+    `${knobs.label}: ${np} provider${np === 1 ? "" : "s"} connected · ${nm} model${nm === 1 ? "" : "s"} usable`,
+  );
+  if (catalog.loginProviders.length > 0) {
+    const preview = catalog.loginProviders
+      .slice(0, 4)
+      .map((p) => p.name)
+      .join(", ");
+    details.push(
+      `Login available: ${preview}${catalog.loginProviders.length > 4 ? "…" : ""}`,
+    );
+  }
+  details.push("Hint: use /model <name> to switch.");
+  return details;
+}
 
-  async function renderModelSummary(
-    activeModel: string,
-    defaultModel: string,
-  ): Promise<{ text: string; quickButtons: Array<ModelButton> }> {
-    const { modelButtons, modelDetails } =
-      await getSettingsPresentation(activeModel);
-    const catalog = await getCatalog();
-    const current = getRemoteModelInfo(catalog, activeModel);
-    const currentLabel = current
-      ? getRemoteModelSelectionValue(current, catalog)
-      : activeModel;
-    const freePreview = catalog.connectedFreeModels.slice(0, 8);
+async function getSettingsPresentation(
+  knobs: Knobs,
+  activeModel: string,
+  options: RemotePickerOptions = {},
+): Promise<RemotePickerResult> {
+  const callbackPrefix = options.callbackPrefix ?? "settings:model:";
+  const navPrefix = options.navCallbackPrefix ?? "settings:models";
+  const catalog = await knobs.getCatalog();
+  const current = getRemoteModelInfo(catalog, activeModel);
 
-    const lines = [
-      `Model: ${currentLabel}${activeModel === defaultModel ? " (default)" : ""}`,
-      ...modelDetails,
-    ];
-    if (freePreview.length > 0) {
-      lines.push("", "Free now");
-      for (const m of freePreview) {
-        const tags = [
-          m.providerName,
-          m.free ? "free" : `$${m.costInput}/${m.costOutput}`,
-          `${formatCtxWindow(m.contextWindow)} ctx`,
-          getAvailabilityLabel(m),
-        ];
-        lines.push(
-          `• ${getRemoteModelSelectionValue(m, catalog)} — ${m.name} (${tags.join(" · ")})`,
-        );
-      }
-    }
-    return { text: lines.join("\n"), quickButtons: modelButtons };
+  const filter = options.filter === "free" ? "free" : "all";
+  const selectable = catalog.connectedModels.filter((m) =>
+    isCallbackSafeModelID(knobs, m.id),
+  );
+  const freeCount = selectable.filter((m) => m.free).length;
+  const scoped = selectable.filter(
+    (m) =>
+      (filter === "all" || m.free) &&
+      (!options.provider || m.providerID === options.provider),
+  );
+  const paged = pagePicker(knobs, catalog, scoped, options);
+  return {
+    modelButtons: pickerButtons(paged, current, callbackPrefix, navPrefix),
+    modelDetails: pickerDetails(knobs, catalog, current),
+    view: paged.asGroups ? "groups" : "models",
+    page: paged.page,
+    totalPages: paged.totalPages,
+    filter,
+    freeCount,
+    totalCount: selectable.length,
+    ...(options.provider ? { provider: options.provider } : {}),
+  };
+}
+
+async function renderModelSummary(
+  knobs: Knobs,
+  activeModel: string,
+  defaultModel: string,
+): Promise<{ text: string; quickButtons: Array<ModelButton> }> {
+  const { modelButtons, modelDetails } = await getSettingsPresentation(
+    knobs,
+    activeModel,
+  );
+  const catalog = await knobs.getCatalog();
+  const current = getRemoteModelInfo(catalog, activeModel);
+  const currentLabel = current
+    ? getRemoteModelSelectionValue(current, catalog)
+    : activeModel;
+  const freePreview = catalog.connectedFreeModels.slice(0, FREE_PREVIEW);
+
+  const lines = [
+    `Model: ${currentLabel}${activeModel === defaultModel ? " (default)" : ""}`,
+    ...modelDetails,
+  ];
+  if (freePreview.length > 0) {
+    lines.push("", "Free now");
+    for (const m of freePreview) lines.push(describeModel(m, catalog));
   }
+  return { text: lines.join("\n"), quickButtons: modelButtons };
+}
 
-  async function renderModelList(
-    mode: "free" | "all" | "providers",
-  ): Promise<string> {
-    const catalog = await getCatalog();
-    if (mode === "providers") {
-      const lines = [`${label} Providers`];
-      for (const p of catalog.providers.slice(0, 24)) {
-        const detail = p.connected
-          ? "connected"
-          : p.loginRequired
-            ? `login: ${p.authMethods.join(", ")}`
-            : p.envRequired
-              ? `env: ${p.envKeys.join(", ")}`
-              : p.source;
-        lines.push(
-          `• ${p.name} (${p.id}) — ${detail} · ${p.modelCount} models`,
-        );
-      }
-      if (catalog.providers.length > 24)
-        lines.push(`…and ${catalog.providers.length - 24} more`);
-      return lines.join("\n");
-    }
-    const source =
-      mode === "free" ? catalog.connectedFreeModels : catalog.connectedModels;
-    const title =
-      mode === "free" ? "Connected Free Models" : "Connected Models";
-    const lines = [title];
-    for (const m of source.slice(0, 24)) {
-      const tags = [
-        m.providerName,
-        m.free ? "free" : `$${m.costInput}/${m.costOutput}`,
-        `${formatCtxWindow(m.contextWindow)} ctx`,
-        getAvailabilityLabel(m),
-      ];
-      lines.push(
-        `• ${getRemoteModelSelectionValue(m, catalog)} — ${m.name} (${tags.join(" · ")})`,
-      );
+async function renderModelList(
+  knobs: Knobs,
+  mode: "free" | "all" | "providers",
+): Promise<string> {
+  const catalog = await knobs.getCatalog();
+  if (mode === "providers") {
+    const lines = [`${knobs.label} Providers`];
+    for (const p of catalog.providers.slice(0, LIST_PREVIEW)) {
+      lines.push(describeProvider(p));
     }
-    if (source.length > 24) lines.push(`…and ${source.length - 24} more`);
+    if (catalog.providers.length > LIST_PREVIEW)
+      lines.push(`…and ${catalog.providers.length - LIST_PREVIEW} more`);
     return lines.join("\n");
   }
-
-  function formatSelectionError(
-    input: string,
-    resolution: Exclude<RemoteModelResolution, { kind: "exact" }>,
-    catalog: RemoteModelCatalog,
-  ): string {
-    if (resolution.kind === "missing")
-      return `No ${label} model matched "${input}".`;
-    const preview = resolution.matches
-      .slice(0, 6)
-      .map((m) => {
-        const provider =
-          m.providerName === m.providerID
-            ? m.providerName
-            : `${m.providerName} / ${m.providerID}`;
-        return `${getRemoteModelSelectionValue(m, catalog)} — ${provider} (${getAvailabilityLabel(m)})`;
-      })
-      .join(", ");
-    return `Model query "${input}" is ambiguous. Try one of: ${preview}`;
+  const source =
+    mode === "free" ? catalog.connectedFreeModels : catalog.connectedModels;
+  const title = mode === "free" ? "Connected Free Models" : "Connected Models";
+  const lines = [title];
+  for (const m of source.slice(0, LIST_PREVIEW)) {
+    lines.push(describeModel(m, catalog));
   }
+  if (source.length > LIST_PREVIEW)
+    lines.push(`…and ${source.length - LIST_PREVIEW} more`);
+  return lines.join("\n");
+}
+
+function formatSelectionError(
+  knobs: Knobs,
+  input: string,
+  resolution: Exclude<RemoteModelResolution, { kind: "exact" }>,
+  catalog: RemoteModelCatalog,
+): string {
+  if (resolution.kind === "missing")
+    return `No ${knobs.label} model matched "${input}".`;
+  const preview = resolution.matches
+    .slice(0, 6)
+    .map((m) => {
+      const provider =
+        m.providerName === m.providerID
+          ? m.providerName
+          : `${m.providerName} / ${m.providerID}`;
+      return `${getRemoteModelSelectionValue(m, catalog)} — ${provider} (${getAvailabilityLabel(m)})`;
+    })
+    .join(", ");
+  return `Model query "${input}" is ambiguous. Try one of: ${preview}`;
+}
 
+export function createRemoteModelPresentation(
+  options: RemotePresentationOptions,
+): RemoteModelPresentation {
+  const knobs: Knobs = { groupThreshold: 60, ...options };
   return {
-    getQuickPickModels,
-    getSettingsPresentation,
-    renderModelSummary,
-    renderModelList,
-    formatSelectionError,
+    getQuickPickModels: (catalog, currentModelID) =>
+      getQuickPickModels(knobs, catalog, currentModelID),
+    getSettingsPresentation: (activeModel, pickerOptions) =>
+      getSettingsPresentation(knobs, activeModel, pickerOptions),
+    renderModelSummary: (activeModel, defaultModel) =>
+      renderModelSummary(knobs, activeModel, defaultModel),
+    renderModelList: (mode) => renderModelList(knobs, mode),
+    formatSelectionError: (input, resolution, catalog) =>
+      formatSelectionError(knobs, input, resolution, catalog),
   };
 }

package/src/backend/remote-server/server-bindings.ts

@@ -107,6 +107,12 @@ export interface RemoteServerBindings<TClient extends RemoteAgentClient> {
   stop(): void;
   /** Lazily start (or reuse) the local server and return a strict client. */
   ensureServer(): Promise<TClient>;
+  /**
+   * Register a chat turn's abort controller for the lifetime of the turn.
+   * `stop()` aborts every registered controller so no turn outlives its
+   * server. Returns the unregister function; call it when the turn ends.
+   */
+  trackActiveTurn(controller: AbortController): () => void;
   ensureChatMcpServer(oc: TClient, chatId: string): Promise<string>;
   ensurePluginMcpServers(oc: TClient, chatId: string): Promise<string[]>;
   /**
@@ -193,6 +199,12 @@ export function bindRemoteServer<TClient extends RemoteAgentClient>(
       });
     },
     ensureServer,
+    trackActiveTurn(controller) {
+      state.activeTurns.add(controller);
+      return () => {
+        state.activeTurns.delete(controller);
+      };
+    },
     ensureChatMcpServer,
     ensurePluginMcpServers,
     buildToolOverrides: (oc, chatServerName, pluginServerNames = []) =>

package/src/backend/remote-server/sessions.ts

@@ -21,7 +21,7 @@ import {
   TALON_MCP_SERVER_NAME,
   TALON_PLUGIN_MCP_SERVER_NAME,
   getChatMcpServerName,
-  safeMcpNamePart,
+  getPluginMcpServerPrefix,
 } from "./mcp.js";
 
 /**
@@ -52,7 +52,7 @@ import {
  */
 export function buildPermissionRuleset(chatId: string): RemotePermissionRule[] {
   const ourServerName = getChatMcpServerName(chatId);
-  const ourPluginPrefix = `${TALON_PLUGIN_MCP_SERVER_NAME}-${safeMcpNamePart(chatId, "chat")}-`;
+  const ourPluginPrefix = getPluginMcpServerPrefix(chatId);
   return [
     { permission: "tool", pattern: `${ourServerName}_*`, action: "allow" },
     {

package/src/backend/remote-server/state.ts

@@ -56,6 +56,13 @@ export interface RemoteServerState<TClient extends RemoteAgentClient> {
   readonly registeredMcpTools: Map<string, readonly string[]>;
   /** Plugin-name → registered server-name mapping for each chat context. */
   readonly pluginMcpServersByChat: Map<string, Map<string, string>>;
+  /**
+   * One controller per in-flight chat turn. `stopRemoteServer` aborts them
+   * so a turn cannot outlive the server it is streaming from — without
+   * this, a mid-turn backend swap left the SSE await hanging until the
+   * 600s deadline while the question watchdog hammered the dead socket.
+   */
+  readonly activeTurns: Set<AbortController>;
 }
 
 /** Inputs for {@link createRemoteServerState}. */
@@ -90,6 +97,7 @@ export function createRemoteServerState<TClient extends RemoteAgentClient>(
     registeredMcpServers: new Set(),
     registeredMcpTools: new Map(),
     pluginMcpServersByChat: new Map(),
+    activeTurns: new Set(),
   };
 }