@coder/ai-sdk-agent 0.9.4 → 0.9.5

package/README.md

@@ -222,7 +222,7 @@ conversation with server‑side history). `agent.chatId` is the current chat id.
 - `agent.resetSession()` — start a fresh chat on the next turn (reuse one instance for sequential turns; you don't need a new agent per turn).
 - `agent.interrupt({ signal? })` — interrupt an in‑flight generation.
 - `agent.archive({ signal? })` — archive the underlying chat (cleanup; see [Cleanup](#cleanup)).
-- `agent.listModels()` — list the deployment's model configs, so you don't have to guess the `model` hint.
+- `agent.listModels()` — list the organization's model configs, so you don't have to guess the `model` hint.
 - Resume a prior chat: `new CoderAgent({ …, chatId: "…" })` — optionally with
   `lastSeenMessageId` (the persisted resume cursor, read from
   `agent.lastSeenMessageId`) to skip the resumed turn's pre‑prompt history
@@ -905,13 +905,17 @@ sequence pinpoints _where_ a turn died:
 | `chatId`                          | resume an existing chat                                                                                            |
 | `lastSeenMessageId`               | resume cursor for `chatId` (persist `agent.lastSeenMessageId`) — skips the resumed turn's pre‑prompt history probe |
 
-The `model` hint resolves against the deployment's model configs in order: a
-config UUID is used as‑is, then an exact `provider:model` match, an exact model
-id, a display‑name substring (case‑insensitive), and finally a model‑id
-substring. Partial payloads from older/newer servers are tolerated (entries
-match on the fields they carry), and an unresolvable hint falls back to the
-server's default model instead of failing. Use `agent.listModels()` to see
-what's available.
+The `model` hint resolves against the organization's model configs
+(`GET /api/v2/organizations/{organizationId}/chats/models`, with the provider
+type joined from the response's provider descriptors) in order: a config UUID
+is used as‑is, then an exact `provider:model` match, an exact model id, a
+display‑name substring (case‑insensitive), and finally a model‑id substring.
+On older deployments where the organization‑scoped route does not exist yet
+(404), resolution falls back once to the legacy deployment‑wide
+`/model-configs` listing. Partial payloads from older/newer servers are
+tolerated (entries match on the fields they carry), and an unresolvable hint
+falls back to the server's default model instead of failing. Use
+`agent.listModels()` to see what's available.
 
 ## How it works
 

package/dist/index.d.ts

@@ -245,10 +245,14 @@ interface UploadChatFileResponse {
     id: string;
 }
 /**
- * A configured model (`GET /api/experimental/chats/model-configs`). Depending
- * on the server version and how a config was created, `provider`, `model`, and
- * `display_name` may be absent on individual entries, so treat them as
- * optional and guard reads.
+ * A configured model, normalized to the shape of the legacy
+ * `GET /api/experimental/chats/model-configs` listing (removed upstream in
+ * coder/coder#28632). The client synthesizes this from the organization-scoped
+ * {@link OrganizationChatModelsResponse} by joining each model's
+ * `ai_provider_id` to its provider descriptor's `type` (→ `provider`).
+ * Depending on the server version and how a config was created, `provider`,
+ * `model`, and `display_name` may be absent on individual entries, so treat
+ * them as optional and guard reads.
  */
 interface ChatModelConfig {
     id: string;
@@ -261,6 +265,59 @@ interface ChatModelConfig {
     context_limit?: number;
     compression_threshold?: number;
 }
+/**
+ * An organization-scoped chat model, as returned by
+ * `GET /api/v2/organizations/{organization}/chats/models` (codersdk
+ * `ChatModel`). The provider type string is not carried here — join
+ * `ai_provider_id` against {@link ChatModelProviderDescriptor.id}. Fields
+ * other than `id` are treated as optional to tolerate partial payloads from
+ * older/newer servers.
+ */
+interface ChatModel {
+    id: string;
+    organization_id?: string;
+    /** FK into the response's `providers[].id`. */
+    ai_provider_id?: string;
+    model?: string;
+    display_name?: string;
+    enabled?: boolean;
+    is_default?: boolean;
+    context_limit?: number;
+    compression_threshold?: number;
+    reasoning_efforts?: string[];
+    created_at?: string;
+    updated_at?: string;
+}
+/**
+ * The redacted view of an AI provider carried on the organization-scoped
+ * model collection (codersdk `ChatModelProviderDescriptor`) — capability
+ * metadata only, no key material or base URLs. `type` is the provider type
+ * string (e.g. `anthropic`) that the legacy listing carried per-model.
+ */
+interface ChatModelProviderDescriptor {
+    id: string;
+    type?: string;
+    display_name?: string;
+    icon?: string;
+    enabled?: boolean;
+    available?: boolean;
+    unavailable_reason?: string;
+}
+/** A configured provider type the server build does not support. */
+interface ChatUnsupportedProvider {
+    provider?: string;
+    display_name?: string;
+}
+/**
+ * Response of `GET /api/v2/organizations/{organization}/chats/models`
+ * (codersdk `OrganizationChatModelsResponse`): the org's model configs plus
+ * the provider descriptors they reference.
+ */
+interface OrganizationChatModelsResponse {
+    models?: ChatModel[];
+    providers?: ChatModelProviderDescriptor[];
+    unsupported_providers?: ChatUnsupportedProvider[];
+}
 type ChatStreamEventType = "message_part" | "message" | "status" | "error" | "queue_update" | "retry" | "action_required" | "preview_reset" | "history_reset";
 interface ChatStreamMessagePart {
     role?: ChatMessageRole;
@@ -698,6 +755,18 @@ declare class CoderChatClient {
     #private;
     readonly baseUrl: string;
     constructor(options: CoderChatClientOptions);
+    /**
+     * List the organization's model configs, normalized to
+     * {@link ChatModelConfig} (the legacy per-model `provider` string is joined
+     * from the response's provider descriptors). See {@link #fetchModelConfigs}
+     * for the endpoint and version-skew fallback.
+     */
+    listModelConfigs(organizationId: string, signal?: AbortSignal): Promise<ChatModelConfig[]>;
+    /**
+     * @deprecated The deployment-scoped `GET /api/experimental/chats/model-configs`
+     * route this overload calls was removed upstream (coder/coder#28632) and
+     * returns 404 on current deployments — pass an `organizationId`.
+     */
     listModelConfigs(signal?: AbortSignal): Promise<ChatModelConfig[]>;
     createChat(req: CreateChatRequest, signal?: AbortSignal): Promise<Chat>;
     getChat(chatId: string, signal?: AbortSignal): Promise<Chat>;
@@ -783,6 +852,12 @@ declare class CoderChatClient {
      * fields they do carry — an entry without `provider` still matches by its
      * model id, one without `model` only by display name.
      */
+    resolveModelConfigId(hint: string, organizationId: string, signal?: AbortSignal): Promise<string | undefined>;
+    /**
+     * @deprecated The deployment-scoped `GET /api/experimental/chats/model-configs`
+     * route this overload calls was removed upstream (coder/coder#28632) and
+     * returns 404 on current deployments — pass an `organizationId`.
+     */
     resolveModelConfigId(hint: string, signal?: AbortSignal): Promise<string | undefined>;
 }
 
@@ -1079,9 +1154,9 @@ declare class CoderAgent<TOOLS extends ToolSet = {}> implements Agent<never, TOO
     generate(options: Parameters<InnerAgent<TOOLS>["generate"]>[0]): ReturnType<InnerAgent<TOOLS>["generate"]>;
     stream(options: Parameters<InnerAgent<TOOLS>["stream"]>[0]): ReturnType<InnerAgent<TOOLS>["stream"]>;
     /**
-     * List the model configs available on the deployment. Use this to discover
-     * valid values for the `model` hint instead of guessing ids — match on
-     * `id`, `provider`/`model`, or `display_name`.
+     * List the model configs available to this agent's organization. Use this
+     * to discover valid values for the `model` hint instead of guessing ids —
+     * match on `id`, `provider`/`model`, or `display_name`.
      */
     listModels(signal?: AbortSignal): Promise<ChatModelConfig[]>;
     /**
@@ -1628,4 +1703,4 @@ declare class CoderChatError extends CoderAgentError {
     constructor(payload: ChatErrorPayload);
 }
 
-export { CHAT_ATTACHMENT_MEDIA_TYPES, CODER_PROVIDER_OPTIONS, type Chat, type ChatAttachment, type ChatAttachmentMediaType, type ChatBusyBehavior, type ChatClientType, type ChatErrorPayload, type ChatFileInput, type ChatInputPart, type ChatInputPartType, type ChatMessage, type ChatMessagePart, type ChatMessagePartType, type ChatMessageRole, type ChatMessageUsage, type ChatMessagesResponse, type ChatMessagesToUIMessagesOptions, type ChatModelConfig, type ChatPlanMode, type ChatQueuedMessage, type ChatStatus, type ChatStreamActionRequired, type ChatStreamEvent, type ChatStreamEventType, type ChatStreamMessagePart, type ChatStreamRetry, type ChatStreamStatus, type ChatStreamToolCall, type ChatWatchEvent, type ChatWatchEventKind, CoderAgent, CoderAgentError, type CoderAgentSettings, CoderApiError, type CoderArchiveResult, CoderChatClient, type CoderChatClientOptions, CoderChatError, type CoderClientOperation, type CoderFileProviderOptions, type CoderInterruptResult, CoderLanguageModel, type CoderLanguageModelConfig, CoderStreamError, type CoderTransportEvent, type CreateChatMessageRequest, type CreateChatMessageResponse, type CreateChatRequest, type DynamicTool, type FileContent, type FilePartUploader, type HttpErrorTransportEvent, type HttpRequestTransportEvent, type HttpResponseTransportEvent, MAX_CHAT_FILE_SIZE_BYTES, type PreviewShareLevel, type ResolvedFile, type SegmentSettleTransportEvent, type SegmentStartTransportEvent, type SharePreviewOptions, type SharedWorkspacePreview, type StreamCloseTransportEvent, type StreamDialTransportEvent, type StreamErrorTransportEvent, type StreamEventTransportEvent, type StreamOpenTransportEvent, type StreamRedialTransportEvent, type SubmitToolResultsRequest, TERMINAL_STATUSES, type ToolResult, type TransportEventHandler, type TurnAction, TurnTranslator, type TurnTranslatorOptions, type UpdateChatRequest, type UploadChatFileResponse, type UploadedChatFile, type UserContent, type WatchChatEventsOptions, type WebSocketFactory, type WebSocketLike, type WorkspaceFileStore, type WorkspacePlacement, type WorkspacePreview, type WorkspacePreviewOptions, chatMessagesToUIMessages, classifyTurnAction, dataContentToFileContent, dynamicToolNames, extractSystemPrompt, resolveFileContent, streamChatEvents, toolsToDynamicTools, userContentToInputParts, watchChatEvents };
+export { CHAT_ATTACHMENT_MEDIA_TYPES, CODER_PROVIDER_OPTIONS, type Chat, type ChatAttachment, type ChatAttachmentMediaType, type ChatBusyBehavior, type ChatClientType, type ChatErrorPayload, type ChatFileInput, type ChatInputPart, type ChatInputPartType, type ChatMessage, type ChatMessagePart, type ChatMessagePartType, type ChatMessageRole, type ChatMessageUsage, type ChatMessagesResponse, type ChatMessagesToUIMessagesOptions, type ChatModel, type ChatModelConfig, type ChatModelProviderDescriptor, type ChatPlanMode, type ChatQueuedMessage, type ChatStatus, type ChatStreamActionRequired, type ChatStreamEvent, type ChatStreamEventType, type ChatStreamMessagePart, type ChatStreamRetry, type ChatStreamStatus, type ChatStreamToolCall, type ChatUnsupportedProvider, type ChatWatchEvent, type ChatWatchEventKind, CoderAgent, CoderAgentError, type CoderAgentSettings, CoderApiError, type CoderArchiveResult, CoderChatClient, type CoderChatClientOptions, CoderChatError, type CoderClientOperation, type CoderFileProviderOptions, type CoderInterruptResult, CoderLanguageModel, type CoderLanguageModelConfig, CoderStreamError, type CoderTransportEvent, type CreateChatMessageRequest, type CreateChatMessageResponse, type CreateChatRequest, type DynamicTool, type FileContent, type FilePartUploader, type HttpErrorTransportEvent, type HttpRequestTransportEvent, type HttpResponseTransportEvent, MAX_CHAT_FILE_SIZE_BYTES, type OrganizationChatModelsResponse, type PreviewShareLevel, type ResolvedFile, type SegmentSettleTransportEvent, type SegmentStartTransportEvent, type SharePreviewOptions, type SharedWorkspacePreview, type StreamCloseTransportEvent, type StreamDialTransportEvent, type StreamErrorTransportEvent, type StreamEventTransportEvent, type StreamOpenTransportEvent, type StreamRedialTransportEvent, type SubmitToolResultsRequest, TERMINAL_STATUSES, type ToolResult, type TransportEventHandler, type TurnAction, TurnTranslator, type TurnTranslatorOptions, type UpdateChatRequest, type UploadChatFileResponse, type UploadedChatFile, type UserContent, type WatchChatEventsOptions, type WebSocketFactory, type WebSocketLike, type WorkspaceFileStore, type WorkspacePlacement, type WorkspacePreview, type WorkspacePreviewOptions, chatMessagesToUIMessages, classifyTurnAction, dataContentToFileContent, dynamicToolNames, extractSystemPrompt, resolveFileContent, streamChatEvents, toolsToDynamicTools, userContentToInputParts, watchChatEvents };

package/dist/index.js

@@ -752,15 +752,10 @@ var CoderChatClient = class {
     });
     return await this.#json(res);
   }
-  // --- REST -----------------------------------------------------------------
-  listModelConfigs(signal) {
-    return this.#request(
-      "listModelConfigs",
-      "GET",
-      `${API_PREFIX}/model-configs`,
-      void 0,
-      signal
-    );
+  listModelConfigs(organizationIdOrSignal, maybeSignal) {
+    const organizationId = typeof organizationIdOrSignal === "string" ? organizationIdOrSignal : void 0;
+    const signal = typeof organizationIdOrSignal === "string" ? maybeSignal : organizationIdOrSignal;
+    return this.#fetchModelConfigs("listModelConfigs", organizationId, signal);
   }
   createChat(req, signal) {
     return this.#request("createChat", "POST", API_PREFIX, req, signal);
@@ -948,32 +943,70 @@ var CoderChatClient = class {
   }
   // --- Helpers --------------------------------------------------------------
   /**
-   * Resolves a user-friendly model hint to a model-config UUID.
+   * Fetch the model listing for hint resolution / listing, tolerating version
+   * skew in both directions:
+   *
+   * - Primary: `GET /api/v2/organizations/{organizationId}/chats/models` —
+   *   the organization-scoped route that replaced the legacy listing upstream
+   *   (coder/coder#28632); its response is normalized to the legacy
+   *   {@link ChatModelConfig} array by {@link joinOrgModels}.
+   * - Newer SDK, older deployment: the org-scoped route does not exist yet,
+   *   so on a 404 this falls back once to the legacy
+   *   `GET /api/experimental/chats/model-configs`, whose body already is the
+   *   legacy array (parsed tolerantly: a non-array body yields no configs and
+   *   non-object entries are dropped). (Older SDK, newer deployment is the
+   *   reverse skew: the legacy route is a reserved 404 upstream, which is why
+   *   the org-scoped route is primary.)
+   * - The deprecated no-`organizationId` overloads call the legacy route
+   *   directly, preserving their historical behavior.
    *
-   * Accepts: a config UUID (returned as-is), a `provider:model` id
-   * (e.g. `anthropic:claude-haiku-4-5-20251001`), a bare model id, or a
-   * display-name substring (case-insensitive). Returns `undefined` if no
-   * match is found, in which case the caller should let chatd pick the default.
+   * When both routes 404, the org-scoped error is rethrown — it names the
+   * organization actually queried (e.g. a mistyped `organizationId`), while
+   * the legacy route's generic "Route not found" would mask it.
    *
-   * Tolerates partial payloads from older/newer servers: a malformed listing
-   * (empty body, non-array JSON, null entries) resolves as no match, and
-   * entries missing `provider`, `model`, or `display_name` are matched on the
-   * fields they do carry — an entry without `provider` still matches by its
-   * model id, one without `model` only by display name.
+   * Both requests stamp the calling public method's `op` on the exchange's
+   * `http:*` events — the stamp names the caller's intent, not the wire shape.
    */
-  async resolveModelConfigId(hint, signal) {
+  async #fetchModelConfigs(op, organizationId, signal) {
+    const legacy = async () => {
+      const raw = await this.#request(
+        op,
+        "GET",
+        `${API_PREFIX}/model-configs`,
+        void 0,
+        signal
+      );
+      return (Array.isArray(raw) ? raw : []).filter(
+        (c) => typeof c === "object" && c !== null
+      );
+    };
+    if (organizationId === void 0) return legacy();
+    let res;
+    try {
+      res = await this.#request(
+        op,
+        "GET",
+        `/api/v2/organizations/${encodeURIComponent(organizationId)}/chats/models`,
+        void 0,
+        signal
+      );
+    } catch (err) {
+      if (!(err instanceof CoderApiError) || err.status !== 404) throw err;
+      try {
+        return await legacy();
+      } catch (legacyErr) {
+        if (legacyErr instanceof CoderApiError && legacyErr.status === 404) throw err;
+        throw legacyErr;
+      }
+    }
+    return joinOrgModels(res);
+  }
+  async resolveModelConfigId(hint, organizationIdOrSignal, maybeSignal) {
+    const organizationId = typeof organizationIdOrSignal === "string" ? organizationIdOrSignal : void 0;
+    const signal = typeof organizationIdOrSignal === "string" ? maybeSignal : organizationIdOrSignal;
     const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
     if (UUID_RE.test(hint)) return hint;
-    const raw = await this.#request(
-      "resolveModelConfigId",
-      "GET",
-      `${API_PREFIX}/model-configs`,
-      void 0,
-      signal
-    );
-    const configs = (Array.isArray(raw) ? raw : []).filter(
-      (c) => typeof c === "object" && c !== null
-    );
+    const configs = await this.#fetchModelConfigs("resolveModelConfigId", organizationId, signal);
     const lower = hint.toLowerCase();
     const colon = hint.indexOf(":");
     const provider = colon >= 0 ? hint.slice(0, colon).toLowerCase() : void 0;
@@ -995,6 +1028,25 @@ var CoderChatClient = class {
     return byModelSubstring?.id;
   }
 };
+function joinOrgModels(res) {
+  const body = typeof res === "object" && res !== null ? res : {};
+  const models = Array.isArray(body.models) ? body.models : [];
+  const providers = Array.isArray(body.providers) ? body.providers : [];
+  const providerTypeById = /* @__PURE__ */ new Map();
+  for (const p of providers) {
+    if (typeof p !== "object" || p === null) continue;
+    if (typeof p.id === "string" && typeof p.type === "string") providerTypeById.set(p.id, p.type);
+  }
+  const configs = [];
+  for (const m of models) {
+    if (typeof m !== "object" || m === null) continue;
+    const config = { ...m };
+    const providerType = typeof m.ai_provider_id === "string" ? providerTypeById.get(m.ai_provider_id) : void 0;
+    if (providerType !== void 0) config.provider = providerType;
+    configs.push(config);
+  }
+  return configs;
+}
 
 // src/coder/workspaces.ts
 async function request(conn, method, path, body, signal) {
@@ -2160,6 +2212,7 @@ var CoderLanguageModel = class {
     if (this.#config.model) {
       this.#resolvedModelConfigId = await this.#config.client.resolveModelConfigId(
         this.#config.model,
+        this.#config.organizationId,
         signal
       );
     }
@@ -2923,12 +2976,12 @@ var CoderAgent = class {
   }
   // --- session helpers ------------------------------------------------------
   /**
-   * List the model configs available on the deployment. Use this to discover
-   * valid values for the `model` hint instead of guessing ids — match on
-   * `id`, `provider`/`model`, or `display_name`.
+   * List the model configs available to this agent's organization. Use this
+   * to discover valid values for the `model` hint instead of guessing ids —
+   * match on `id`, `provider`/`model`, or `display_name`.
    */
   listModels(signal) {
-    return this.#client.listModelConfigs(signal);
+    return this.#client.listModelConfigs(this.#organizationId, signal);
   }
   /**
    * Start a fresh chatd chat on the next turn. The dropped chat still exists