dsh-connect-trae 2.10.0 → 3.0.1

package/lib/index.d.ts

@@ -475,12 +475,35 @@ declare class TraeCredentialStore {
   selectAccount(accountId: string | undefined): void;
   candidates(): TraeStorageCandidate[];
   /**
-   * 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.
+   * Deterministic default when no account is explicitly selected: the account
+   * the Trae desktop app is signed in to RIGHT NOW, else the first discovered
+   * one. This is NOT credit-seeking — it never reorders accounts to find one
+   * with general credits. The plugin bills exactly the account the user
+   * selected, the app's current sign-in when nothing has been selected, and
+   * only then the first account.
+   *
+   * The app's live sign-in outranks the plugin's own refreshed copies (issue
+   * #29): after the user switches accounts in Trae, the desktop storage file
+   * holds the NEW login while the plugin's copy of the old one still resolves,
+   * so a bare `credentials[0]` kept defaulting to a sign-in the app has
+   * abandoned — and `dsh-connect-workbuddy`, whose `preferred()` ranks the live
+   * file first, followed the app instead. Ordering only: the VALUE behind an
+   * account id is still whichever copy expires later (`readAll`), so a refresh
+   * the plugin performed is never discarded by this preference.
    */
   private preferred;
+  /**
+   * The account the Trae app is signed in to right now, when that differs from
+   * the account this store is bound to (issue #29).
+   *
+   * This is a READ, not a rebind: `current()` keeps resolving the bound
+   * account verbatim so billing never moves without a decision — the store
+   * only reports the mismatch, and the card (hint row) or the host (follow
+   * switch) turns it into a settings write the user can see and undo. Absent
+   * when nothing is live, when the live account IS the bound one, or when the
+   * binding itself already fell through to the live account.
+   */
+  liveLogin(): Promise<TraeAccountChoice | undefined>;
   accounts(): Promise<TraeAccountChoice[]>;
   current(): Promise<TraeCredential | undefined>;
   /**
@@ -1690,14 +1713,23 @@ interface TraeWebAccount {
   selected: boolean;
 }
 /**
- * Another account on this machine that still has credit, surfaced only while
- * the BOUND account is exhausted (issue #25).
+ * The account the Trae desktop app is signed in to right now, when it differs
+ * from the one this plugin is bound to (issue #29).
  *
- * The account switch is persisted, so a user whose bound account ran out sees
- * a permanently zeroed card with no explanation. This carries just enough to
- * name the alternative in the UI — identity plus the two CN credit buckets —
- * and is only ever produced by a read-only upstream call.
- */
+ * Reported on the usage document so the card can offer one-click follow without
+ * an extra round trip; also written back on a POST to the accounts refresh
+ * route when the client confirms it saw the hint. Absent whenever the two
+ * agree or the app is not readable — a healthy document carries no extra
+ * fields and the plugin never bills from this value directly: the FOLLOW is a
+ * settings write of `accounts.<region>`, made by the card or by the host's
+ * follow switch, never a silent rebind here.
+ */
+interface TraeWebAppLogin {
+  id: string;
+  accountName: string;
+  edition: 'cn' | 'sg' | 'solo' | 'solo-sg';
+  region: TraeRegion;
+}
 interface TraeWebCreditAlternative {
   id: string;
   accountName: string;
@@ -1738,6 +1770,33 @@ declare function unwrapVolatile<T>(value: T): T;
  * value is never touched.
  */
 declare function unwrapVolatileDeep<T>(value: T): T;
+/**
+ * Read the per-region account selections out of a settings value.
+ *
+ * SHARED because `accounts` now has TWO writers: the card, and the composer
+ * panel's account table (2.14.0). Two writers of one field must use one merge
+ * rule, or they drift — and the rule is not obvious.
+ *
+ * Deep-unwraps first: on DSH 0.1.7 a volatile field arrives as a `{get(): T}`
+ * live reference, which passes the `typeof === 'object'` check and would be
+ * returned as if it were the map. Every lookup on it is then `undefined`, and
+ * the merge (`{ ...configured, [region]: id }`) would spread a reference into
+ * `{get: <function>}` — dropping the other region's selection and leaking a
+ * function into the settings document.
+ */
+declare function configuredAccountsOf(configured: unknown): Record<string, string>;
+/**
+ * Whether the host-side "follow the Trae app's sign-in" switch is on (issue
+ * #29). Absent reads as OFF, so an existing configuration keeps the strict
+ * bind it shipped with and the switch is an opt-in — the same opt-out
+ * semantics as {@link regionEnabledOf}, for the same reason: a config written
+ * before this field existed cannot ask for behavior it never declared.
+ *
+ * Reads the whole settings section (or the bare field); deep-unwraps first
+ * because on DSH 0.1.7 a volatile field arrives as a `{get(): T}` live
+ * reference, whose `typeof === 'object'` would otherwise pass a naive check.
+ */
+declare function followAppLoginEnabled(configured: unknown): boolean;
 /**
  * Build the next `regions` settings value for the card's save. The write
  * targets ONLY the signed-in account's region slot; every other region's slot
@@ -1828,6 +1887,15 @@ type TraeWebUsage = {
    * other case so a healthy account never pays for the extra read.
    */
   alternatives?: readonly TraeWebCreditAlternative[];
+  /**
+   * Present only when the Trae app's CURRENT sign-in differs from the
+   * account this plugin is bound to (issue #29): the card then offers a
+   * one-click follow instead of making the user hunt the account dropdown
+   * after every app-side sign-out. Absent in every other case — a healthy
+   * document costs no extra read beyond the accounts scan the document
+   * already runs.
+   */
+  appLogin?: TraeWebAppLogin;
   /**
    * Daily check-in state (CN only). Absent on the international region,
    * whose check-in surface does not exist — probed 2026-09-24: the
@@ -1862,6 +1930,14 @@ interface TraeUsageRouteOptions {
    * exhausted-account hint is simply not offered.
    */
   creditsOfAccount?(region: TraeRegion, accountId: string): Promise<TraeWebCredits | undefined>;
+  /**
+   * The account the Trae app is signed in to right now, when it differs from
+   * the bound one (issue #29). Optional: absent means the card's follow hint
+   * simply is not offered (a test harness or a host without the store's scan).
+   * Read-only — the HOST never rebinds from this value; the follow is a
+   * settings write, made by the card or by the host's follow switch.
+   */
+  liveLogin?(region: TraeRegion): Promise<TraeWebAppLogin | undefined>;
   /** The requested region's last-refreshed raw directory (one entry per upstream model). */
   displayModels(region: TraeRegion): readonly TraeModelInfo[];
   /** The user's model selection in the requested region, stored as model id (= Trae name). */
@@ -2023,21 +2099,42 @@ interface Config {
    */
   accounts?: Partial<Record<TraeRegion, string>>;
   /**
-   * Show the CN account's general credit balance as a permanent line at the
-   * bottom of the DSH sidebar (issue #26, contributed by JiewiW).
+   * Show the credit readout in the composer tool row: `Trae CN · <n>`, rendered
+   * ONLY while the session's selected model belongs to this plugin, clickable
+   * for the account/balances panel.
    *
-   * ON by default and opt-out since 2.9.1. It was opt-in first, on the theory
-   * that a user who never asked for a periodic usage read should not get one —
-   * but the switch lived only in the plugin card, and the card is not reachable
-   * in every host: a market plugin can own the Plugins tab and never dispatch
-   * `plugins.bundle.config`, so the line was permanently off with no discoverable
-   * way to turn it on. The line now carries its own on/off control in the
-   * sidebar, which is reachable exactly where the feature renders.
+   * This field first gated the sidebar credit line (issue #26, contributed by
+   * JiewiW); when that line was removed in 2.13.0 the composer readout replaced
+   * it and rendered unconditionally; 2.13.3 restores the switch, because the
+   * user went looking for it and a readout inside the SHARED composer row
+   * deserves the same opt-in the sidebar line had. The field is REUSED so an
+   * existing `true` keeps the readout on across the upgrade.
    *
-   * Declared volatile alongside `accounts`/`regions` so the settings form can
-   * both read and write it.
+   * OFF by default. The card's checkbox is the only writer, so exactly one path
+   * can change it. Declared volatile alongside `accounts`/`regions` so the
+   * settings form can both read and write it.
    */
   showPointsInMainUi?: boolean;
+  /**
+   * Follow the Trae desktop app's CURRENT sign-in instead of staying bound to
+   * the account the user (or the default) picked earlier (issue #29).
+   *
+   * When the app switches accounts, the old binding kept billing the previous
+   * account forever while `dsh-connect-workbuddy` followed the app
+   * automatically — every Trae sign-out then needed a manual switch here. With
+   * this switch ON, each settings re-apply rebinds `accounts.<region>` to
+   * whatever the app is signed in to right now (the live login outranks the
+   * plugin's own refreshed copies, see `TraeCredentialStore.preferred`).
+   *
+   * OFF by default: an existing configuration keeps the strict bind it
+   * shipped with, because silently switching billing accounts is exactly what
+   * `current()`'s no-fallback rule exists to prevent — the user opts in. When
+   * OFF, the card still shows a one-click hint (its own settings write), so
+   * the report in #29 is solved on both paths without any behavior change
+   * nobody asked for. Declared volatile so the card's switch can read and
+   * write it on the 0.1.7 settings form.
+   */
+  followAppLogin?: boolean;
   /**
    * Per-region model state, keyed `cn` | `ai`. The CN and international apps
    * expose different rosters, so each keeps its own directory and selection
@@ -2096,4 +2193,4 @@ declare function asVolatile<S>(schema: S): S;
 declare const Config: z<Config>;
 declare function apply(ctx: Context, config: Config): void;
 //#endregion
-export { Config, FALLBACK_TRAE_MODELS, FALLBACK_TRAE_MODELS_AI, REGION_GATEWAYS, type RawChatDelta, type RawChatMessage, type RawChatTool, SseDecoder, type SseEvent, TRAE_AI_PROVIDER, TRAE_CHECKIN_PATH, TRAE_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODELS_TEST_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, TRAE_PROBE_TIMEOUT_MS, TRAE_PROVIDER, TRAE_PROVIDERS, TRAE_PROVIDER_DISPLAY_NAMES, TRAE_RAW_CHAT_V1_PATH, TRAE_RAW_CHAT_V2_PATH, TRAE_REASONING_EFFORTS, TRAE_REGIONS, TRAE_REGION_PARAM, TRAE_SETTINGS_NS, TRAE_SOLO_CHAT_PATH, TRAE_SOLO_FUNCTION, TRAE_SOLO_MODELS_PATH, TRAE_SOLO_REMOTE_BASE, TRAE_STATE_DB_FILENAME, TRAE_STREAM_IDLE_TIMEOUT_MS, TRAE_USAGE_PATH, TRAE_VERSION_CODE_FALLBACK, type TraeActivityRule, type TraeAdapter, type TraeCachedModelConfig, TraeCatalog, type TraeChatResult, type TraeCheckinClaim, 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 TraeModelProbeVerdict, type TraeModelsTestResponse, type TraeObservedModelConfig, type TraeProbeResult, type TraeProbeVerdict, 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 TraeRefreshDevice, type TraeRegion, type TraeRegionGateways, TraeRegionState, 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 TraeWebCheckinClaim, type TraeWebCredits, type TraeWebUsage, type TraeWireModel, UnconfiguredTraeUpstreamClient, apply, applyContextBudgets, applyImageSelection, applyReasoningEffort, asVolatile, bridgeTraeSoloStream, buildTraeAgentTaskBody, buildTraeCnHeaders, buildTraeFusionRawChatEnvelope, buildTraeModelDetailRequest, buildTraeRawChatDraft, buildTraeRawChatRuntimeConfig, classifyProbeError, classifyProbeResult, classifyTraeRawChatFailure, createTraeAdapter, createTraeRawGateway, createTraeShim, decodeRawChatChunk, decodeTraeEvent, decryptTraeStorageValue, deriveCatalog, describeIdShape, describeNameShape, discoveredCatalog, fallbackModelsFor, hashTraeRawChatArg, identityHeaders, inject, legacyTraeOwnAuthPath, maskUserPath, mergeTraeModelSources, name, nextRegionEnabled, nextRegionSlots, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, pickTraeStorageIdentity, prepareSoloBody, probeBody, probeModelsSequentially, probeOneModel, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeCliIdentity, readTraeIdentity, refreshTraeCredential, regionEnabled, regionEnabledOf, regionOfCredential, regionOfEdition, regionOfHost, regionOfTraeProvider, regionOfTraeStatusUrl, regionOfUserRegion, regionStateOf, registerTraeUsageRoute, resolveTraeIdentity, resolveTraeRawRuntime, sanitizeCatalog, settingsNamespaceOf, traeEndpoint, traeInputModalities, traeModelDisplayName, traeOwnAuthPath, traeRawChatExtraInfo, traeStateDatabaseCandidates, traeStorageCandidates, traeWebUsage, traeWindowsAppNames, unwrapVolatile, unwrapVolatileDeep, withTraeRegion };
+export { Config, FALLBACK_TRAE_MODELS, FALLBACK_TRAE_MODELS_AI, REGION_GATEWAYS, type RawChatDelta, type RawChatMessage, type RawChatTool, SseDecoder, type SseEvent, TRAE_AI_PROVIDER, TRAE_CHECKIN_PATH, TRAE_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODELS_TEST_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, TRAE_PROBE_TIMEOUT_MS, TRAE_PROVIDER, TRAE_PROVIDERS, TRAE_PROVIDER_DISPLAY_NAMES, TRAE_RAW_CHAT_V1_PATH, TRAE_RAW_CHAT_V2_PATH, TRAE_REASONING_EFFORTS, TRAE_REGIONS, TRAE_REGION_PARAM, TRAE_SETTINGS_NS, TRAE_SOLO_CHAT_PATH, TRAE_SOLO_FUNCTION, TRAE_SOLO_MODELS_PATH, TRAE_SOLO_REMOTE_BASE, TRAE_STATE_DB_FILENAME, TRAE_STREAM_IDLE_TIMEOUT_MS, TRAE_USAGE_PATH, TRAE_VERSION_CODE_FALLBACK, type TraeActivityRule, type TraeAdapter, type TraeCachedModelConfig, TraeCatalog, type TraeChatResult, type TraeCheckinClaim, 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 TraeModelProbeVerdict, type TraeModelsTestResponse, type TraeObservedModelConfig, type TraeProbeResult, type TraeProbeVerdict, 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 TraeRefreshDevice, type TraeRegion, type TraeRegionGateways, TraeRegionState, 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 TraeWebAppLogin, type TraeWebCheckin, type TraeWebCheckinClaim, type TraeWebCredits, type TraeWebUsage, type TraeWireModel, UnconfiguredTraeUpstreamClient, apply, applyContextBudgets, applyImageSelection, applyReasoningEffort, asVolatile, bridgeTraeSoloStream, buildTraeAgentTaskBody, buildTraeCnHeaders, buildTraeFusionRawChatEnvelope, buildTraeModelDetailRequest, buildTraeRawChatDraft, buildTraeRawChatRuntimeConfig, classifyProbeError, classifyProbeResult, classifyTraeRawChatFailure, configuredAccountsOf, createTraeAdapter, createTraeRawGateway, createTraeShim, decodeRawChatChunk, decodeTraeEvent, decryptTraeStorageValue, deriveCatalog, describeIdShape, describeNameShape, discoveredCatalog, fallbackModelsFor, followAppLoginEnabled, hashTraeRawChatArg, identityHeaders, inject, legacyTraeOwnAuthPath, maskUserPath, mergeTraeModelSources, name, nextRegionEnabled, nextRegionSlots, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, pickTraeStorageIdentity, prepareSoloBody, probeBody, probeModelsSequentially, probeOneModel, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeCliIdentity, readTraeIdentity, refreshTraeCredential, regionEnabled, regionEnabledOf, regionOfCredential, regionOfEdition, regionOfHost, regionOfTraeProvider, regionOfTraeStatusUrl, regionOfUserRegion, regionStateOf, registerTraeUsageRoute, resolveTraeIdentity, resolveTraeRawRuntime, sanitizeCatalog, settingsNamespaceOf, traeEndpoint, traeInputModalities, traeModelDisplayName, traeOwnAuthPath, traeRawChatExtraInfo, traeStateDatabaseCandidates, traeStorageCandidates, traeWebUsage, traeWindowsAppNames, unwrapVolatile, unwrapVolatileDeep, withTraeRegion };