dsh-connect-trae 1.0.0 → 1.1.0

package/lib/index.d.ts

@@ -34,24 +34,88 @@ interface TraeDiscoveredModel {
 declare function parseTraeRemoteModel(value: unknown): TraeDiscoveredModel | undefined;
 //#endregion
 //#region src/catalog.d.ts
+type TraeInputModality = 'text' | 'image';
+/**
+ * One model the adapter exposes. `contextWindow` is the effective DSH context
+ * after the user's budget; `maxContextWindow` is the native Max window Trae
+ * advertises (capability display only — never a second model entry).
+ */
 interface TraeModelInfo {
   id: string;
   name: string;
   contextWindow?: number;
   maxTokens?: number;
-  input?: ('text' | 'image')[];
+  input?: TraeInputModality[];
   creditMultiplier?: number;
   reasoningSupported?: boolean;
   reasoning?: TraeDiscoveredReasoning;
   reasoningEfforts?: Partial<Record<TraeReasoningEffort, string | null>>;
-  baseModelId?: string;
-  maxContext?: boolean;
   maxContextWindow?: number;
+  /** The `config_name` `llm_utils_chat` accepts; absent means `id` is already the wire id. */
+  wireConfigName?: string;
 }
 /** Bootstrap catalog: identity only where current Trae metadata has not been fetched yet. */
 declare const FALLBACK_TRAE_MODELS: readonly TraeModelInfo[];
-/** Convert verified Trae API metadata into normal models and optional 1M variants. */
-declare function discoveredCatalog(models: readonly TraeDiscoveredModel[], enabled1m?: ReadonlySet<string>): TraeModelInfo[];
+/** Exact DSH modalities for one catalog entry; absent metadata is text-only. */
+declare function traeInputModalities(model: Pick<TraeModelInfo, 'input'>): TraeInputModality[];
+/** Apply the user's explicit image opt-ins; upstream and saved row hints are ignored. */
+declare function applyImageSelection(models: readonly TraeModelInfo[], selected: ReadonlySet<string>): TraeModelInfo[];
+/** One row from `get_detail_param`: the authoritative llm_utils_chat wire id + display name. */
+interface TraeWireModel {
+  id: string;
+  name: string;
+  contextWindow?: number;
+  maxTokens?: number;
+  reasoning?: TraeReasoningCapability;
+}
+/**
+ * Merge the two Trae model sources into one authoritative catalog.
+ *
+ * `remote` (the solo.trae.cn `/models` directory) is the authoritative model
+ * skeleton: it supplies the display id, display name, context windows, credit
+ * multiplier, reasoning and multimodal flags. `wire` (from `get_detail_param`)
+ * supplies the real `llm_utils_chat` `config_name` — the only id the chat
+ * endpoint actually accepts. A remote row is only callable when it maps to a
+ * wire `config_name`, so a remote row with no wire match is DROPPED (it would
+ * otherwise be sent as an invalid `config_name` and rejected with 4001
+ * "param is invalid"). Verified 2026-08-30: the Remote directory advertises
+ * `Doubao-Seed-Code` and `glm-5.3`, neither of which is a current `config_name`;
+ * both fail every request, so they must not be exposed.
+ *
+ * Joining is two-tier, in priority order:
+ *  1. `wire.id` (the `config_name`) equals the remote id — the model's display
+ *     id is already its wire id (the common case: glm-5.2, DeepSeek-V4-Flash,
+ *     kimi-k3, …).
+ *  2. `wire.name` (the `display_name`) equals the remote display name — for
+ *     models whose display id differs from the wire id across Trae versions.
+ * When the matched wire `config_name` differs from the remote id it is recorded
+ * as `wireConfigName`; otherwise it is left undefined (id is already the wire id).
+ */
+declare function mergeTraeModelSources(remote: readonly TraeDiscoveredModel[], wire: readonly TraeWireModel[]): TraeModelInfo[];
+/** Local DSH context budget per model; a value may only select an advertised window. */
+type TraeContextBudget = number;
+/**
+ * Apply the saved local budget. Trae advertises two windows per model (dev and
+ * Max), so the budget may only switch a model to its own advertised Max value —
+ * never to a fabricated number. Everything else keeps the dev window.
+ */
+declare function applyContextBudgets(catalog: readonly TraeModelInfo[], budgets?: Readonly<Record<string, TraeContextBudget | undefined>>): TraeModelInfo[];
+/** Convert Trae metadata into text-only model rows; image support is user-owned configuration. */
+declare function discoveredCatalog(models: readonly TraeDiscoveredModel[]): TraeModelInfo[];
+/**
+ * Drop rows saved by older releases that generated `@1m` variant models, so a
+ * stale configuration cannot resurrect a variant the runtime no longer builds.
+ */
+declare function sanitizeCatalog(catalog: readonly TraeModelInfo[]): TraeModelInfo[];
+/**
+ * Derive the runtime catalog from the last refreshed Trae directory plus the
+ * user's explicit selection and context budgets. An empty selection falls back
+ * to the whole directory: a plugin that has never been configured must still
+ * serve models rather than nothing. This is the single source of truth for
+ * what DSH actually exposes, so saving only the selection and budgets is
+ * enough to rebuild it after a restart.
+ */
+declare function deriveCatalog(catalog: readonly TraeModelInfo[], enabled: ReadonlySet<string>, budgets?: Readonly<Record<string, TraeContextBudget | undefined>>): TraeModelInfo[];
 declare class TraeCatalog {
   private models;
   current(): readonly TraeModelInfo[];
@@ -161,7 +225,6 @@ declare class TraeCredentialStore {
   private storagePathOverride;
   private edition;
   private accountId;
-  private preferIds;
   private readonly ownPath;
   private readonly refresh;
   private readonly refreshMarginMs;
@@ -169,15 +232,13 @@ declare class TraeCredentialStore {
   constructor(options: TraeCredentialStoreOptions);
   setSource(storagePath: string | undefined, edition?: TraeEdition | 'auto', accountId?: string): void;
   selectAccount(accountId: string | undefined): void;
+  candidates(): TraeStorageCandidate[];
   /**
-   * Preferred account ordering used when no account is explicitly selected.
-   * The connector can only bill the `llm_utils_chat` channel against general
-   * credits, so accounts with zero general credits should not become the
-   * default or they fail with 4008 / empty responses.
+   * Deterministic default when no account is explicitly selected: the first
+   * discovered account. This is NOT credit-seeking — it never reorders accounts
+   * to find one with general credits. The plugin bills exactly the account the
+   * user selected, or the first account when nothing has been selected yet.
    */
-  setPreferAccountIds(ids: readonly string[]): void;
-  candidates(): TraeStorageCandidate[];
-  /** First credential matching the preferred ordering, else the first live one. */
   private preferred;
   accounts(): Promise<TraeAccountChoice[]>;
   current(): Promise<TraeCredential | undefined>;
@@ -213,8 +274,16 @@ interface TraeIdentity {
   osVersion?: string;
   platform: NodeJS.Platform;
 }
+interface TraeIdentityReadOptions {
+  /** Platform override for testing; defaults to process.platform. */
+  platform?: NodeJS.Platform;
+  /** Home-directory override for testing; defaults to homedir(). */
+  home?: string;
+  /** Environment override for testing; defaults to process.env. */
+  env?: NodeJS.ProcessEnv;
+}
 /** Read stable identity from Trae-owned files without generating impersonated IDs. */
-declare function readTraeIdentity(candidate: TraeStorageCandidate): Promise<TraeIdentity>;
+declare function readTraeIdentity(candidate: TraeStorageCandidate, options?: TraeIdentityReadOptions): Promise<TraeIdentity>;
 /** Headers derived from actual persisted identity, never a new random identity per request. */
 declare function identityHeaders(identity: TraeIdentity): Record<string, string>;
 //#endregion
@@ -244,8 +313,20 @@ interface TraeCachedModelConfig {
 }
 /** Parse a safe subset of one cached model entry; credentials and endpoints are intentionally omitted. */
 declare function parseTraeCachedModel(value: unknown): TraeCachedModelConfig | undefined;
-/** Read Trae's own current user's model map via sqlite3 without exposing secrets. */
-declare function readTraeCachedModel(functionName: string, modelName: string, userId: string): Promise<TraeCachedModelConfig | undefined>;
+interface TraeCachedModelReadOptions {
+  /** Platform override for testing; defaults to process.platform. */
+  platform?: NodeJS.Platform;
+  /** Home-directory override for testing; defaults to homedir(). */
+  home?: string;
+  /** Environment override for testing; defaults to process.env. */
+  env?: NodeJS.ProcessEnv;
+}
+/**
+ * Read Trae's own current user's model map via sqlite3 without exposing
+ * secrets. The sqlite3 command line is a macOS prerequisite; on Windows it is
+ * typically absent, so the call fails and callers fall back gracefully.
+ */
+declare function readTraeCachedModel(functionName: string, modelName: string, userId: string, options?: TraeCachedModelReadOptions): Promise<TraeCachedModelConfig | undefined>;
 //#endregion
 //#region src/model-extra-config.d.ts
 interface TraeRawChatBehaviorConfig {
@@ -591,7 +672,7 @@ interface TraeFallbackUpstreamOptions {
   }>) => void;
 }
 /**
- * Raw Chat first, SOLO Remote second. Fallback is intentionally narrow:
+ * Optional primary route first, native SOLO tool-call route second. Fallback is intentionally narrow:
  * only definitive pre-stream schema/route incompatibilities may retry the same
  * user request. Authentication, credit, rate, cancellation, transport/server
  * failures, and every successful Response are never replayed.
@@ -686,6 +767,7 @@ interface TraeSoloClientOptions {
   identity(): Promise<TraeIdentity>;
   baseUrl?: string;
   fetchImpl?: typeof fetch;
+  log?: (message: string, detail?: unknown) => void;
 }
 declare class TraeSoloUpstreamClient {
   private readonly options;
@@ -698,58 +780,39 @@ declare class TraeSoloUpstreamClient {
 //#region src/solo-bridge.d.ts
 /** Convert Trae's named SSE events into OpenAI chat-completion SSE chunks. */
 declare function bridgeTraeSoloStream(response: Response, model: string): Response;
+/** Resolves a display model id to the real llm_utils_chat config_name. */
+type TraeWireResolver = (displayId: string) => string | undefined;
 /** Native SOLO client wrapper used by the loopback OpenAI adapter. */
 declare class TraeSoloBridge implements TraeUpstreamClient {
   private readonly upstream;
-  constructor(upstream: TraeUpstreamClient);
+  private readonly catalog?;
+  private readonly wireResolver?;
+  constructor(upstream: TraeUpstreamClient, catalog?: Pick<TraeCatalog, "current"> | undefined, wireResolver?: TraeWireResolver | undefined);
   chatStream(bodyJson: string, signal?: AbortSignal): Promise<TraeChatResult>;
 }
 //#endregion
 //#region src/solo-remote.d.ts
 declare const TRAE_SOLO_REMOTE_BASE = "https://solo.trae.cn/api/remote/v1";
-declare const TRAE_SOLO_REMOTE_MODELS: readonly {
-  name: string;
-  displayName: string;
-  multimodal: boolean;
-}[];
-interface TraeSoloRemoteOptions {
+interface TraeSoloRemoteCatalogOptions {
   credential(): Promise<TraeCredential>;
   fetchImpl?: typeof fetch;
   baseUrl?: string;
-  pollIntervalMs?: number;
-  timeoutMs?: number;
-}
-interface TraeRemoteInputMessage {
-  role: string;
-  content: string;
 }
-declare class TraeSoloRemoteClient {
+/**
+ * Read-only model catalog client for the SOLO Web API.
+ *
+ * This deliberately has no chat/session method: the Remote session protocol
+ * only exposes a final answer and cannot preserve DSH's structured tool loop.
+ */
+declare class TraeSoloRemoteCatalogClient {
   private readonly options;
   private readonly fetchImpl;
   private readonly baseUrl;
-  private readonly pollIntervalMs;
-  private readonly timeoutMs;
-  constructor(options: TraeSoloRemoteOptions);
+  constructor(options: TraeSoloRemoteCatalogOptions);
   private headers;
-  chat(messages: readonly TraeRemoteInputMessage[], model: string, signal?: AbortSignal): Promise<{
-    content: string;
-    sessionId: string;
-  }>;
   fetchModels(signal?: AbortSignal): Promise<TraeDiscoveredModel[]>;
 }
 //#endregion
-//#region src/solo-remote-bridge.d.ts
-/**
- * Bridges the SOLO remote polling-based API into the shim's stream interface.
- * The remote API uses create-session + poll-messages rather than raw SSE,
- * so this bridge converts the final result into a synthetic OpenAI SSE stream.
- */
-declare class TraeSoloRemoteBridge implements TraeUpstreamClient {
-  private readonly remote;
-  constructor(remote: TraeSoloRemoteClient);
-  chatStream(bodyJson: string, signal?: AbortSignal): Promise<TraeChatResult>;
-}
-//#endregion
 //#region src/delegating-upstream.d.ts
 /** Stable shim dependency whose delegate can be replaced after async setup. */
 declare class TraeDelegatingUpstreamClient implements TraeUpstreamClient {
@@ -877,10 +940,7 @@ interface TraeWebModel {
     supported: string[];
     defaultEffort?: string;
   };
-  baseModelId?: string;
-  maxContext?: boolean;
   maxContextWindow?: number;
-  maxContextEnabled?: boolean;
 }
 /** Daily check-in status rendered by the card. */
 interface TraeWebCheckin {
@@ -915,7 +975,6 @@ type TraeWebUsage = {
   accounts: readonly TraeWebAccount[];
   models: readonly TraeWebModel[];
   enabledModelIds: readonly string[];
-  enabled1mModelIds: readonly string[];
   rawChat?: {
     state: 'disabled' | 'unchecked' | 'available' | 'protocol-gated' | 'authentication' | 'credit' | 'rate' | 'transport' | 'server';
     checkedAtMs?: number;
@@ -933,12 +992,10 @@ type TraeWebUsage = {
 interface TraeUsageRouteOptions {
   store: TraeCredentialStore;
   client: TraeUsageClient;
-  /** The last-refreshed Trae raw directory (no generated @1m variants) for card display. */
+  /** The last-refreshed Trae raw directory (one entry per upstream model) for card display. */
   displayModels(): readonly TraeModelInfo[];
-  /** The user's ordinary-model selection stored as model id (= Trae name). */
+  /** The user's model selection stored as model id (= Trae name). */
   enabledModelIds(): readonly string[];
-  /** The user's 1M selection stored as base-model id. */
-  enabled1mModelIds(): readonly string[];
   discoverModels?(signal?: AbortSignal): Promise<readonly TraeModelInfo[]>;
   rawDiagnostic?(): TraeRawDiagnostic;
 }
@@ -952,7 +1009,7 @@ declare function traeWebUsage(deps: TraeUsageRouteOptions): Promise<TraeWebUsage
 declare function registerTraeUsageRoute(ctx: Context, deps: TraeUsageRouteOptions): void;
 //#endregion
 //#region src/index.d.ts
-declare const name = "llm-trae";
+declare const name = "dsh-connect-trae";
 declare const inject: string[];
 declare const TRAE_SETTINGS_NS: import("@deepseek-ai/dsh-settings").SettingsNamespace;
 interface Config {
@@ -964,12 +1021,14 @@ interface Config {
   lastCatalog?: TraeModelInfo[];
   /** The user's ordinary-model selection, as model id (= Trae name). */
   enabledModelIds?: string[];
-  /** The user's 1M selection, as base-model id. */
-  enabled1mModels?: string[];
+  /** Local DSH context budget per model; a value may only select an advertised window. */
+  contextBudgets?: Record<string, number>;
+  /** Models the user explicitly enabled for image input; text is always enabled. */
+  imageModelIds?: string[];
   /** Legacy generated runtime catalog; kept for backwards compatibility. */
   models?: TraeModelInfo[];
 }
 declare const Config: z<Config>;
 declare function apply(ctx: Context, config: Config): void;
 //#endregion
-export { Config, FALLBACK_TRAE_MODELS, type RawChatDelta, type RawChatMessage, type RawChatTool, SseDecoder, type SseEvent, TRAE_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, TRAE_PROVIDER, TRAE_RAW_CHAT_V1_PATH, TRAE_RAW_CHAT_V2_PATH, TRAE_REASONING_EFFORTS, TRAE_SETTINGS_NS, TRAE_SOLO_CHAT_PATH, TRAE_SOLO_FUNCTION, TRAE_SOLO_MODELS_PATH, TRAE_SOLO_REMOTE_BASE, TRAE_SOLO_REMOTE_MODELS, TRAE_STREAM_IDLE_TIMEOUT_MS, TRAE_USAGE_PATH, TRAE_VERSION_CODE_FALLBACK, type TraeActivityRule, type TraeCachedModelConfig, TraeCatalog, type TraeChatResult, type TraeCheckinStatus, type TraeCredential, TraeCredentialStore, TraeDelegatingUpstreamClient, type TraeDiscoveredModel, type TraeDiscoveredReasoning, type TraeEdition, TraeFallbackUpstreamClient, type TraeFallbackUpstreamOptions, type TraeFusionRawChatEnvelope, TraeGatedUpstreamClient, type TraeGatedUpstreamOptions, type TraeIdentity, type TraeModelDetailRequest, type TraeModelInfo, type TraeObservedModelConfig, TraeRawCapabilityController, type TraeRawCapabilityControllerOptions, type TraeRawCapabilitySnapshot, TraeRawCapabilityState, type TraeRawChatBehaviorConfig, type TraeRawChatCapability, type TraeRawChatClientOptions, type TraeRawChatConfig, type TraeRawChatFailureReason, type TraeRawChatRuntimeConfig, TraeRawChatUpstreamClient, type TraeRawDiagnostic, type TraeRawDiagnosticState, type TraeRawGateway, type TraeRawGatewayOptions, type TraeRawResolverResult, type TraeReasoningCapability, type TraeReasoningEffort, type TraeShim, TraeSoloBridge, type TraeSoloClientOptions, TraeSoloRemoteBridge, TraeSoloRemoteClient, type TraeSoloRemoteOptions, TraeSoloUpstreamClient, type TraeStorageCandidate, type TraeStreamEvent, type TraeUpstreamClient, TraeUsageClient, type TraeUsageOptions, type TraeUsagePack, type TraeUsageRouteOptions, type TraeUsageSnapshot, type TraeUsageSummary, type TraeUsageView, type TraeWebActivity, type TraeWebCheckin, type TraeWebCredits, type TraeWebUsage, UnconfiguredTraeUpstreamClient, apply, applyReasoningEffort, bridgeTraeSoloStream, buildTraeAgentTaskBody, buildTraeCnHeaders, buildTraeFusionRawChatEnvelope, buildTraeModelDetailRequest, buildTraeRawChatDraft, buildTraeRawChatRuntimeConfig, classifyTraeRawChatFailure, createTraeAdapter, createTraeRawGateway, createTraeShim, decodeRawChatChunk, decodeTraeEvent, decryptTraeStorageValue, discoveredCatalog, hashTraeRawChatArg, identityHeaders, inject, name, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, prepareSoloBody, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeIdentity, refreshTraeCredential, registerTraeUsageRoute, resolveTraeRawRuntime, traeEndpoint, traeOwnAuthPath, traeRawChatExtraInfo, traeStorageCandidates, traeWebUsage };
+export { Config, FALLBACK_TRAE_MODELS, type RawChatDelta, type RawChatMessage, type RawChatTool, SseDecoder, type SseEvent, TRAE_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, TRAE_PROVIDER, TRAE_RAW_CHAT_V1_PATH, TRAE_RAW_CHAT_V2_PATH, TRAE_REASONING_EFFORTS, TRAE_SETTINGS_NS, TRAE_SOLO_CHAT_PATH, TRAE_SOLO_FUNCTION, TRAE_SOLO_MODELS_PATH, TRAE_SOLO_REMOTE_BASE, TRAE_STREAM_IDLE_TIMEOUT_MS, TRAE_USAGE_PATH, TRAE_VERSION_CODE_FALLBACK, type TraeActivityRule, type TraeCachedModelConfig, TraeCatalog, type TraeChatResult, type TraeCheckinStatus, type TraeContextBudget, type TraeCredential, TraeCredentialStore, TraeDelegatingUpstreamClient, type TraeDiscoveredModel, type TraeDiscoveredReasoning, type TraeEdition, TraeFallbackUpstreamClient, type TraeFallbackUpstreamOptions, type TraeFusionRawChatEnvelope, TraeGatedUpstreamClient, type TraeGatedUpstreamOptions, type TraeIdentity, type TraeInputModality, type TraeModelDetailRequest, type TraeModelInfo, type TraeObservedModelConfig, TraeRawCapabilityController, type TraeRawCapabilityControllerOptions, type TraeRawCapabilitySnapshot, TraeRawCapabilityState, type TraeRawChatBehaviorConfig, type TraeRawChatCapability, type TraeRawChatClientOptions, type TraeRawChatConfig, type TraeRawChatFailureReason, type TraeRawChatRuntimeConfig, TraeRawChatUpstreamClient, type TraeRawDiagnostic, type TraeRawDiagnosticState, type TraeRawGateway, type TraeRawGatewayOptions, type TraeRawResolverResult, type TraeReasoningCapability, type TraeReasoningEffort, type TraeShim, TraeSoloBridge, type TraeSoloClientOptions, TraeSoloRemoteCatalogClient, type TraeSoloRemoteCatalogOptions, TraeSoloUpstreamClient, type TraeStorageCandidate, type TraeStreamEvent, type TraeUpstreamClient, TraeUsageClient, type TraeUsageOptions, type TraeUsagePack, type TraeUsageRouteOptions, type TraeUsageSnapshot, type TraeUsageSummary, type TraeUsageView, type TraeWebActivity, type TraeWebCheckin, type TraeWebCredits, type TraeWebUsage, type TraeWireModel, UnconfiguredTraeUpstreamClient, apply, applyContextBudgets, applyImageSelection, applyReasoningEffort, bridgeTraeSoloStream, buildTraeAgentTaskBody, buildTraeCnHeaders, buildTraeFusionRawChatEnvelope, buildTraeModelDetailRequest, buildTraeRawChatDraft, buildTraeRawChatRuntimeConfig, classifyTraeRawChatFailure, createTraeAdapter, createTraeRawGateway, createTraeShim, decodeRawChatChunk, decodeTraeEvent, decryptTraeStorageValue, deriveCatalog, discoveredCatalog, hashTraeRawChatArg, identityHeaders, inject, mergeTraeModelSources, name, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, prepareSoloBody, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeIdentity, refreshTraeCredential, registerTraeUsageRoute, resolveTraeRawRuntime, sanitizeCatalog, traeEndpoint, traeInputModalities, traeOwnAuthPath, traeRawChatExtraInfo, traeStorageCandidates, traeWebUsage };