dsh-subscriptions 0.2.0 → 0.2.2

package/lib/client/locales.js

@@ -20,23 +20,28 @@ export const en = {
     accountsNoModels: 'No models reported for this account.',
     accountsCatalogUnavailable: 'Model discovery is currently unavailable. Saved model selections are preserved.',
     modelsPartialSave: 'Some reasoning defaults were saved. Remaining changes are still in the draft; retry to finish.',
-    modelsEdit: "Edit model list",
-    modelsHint: "Configure model visibility, default reasoning effort, context and tools here; Save changes below submits them together with the account settings. Hidden models remain usable by existing sessions; tool changes apply to new sessions.",
-    modelsAutomatic: "Automatically show all models, including new models",
-    modelsSelectAll: "Select all",
-    modelsSelectNone: "Clear selection",
-    modelsContext: "Context (tokens)",
-    modelsContextBounds: "Default {default} · Maximum {max}",
-    modelsContextHint: "Leave blank to follow the provider. The requested window is capped by the account’s advertised maximum; account pools use the smallest member window. This controls local history and compaction, not the API’s capacity.",
-    modelsContextInvalid: "Enter a positive whole number of tokens for {model}.",
-    modelsTools: "Provider tools",
-    modelsToolsHint: "Changes apply only to sessions created after saving. Existing sessions keep their tools. Shared tools remain available if any supporting provider is enabled.",
-    modelsImage: "Image generation",
-    modelsVideo: "Video generation",
-    modelsSearch: "X search",
-    modelsWebSearch: "Web search",
-    modelsSave: "Save changes",
-    modelsUnavailable: "Currently unavailable",
+    modelsEdit: 'Edit model list',
+    modelsHint: 'Configure model visibility, default reasoning effort, context and tools here; Save changes below submits them together with the account settings. Hidden models remain usable by existing sessions; tool changes apply to new sessions.',
+    modelsAutomatic: 'Automatically show all models, including new models',
+    modelsSelectAll: 'Select all',
+    modelsSelectNone: 'Clear selection',
+    modelsContext: 'Context (tokens)',
+    modelsContextBounds: 'Default {default} · Maximum {max}',
+    modelsContextHint: 'Leave blank to follow the provider. The requested window is capped by the account’s advertised maximum; account pools use the smallest member window. This controls local history and compaction, not the API’s capacity.',
+    modelsContextInvalid: 'Enter a positive whole number of tokens for {model}.',
+    modelsTools: 'Provider tools',
+    modelsToolsHint: 'Changes apply only to sessions created after saving. Existing sessions keep their tools. Shared tools remain available if any supporting provider is enabled.',
+    modelsImage: 'Image generation',
+    modelsVideo: 'Video generation',
+    modelsSearch: 'X search',
+    modelsWebSearch: 'Web search',
+    modelsSave: 'Save changes',
+    modelsUnavailable: 'Currently unavailable',
+    claudeCacheTtl: 'Prompt cache lifetime',
+    claudeCacheTtlFollowConfig: 'Follow config',
+    claudeCacheTtl5m: '5 minutes',
+    claudeCacheTtl1h: '1 hour',
+    claudeCacheTtlHint: 'Overrides the claudePromptCacheTtl config for this Claude route; Follow config uses the configured value. Saved changes apply from the next request. One hour keeps cached prefixes longer but writes them at a higher input price; compaction and session-title requests stay at five minutes.',
     nav: 'Subscriptions',
     intro: 'Log a subscription provider in or out. Login opens the provider’s authorization page in a new tab; headless setups can paste the callback URL or code instead.',
     unavailable: 'Connection unavailable; subscription status cannot be loaded.',
@@ -206,21 +211,21 @@ export const en = {
     ollamaWebOn: 'Web search/fetch enabled',
     ollamaWebOff: 'Web search/fetch off',
     ollamaManageTitle: 'Manage Ollama Cloud',
-    ollamaManageHint: 'Fetch the Cloud list, tick the models this route serves, then Save. The picker '
-        + 'shows the ticked models in order; the API key itself stays in DSH credentials.',
+    ollamaManageHint: 'Fetch the Cloud list, tick the models this route serves, then Save. The picker ' +
+        'shows the ticked models in order; the API key itself stays in DSH credentials.',
     ollamaFetch: 'Fetch cloud models',
     ollamaFetching: 'Fetching…',
     ollamaKeyPlaceholder: 'One-time API key (optional)',
-    ollamaKeyHint: 'A key typed here is used for this fetch only and is never saved. Leave it '
-        + 'blank to use the stored credential.',
+    ollamaKeyHint: 'A key typed here is used for this fetch only and is never saved. Leave it ' +
+        'blank to use the stored credential.',
     ollamaFetchFailed: 'Could not fetch cloud models: {message}',
     ollamaCandidatesCount: '{count} returned',
     ollamaCandidatesEmpty: 'No cloud models returned.',
     ollamaModelsEmpty: 'No models configured. Fetch the cloud list and tick the ones to keep.',
     ollamaModelsLoadFailed: 'Could not load Ollama settings: {message}',
     ollamaModelsSaveFailed: 'Could not save Ollama settings: {message}',
-    ollamaConfigureHint: 'No API key found at {ref}. Add it to the credentials file '
-        + '(~/.dsh/.credentials.yaml).',
+    ollamaConfigureHint: 'No API key found at {ref}. Add it to the credentials file ' +
+        '(~/.dsh/.credentials.yaml).',
     ollamaDisplayName: 'Display name',
     ollamaRowDetails: 'Details',
     ollamaEffortsUnknown: 'This model reasons; its level set will come from live discovery.',
@@ -228,16 +233,16 @@ export const en = {
     ollamaMoveDown: 'Move down',
     ollamaBaseURL: 'Base URL',
     ollamaApiKeyRef: 'API key reference',
-    ollamaConnectionHint: "The base URL receives this route's requests and the credential lookup; the "
-        + "reference names the DSH credential, not the key itself. Requests send "
-        + "the resolved key to that address, so point it only at a host you trust.",
-    ollamaWebHint: 'Enables the Ollama Cloud web search and fetch providers. The host still '
-        + 'has to select them before the web tools use them.',
-    ollamaCatalogOverride: "A profile pins this route's model list; the picker ignores store models "
-        + "until that override is removed.",
+    ollamaConnectionHint: "The base URL receives this route's requests and the credential lookup; the " +
+        'reference names the DSH credential, not the key itself. Requests send ' +
+        'the resolved key to that address, so point it only at a host you trust.',
+    ollamaWebHint: 'Enables the Ollama Cloud web search and fetch providers. The host still ' +
+        'has to select them before the web tools use them.',
+    ollamaCatalogOverride: "A profile pins this route's model list; the picker ignores store models " +
+        'until that override is removed.',
     ollamaResetDefaults: 'Restore deployment defaults',
-    ollamaResetConfirm: 'Clear every saved Ollama override? The profile values and built-in '
-        + 'defaults apply again.',
+    ollamaResetConfirm: 'Clear every saved Ollama override? The profile values and built-in ' +
+        'defaults apply again.',
     ollamaCapVision: 'vision',
     ollamaCapThinking: 'thinking',
     ollamaContext: 'context {tokens}',
@@ -263,23 +268,28 @@ export const zh = {
     accountsNoModels: '此账号暂未返回模型。',
     accountsCatalogUnavailable: '暂时无法获取模型目录，已保存的模型选择会被保留。',
     modelsPartialSave: '部分推理档已保存，其余更改仍保留在草稿中，请重试完成保存。',
-    modelsEdit: "编辑模型列表",
-    modelsHint: "在此配置模型显示、默认推理档、上下文与工具，底部的「保存更改」会连同账号设置一起提交。隐藏模型不影响已有会话；工具开关对新建会话生效。",
-    modelsAutomatic: "自动显示全部模型（包含以后新增的模型）",
-    modelsSelectAll: "全选",
-    modelsSelectNone: "清空选择",
-    modelsContext: "上下文（token）",
-    modelsContextBounds: "默认 {default} · 最大 {max}",
-    modelsContextHint: "留空跟随服务商。配置值按账号返回的最大窗口限制；账号池取各成员的最小窗口。此设置控制本地历史保留和压缩时机，不会扩大 API 本身的容量。",
-    modelsContextInvalid: "请为 {model} 输入正整数 token 数。",
-    modelsTools: "Provider 工具",
-    modelsToolsHint: "仅对保存后新建的会话生效，已有会话保留原工具。任一支持的服务商启用共享工具时，该工具仍会显示。",
-    modelsImage: "图片生成",
-    modelsVideo: "视频生成",
-    modelsSearch: "X 搜索",
-    modelsWebSearch: "网页搜索",
-    modelsSave: "保存更改",
-    modelsUnavailable: "当前不可用",
+    modelsEdit: '编辑模型列表',
+    modelsHint: '在此配置模型显示、默认推理档、上下文与工具，底部的「保存更改」会连同账号设置一起提交。隐藏模型不影响已有会话；工具开关对新建会话生效。',
+    modelsAutomatic: '自动显示全部模型（包含以后新增的模型）',
+    modelsSelectAll: '全选',
+    modelsSelectNone: '清空选择',
+    modelsContext: '上下文（token）',
+    modelsContextBounds: '默认 {default} · 最大 {max}',
+    modelsContextHint: '留空跟随服务商。配置值按账号返回的最大窗口限制；账号池取各成员的最小窗口。此设置控制本地历史保留和压缩时机，不会扩大 API 本身的容量。',
+    modelsContextInvalid: '请为 {model} 输入正整数 token 数。',
+    modelsTools: 'Provider 工具',
+    modelsToolsHint: '仅对保存后新建的会话生效，已有会话保留原工具。任一支持的服务商启用共享工具时，该工具仍会显示。',
+    modelsImage: '图片生成',
+    modelsVideo: '视频生成',
+    modelsSearch: 'X 搜索',
+    modelsWebSearch: '网页搜索',
+    modelsSave: '保存更改',
+    modelsUnavailable: '当前不可用',
+    claudeCacheTtl: '提示词缓存时长',
+    claudeCacheTtlFollowConfig: '跟随配置',
+    claudeCacheTtl5m: '5 分钟',
+    claudeCacheTtl1h: '1 小时',
+    claudeCacheTtlHint: '覆盖此 Claude 路由的 claudePromptCacheTtl 配置；选择「跟随配置」时使用配置值。保存后自下一次请求生效。1 小时可更久保留缓存前缀，但写入按更高的输入价格计费；压缩与会话标题请求仍为 5 分钟。',
     nav: '订阅',
     intro: '在此登录或退出订阅服务商。点击登录会在新标签页打开服务商的授权页面；无浏览器环境可改为粘贴回调 URL 或授权码。',
     unavailable: '连接不可用，无法加载订阅状态。',
@@ -468,8 +478,8 @@ export const zh = {
     ollamaMoveDown: '下移',
     ollamaBaseURL: '基础 URL',
     ollamaApiKeyRef: 'API 密钥引用',
-    ollamaConnectionHint: '基础 URL 用于此路由的请求与凭据查询；引用是 DSH 凭据的名称，不是密钥本身。'
-        + '请求会把解析出的密钥发往该地址，请只填写可信主机。',
+    ollamaConnectionHint: '基础 URL 用于此路由的请求与凭据查询；引用是 DSH 凭据的名称，不是密钥本身。' +
+        '请求会把解析出的密钥发往该地址，请只填写可信主机。',
     ollamaWebHint: '启用 Ollama Cloud 的网页搜索与抓取能力。宿主仍需选择它们，网页工具才会使用。',
     ollamaCatalogOverride: '配置档案固定了此路由的模型列表；在移除该覆盖前，选择器会忽略存储中的模型。',
     ollamaResetDefaults: '恢复部署默认值',

package/lib/client/ollama-draft.js

@@ -17,7 +17,7 @@
  */
 export function adoptCandidates(current, candidates, selectedIds) {
     const models = [...(current ?? [])];
-    const present = new Set(models.map(model => model.id));
+    const present = new Set(models.map((model) => model.id));
     const selected = new Set(selectedIds);
     for (const candidate of candidates) {
         if (!selected.has(candidate.id) || present.has(candidate.id))
@@ -26,7 +26,9 @@ export function adoptCandidates(current, candidates, selectedIds) {
         models.push({
             id: candidate.id,
             name: candidate.name,
-            ...(candidate.contextWindow === undefined ? {} : { contextWindow: candidate.contextWindow }),
+            ...(candidate.contextWindow === undefined
+                ? {}
+                : { contextWindow: candidate.contextWindow }),
             ...(candidate.vision ? { vision: true } : {}),
             ...(candidate.thinking ? { thinking: true } : {}),
             // The vendor's default is not copied: defaultEffort in the store is
@@ -48,7 +50,7 @@ export function adoptCandidates(current, candidates, selectedIds) {
  */
 export function moveModel(models, id, delta) {
     const next = [...models];
-    const index = next.findIndex(model => model.id === id);
+    const index = next.findIndex((model) => model.id === id);
     const target = index + delta;
     if (index === -1 || target < 0 || target >= next.length)
         return next;
@@ -64,7 +66,7 @@ export function moveModel(models, id, delta) {
  * @returns a new list; the input array is not mutated.
  */
 export function removeModel(models, id) {
-    return models.filter(model => model.id !== id);
+    return models.filter((model) => model.id !== id);
 }
 /**
  * Short context-window label for a model row.
@@ -91,7 +93,7 @@ export function contextLabel(contextWindow) {
  * @returns a new list; the input array is not mutated.
  */
 export function renameModel(models, id, name) {
-    return models.map(model => {
+    return models.map((model) => {
         if (model.id !== id)
             return model;
         const next = { ...model };
@@ -112,7 +114,7 @@ export function renameModel(models, id, name) {
  * @returns a new list; the input array is not mutated.
  */
 export function setModelEffort(models, id, effort) {
-    return models.map(model => {
+    return models.map((model) => {
         if (model.id !== id)
             return model;
         if (effort === '') {
@@ -133,7 +135,7 @@ export function setModelEffort(models, id, effort) {
  * @returns a new list; the input array is not mutated.
  */
 export function setModelContext(models, id, tokens) {
-    return models.map(model => {
+    return models.map((model) => {
         if (model.id !== id)
             return model;
         const next = { ...model };
@@ -169,7 +171,7 @@ export function parseContextInput(text) {
  * @returns the new list and stash; neither input is mutated.
  */
 export function untickModel(models, stash, id) {
-    const row = models.find(model => model.id === id);
+    const row = models.find((model) => model.id === id);
     if (row === undefined)
         return { models: [...models], stash };
     return { models: removeModel(models, id), stash: new Map(stash).set(id, row) };
@@ -186,7 +188,7 @@ export function untickModel(models, stash, id) {
  * @returns a new list and the stash without the restored row.
  */
 export function tickModel(models, stash, candidates, id) {
-    if (models.some(model => model.id === id))
+    if (models.some((model) => model.id === id))
         return { models: [...models], stash };
     const stashed = stash.get(id);
     if (stashed === undefined)
@@ -237,10 +239,17 @@ export function untickModels(models, stash, ids) {
  * @returns the options in picker order.
  */
 export function effortOptions(row, fetched, labels) {
-    const ids = row.efforts ?? fetched ?? labels?.map(entry => entry.id) ?? [];
-    const options = ids.map(id => ({ id, name: labels?.find(entry => entry.id === id)?.name ?? id }));
+    const ids = row.efforts ?? fetched ?? labels?.map((entry) => entry.id) ?? [];
+    const options = ids.map((id) => ({
+        id,
+        name: labels?.find((entry) => entry.id === id)?.name ?? id,
+    }));
     if (row.defaultEffort !== undefined && !ids.includes(row.defaultEffort)) {
-        options.push({ id: row.defaultEffort, name: row.defaultEffort, unavailable: true });
+        options.push({
+            id: row.defaultEffort,
+            name: row.defaultEffort,
+            unavailable: true,
+        });
     }
     return options;
 }

package/lib/client/reset-action.js

@@ -1,15 +1,17 @@
 /** Explain client-side gating; the server independently revalidates before spending. */
 export function resetActionBlock(usage, now = Date.now()) {
-    const weekly = usage.windows?.find(w => w.kind === 'weekly' && w.scope === undefined);
+    const weekly = usage.windows?.find((w) => w.kind === 'weekly' && w.scope === undefined);
     if (!weekly || !Number.isFinite(weekly.usedPercent))
         return 'resetUseRefresh';
     if (weekly.usedPercent < 80)
         return 'resetUseGuard';
-    if (weekly.resetsAt === undefined || weekly.resetsAt <= now || usage.resetCreditsError)
+    if (weekly.resetsAt === undefined ||
+        weekly.resetsAt <= now ||
+        usage.resetCreditsError)
         return 'resetUseRefresh';
-    if (!usage.resetCredits?.some(c => c.id))
+    if (!usage.resetCredits?.some((c) => c.id))
         return 'resetUseRestart';
-    if (!usage.resetCredits.some(c => c.id && (c.expiresAt === undefined || c.expiresAt > now)))
+    if (!usage.resetCredits.some((c) => c.id && (c.expiresAt === undefined || c.expiresAt > now)))
         return 'resetUseRefresh';
     return undefined;
 }

package/lib/client/reset-credits-view.d.ts

@@ -29,7 +29,7 @@ export declare function resetCreditRowName(t: Translate, credit: ResetCreditView
 /** Claude omits an empty grant list; Codex still shows a defined, possibly empty, list. */
 export declare function showsResetCredits(provider: 'codex' | 'claude', credits: readonly ResetCreditView[] | undefined): boolean;
 /** The error line the settings card mounts. Claude never interpolates provider text. */
-export declare function ResetCreditsErrorLine({ provider, message, t }: {
+export declare function ResetCreditsErrorLine({ provider, message, t, }: {
     provider: 'codex' | 'claude';
     message: string;
     t: Translate;

package/lib/client/reset-credits-view.js

@@ -19,7 +19,8 @@ export function resetCreditState(credit, now) {
         return 'paused';
     if (credit.resetsLeft === 0)
         return 'exhausted';
-    if ((credit.cooldownUntil !== undefined && credit.cooldownUntil > now) || credit.usableNow === false)
+    if ((credit.cooldownUntil !== undefined && credit.cooldownUntil > now) ||
+        credit.usableNow === false)
         return 'notUsable';
     return 'available';
 }
@@ -37,7 +38,9 @@ export function resetCreditsAvailableCount(credits, now, mode) {
         const state = resetCreditState(credit, now);
         if (state === 'expired' || state === 'paused')
             continue;
-        if (typeof credit.resetsLeft === 'number' && Number.isFinite(credit.resetsLeft) && credit.resetsLeft > 0) {
+        if (typeof credit.resetsLeft === 'number' &&
+            Number.isFinite(credit.resetsLeft) &&
+            credit.resetsLeft > 0) {
             sum += credit.resetsLeft;
         }
     }
@@ -46,7 +49,9 @@ export function resetCreditsAvailableCount(credits, now, mode) {
 function expiryText(t, credit) {
     return credit.expiresAt === undefined
         ? t('resetCreditExpiryUnknown')
-        : t('resetCreditExpires', { date: new Date(credit.expiresAt).toLocaleString() });
+        : t('resetCreditExpires', {
+            date: new Date(credit.expiresAt).toLocaleString(),
+        });
 }
 function remainingText(t, credit) {
     const left = credit.resetsLeft;
@@ -62,9 +67,18 @@ function remainingText(t, credit) {
 /** Accessible name of one Claude grant row: state, remaining, and expiry, not a control name. */
 export function resetCreditRowName(t, credit, now) {
     const state = resetCreditState(credit, now);
-    const parts = [t('resetCreditFull'), t(STATE_KEYS[state]), remainingText(t, credit), expiryText(t, credit)];
-    if (state === 'notUsable' && credit.cooldownUntil !== undefined && credit.cooldownUntil > now) {
-        parts.push(t('resetCreditCooldownUntil', { date: new Date(credit.cooldownUntil).toLocaleString() }));
+    const parts = [
+        t('resetCreditFull'),
+        t(STATE_KEYS[state]),
+        remainingText(t, credit),
+        expiryText(t, credit),
+    ];
+    if (state === 'notUsable' &&
+        credit.cooldownUntil !== undefined &&
+        credit.cooldownUntil > now) {
+        parts.push(t('resetCreditCooldownUntil', {
+            date: new Date(credit.cooldownUntil).toLocaleString(),
+        }));
     }
     return parts.join(', ');
 }
@@ -75,15 +89,21 @@ export function showsResetCredits(provider, credits) {
     return (credits?.length ?? 0) > 0;
 }
 /** The error line the settings card mounts. Claude never interpolates provider text. */
-export function ResetCreditsErrorLine({ provider, message, t }) {
-    return _jsx("p", { style: cardStyles.error, children: resetCreditsErrorText(provider, message, t) });
+export function ResetCreditsErrorLine({ provider, message, t, }) {
+    return (_jsx("p", { style: cardStyles.error, children: resetCreditsErrorText(provider, message, t) }));
 }
 /** Fixed sentence for Claude. Codex may include the lookup message; Claude must not. */
 export function resetCreditsErrorText(provider, message, t) {
-    return provider === 'claude' ? t('resetCreditsErrorFixed') : t('resetCreditsError', { message });
+    return provider === 'claude'
+        ? t('resetCreditsErrorFixed')
+        : t('resetCreditsError', { message });
 }
 const summaryStyle = {
-    ...cardStyles.usageMeta, cursor: 'pointer', listStyle: 'none', justifyContent: 'flex-start', gap: 6,
+    ...cardStyles.usageMeta,
+    cursor: 'pointer',
+    listStyle: 'none',
+    justifyContent: 'flex-start',
+    gap: 6,
 };
 /**
  * The closed disclosure both providers share. Claude rows are plain text:
@@ -92,12 +112,41 @@ const summaryStyle = {
  */
 export function ResetCreditsDisclosure({ mode, credits, t, now = Date.now(), nextCredit, useAction, statusMessage, }) {
     const count = resetCreditsAvailableCount(credits, now, mode);
-    return (_jsxs("details", { className: "subscriptions-reset-credits", style: cardStyles.usageRow, children: [_jsxs("summary", { style: summaryStyle, children: [_jsx("svg", { "aria-hidden": "true", width: "12", height: "12", viewBox: "0 0 16 16", style: { flexShrink: 0 }, children: _jsx("path", { d: "m6 3 5 5-5 5", fill: "none", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round", strokeLinejoin: "round" }) }), _jsx("span", { children: t('resetCreditsTitle') }), mode === 'grants' && _jsx("span", { children: t('resetCreditReadOnlyLabel') }), _jsx("span", { style: { marginLeft: 'auto' }, children: t('resetCreditsAvailable', { count }) })] }), _jsx("style", { children: '.subscriptions-reset-credits > summary::-webkit-details-marker { display: none; }'
-                    + '.subscriptions-reset-credits[open] > summary > svg { transform: rotate(90deg); }' }), _jsxs("div", { style: { paddingLeft: 18, marginTop: 6 }, children: [mode === 'grants' && _jsx("p", { style: cardStyles.status, children: t('resetCreditReadOnly') }), credits.map((credit, index) => {
+    return (_jsxs("details", { className: "subscriptions-reset-credits", style: cardStyles.usageRow, children: [_jsxs("summary", { style: summaryStyle, children: [_jsx("svg", { "aria-hidden": "true", width: "12", height: "12", viewBox: "0 0 16 16", style: { flexShrink: 0 }, children: _jsx("path", { d: "m6 3 5 5-5 5", fill: "none", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round", strokeLinejoin: "round" }) }), _jsx("span", { children: t('resetCreditsTitle') }), mode === 'grants' && _jsx("span", { children: t('resetCreditReadOnlyLabel') }), _jsx("span", { style: { marginLeft: 'auto' }, children: t('resetCreditsAvailable', { count }) })] }), _jsx("style", { children: '.subscriptions-reset-credits > summary::-webkit-details-marker { display: none; }' +
+                    '.subscriptions-reset-credits[open] > summary > svg { transform: rotate(90deg); }' }), _jsxs("div", { style: { paddingLeft: 18, marginTop: 6 }, children: [mode === 'grants' && (_jsx("p", { style: cardStyles.status, children: t('resetCreditReadOnly') })), credits.map((credit, index) => {
                         const state = resetCreditState(credit, now);
-                        const showUse = mode === 'credits' && useAction !== undefined && credit === nextCredit;
-                        return (_jsxs("div", { "data-reset-state": mode === 'grants' ? state : undefined, "data-reset-claimable": mode === 'grants' && credit.claimable === true ? 'true' : undefined, role: mode === 'grants' ? 'group' : undefined, "aria-label": mode === 'grants' ? resetCreditRowName(t, credit, now) : undefined, style: { ...cardStyles.usageMeta, minHeight: 28, gap: 12, cursor: mode === 'grants' ? 'default' : undefined }, children: [_jsxs("span", { style: { display: 'inline-flex', alignItems: 'center', gap: 8, flexShrink: 0 }, children: [t('resetCreditFull'), mode === 'grants' && (_jsx("span", { "aria-hidden": "true", "data-reset-state-word": state, children: t(STATE_KEYS[state]) })), showUse && (_jsx("button", { type: "button", "aria-disabled": useAction.disabled, title: useAction.title, style: { minHeight: 22, height: 22, padding: '0 7px', borderRadius: 6,
-                                                opacity: useAction.disabled ? 0.35 : 1, cursor: useAction.disabled ? 'not-allowed' : 'pointer' }, onClick: () => { if (!useAction.disabled)
-                                                useAction.onUse(); }, children: useAction.busy ? t('resetUseChecking') : useAction.label }))] }), _jsxs("span", { style: { textAlign: 'right' }, children: [mode === 'grants' && _jsxs("span", { "aria-hidden": "true", children: [remainingText(t, credit), " \u00B7 "] }), mode === 'grants' && state === 'notUsable' && credit.cooldownUntil !== undefined && credit.cooldownUntil > now && (_jsxs("span", { "aria-hidden": "true", children: [t('resetCreditCooldownUntil', { date: new Date(credit.cooldownUntil).toLocaleString() }), " \u00B7 "] })), _jsx("span", { "aria-hidden": mode === 'grants' ? true : undefined, children: expiryText(t, credit) })] })] }, credit.id ?? index));
-                    }), statusMessage !== undefined && statusMessage !== '' && _jsx("p", { role: "status", style: cardStyles.status, children: statusMessage })] })] }));
+                        const showUse = mode === 'credits' &&
+                            useAction !== undefined &&
+                            credit === nextCredit;
+                        return (_jsxs("div", { "data-reset-state": mode === 'grants' ? state : undefined, "data-reset-claimable": mode === 'grants' && credit.claimable === true
+                                ? 'true'
+                                : undefined, role: mode === 'grants' ? 'group' : undefined, "aria-label": mode === 'grants'
+                                ? resetCreditRowName(t, credit, now)
+                                : undefined, style: {
+                                ...cardStyles.usageMeta,
+                                minHeight: 28,
+                                gap: 12,
+                                cursor: mode === 'grants' ? 'default' : undefined,
+                            }, children: [_jsxs("span", { style: {
+                                        display: 'inline-flex',
+                                        alignItems: 'center',
+                                        gap: 8,
+                                        flexShrink: 0,
+                                    }, children: [t('resetCreditFull'), mode === 'grants' && (_jsx("span", { "aria-hidden": "true", "data-reset-state-word": state, children: t(STATE_KEYS[state]) })), showUse && (_jsx("button", { type: "button", "aria-disabled": useAction.disabled, title: useAction.title, style: {
+                                                minHeight: 22,
+                                                height: 22,
+                                                padding: '0 7px',
+                                                borderRadius: 6,
+                                                opacity: useAction.disabled ? 0.35 : 1,
+                                                cursor: useAction.disabled ? 'not-allowed' : 'pointer',
+                                            }, onClick: () => {
+                                                if (!useAction.disabled)
+                                                    useAction.onUse();
+                                            }, children: useAction.busy ? t('resetUseChecking') : useAction.label }))] }), _jsxs("span", { style: { textAlign: 'right' }, children: [mode === 'grants' && (_jsxs("span", { "aria-hidden": "true", children: [remainingText(t, credit), " \u00B7 "] })), mode === 'grants' &&
+                                            state === 'notUsable' &&
+                                            credit.cooldownUntil !== undefined &&
+                                            credit.cooldownUntil > now && (_jsxs("span", { "aria-hidden": "true", children: [t('resetCreditCooldownUntil', {
+                                                    date: new Date(credit.cooldownUntil).toLocaleString(),
+                                                }), ' ', "\u00B7", ' '] })), _jsx("span", { "aria-hidden": mode === 'grants' ? true : undefined, children: expiryText(t, credit) })] })] }, credit.id ?? index));
+                    }), statusMessage !== undefined && statusMessage !== '' && (_jsx("p", { role: "status", style: cardStyles.status, children: statusMessage }))] })] }));
 }

package/lib/client/subscription-card-styles.js

@@ -1,48 +1,118 @@
 /** Shared visual language for OAuth, Cursor, and built-in provider cards. */
 export const subscriptionCardStyles = {
     card: {
-        border: '1px solid var(--dsw-alias-border-l2)', borderRadius: 12,
-        padding: '12px 14px', display: 'flex', flexDirection: 'column', gap: 6,
+        border: '1px solid var(--dsw-alias-border-l2)',
+        borderRadius: 12,
+        padding: '12px 14px',
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 6,
         color: 'var(--dsw-alias-label-primary)',
     },
     header: { display: 'flex', alignItems: 'center', gap: 8 },
     dot: { width: 8, height: 8, borderRadius: '50%', flexShrink: 0 },
-    name: { fontWeight: 500, fontSize: 14, lineHeight: '22px', color: 'var(--dsw-alias-label-primary)' },
-    status: { margin: 0, fontSize: 12, lineHeight: '18px', color: 'var(--dsw-alias-label-tertiary)' },
-    error: { margin: 0, fontSize: 12, lineHeight: '18px', color: 'var(--dsw-alias-state-error-primary)' },
-    actions: { display: 'flex', gap: 8, marginTop: 4, alignItems: 'center', flexWrap: 'wrap' },
+    name: {
+        fontWeight: 500,
+        fontSize: 14,
+        lineHeight: '22px',
+        color: 'var(--dsw-alias-label-primary)',
+    },
+    status: {
+        margin: 0,
+        fontSize: 12,
+        lineHeight: '18px',
+        color: 'var(--dsw-alias-label-tertiary)',
+    },
+    error: {
+        margin: 0,
+        fontSize: 12,
+        lineHeight: '18px',
+        color: 'var(--dsw-alias-state-error-primary)',
+    },
+    actions: {
+        display: 'flex',
+        gap: 8,
+        marginTop: 4,
+        alignItems: 'center',
+        flexWrap: 'wrap',
+    },
     button: {
-        boxSizing: 'border-box', display: 'inline-flex', alignItems: 'center', justifyContent: 'center',
-        height: 28, padding: '0 10px', borderRadius: 14,
-        border: '1px solid var(--dsw-alias-border-l2)', background: 'transparent',
-        color: 'var(--dsw-alias-label-primary)', font: 'inherit', fontSize: 12, lineHeight: '18px',
+        boxSizing: 'border-box',
+        display: 'inline-flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        height: 28,
+        padding: '0 10px',
+        borderRadius: 14,
+        border: '1px solid var(--dsw-alias-border-l2)',
+        background: 'transparent',
+        color: 'var(--dsw-alias-label-primary)',
+        font: 'inherit',
+        fontSize: 12,
+        lineHeight: '18px',
         cursor: 'pointer',
     },
     account: {
-        display: 'flex', flexDirection: 'column', gap: 6,
-        border: '1px solid var(--dsw-alias-border-l2)', borderRadius: 8,
-        padding: '8px 10px', marginTop: 4,
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 6,
+        border: '1px solid var(--dsw-alias-border-l2)',
+        borderRadius: 8,
+        padding: '8px 10px',
+        marginTop: 4,
     },
     accountHeader: { display: 'flex', alignItems: 'center', gap: 8 },
-    accountName: { fontSize: 13, lineHeight: '20px', color: 'var(--dsw-alias-label-primary)', userSelect: 'all' },
+    accountName: {
+        fontSize: 13,
+        lineHeight: '20px',
+        color: 'var(--dsw-alias-label-primary)',
+        userSelect: 'all',
+    },
     defaultStar: { color: 'var(--dsw-alias-state-warn-label)' },
     usage: {
-        display: 'flex', flexDirection: 'column', gap: 6, marginTop: 4,
-        borderTop: '1px solid var(--dsw-alias-border-l2)', paddingTop: 8,
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 6,
+        marginTop: 4,
+        borderTop: '1px solid var(--dsw-alias-border-l2)',
+        paddingTop: 8,
     },
     usageHeader: { display: 'flex', alignItems: 'center', gap: 8 },
-    usageTitle: { fontSize: 12, lineHeight: '18px', fontWeight: 500, color: 'var(--dsw-alias-label-secondary)' },
-    usagePlan: { fontSize: 12, lineHeight: '18px', color: 'var(--dsw-alias-label-tertiary)' },
+    usageTitle: {
+        fontSize: 12,
+        lineHeight: '18px',
+        fontWeight: 500,
+        color: 'var(--dsw-alias-label-secondary)',
+    },
+    usagePlan: {
+        fontSize: 12,
+        lineHeight: '18px',
+        color: 'var(--dsw-alias-label-tertiary)',
+    },
     usageRefresh: {
-        boxSizing: 'border-box', display: 'inline-flex', alignItems: 'center', justifyContent: 'center',
-        height: 22, padding: '0 8px', borderRadius: 11, marginLeft: 'auto',
-        border: '1px solid var(--dsw-alias-border-l2)', background: 'transparent',
-        color: 'var(--dsw-alias-label-secondary)', font: 'inherit', fontSize: 12, lineHeight: '18px',
+        boxSizing: 'border-box',
+        display: 'inline-flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        height: 22,
+        padding: '0 8px',
+        borderRadius: 11,
+        marginLeft: 'auto',
+        border: '1px solid var(--dsw-alias-border-l2)',
+        background: 'transparent',
+        color: 'var(--dsw-alias-label-secondary)',
+        font: 'inherit',
+        fontSize: 12,
+        lineHeight: '18px',
         cursor: 'pointer',
     },
     usageRow: { display: 'flex', flexDirection: 'column', gap: 3 },
     usageMeta: {
-        display: 'flex', justifyContent: 'space-between', gap: 8,
-        fontSize: 12, lineHeight: '18px', color: 'var(--dsw-alias-label-tertiary)',
+        display: 'flex',
+        justifyContent: 'space-between',
+        gap: 8,
+        fontSize: 12,
+        lineHeight: '18px',
+        color: 'var(--dsw-alias-label-tertiary)',
     },
 };

package/lib/client/usage-color-preferences.js

@@ -24,8 +24,10 @@ export function setUsageColorPreset(value) {
     window.dispatchEvent(new Event(EVENT));
 }
 export function subscribeUsageColorPreset(notify) {
-    const storage = (event) => { if (event.key === KEY || event.key === null)
-        notify(); };
+    const storage = (event) => {
+        if (event.key === KEY || event.key === null)
+            notify();
+    };
     window.addEventListener(EVENT, notify);
     window.addEventListener('storage', storage);
     return () => {