dsh-plugin-subscriptions 0.4.1 → 0.5.0

package/README.md

@@ -2,11 +2,11 @@
 
 English | [中文](README.zh.md)
 
-Use your **ChatGPT (Codex)**, **Claude**, and **Grok (X Premium)** subscriptions as LLM providers in [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) — no API keys. Login happens in the dsh web UI (Settings → Subscriptions); tokens live at `~/.dsh/plugins/subscriptions/auth.json` (mode 0600) and refresh automatically.
+Use your **ChatGPT (Codex)**, **Claude**, and **Grok (X Premium)** subscriptions as LLM providers in [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) — no API keys. Codex and Grok log in via OAuth in the dsh web UI (Settings → Subscriptions); Claude imports credentials directly from an existing Claude Code session (macOS Keychain or `~/.claude/.credentials.json`). Tokens live at `~/.dsh/plugins/subscriptions/auth.json` (mode 0600) and refresh automatically.
 
 ## Demo
 
-Settings → **Subscriptions**: per-provider OAuth login/logout, no API keys (account address masked in the screenshot):
+Settings → **Subscriptions**: per-provider login/logout, no API keys. Claude imports credentials from Claude Code; Codex and Grok use OAuth (account address masked in the screenshot):
 
 ![Subscriptions settings page](https://raw.githubusercontent.com/V1ki/dsh-plugin-subscriptions/main/docs/images/subscriptions.png)
 
@@ -18,6 +18,10 @@ Models that advertise reasoning levels get an **Effort** selector in the same me
 
 ![Reasoning effort selector](https://raw.githubusercontent.com/V1ki/dsh-plugin-subscriptions/main/docs/images/model-effort.png)
 
+Codex models whose catalog advertises the fast tier (the codex CLI's fast mode) get a **Speed** toggle in the composer's tool row, next to the model selector — Standard or Fast (`service_tier: priority`), per session. The `/fast` slash command offers the same choice as a popup; it errors with an explanation when the current model has no fast tier.
+
+![Speed toggle with the Standard/Fast menu open](https://raw.githubusercontent.com/V1ki/dsh-plugin-subscriptions/main/docs/images/speed-toggle.png)
+
 The `image_generate` tool renders its result inline in the conversation:
 
 ![image_generate renders the image inline](https://raw.githubusercontent.com/V1ki/dsh-plugin-subscriptions/main/docs/images/image-generate-inline.png)
@@ -35,7 +39,7 @@ The `video_generate` tool plays the generated clip inline:
 | Route    | Subscription      | Models |
 |----------|-------------------|--------|
 | `codex`  | ChatGPT Plus/Pro  | live catalog from `chatgpt.com/backend-api/codex/models` |
-| `claude` | Claude Pro/Max    | claude-opus-4-5, claude-sonnet-4-5, claude-haiku-4-5 |
+| `claude` | Claude Pro/Max    | all models available in your subscription (Opus, Sonnet, Haiku, Fable — static catalog, updated with the plugin) |
 | `grok`   | X Premium (xAI)   | live catalog from `api.x.ai/v1/models` (chat models only); reasoning efforts from the Grok CLI catalog (`cli-chat-proxy.grok.com/v1/models`) |
 
 Only logged-in providers appear in the session model picker; the lists above refresh on login/logout. Vision-capable models declare `['text', 'image']` input modalities, and image content is translated to each provider's wire format.
@@ -101,7 +105,7 @@ Either way, restart `dsh web` afterwards so the new version loads.
 ## Use
 
 1. `dsh web`, open the printed URL.
-2. Settings → **Subscriptions**: click **Log in** on a provider and authorize in the opened tab. If the browser flow can't complete (headless host), expand the manual fallback and paste the callback URL or code.
+2. Settings → **Subscriptions**: click **Connect** on a provider. For Claude, credentials are imported instantly from Claude Code (you must have run `claude` and logged in at least once). For Codex and Grok, authorize in the opened browser tab; if the browser flow can't complete (headless host), expand the manual fallback and paste the callback URL or code.
 3. In any session, open the model picker (`/model`) and choose a model under **ChatGPT (Codex)** / **Claude (Subscription)** / **Grok (Subscription)**.
 
 Not logged in? The provider stays out of the picker, and requests fail with `MISSING_CREDENTIAL` pointing at the Settings page; nothing else breaks.
@@ -134,7 +138,7 @@ After `pnpm build`, restart `dsh web` to pick up changes.
 ## Layout
 
 - `src/index.ts` — plugin entry: config schema, adapter registration, auth-change re-announce, RPC wiring
-- `src/auth/` — PKCE/JWT helpers, token store, OAuth flow engine (temp loopback callback server), `/subscriptions-auth` RPC channel
+- `src/auth/` — PKCE/JWT helpers, token store, OAuth flow engine (temp loopback callback server), Claude Code credential reader (Keychain/file), `/subscriptions-auth` RPC channel
 - `src/providers/` — per-provider OAuth constants/exchange/refresh + `LlmAdapter`s
 - `src/translate/` — dsh `Message[]` ⟷ OpenAI Responses / Anthropic Messages wire formats, SSE → `StreamChunk`
 - `src/tools/` — `x_search`, `image_generate`, and `video_generate`

package/README.zh.md

@@ -2,11 +2,11 @@
 
 [English](README.md) | 中文
 
-把你的 **ChatGPT(Codex)**、**Claude**、**Grok(X Premium)** 订阅当作 [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) 的 LLM provider 使用 —— 不需要 API key。登录在 dsh web 界面完成(设置 → 订阅);token 保存在 `~/.dsh/plugins/subscriptions/auth.json`(权限 0600),过期自动刷新。
+把你的 **ChatGPT(Codex)**、**Claude**、**Grok(X Premium)** 订阅当作 [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) 的 LLM provider 使用 —— 不需要 API key。Codex 和 Grok 通过 dsh web 界面 OAuth 登录(设置 → 订阅);Claude 直接从已有的 Claude Code 会话导入凭据(macOS Keychain 或 `~/.claude/.credentials.json`)。Token 保存在 `~/.dsh/plugins/subscriptions/auth.json`(权限 0600),过期自动刷新。
 
 ## 演示
 
-设置 → **订阅**:每个 provider 的 OAuth 登录/退出,无需 API key(截图中账号已打码):
+设置 → **订阅**:每个 provider 的登录/退出,无需 API key。Claude 从 Claude Code 导入凭据;Codex 和 Grok 使用 OAuth(截图中账号已打码):
 
 ![订阅设置页](https://raw.githubusercontent.com/V1ki/dsh-plugin-subscriptions/main/docs/images/subscriptions.png)
 
@@ -18,6 +18,10 @@
 
 ![推理等级选择器](https://raw.githubusercontent.com/V1ki/dsh-plugin-subscriptions/main/docs/images/model-effort.png)
 
+目录声明了 fast tier(即 codex CLI 的 fast 模式)的 Codex 模型,会在输入框工具行(模型选择器旁)多出一个**速度**开关 —— 标准 / 快速(`service_tier: priority`),按会话生效。`/fast` 斜杠命令提供同样的弹窗选择;当前模型不支持快速档时会提示原因。
+
+![速度开关及其标准/快速菜单](https://raw.githubusercontent.com/V1ki/dsh-plugin-subscriptions/main/docs/images/speed-toggle.png)
+
 `image_generate` 工具生成的图片直接内联显示在对话里:
 
 ![image_generate 内联显示生成的图片](https://raw.githubusercontent.com/V1ki/dsh-plugin-subscriptions/main/docs/images/image-generate-inline.png)
@@ -35,7 +39,7 @@
 | 路由     | 订阅             | 模型 |
 |----------|------------------|------|
 | `codex`  | ChatGPT Plus/Pro | 从 `chatgpt.com/backend-api/codex/models` 实时获取 |
-| `claude` | Claude Pro/Max   | claude-opus-4-5、claude-sonnet-4-5、claude-haiku-4-5 |
+| `claude` | Claude Pro/Max   | 订阅内所有可用模型(Opus、Sonnet、Haiku、Fable —— 静态目录,随插件更新) |
 | `grok`   | X Premium (xAI)  | 从 `api.x.ai/v1/models` 实时获取(仅对话模型);推理等级来自 Grok CLI 目录(`cli-chat-proxy.grok.com/v1/models`) |
 
 只有已登录的 provider 才会出现在会话模型选择器里;登录/退出后列表自动刷新。支持视觉的模型会声明 `['text', 'image']` 输入模态,图片内容会被翻译成各 provider 的 wire 格式。
@@ -101,7 +105,7 @@ GitHub 安装的:重新执行一遍 `add github:V1ki/dsh-plugin-subscriptions`
 ## 使用
 
 1. `dsh web`,打开打印的 URL。
-2. **设置 → 订阅**:点对应 provider 的「登录」,在打开的标签页里授权。无浏览器环境下可展开手动兜底,粘贴回调 URL 或授权码。
+2. **设置 → 订阅**:点对应 provider 的「连接」。Claude 会即时从 Claude Code 导入凭据(需先运行过 `claude` 并登录)。Codex 和 Grok 在打开的标签页里授权;无浏览器环境下可展开手动兜底,粘贴回调 URL 或授权码。
 3. 在任意会话里打开模型选择器(`/model`),选择 **ChatGPT (Codex)** / **Claude (Subscription)** / **Grok (Subscription)** 下的模型。
 
 未登录时:该 provider 不出现在选择器里;直接请求会报 `MISSING_CREDENTIAL` 并提示去设置页登录,不影响其他功能。
@@ -134,7 +138,7 @@ pnpm test      # 编译后跑 node --test 单测
 ## 目录结构
 
 - `src/index.ts` —— 插件入口:配置 schema、adapter 注册、登录态变更通告、RPC 接线
-- `src/auth/` —— PKCE/JWT 工具、token 存储、OAuth 流程引擎(临时本地回调服务)、`/subscriptions-auth` RPC 通道
+- `src/auth/` —— PKCE/JWT 工具、token 存储、OAuth 流程引擎(临时本地回调服务)、Claude Code 凭据读取器(Keychain/文件)、`/subscriptions-auth` RPC 通道
 - `src/providers/` —— 各 provider 的 OAuth 常量/换发/刷新 + `LlmAdapter` 实现
 - `src/translate/` —— dsh `Message[]` 与 OpenAI Responses / Anthropic Messages 格式互转,SSE → `StreamChunk`
 - `src/tools/` —— `x_search`、`image_generate` 与 `video_generate`

package/lib/auth/claude-code-creds.d.ts

@@ -0,0 +1,23 @@
+import type { ClaudeSession } from './store.js';
+/** Read the current Claude Code session from its source of truth: macOS Keychain, falling back to the credentials file. */
+export declare function readClaudeCodeCredentials(): ClaudeSession | undefined;
+/**
+ * Write a refreshed session back to Claude Code's own credential store, so
+ * the `claude` CLI and any other consumer of the same account see the token
+ * we just rotated. A stale-blob mismatch (something else rotated it first)
+ * is a no-op — the caller already has that other rotation via readClaudeCodeCredentials.
+ * @param next - the freshly refreshed session to persist.
+ * @param expectedPriorAccessToken - the access token this refresh started from.
+ * @returns whether the write-back succeeded.
+ */
+export declare function writeBackClaudeCodeCredentials(next: ClaudeSession, expectedPriorAccessToken: string): boolean;
+/**
+ * Refresh a Claude session, first checking whether Claude Code's own store
+ * already holds a fresher token (rotated by the `claude` CLI or another
+ * consumer) before hitting the OAuth endpoint ourselves — and writing our own
+ * refresh back to that store so every consumer of the account stays synced.
+ * @param session - the session TokenManager wants refreshed.
+ * @param doRefresh - the actual OAuth refresh-token grant (network call).
+ * @returns the freshest available session.
+ */
+export declare function refreshClaudeSynced(session: ClaudeSession, doRefresh: (session: ClaudeSession) => Promise<ClaudeSession>): Promise<ClaudeSession>;

package/lib/auth/claude-code-creds.js

@@ -0,0 +1,167 @@
+import { execFileSync } from 'node:child_process';
+import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { dirname, join } from 'node:path';
+const PRIMARY_SERVICE = 'Claude Code-credentials';
+const DEFAULT_SCOPES = 'user:profile user:inference user:sessions:claude_code user:mcp_servers';
+function toSession(data) {
+    if (typeof data.accessToken !== 'string' || typeof data.refreshToken !== 'string' || typeof data.expiresAt !== 'number') {
+        return undefined;
+    }
+    const scopes = Array.isArray(data.scopes) ? data.scopes.join(' ') : typeof data.scopes === 'string' ? data.scopes : DEFAULT_SCOPES;
+    return {
+        accessToken: data.accessToken,
+        refreshToken: data.refreshToken,
+        expiresAt: Math.trunc(data.expiresAt),
+        scopes,
+        ...typeof data.emailAddress === 'string' ? { emailAddress: data.emailAddress } : {},
+        ...typeof data.subscriptionType === 'string' ? { subscriptionType: data.subscriptionType } : {},
+    };
+}
+function parseBlob(raw) {
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch {
+        return undefined;
+    }
+    return toSession(parsed.claudeAiOauth ?? parsed);
+}
+function credentialsFilePath() {
+    return join(process.env.CLAUDE_CONFIG_DIR ?? join(homedir(), '.claude'), '.credentials.json');
+}
+function readKeychainRaw() {
+    try {
+        return execFileSync('/usr/bin/security', ['find-generic-password', '-s', PRIMARY_SERVICE, '-w'], {
+            timeout: 3000,
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+    }
+    catch {
+        return undefined;
+    }
+}
+function readFileRaw() {
+    try {
+        return readFileSync(credentialsFilePath(), 'utf8');
+    }
+    catch {
+        return undefined;
+    }
+}
+/** Read the current Claude Code session from its source of truth: macOS Keychain, falling back to the credentials file. */
+export function readClaudeCodeCredentials() {
+    if (process.platform === 'darwin') {
+        const raw = readKeychainRaw();
+        const session = raw !== undefined ? parseBlob(raw) : undefined;
+        if (session)
+            return session;
+    }
+    const raw = readFileRaw();
+    return raw !== undefined ? parseBlob(raw) : undefined;
+}
+function blobMatches(raw, expectedAccessToken) {
+    return parseBlob(raw)?.accessToken === expectedAccessToken;
+}
+function getKeychainAccountName() {
+    try {
+        const output = execFileSync('/usr/bin/security', ['find-generic-password', '-s', PRIMARY_SERVICE], {
+            timeout: 2000,
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        return /"acct"<blob>="([^"]*)"/.exec(output)?.[1];
+    }
+    catch {
+        return undefined;
+    }
+}
+/** Merge fresh tokens into an existing raw blob, preserving unrelated fields. */
+function mergeIntoBlob(existingRaw, next) {
+    let parsed;
+    try {
+        parsed = JSON.parse(existingRaw);
+    }
+    catch {
+        return undefined;
+    }
+    const target = (parsed.claudeAiOauth ?? parsed);
+    target.accessToken = next.accessToken;
+    target.refreshToken = next.refreshToken;
+    target.expiresAt = next.expiresAt;
+    return JSON.stringify(parsed);
+}
+/**
+ * Write a refreshed session back to Claude Code's own credential store, so
+ * the `claude` CLI and any other consumer of the same account see the token
+ * we just rotated. A stale-blob mismatch (something else rotated it first)
+ * is a no-op — the caller already has that other rotation via readClaudeCodeCredentials.
+ * @param next - the freshly refreshed session to persist.
+ * @param expectedPriorAccessToken - the access token this refresh started from.
+ * @returns whether the write-back succeeded.
+ */
+export function writeBackClaudeCodeCredentials(next, expectedPriorAccessToken) {
+    if (process.platform === 'darwin') {
+        const raw = readKeychainRaw();
+        if (raw === undefined || !blobMatches(raw, expectedPriorAccessToken))
+            return false;
+        const updated = mergeIntoBlob(raw, next);
+        if (updated === undefined)
+            return false;
+        const account = getKeychainAccountName() ?? PRIMARY_SERVICE;
+        try {
+            execFileSync('/usr/bin/security', ['add-generic-password', '-s', PRIMARY_SERVICE, '-a', account, '-w', updated, '-U'], {
+                timeout: 2000,
+                stdio: 'ignore',
+            });
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    const path = credentialsFilePath();
+    let raw;
+    try {
+        raw = readFileSync(path, 'utf8');
+    }
+    catch {
+        return false;
+    }
+    if (!blobMatches(raw, expectedPriorAccessToken))
+        return false;
+    const updated = mergeIntoBlob(raw, next);
+    if (updated === undefined)
+        return false;
+    try {
+        const dir = dirname(path);
+        if (!existsSync(dir))
+            mkdirSync(dir, { recursive: true, mode: 0o700 });
+        writeFileSync(path, updated, { encoding: 'utf8', mode: 0o600 });
+        chmodSync(path, 0o600);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Refresh a Claude session, first checking whether Claude Code's own store
+ * already holds a fresher token (rotated by the `claude` CLI or another
+ * consumer) before hitting the OAuth endpoint ourselves — and writing our own
+ * refresh back to that store so every consumer of the account stays synced.
+ * @param session - the session TokenManager wants refreshed.
+ * @param doRefresh - the actual OAuth refresh-token grant (network call).
+ * @returns the freshest available session.
+ */
+export async function refreshClaudeSynced(session, doRefresh) {
+    const fromSource = readClaudeCodeCredentials();
+    const base = fromSource !== undefined && fromSource.accessToken !== session.accessToken ? fromSource : session;
+    if (base.expiresAt > Date.now() + 60_000)
+        return base;
+    const next = await doRefresh(base);
+    writeBackClaudeCodeCredentials(next, base.accessToken);
+    return next;
+}

package/lib/auth/pkce.js

@@ -22,7 +22,7 @@ export function createPkce() {
  * @param bytes - entropy length.
  * @returns base64url-encoded random bytes.
  */
-export function randomToken(bytes = 16) {
+export function randomToken(bytes = 32) {
     return base64url(randomBytes(bytes));
 }
 /**

package/lib/auth/rpc.d.ts

@@ -20,6 +20,22 @@ export interface VideoBytesResult {
     mediaType: string;
     dataBase64: string;
 }
+/** One session's speed choice: standard routing or the fast (priority) tier. */
+export type SpeedTier = 'standard' | 'fast';
+/** `speed` endpoint value: the session's choice plus the visibility list. */
+export interface SpeedState {
+    /** The session's current speed tier (default `standard`). */
+    tier: SpeedTier;
+    /** Codex model ids whose catalog advertises a fast tier. */
+    fastModels: string[];
+}
+/** Speed state the RPC handler delegates to (in-memory, per session). */
+export interface SpeedController {
+    /** Current speed state: the session's tier and the fast-capable codex models. */
+    speed(sessionId: string): Promise<SpeedState>;
+    /** Set one session's speed tier. */
+    setSpeed(sessionId: string, tier: SpeedTier): Promise<void>;
+}
 /** Login state of one provider, as rendered by the Settings page. */
 export interface ProviderStatus {
     /** Whether a session exists in the store. */
@@ -83,5 +99,6 @@ export interface AuthController {
  * Register the `/subscriptions-auth` RPC channel when a host connection exists.
  * @param ctx - the plugin context (headless profiles have no `connection`).
  * @param controller - the auth operations backing the endpoints.
+ * @param speed - the per-session speed-tier state backing the Speed toggle.
  */
-export declare function registerAuthRpc(ctx: Context, controller: AuthController): void;
+export declare function registerAuthRpc(ctx: Context, controller: AuthController, speed: SpeedController): void;

package/lib/auth/rpc.js

@@ -42,6 +42,14 @@ function readString(payload, field) {
     }
     return value;
 }
+/** Validate the `setSpeed` endpoint's tier. */
+function readSpeedTier(payload) {
+    const tier = payload.tier;
+    if (tier !== 'standard' && tier !== 'fast') {
+        throw new BadRequest('payload.tier must be "standard" or "fast"');
+    }
+    return tier;
+}
 /** Validate the `image` endpoint's payload into a full attachment reference. */
 function readImageRef(payload) {
     if (typeof payload !== 'object' || payload === null)
@@ -88,7 +96,13 @@ function readVideoName(payload) {
     }
     return name;
 }
-async function dispatch(controller, endpoint, payload, signal) {
+/** Validate the session id both speed endpoints carry. */
+function readSessionId(payload) {
+    if (typeof payload !== 'object' || payload === null)
+        throw new BadRequest('payload must be an object');
+    return readString(payload, 'sessionId');
+}
+async function dispatch(controller, speed, endpoint, payload, signal) {
     switch (endpoint) {
         case 'status': {
             const entries = await Promise.all(PROVIDER_IDS.map(async (provider) => [provider, await controller.status(provider)]));
@@ -113,6 +127,11 @@ async function dispatch(controller, endpoint, payload, signal) {
             return ok(await controller.readImage(readImageRef(payload), signal));
         case 'video':
             return ok(await controller.readVideo(readVideoName(payload), signal));
+        case 'speed':
+            return ok(await speed.speed(readSessionId(payload)));
+        case 'setSpeed':
+            await speed.setSpeed(readSessionId(payload), readSpeedTier(payload));
+            return ok({ ok: true });
         default:
             throw new BadRequest(`unknown /subscriptions-auth endpoint "${endpoint}"`);
     }
@@ -121,8 +140,9 @@ async function dispatch(controller, endpoint, payload, signal) {
  * Register the `/subscriptions-auth` RPC channel when a host connection exists.
  * @param ctx - the plugin context (headless profiles have no `connection`).
  * @param controller - the auth operations backing the endpoints.
+ * @param speed - the per-session speed-tier state backing the Speed toggle.
  */
-export function registerAuthRpc(ctx, controller) {
+export function registerAuthRpc(ctx, controller, speed) {
     // `connection` is not in this plugin's inject list (headless compositions
     // lack it), so its startup order is unconstrained: defer registration until
     // the service exists instead of probing once at apply time.
@@ -130,7 +150,7 @@ export function registerAuthRpc(ctx, controller) {
         const connection = ctx.get('connection');
         ctx.effect(() => connection.rpc.handle(SUBSCRIPTIONS_AUTH_CHANNEL, async (endpoint, payload, signal) => {
             try {
-                return await dispatch(controller, endpoint, payload, signal);
+                return await dispatch(controller, speed, endpoint, payload, signal);
             }
             catch (error) {
                 return failure(error);

package/lib/client/ImageGallery.d.ts

@@ -0,0 +1,54 @@
+/**
+ * Mirror of ImageAttachmentRef (packages/attachment/attachment/src/types.ts);
+ * the brand on attachmentId is compile-time only, so string suffices here.
+ */
+export interface ImageAttachmentRef {
+    attachmentId: string;
+    mediaType: string;
+    bytes: number;
+    width: number;
+    height: number;
+    name?: string;
+}
+/** Loads a session-authorized durable image URL (resolves to a data/blob URL). */
+export type ImageLoader = (attachment: ImageAttachmentRef) => Promise<string>;
+/** Lightbox strings forwarded to the opened preview. */
+export interface ImageLightboxLabels {
+    dialog: string;
+    close: string;
+}
+/** Message-image strings the owner resolves from its own locale namespace. */
+export interface MessageImageLabels {
+    /** Fallback display name for an unnamed image. */
+    image: string;
+    /** Thumbnail tooltip inviting the original-image preview. */
+    open: string;
+    /** Accessible thumbnail label; receives the image's display name. */
+    openNamed: (label: string) => string;
+    /** Loading placeholder shown until bytes resolve. */
+    loading: string;
+    /** Retry-control label shown when the load fails. */
+    loadFailed: string;
+    /** Lightbox strings forwarded to the opened preview. */
+    lightbox: ImageLightboxLabels;
+}
+/**
+ * Compact history renderer with retryable loading and click-to-open original
+ * preview. A lone image renders at its `singleFit` size; an image among
+ * several renders as a fixed 64px square tile.
+ */
+export declare function MessageImage({ attachment, load, variant, labels }: {
+    attachment: ImageAttachmentRef;
+    load: ImageLoader;
+    variant: 'single' | 'tile';
+    labels: MessageImageLabels;
+}): import("react").JSX.Element;
+/** Wrapping image group: a lone image renders large, several render as 64px
+ * square tiles (same rule as the platform gallery). */
+export declare function ImageGallery({ images, load, labels }: {
+    images: readonly {
+        attachment: ImageAttachmentRef;
+    }[];
+    load: ImageLoader;
+    labels: MessageImageLabels;
+}): import("react").JSX.Element | null;

package/lib/client/ImageGallery.js

@@ -0,0 +1,112 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+/**
+ * Plugin-local image gallery for generated-image toolviews.
+ *
+ * Since web-app rc.8, `@deepseek-ai/dsh-client-ui-attachment`'s browser module
+ * exports only its cordis plugin surface (`apply`/`inject`) — the React
+ * components are no longer package values, so importing `ImageGallery` from it
+ * yields `undefined` at runtime and crashes the toolview inside the slot error
+ * boundary (the whole call row disappears). This module re-implements the
+ * gallery contract the toolview needs (loader-driven thumbnails, retry on
+ * failure, click-to-open lightbox) with the same sizing rules as the platform
+ * component, keeping this plugin independent of harness component exports.
+ */
+import { useCallback, useEffect, useMemo, useState } from 'react';
+/** Display box for a lone image (platform rule): long edge 240px with the
+ * rendered aspect ratio clamped to [0.25, 4] — the overflow is cropped by
+ * `object-fit: cover` — and never upscaled past the image's natural size. The
+ * crop anchor keeps the top of very tall images and the left of very wide
+ * ones, where the informative content usually starts. */
+function singleFit(attachment) {
+    const natural = attachment.width / attachment.height;
+    const ratio = Math.min(4, Math.max(0.25, natural));
+    const box = ratio >= 1 ? { width: 240, height: 240 / ratio } : { width: 240 * ratio, height: 240 };
+    const scale = Math.min(1, attachment.width / box.width, attachment.height / box.height);
+    return {
+        width: Math.max(1, Math.round(box.width * scale)),
+        height: Math.max(1, Math.round(box.height * scale)),
+        objectPosition: natural < 0.25 ? 'center top' : natural > 4 ? 'left center' : 'center',
+    };
+}
+const styles = {
+    gallery: { display: 'flex', flexWrap: 'wrap', gap: 8, justifyContent: 'flex-start' },
+    frame: {
+        display: 'grid', placeItems: 'center', overflow: 'hidden', padding: 0,
+        border: '1px solid var(--dsw-alias-border-l2-darkmode-thin)', borderRadius: 8,
+        background: 'var(--dsw-alias-interactive-bg-hover-solid)', cursor: 'zoom-in',
+    },
+    tile: { width: 64, height: 64 },
+    img: { width: '100%', height: '100%', objectFit: 'cover', display: 'block' },
+    loading: { fontSize: 12, color: 'var(--dsw-alias-label-tertiary)', padding: '0 8px' },
+    error: {
+        fontSize: 12, color: 'var(--dsw-alias-state-error-primary)', cursor: 'pointer',
+        border: '1px solid var(--dsw-alias-border-l2-darkmode-thin)', borderRadius: 8,
+        background: 'transparent', padding: '6px 10px',
+    },
+    overlay: {
+        position: 'fixed', inset: 0, zIndex: 1000, display: 'grid', placeItems: 'center',
+        background: 'rgba(0, 0, 0, 0.72)', padding: 24,
+    },
+    overlayImg: { maxWidth: '92vw', maxHeight: '92vh', objectFit: 'contain', borderRadius: 4 },
+    close: {
+        position: 'absolute', top: 12, right: 12, width: 32, height: 32, display: 'grid',
+        placeItems: 'center', border: 'none', borderRadius: '50%', cursor: 'pointer',
+        background: 'rgba(255, 255, 255, 0.16)', color: '#fff', fontSize: 16, lineHeight: 1,
+    },
+};
+/**
+ * Full-viewport original-image preview: backdrop or close-control click and
+ * Escape all dismiss; the image itself is inert so a click on it does not
+ * fall through to the backdrop dismissal.
+ */
+function ImageLightbox({ src, alt, labels, onClose }) {
+    useEffect(() => {
+        const onKey = (event) => { if (event.key === 'Escape')
+            onClose(); };
+        window.addEventListener('keydown', onKey);
+        return () => { window.removeEventListener('keydown', onKey); };
+    }, [onClose]);
+    return (_jsxs("div", { role: "dialog", "aria-label": labels.dialog, style: styles.overlay, onClick: onClose, children: [_jsx("img", { src: src, alt: alt, style: styles.overlayImg, onClick: event => { event.stopPropagation(); } }), _jsx("button", { type: "button", "aria-label": labels.close, style: styles.close, onClick: onClose, children: "\u00D7" })] }));
+}
+/**
+ * Compact history renderer with retryable loading and click-to-open original
+ * preview. A lone image renders at its `singleFit` size; an image among
+ * several renders as a fixed 64px square tile.
+ */
+export function MessageImage({ attachment, load, variant, labels }) {
+    const [src, setSrc] = useState(null);
+    const [error, setError] = useState(false);
+    const [open, setOpen] = useState(false);
+    // Retry re-arms the one load effect below, so every attempt — first load or
+    // retry — runs under the same liveness guard and the same reset.
+    const [attempt, setAttempt] = useState(0);
+    const retry = useCallback(() => { setAttempt(a => a + 1); }, []);
+    const close = useCallback(() => { setOpen(false); }, []);
+    const fit = useMemo(() => (variant === 'single' ? singleFit(attachment) : undefined), [attachment, variant]);
+    useEffect(() => {
+        let live = true;
+        setError(false);
+        setSrc(null);
+        void load(attachment).then((url) => { if (live)
+            setSrc(url); }).catch(() => { if (live)
+            setError(true); });
+        return () => { live = false; };
+    }, [attachment, load, attempt]);
+    const label = attachment.name ?? labels.image;
+    if (error) {
+        return _jsx("button", { type: "button", style: styles.error, onClick: retry, children: labels.loadFailed });
+    }
+    const box = fit === undefined ? styles.tile : { width: fit.width, height: fit.height };
+    return (_jsxs(_Fragment, { children: [_jsx("button", { type: "button", style: { ...styles.frame, ...box }, title: labels.open, "aria-label": labels.openNamed(label), onClick: () => { if (src !== null)
+                    setOpen(true); }, children: src === null
+                    ? _jsx("span", { style: styles.loading, children: labels.loading })
+                    : _jsx("img", { src: src, alt: label, style: { ...styles.img, objectPosition: fit?.objectPosition } }) }), open && src !== null && _jsx(ImageLightbox, { src: src, alt: label, labels: labels.lightbox, onClose: close })] }));
+}
+/** Wrapping image group: a lone image renders large, several render as 64px
+ * square tiles (same rule as the platform gallery). */
+export function ImageGallery({ images, load, labels }) {
+    if (images.length === 0)
+        return null;
+    const variant = images.length === 1 ? 'single' : 'tile';
+    return (_jsx("div", { style: styles.gallery, children: images.map((image, index) => (_jsx(MessageImage, { attachment: image.attachment, load: load, variant: variant, labels: labels }, `${image.attachment.attachmentId}:${index}`))) }));
+}

package/lib/client/ImageGenerateToolview.d.ts

@@ -1,6 +1,6 @@
 import type { ConnectionHandle } from '@deepseek-ai/dsh-api-remotes/client';
 import type { ToolCallBlock } from '@deepseek-ai/dsh-client-runtime/client';
-import type { ImageLoader } from '@deepseek-ai/dsh-client-ui-attachment';
+import type { ImageLoader } from './ImageGallery.js';
 import type { SubscriptionsKey } from './locales.js';
 /** Mirror of ui-tool's ToolCallOwnerProps (see the module header). */
 interface ToolCallOwnerProps {

package/lib/client/ImageGenerateToolview.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { IconSparkle16 } from '@deepseek-ai/dsh-client-ui-primitives';
-import { ImageGallery } from '@deepseek-ai/dsh-client-ui-attachment';
+import { ImageGallery } from './ImageGallery.js';
 import { en } from './locales.js';
 /** Logical RPC channel served by the node half of this plugin. */
 const SUBSCRIPTIONS_AUTH_CHANNEL = '/subscriptions-auth';
@@ -133,5 +133,5 @@ export function ImageGenerateToolview(props) {
         loadFailed: t('imageLoadFailed'),
         lightbox: { dialog: t('imagePreview'), close: t('imageClose') },
     };
-    return (_jsxs("div", { style: styles.container, children: [_jsxs("div", { style: styles.row, children: [_jsx("span", { style: styles.icon, children: _jsx(IconSparkle16, { size: 14 }) }), _jsx("span", { style: styles.title, children: title })] }), !settled && _jsx("p", { style: styles.subtle, children: t('generating') }), settled && block.isError && text !== '' && (_jsx("p", { style: styles.error, children: text.split('\n', 1)[0] })), settled && !block.isError && images.length > 0 && load !== undefined && (_jsx(ImageGallery, { images: images, load: load, align: "start", labels: labels })), settled && !block.isError && images.length === 0 && text !== '' && (_jsx("p", { style: styles.output, children: text }))] }));
+    return (_jsxs("div", { style: styles.container, children: [_jsxs("div", { style: styles.row, children: [_jsx("span", { style: styles.icon, children: _jsx(IconSparkle16, { size: 14 }) }), _jsx("span", { style: styles.title, children: title })] }), !settled && _jsx("p", { style: styles.subtle, children: t('generating') }), settled && block.isError && text !== '' && (_jsx("p", { style: styles.error, children: text.split('\n', 1)[0] })), settled && !block.isError && images.length > 0 && load !== undefined && (_jsx(ImageGallery, { images: images, load: load, labels: labels })), settled && !block.isError && images.length === 0 && text !== '' && (_jsx("p", { style: styles.output, children: text }))] }));
 }

package/lib/client/SpeedSelect.d.ts

@@ -0,0 +1,48 @@
+import type { PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots';
+import type { ConnectionHandle } from '@deepseek-ai/dsh-api-remotes/client';
+/** One session's speed choice: standard routing or the fast (priority) tier. */
+export type SpeedTier = 'standard' | 'fast';
+/** `speed` endpoint value, mirrored from the node half. */
+export interface SpeedState {
+    tier: SpeedTier;
+    fastModels: string[];
+}
+/** What {@link SpeedSelect} renders from: visibility plus the current tier. */
+export interface SpeedSelectState {
+    visible: boolean;
+    tier: SpeedTier;
+}
+/** Injected dependencies of {@link SpeedSelect} (slot `inject`, session-bound). */
+export interface SpeedSelectInjected {
+    /** Load the session's speed state; `visible` false keeps the control hidden. */
+    loadSpeed: () => Promise<SpeedSelectState>;
+    /** Set the session's speed tier; resolves false when the write failed. */
+    setSpeed: (tier: SpeedTier) => Promise<boolean>;
+}
+/**
+ * Props delivered by the slot outlet: the framework session kit and InputZone
+ * owner share (unused — everything arrives session-bound through the inject
+ * face), the injected callbacks, and the locale seat.
+ */
+export type SpeedSelectProps = PropsRuntime<'conversation.input.right'> & Partial<SpeedSelectInjected> & Partial<PropsLocale<'settings.subscriptions'>>;
+/**
+ * The `loadSpeed` half of the inject face: the plugin's own speed state plus
+ * the host's current model selection (the visibility gate). A model-RPC
+ * failure throws rather than answering "hidden" — the caller keeps its last
+ * known state, so a transient failure never locks the toggle away.
+ *
+ * `sessionId` is a plain string: slot and command contexts brand it through
+ * different dsh-session copies, and only the API-client boundary needs one.
+ */
+export declare function createSpeedLoader(connection: ConnectionHandle, sessionId: string): SpeedSelectInjected['loadSpeed'];
+/** The `setSpeed` half of the inject face: boolean outcome for the component's busy state. */
+export declare function createSpeedSetter(connection: ConnectionHandle, sessionId: string): SpeedSelectInjected['setSpeed'];
+/**
+ * The composer Speed control: a trigger reading `速度 · 快速`/`速度 · 标准`
+ * that opens a two-row menu (standard/fast with descriptions, check mark on
+ * the current tier). The host pushes nothing on a model switch, so the
+ * control re-reads on a slow poll with a single-flight guard; a failed read
+ * keeps the last known state, so a transient RPC failure can never lock the
+ * toggle away (the earlier mount-only load had no recovery path).
+ */
+export declare function SpeedSelect({ loadSpeed, setSpeed, t }: SpeedSelectProps): import("react").JSX.Element | null;