dsh-plugin-subscriptions 0.5.2 → 0.6.0

package/lib/client/VideoGenerateToolview.d.ts

@@ -1,5 +1,5 @@
 import type { ConnectionHandle } from '@deepseek-ai/dsh-api-remotes/client';
-import type { ToolCallBlock } from '@deepseek-ai/dsh-client-runtime/client';
+import type { ToolCallBlock } from '@deepseek-ai/dsh-client-ui-conversation/client';
 import type { SubscriptionsKey } from './locales.js';
 /** Mirror of ui-tool's ToolCallOwnerProps (see ImageGenerateToolview). */
 interface ToolCallOwnerProps {

package/lib/client/index.d.ts

@@ -1,12 +1,4 @@
-/**
- * Subscription OAuth login page, browser half. Registers the Subscriptions
- * settings section; every login state fact arrives through the node half's
- * `/subscriptions-auth` RPC channel — this plugin holds no credential state of its
- * own. Section copy rides the client locale service: one 'settings.subscriptions'
- * namespace with zh/en dictionaries, rebound per read so the nav label and
- * page text follow the active locale.
- */
-import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client';
+import type { Context as ClientContext } from '@deepseek-ai/cordis';
 import type { SubscriptionsKey } from './locales.js';
 export type { SubscriptionsSectionInjected, SubscriptionsSectionProps } from './SubscriptionsSection.js';
 export type { ImageGenerateToolviewInjected, ImageGenerateToolviewProps } from './ImageGenerateToolview.js';

package/lib/client/index.js

@@ -33,8 +33,8 @@ export function apply(ctx) {
         document.head.appendChild(style);
         return () => style.remove();
     }, 'dsh-plugin-subscriptions: settings panel breathing room');
-    // The client-runtime Context merge types `connection` as the host handle;
-    // in the browser shell the same key holds the full client ConnectionHandle.
+    // The shell's Context merge types `connection` as the host handle; in the
+    // browser shell the same key holds the full client ConnectionHandle.
     const connection = ctx.get('connection');
     const t = ctx.locale.bind(NS);
     const injected = () => ({ rpc: connection.rpc, t });
@@ -68,13 +68,16 @@ export function apply(ctx) {
     // 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.
+    // The current-model read rides ui-model-selection's `modelDirectories`
+    // service, resolved lazily so registration order never matters.
+    const models = () => ctx.get('modelDirectories');
     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),
+            loadSpeed: createSpeedLoader(connection, models, sessionId),
             setSpeed: createSpeedSetter(connection, sessionId),
         }),
     }, SpeedSelect));
