dsh-subscriptions 0.1.0

package/lib/compat.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Single-build compatibility with both published dsh lines (issue #53).
+ *
+ * dsh 0.1.2-alpha renamed `CallId` to `ToolCallId` in `@deepseek-ai/dsh-llm`.
+ * A named import of either symbol is an ESM link-time failure on the other
+ * line (the module executes before any code runs, so the whole profile boot
+ * dies). A namespace import never link-fails, and both constructors are pure
+ * type brands (`id as Branded`), so one runtime lookup serves both lines.
+ *
+ * `RpcResult` also moved homes: rc.2 ships it from the removed
+ * `@deepseek-ai/dsh-host-apiproxy/api`, the alpha as `ConnectionRpcResult`
+ * from `@deepseek-ai/dsh-client-connection`. Both are the same structural
+ * shape, so this local mirror avoids importing from either package.
+ */
+import type { ContentBlock } from '@deepseek-ai/dsh-llm';
+/** The branded tool-call id of whichever dsh-llm line is installed. */
+export type ToolCallId = Extract<ContentBlock, {
+    type: 'tool-call';
+}>['id'];
+/** Brand a string as a tool-call id: alpha's `ToolCallId`, rc.2's `CallId`. */
+export declare const ToolCallId: (id: string) => ToolCallId;
+/**
+ * Structural mirror of the RPC result both dsh lines use (rc.2's apiproxy
+ * `RpcResult`, the alpha's connection `ConnectionRpcResult`).
+ */
+export type RpcResult<T> = {
+    ok: true;
+    value: T;
+} | {
+    ok: false;
+    error: {
+        code: string;
+        message: string;
+        details: object;
+    };
+};

package/lib/compat.js

@@ -0,0 +1,20 @@
+/**
+ * Single-build compatibility with both published dsh lines (issue #53).
+ *
+ * dsh 0.1.2-alpha renamed `CallId` to `ToolCallId` in `@deepseek-ai/dsh-llm`.
+ * A named import of either symbol is an ESM link-time failure on the other
+ * line (the module executes before any code runs, so the whole profile boot
+ * dies). A namespace import never link-fails, and both constructors are pure
+ * type brands (`id as Branded`), so one runtime lookup serves both lines.
+ *
+ * `RpcResult` also moved homes: rc.2 ships it from the removed
+ * `@deepseek-ai/dsh-host-apiproxy/api`, the alpha as `ConnectionRpcResult`
+ * from `@deepseek-ai/dsh-client-connection`. Both are the same structural
+ * shape, so this local mirror avoids importing from either package.
+ */
+import * as llm from '@deepseek-ai/dsh-llm';
+/** Brand a string as a tool-call id: alpha's `ToolCallId`, rc.2's `CallId`. */
+export const ToolCallId = (() => {
+    const exports = llm;
+    return (exports['ToolCallId'] ?? exports['CallId']);
+})();

package/lib/http.d.ts

@@ -0,0 +1,6 @@
+/** Keep a sufficient per-address connection budget on high-latency networks. */
+export declare const MIN_CONNECT_ATTEMPT_TIMEOUT_MS = 1500;
+export declare function ensureConnectAttemptTimeout(minMs?: number): number;
+export declare function restoreConnectAttemptTimeout(previous: number): void;
+/** Use DSH's global fetch routing, including its configured network proxy. */
+export declare const hostFetch: typeof fetch;

package/lib/http.js

@@ -0,0 +1,15 @@
+/** Host-managed network routing for subscription requests. */
+import { getDefaultAutoSelectFamilyAttemptTimeout, setDefaultAutoSelectFamilyAttemptTimeout } from 'node:net';
+/** Keep a sufficient per-address connection budget on high-latency networks. */
+export const MIN_CONNECT_ATTEMPT_TIMEOUT_MS = 1500;
+export function ensureConnectAttemptTimeout(minMs = MIN_CONNECT_ATTEMPT_TIMEOUT_MS) {
+    const previous = getDefaultAutoSelectFamilyAttemptTimeout();
+    if (previous < minMs)
+        setDefaultAutoSelectFamilyAttemptTimeout(minMs);
+    return previous;
+}
+export function restoreConnectAttemptTimeout(previous) {
+    setDefaultAutoSelectFamilyAttemptTimeout(previous);
+}
+/** Use DSH's global fetch routing, including its configured network proxy. */
+export const hostFetch = (input, init) => fetch(input, init);

package/lib/index.d.ts

@@ -0,0 +1,80 @@
+/**
+ * dsh-subscriptions: register OAuth-subscription LLM providers
+ * (ChatGPT/Codex, Claude, Grok, GitHub Copilot, Google Antigravity) on `ctx.llm`, and expose the `/subscriptions-auth`
+ * RPC channel the web Settings page uses to run the logins. The token store
+ * lives at `~/.dsh/plugins/subscriptions/auth.json`; the channel registers only when
+ * a host `connection` service exists, so headless compositions load fine.
+ * @module dsh-subscriptions
+ */
+import type { Context } from '@deepseek-ai/cordis';
+import z from '@deepseek-ai/schemastery';
+import type { ProviderId } from './auth/store.js';
+import type { ModelEntry } from './providers/common.js';
+import type { RateLimitConfig } from './providers/rate-limit.js';
+import type { CliVersion, NpmCliVersionCache } from './providers/npm-cli-version.js';
+export type { AccountPreferences, ProviderPreferences } from './provider-settings.js';
+import type { PoolMemberRef } from './providers/pool-family.js';
+import type { AntigravityRuntimeConfig } from './providers/antigravity.js';
+export type { ModelEntry, ProviderUsage, UsageWindow } from './providers/common.js';
+export type { RateLimitConfig, RateLimitWait } from './providers/rate-limit.js';
+export type { ProviderStatus } from './auth/rpc.js';
+export type { AntigravitySession, ClaudeSession, CodexSession, CopilotSession, GrokSession, ProviderId } from './auth/store.js';
+export declare const name = "dsh-subscriptions";
+export declare const inject: string[];
+/** Default maximum provider idle time while one stream read is outstanding. */
+export declare const DEFAULT_STREAM_IDLE_TIMEOUT_MS = 300000;
+/** Bound on one pool quota poll — member selection must not hang on a usage endpoint. */
+export declare const POOL_USAGE_TIMEOUT_MS = 10000;
+export { withTimeout } from './providers/common.js';
+/** Plugin config, validated by the same-named schemastery schema. */
+export interface Config {
+    /** Codex /models client_version override; does not change account entitlements. */
+    codexClientVersion?: string;
+    /** Provider routes to register; defaults to every supported provider. */
+    providers?: ProviderId[];
+    /** Maximum provider idle time while one stream read is outstanding (default five minutes). */
+    streamIdleTimeoutMs?: number;
+    /** Whether and how long a route waits out a closed rate-limit window. */
+    rateLimit?: RateLimitConfig;
+    /** Advisory model catalogs overriding the built-in defaults, per provider. */
+    models?: {
+        codex?: ModelEntry[];
+        claude?: ModelEntry[];
+        grok?: ModelEntry[];
+        copilot?: ModelEntry[];
+        antigravity?: ModelEntry[];
+    };
+    /** Antigravity-specific OAuth and endpoint configuration. */
+    antigravity?: AntigravityRuntimeConfig & {
+        /** Google OAuth client id. May instead be supplied as ANTIGRAVITY_CLIENT_ID. */
+        clientId?: string;
+        /** Google OAuth client secret, when required by the client registration. */
+        clientSecret?: string;
+    };
+    /** Same-subscription account pools (and optional extra tier models). */
+    pool?: {
+        /** Enable account pooling (default true; needs ≥2 accounts of one provider). */
+        enabled?: boolean;
+        /** Member selection: plain priority failover, or quota-aware urgency scheduling. */
+        strategy?: 'priority' | 'quota_aware';
+        /** A challenger must out-score the sticky member by this factor to take over (default 2). */
+        switchMargin?: number;
+        /** Auto-pool every catalog model across a provider's logged-in accounts (default true). */
+        autoAccounts?: boolean;
+        /** @deprecated Use {@link autoAccounts}. */
+        autoFamilies?: boolean;
+        /** Explicit account lists for one catalog model (same provider); replaces the auto pool. */
+        families?: Record<string, PoolMemberRef[]>;
+        /** Extra picker entries with heterogeneous fallbacks, listed under the first member's provider. */
+        tiers?: Record<string, PoolMemberRef[]>;
+    };
+}
+export declare const Config: z<Config>;
+/**
+ * Read the CLI version a route presents for the Settings page. The first
+ * lookup is awaited (bounded by its own 5s deadline) so a slow registry is
+ * not misreported as a fallback; a later refresh is waited on only briefly,
+ * because the whole page waits on `status`, and the last result shows.
+ */
+export declare function presentedVersion(cache: Pick<NpmCliVersionCache, 'resolve' | 'current'>, waitMs?: number): () => Promise<CliVersion | undefined>;
+export declare function apply(ctx: Context, config: Config): void;