dsh-plugin-subscriptions 0.4.1 → 0.5.0

package/lib/client/SpeedSelect.js

@@ -0,0 +1,173 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * Codex Speed toggle: one small control in the composer's right tool row
+ * (`conversation.input.right`), switching the session between standard routing
+ * and the fast (priority) service tier — the Codex desktop app's Speed menu.
+ * The choice is per session and lives in the node half (in-memory); this
+ * component holds only viewing state. The control renders nothing until the
+ * first load proves the session's current model is a codex model whose catalog
+ * advertises the fast tier.
+ *
+ * Every color resolves through a `--dsw-alias-*` design token and every
+ * user-visible string goes through the locale `t` of the
+ * 'settings.subscriptions' namespace, same as the settings section.
+ */
+import { useEffect, useRef, useState } from 'react';
+import { callSubscriptionsAuth } from './SubscriptionsSection.js';
+import { en } from './locales.js';
+/**
+ * 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 function createSpeedLoader(connection, sessionId) {
+    return async () => {
+        const state = await callSubscriptionsAuth(connection.rpc, 'speed', { sessionId });
+        const { result } = await connection.api.sessions.models({ sessionId: sessionId });
+        if (!result.ok)
+            throw new Error(`session.models failed: ${result.error.code}: ${result.error.message}`);
+        const current = result.value.current;
+        const visible = current !== null && current.provider === 'codex'
+            && state.fastModels.includes(current.model);
+        return { visible, tier: state.tier };
+    };
+}
+/** The `setSpeed` half of the inject face: boolean outcome for the component's busy state. */
+export function createSpeedSetter(connection, sessionId) {
+    return tier => callSubscriptionsAuth(connection.rpc, 'setSpeed', { sessionId, tier })
+        .then(() => true, () => false);
+}
+/** English-dictionary fallback for a missing inject `t` (standalone renders). */
+function fallbackTranslate(key) {
+    return en[key];
+}
+const TIERS = ['standard', 'fast'];
+/**
+ * The composer Speed control: a trigger reading `速度 · 快速`/`速度 · 标准`
+ * that opens a two-row menu (standard/fast with descriptions, check mark on
+ * the current tier). Mount and every open reload the host state so a model
+ * switch made since the last open self-corrects.
+ */
+/** How often the control re-reads the host state (model switches arrive only by asking). */
+const POLL_INTERVAL_MS = 3000;
+/**
+ * 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 function SpeedSelect({ loadSpeed, setSpeed, t }) {
+    const translate = t ?? fallbackTranslate;
+    const [state, setState] = useState(null);
+    const [open, setOpen] = useState(false);
+    const [busy, setBusy] = useState(false);
+    const rootRef = useRef(null);
+    // The inject face may be re-evaluated (new callback identities) on re-render;
+    // the poll effect mounts once and reads through this ref, so identity churn
+    // neither resets the interval nor multiplies in-flight loads.
+    const loadRef = useRef(loadSpeed);
+    loadRef.current = loadSpeed;
+    useEffect(() => {
+        if (loadRef.current === undefined)
+            return;
+        let cancelled = false;
+        let inflight = false;
+        const reload = () => {
+            const load = loadRef.current;
+            if (load === undefined || inflight)
+                return;
+            inflight = true;
+            void load().then((loaded) => { if (!cancelled)
+                setState(loaded); }, () => { }).finally(() => { inflight = false; });
+        };
+        reload();
+        const timer = setInterval(reload, POLL_INTERVAL_MS);
+        return () => {
+            cancelled = true;
+            clearInterval(timer);
+        };
+    }, []);
+    useEffect(() => {
+        if (!open)
+            return;
+        const closeOutside = (event) => {
+            if (!rootRef.current?.contains(event.target))
+                setOpen(false);
+        };
+        document.addEventListener('mousedown', closeOutside);
+        return () => { document.removeEventListener('mousedown', closeOutside); };
+    }, [open]);
+    if (loadSpeed === undefined || setSpeed === undefined || state === null || !state.visible) {
+        return null;
+    }
+    const choose = (tier) => {
+        if (busy)
+            return;
+        if (tier === state.tier) {
+            setOpen(false);
+            return;
+        }
+        setBusy(true);
+        void setSpeed(tier).then((ok) => {
+            setBusy(false);
+            if (ok) {
+                setState({ visible: true, tier });
+                setOpen(false);
+            }
+        });
+    };
+    const show = () => {
+        setOpen(true);
+        const load = loadRef.current;
+        if (load === undefined)
+            return;
+        void load().then(setState, () => { });
+    };
+    const tierName = (tier) => translate(tier === 'fast' ? 'speedFast' : 'speedStandard');
+    const tierDescription = (tier) => translate(tier === 'fast' ? 'speedFastDescription' : 'speedStandardDescription');
+    const triggerLabel = `${translate('speed')} · ${tierName(state.tier)}`;
+    return (_jsxs("div", { ref: rootRef, style: styles.root, onKeyDown: (event) => {
+            if (event.key === 'Escape' && open) {
+                event.preventDefault();
+                setOpen(false);
+            }
+        }, children: [open && (_jsx("div", { style: styles.menu, role: "menu", "aria-label": translate('speed'), children: TIERS.map(tier => (_jsxs("button", { type: "button", role: "menuitemradio", "aria-checked": tier === state.tier, style: styles.item, disabled: busy, onClick: () => { choose(tier); }, children: [_jsx("span", { style: styles.itemCheck, children: tier === state.tier ? '✓' : '' }), _jsxs("span", { style: styles.itemText, children: [_jsx("span", { style: styles.itemName, children: tierName(tier) }), _jsx("span", { style: styles.itemDescription, children: tierDescription(tier) })] })] }, tier))) })), _jsx("button", { type: "button", style: styles.trigger, "aria-haspopup": "menu", "aria-expanded": open, title: triggerLabel, disabled: busy, onClick: () => {
+                    if (open)
+                        setOpen(false);
+                    else
+                        show();
+                }, children: triggerLabel })] }));
+}
+const styles = {
+    root: { position: 'relative', display: 'inline-flex' },
+    trigger: {
+        border: '1px solid var(--dsw-alias-border-l2)', borderRadius: 8,
+        background: 'transparent', color: 'var(--dsw-alias-label-secondary)',
+        font: 'inherit', fontSize: 12, lineHeight: '18px',
+        padding: '2px 8px', cursor: 'pointer', whiteSpace: 'nowrap',
+    },
+    menu: {
+        position: 'absolute', bottom: '100%', right: 0, marginBottom: 4,
+        minWidth: 180, padding: 4, zIndex: 20,
+        background: 'var(--dsw-alias-bg-layer-1)', border: '1px solid var(--dsw-alias-border-l2)',
+        borderRadius: 8, display: 'flex', flexDirection: 'column', gap: 2,
+    },
+    item: {
+        display: 'flex', alignItems: 'flex-start', gap: 6, width: '100%',
+        border: 'none', borderRadius: 6, background: 'transparent',
+        padding: '6px 8px', cursor: 'pointer', font: 'inherit', textAlign: 'left',
+    },
+    itemCheck: {
+        width: 14, flexShrink: 0, fontSize: 12, lineHeight: '18px',
+        color: 'var(--dsw-alias-label-primary)',
+    },
+    itemText: { display: 'flex', flexDirection: 'column' },
+    itemName: { fontSize: 12, lineHeight: '18px', color: 'var(--dsw-alias-label-primary)' },
+    itemDescription: { fontSize: 11, lineHeight: '16px', color: 'var(--dsw-alias-label-tertiary)' },
+};

package/lib/client/SubscriptionsSection.d.ts

@@ -35,6 +35,15 @@ export interface SubscriptionsSectionInjected {
  * renderer erases the share boundary at the render call).
  */
 export type SubscriptionsSectionProps = Partial<SubscriptionsSectionInjected>;