@@ -92,7 +95,7 @@ export function apply(ctx) {
             ui: {
                 kind: 'popupSelect',
                 options: async (session) => {
-                    const state = await createSpeedLoader(connection, session.sessionId)();
+                    const state = await createSpeedLoader(connection, models, session.sessionId)();
                     if (!state.visible)
                         throw new Error(t('commandFastUnavailable'));
                     return [

package/lib/client/locales.d.ts

@@ -6,15 +6,19 @@ export declare const en: {
     unavailable: string;
     checking: string;
     loginInProgress: string;
-    loggedIn: string;
-    loggedInAccount: string;
-    loggedInExpires: string;
-    loggedInAccountExpires: string;
     notLoggedIn: string;
+    loggedInCount: string;
+    accountExpires: string;
+    defaultBadge: string;
+    setDefault: string;
+    addAccount: string;
+    addAccountOAuth: string;
+    addAccountKeychain: string;
+    addAccountHint: string;
     login: string;
     cancel: string;
     logout: string;
-    logoutConfirm: string;
+    logoutAccountConfirm: string;
     manualSummary: string;
     manualPlaceholder: string;
     submit: string;
@@ -33,6 +37,20 @@ export declare const en: {
     usageWindow: string;
     usageResets: string;
     usagePlan: string;
+    modelDefaultsTitle: string;
+    modelDefaultsHint: string;
+    modelDefaultsFollowProvider: string;
+    modelDefaultsNoLevels: string;
+    modelDefaultsLoading: string;
+    modelDefaultsLoadFailed: string;
+    modelDefaultsRetry: string;
+    modelDefaultsSaving: string;
+    modelDefaultsSaveFailedNamed: string;
+    modelDefaultsSummary: string;
+    modelDefaultsSummaryNone: string;
+    modelDefaultsSummaryEmpty: string;
+    modelDefaultsFilterPlaceholder: string;
+    modelDefaultsFilterEmpty: string;
     generating: string;
     image: string;
     viewImage: string;
@@ -91,15 +109,19 @@ export declare const zh: {
     unavailable: string;
     checking: string;
     loginInProgress: string;
-    loggedIn: string;
-    loggedInAccount: string;
-    loggedInExpires: string;
-    loggedInAccountExpires: string;
     notLoggedIn: string;
+    loggedInCount: string;
+    accountExpires: string;
+    defaultBadge: string;
+    setDefault: string;
+    addAccount: string;
+    addAccountOAuth: string;
+    addAccountKeychain: string;
+    addAccountHint: string;
     login: string;
     cancel: string;
     logout: string;
-    logoutConfirm: string;
+    logoutAccountConfirm: string;
     manualSummary: string;
     manualPlaceholder: string;
     submit: string;
@@ -118,6 +140,20 @@ export declare const zh: {
     usageWindow: string;
     usageResets: string;
     usagePlan: string;
+    modelDefaultsTitle: string;
+    modelDefaultsHint: string;
+    modelDefaultsFollowProvider: string;
+    modelDefaultsNoLevels: string;
+    modelDefaultsLoading: string;
+    modelDefaultsLoadFailed: string;
+    modelDefaultsRetry: string;
+    modelDefaultsSaving: string;
+    modelDefaultsSaveFailedNamed: string;
+    modelDefaultsSummary: string;
+    modelDefaultsSummaryNone: string;
+    modelDefaultsSummaryEmpty: string;
+    modelDefaultsFilterPlaceholder: string;
+    modelDefaultsFilterEmpty: string;
     generating: string;
     image: string;
     viewImage: string;

package/lib/client/locales.js

@@ -6,15 +6,19 @@ export const en = {
     unavailable: 'Connection unavailable; subscription status cannot be loaded.',
     checking: 'Checking…',
     loginInProgress: 'Login in progress…',
-    loggedIn: 'Logged in',
-    loggedInAccount: 'Logged in as {account}',
-    loggedInExpires: 'Logged in · expires {date}',
-    loggedInAccountExpires: 'Logged in as {account} · expires {date}',
     notLoggedIn: 'Not logged in',
+    loggedInCount: '{count} account(s) connected',
+    accountExpires: 'expires {date}',
+    defaultBadge: 'Default',
+    setDefault: 'Set as default',
+    addAccount: 'Add account',
+    addAccountOAuth: 'Browser authorization',
+    addAccountKeychain: 'Import Claude Code',
+    addAccountHint: 'Browser authorization signs in whichever account the browser currently uses — switch accounts there first (or use an incognito window with the manual code below) to add a different one.',
     login: 'Log in',
     cancel: 'Cancel',
     logout: 'Log out',
-    logoutConfirm: 'Log out of {provider}?',
+    logoutAccountConfirm: 'Log out {account} of {provider}?',
     manualSummary: 'Browser flow not working? Paste the callback URL or code',
     manualPlaceholder: 'Paste the callback URL or code',
     submit: 'Submit',
@@ -33,6 +37,20 @@ export const en = {
     usageWindow: 'Window',
     usageResets: 'resets {date}',
     usagePlan: 'Plan: {plan}',
+    modelDefaultsTitle: 'Default reasoning effort',
+    modelDefaultsHint: 'The model picker preselects this level when you switch to the model; models without levels always follow the provider.',
+    modelDefaultsFollowProvider: 'Follow provider',
+    modelDefaultsNoLevels: '{count} model(s) advertise no reasoning levels and always follow the provider.',
+    modelDefaultsLoading: 'Loading models…',
+    modelDefaultsLoadFailed: 'Failed to load models: {message}',
+    modelDefaultsRetry: 'Retry',
+    modelDefaultsSaving: 'Saving…',
+    modelDefaultsSaveFailedNamed: 'Save failed for {model}: {message}',
+    modelDefaultsSummary: '{total} model(s) · {configured} overridden',
+    modelDefaultsSummaryNone: '{total} model(s) · following the provider',
+    modelDefaultsSummaryEmpty: 'No model advertises reasoning levels',
+    modelDefaultsFilterPlaceholder: 'Filter models',
+    modelDefaultsFilterEmpty: 'No model matches “{query}”.',
     generating: 'Generating image…',
     image: 'image',
     viewImage: 'View image',
@@ -91,15 +109,19 @@ export const zh = {
     unavailable: '连接不可用，无法加载订阅状态。',
     checking: '查询中…',
     loginInProgress: '登录中…',
-    loggedIn: '已登录',
-    loggedInAccount: '已登录：{account}',
-    loggedInExpires: '已登录 · 过期时间 {date}',
-    loggedInAccountExpires: '已登录：{account} · 过期时间 {date}',
     notLoggedIn: '未登录',
+    loggedInCount: '已连接 {count} 个账号',
+    accountExpires: '过期时间 {date}',
+    defaultBadge: '默认',
+    setDefault: '设为默认',
+    addAccount: '添加账号',
+    addAccountOAuth: '浏览器授权',
+    addAccountKeychain: '导入 Claude Code',
+    addAccountHint: '浏览器授权以浏览器当前登录的账号为准；要添加不同账号，请先在浏览器里切换账号，或用无痕窗口走下方手动授权码。',
     login: '登录',
     cancel: '取消',
     logout: '退出登录',
-    logoutConfirm: '确定退出 {provider} 的登录吗？',
+    logoutAccountConfirm: '确定退出 {provider} 的账号 {account} 吗？',
     manualSummary: '浏览器流程无法完成？粘贴回调 URL 或授权码',
     manualPlaceholder: '粘贴回调 URL 或授权码',
     submit: '提交',
@@ -118,6 +140,20 @@ export const zh = {
     usageWindow: '窗口',
     usageResets: '{date} 重置',
     usagePlan: '计划：{plan}',
+    modelDefaultsTitle: '默认推理档',
+    modelDefaultsHint: '切换到该模型时，模型选择器会预选此档位；没有推理档的模型始终跟随服务商默认。',
+    modelDefaultsFollowProvider: '跟随服务商',
+    modelDefaultsNoLevels: '{count} 个模型未声明推理档，始终跟随服务商默认。',
+    modelDefaultsLoading: '加载模型中…',
+    modelDefaultsLoadFailed: '模型加载失败：{message}',
+    modelDefaultsRetry: '重试',
+    modelDefaultsSaving: '保存中…',
+    modelDefaultsSaveFailedNamed: '{model} 保存失败：{message}',
+    modelDefaultsSummary: '{total} 个模型 · {configured} 个已覆盖',
+    modelDefaultsSummaryNone: '{total} 个模型 · 全部跟随服务商',
+    modelDefaultsSummaryEmpty: '没有模型声明推理档',
+    modelDefaultsFilterPlaceholder: '筛选模型',
+    modelDefaultsFilterEmpty: '没有匹配「{query}」的模型。',
     generating: '正在生成图片…',
     image: '图片',
     viewImage: '查看图片',