+/**
+ * Call one `/subscriptions-auth` endpoint and unwrap the business result.
+ * Shared by the settings section and the composer Speed toggle.
+ * @param rpc - Connection RPC caller.
+ * @param endpoint - channel-relative endpoint.
+ * @param payload - channel-owned request payload.
+ * @returns the success value, cast by the caller to the endpoint's shape.
+ */
+export declare function callSubscriptionsAuth<T>(rpc: ConnectionHandle['rpc'], endpoint: string, payload: unknown): Promise<T>;
 /**
  * The Subscriptions settings page component.
  * @param props - the slot inject face ({@link SubscriptionsSectionInjected}).

package/lib/client/SubscriptionsSection.js

@@ -30,12 +30,13 @@ class SubscriptionsAuthError extends Error {
 }
 /**
  * Call one `/subscriptions-auth` endpoint and unwrap the business result.
+ * Shared by the settings section and the composer Speed toggle.
  * @param rpc - Connection RPC caller.
  * @param endpoint - channel-relative endpoint.
  * @param payload - channel-owned request payload.
  * @returns the success value, cast by the caller to the endpoint's shape.
  */
-async function callSubscriptionsAuth(rpc, endpoint, payload) {
+export async function callSubscriptionsAuth(rpc, endpoint, payload) {
     let result;
     try {
         result = await rpc.call(SUBSCRIPTIONS_AUTH_CHANNEL, endpoint, payload);
@@ -323,7 +324,12 @@ export function SubscriptionsSection(props) {
         setProviderError(provider, undefined);
         try {
             const response = await callSubscriptionsAuth(rpc, 'login', { provider });
-            if (typeof response.authorizeUrl !== 'string' || response.authorizeUrl === '') {
+            if (typeof response.authorizeUrl === 'string' && response.authorizeUrl === '') {
+                // Instant login (e.g. imported from Claude Code credentials)
+                await refresh();
+                return;
+            }
+            if (typeof response.authorizeUrl !== 'string') {
                 throw new SubscriptionsAuthError(t('loginMissingUrl'));
             }
             window.open(response.authorizeUrl, '_blank', 'noopener');

package/lib/client/index.d.ts

@@ -11,6 +11,7 @@ import type { SubscriptionsKey } from './locales.js';
 export type { SubscriptionsSectionInjected, SubscriptionsSectionProps } from './SubscriptionsSection.js';
 export type { ImageGenerateToolviewInjected, ImageGenerateToolviewProps } from './ImageGenerateToolview.js';
 export type { VideoGenerateToolviewInjected, VideoGenerateToolviewProps } from './VideoGenerateToolview.js';
+export type { SpeedSelectInjected, SpeedSelectProps, SpeedState, SpeedTier } from './SpeedSelect.js';
 export type { SubscriptionsKey } from './locales.js';
 declare module '@deepseek-ai/dsh-client-ui-slots' {
     interface LocaleNamespaceMap {

package/lib/client/index.js

@@ -4,6 +4,7 @@
 import { SubscriptionsSection } from './SubscriptionsSection.js';
 import { ImageGenerateToolview, createImageLoader } from './ImageGenerateToolview.js';
 import { VideoGenerateToolview, createVideoLoader } from './VideoGenerateToolview.js';
+import { SpeedSelect, createSpeedLoader, createSpeedSetter } from './SpeedSelect.js';
 import { en, zh } from './locales.js';
 /** Dictionary namespace owned by this plugin. */
 const NS = 'settings.subscriptions';
@@ -53,4 +54,45 @@ export function apply(ctx) {
         locale: NS,
         inject: videoToolviewInjected,
     }, VideoGenerateToolview));
+    // The composer Speed toggle (codex fast tier) sits in the right tool row,
+    // just left of the model selector; the framework synthesizes its `t` seat
+    // from `locale: NS`, and the inject face binds each session's RPC calls.
+    ctx.slots.inject('conversation.input.right', () => ctx.slots.register({
+        name: 'conversation.input.right',
+        id: 'codex-speed',
+        order: 0,
+        locale: NS,
+        inject: (sessionId) => ({
+            loadSpeed: createSpeedLoader(connection, sessionId),
+            setSpeed: createSpeedSetter(connection, sessionId),
+        }),
+    }, SpeedSelect));
+    // The /fast slash command offers the same Standard/Fast choice as a popup.
+    // `available` is synchronous and sees only the session id, so the command
+    // stays listed everywhere; `options` throws the friendly gate when the
+    // session's current model is not a fast-capable codex model (the same
+    // in-popup error posture the /model contribution uses for its guards).
+    ctx.inject(['commandUi'], (scope) => {
+        const command = scope.get('commandUi');
+        scope.effect(() => command.register({
+            name: 'fast',
+            description: t('commandFast'),
+            available: () => true,
+            ui: {
+                kind: 'popupSelect',
+                options: async (session) => {
+                    const state = await createSpeedLoader(connection, session.sessionId)();
+                    if (!state.visible)
+                        throw new Error(t('commandFastUnavailable'));
+                    return [
+                        { id: 'standard', label: t('speedStandard'), detail: t('speedStandardDescription') },
+                        { id: 'fast', label: t('speedFast'), detail: t('speedFastDescription') },
+                    ].map(option => ({ ...option, active: option.id === state.tier }));
+                },
+                onSelect: async (option, session) => {
+                    await createSpeedSetter(connection, session.sessionId)(option.id);
+                },
+            },
+        }), 'dsh-plugin-subscriptions: /fast contribution');
+    });
 }

package/lib/client/locales.d.ts

@@ -40,6 +40,13 @@ export declare const en: {
     generatingVideo: string;
     videoLoading: string;
     videoLoadFailed: string;
+    speed: string;
+    speedStandard: string;
+    speedStandardDescription: string;
+    speedFast: string;
+    speedFastDescription: string;
+    commandFast: string;
+    commandFastUnavailable: string;
 };
 /** zh strings, one per {@link en} key. */
 export declare const zh: {
@@ -82,6 +89,13 @@ export declare const zh: {
     generatingVideo: string;
     videoLoading: string;
     videoLoadFailed: string;
+    speed: string;
+    speedStandard: string;
+    speedStandardDescription: string;
+    speedFast: string;
+    speedFastDescription: string;
+    commandFast: string;
+    commandFastUnavailable: string;
 };
 /** The Subscriptions namespace key union (en is the key-set source of truth). */
 export type SubscriptionsKey = keyof typeof en;

package/lib/client/locales.js

@@ -40,6 +40,13 @@ export const en = {
     generatingVideo: 'Generating video…',
     videoLoading: 'Loading video…',
     videoLoadFailed: 'Video failed to load: {message}',
+    speed: 'Speed',
+    speedStandard: 'Standard',
+    speedStandardDescription: 'Default speed',
+    speedFast: 'Fast',
+    speedFastDescription: '1.5x speed, more usage',
+    commandFast: 'Switch the Codex speed tier (Standard/Fast)',
+    commandFastUnavailable: 'The current model has no fast tier; /fast only works on Codex models whose catalog advertises one',
 };
 /** zh strings, one per {@link en} key. */
 export const zh = {
@@ -82,4 +89,11 @@ export const zh = {
     generatingVideo: '正在生成视频…',
     videoLoading: '视频加载中…',
     videoLoadFailed: '视频加载失败：{message}',
+    speed: '速度',
+    speedStandard: '标准',
+    speedStandardDescription: '默认速度',
+    speedFast: '快速',
+    speedFastDescription: '约 1.5 倍速度，消耗更多用量',
+    commandFast: '切换 Codex 速度档（标准/快速）',
+    commandFastUnavailable: '当前模型不支持快速档；/fast 仅对目录声明了 fast tier 的 Codex 模型可用',
 };