@goodandready/dsh-subscriptions 0.7.48 → 0.7.50

package/lib/account-features.js

@@ -69,6 +69,10 @@ export function createUsageLoader({ load } = {}) {
   }
 }
 
+export function supportsFastTier(model) {
+  return /(?:^|[-_.])(gpt-5|gpt-6|codex|o3|o4)(?:[-_.]|$)/i.test(String(model || ''))
+}
+
 /** #802: explicit child choice > subagent default > session choice > global. */
 export function resolveSpeed({ childSpeed, sessionSpeed, subagentSpeed, modelSupportsFast = true } = {}) {
   const pick = [childSpeed, subagentSpeed, sessionSpeed].find((value) => value === 'standard' || value === 'fast')

package/lib/adapter.js

@@ -6,7 +6,7 @@ import { LlmAdapter, LlmError, attributionHeaders } from '@deepseek-ai/dsh-llm'
 import { displayName } from './refs.js'
 import { applyModelSettings, bestAccountPlan } from './model-settings.js'
 import { getSpeedMode } from './speed-mode.js'
-import { resolveSpeed } from './account-features.js'
+import { resolveSpeed, supportsFastTier } from './account-features.js'
 import { getVendor } from './vendors/index.js'
 import { modelCatalog } from './messages.js'
 import { streamWithRotation } from './stream-rotate.js'
@@ -204,13 +204,17 @@ export class SubscriptionAdapter extends LlmAdapter {
       }
       const poolEnabled = typeof deps.poolEnabled === 'function' ? deps.poolEnabled() !== false : true
       const defaultRef = typeof deps.defaultAccountRef === 'function' ? deps.defaultAccountRef(provider) : null
-      const streamOptions = {
-        ...hydratedOptions,
-        ...(provider === 'codex' && resolveSpeed({
+      const effectiveSpeed = provider === 'codex'
+        ? resolveSpeed({
           childSpeed: options.speed,
           sessionSpeed: getSpeedMode(sessionId),
           subagentSpeed: (options.subagent || options.parentSessionId) && typeof deps.subagentSpeed === 'function' ? deps.subagentSpeed() : undefined,
-        }) === 'fast' ? { service_tier: 'priority' } : {}),
+          modelSupportsFast: supportsFastTier(options.model),
+        })
+        : 'standard'
+      const streamOptions = {
+        ...hydratedOptions,
+        ...(provider === 'codex' && effectiveSpeed === 'fast' ? { service_tier: 'priority' } : {}),
         ...(effectiveReasoning.effort ? { reasoningEffort: effectiveReasoning.effort } : {}),
         ...(effectiveReasoning.budgetTokens ? { thinkingBudget: effectiveReasoning.budgetTokens } : {}),
         // #830: kill switch. With no default account, use a sentinel that

package/lib/analytics.js

@@ -342,6 +342,27 @@ export function calculateQuotaForecast(accounts = [], entries = [], nowMs = Date
   return forecast
 }
 
+/** #789: 24h request heatmap grouped by account ref and model. */
+export function calculateAccountModelHeatmap(entries = [], nowMs = Date.now()) {
+  const ONE_HOUR = 3600000
+  const cutoff = nowMs - 24 * ONE_HOUR
+  const rows = new Map()
+  for (const entry of entries) {
+    if (!entry || !entry.ts || entry.ts < cutoff || entry.ts > nowMs) continue
+    const ref = String(entry.ref || entry.accountRef || entry.provider || 'unknown')
+    const model = String(entry.model || 'unknown')
+    const key = ref + '\u0000' + model
+    let row = rows.get(key)
+    if (!row) {
+      row = { ref, provider: entry.provider || '', model, hours: Array(24).fill(0) }
+      rows.set(key, row)
+    }
+    const bucket = 23 - Math.floor((nowMs - entry.ts) / ONE_HOUR)
+    if (bucket >= 0 && bucket < 24) row.hours[bucket]++
+  }
+  return [...rows.values()]
+}
+
 export function calculateAnalytics(entries = [], accounts = [], nowMs = Date.now()) {
   let totalPrompt = 0, totalCompletion = 0, totalCacheRead = 0
   for (const r of entries) {
@@ -360,6 +381,7 @@ export function calculateAnalytics(entries = [], accounts = [], nowMs = Date.now
     cache: calculateCacheMetrics(entries),
     performance: calculatePerformanceMetrics(entries),
     hourly: calculateHourlyBuckets(entries, nowMs),
+    heatmap: calculateAccountModelHeatmap(entries, nowMs),
     accounts: calculateAccountBreakdown(entries, accounts),
     forecast: calculateQuotaForecast(accounts, entries, nowMs),
     valueDelivered,

package/lib/client.js

@@ -1089,6 +1089,7 @@ window.__ModuleLoader__.load({
     const ProviderPacksPanel = lazyPanel('ProviderPacksPanel')
     const SourcesPanel = lazyPanel('SourcesPanel')
     const AccountsDashboardPanel = lazyPanel('AccountsDashboardPanel')
+    const SpeedToggle = lazyPanel('SpeedToggle')
 
     // #839 model-list helpers
     function modelListSearchText(model) {
@@ -3900,6 +3901,17 @@ h('div', { className: 'dsub-row' },
       }, 'dsh-subscriptions: locales')
       setT(ctx.locale.bind(NS))
 
+      ctx.effect(() => {
+        if (!ctx.slots || typeof ctx.slots.inject !== 'function') return () => {}
+        return ctx.slots.inject('conversation.input.right', () => ctx.slots.register({
+          name: 'conversation.input.right',
+          id: 'subscriptions-speed',
+          order: 50,
+          locale: NS,
+          inject: () => ({}),
+        }, SpeedToggle))
+      }, 'dsh-subscriptions: composer speed toggle')
+
       ctx.effect(() => {
         const cleanups = []
         const registerLegacySeats = () => {

package/lib/client.panels.js

@@ -280,8 +280,8 @@ window.__ModuleLoader__.load({
             h('div', { className: 'dsub-row' },
               h('span', { className: 'dsub-h' }, '#' + row.index + ' ' + (row.label || row.email || row.ref)),
               h('span', { className: 'dsub-pillTag' }, row.quarantineUntil > Date.now() ? t('statusQuarantined') : (row.cooldownUntil > Date.now() ? t('statusCooling') : t('statusHealthy')))),
-            h('div', { className: 'dsub-sub' }, t('quotaUsed') + ': ' + (row.usagePercent == null ? '—' : row.usagePercent + '%') + ' · ' + t('requests') + ' ' + (row.requests || 0) + ' · ' + t('errors') + ' ' + (row.errors || 0)),
-            h('div', { className: 'dsub-row' },
+            compact ? null : h('div', { className: 'dsub-sub' }, t('quotaUsed') + ': ' + (row.usagePercent == null ? '—' : row.usagePercent + '%') + ' · ' + t('requests') + ' ' + (row.requests || 0) + ' · ' + t('errors') + ' ' + (row.errors || 0)),
+            compact ? null : h('div', { className: 'dsub-row' },
               h('button', { type: 'button', className: 'dsub-mini', onClick: () => loadUsage(row) }, u && u.loading ? '…' : t('loadUsage')),
               u && u.error ? h('span', { className: 'dsub-bad' }, u.error) : null,
               u && u.value ? h('span', { className: 'dsub-dim' }, JSON.stringify(u.value).slice(0, 180)) : null),
@@ -291,12 +291,13 @@ window.__ModuleLoader__.load({
           h('label', { className: 'dsub-sub' }, h('input', { type: 'checkbox', checked: compact, onChange: (e) => setCompact(e.target.checked) }), ' ' + t('compact')),
         ),
         h('div', { className: 'dsub-h' }, t('heatmap')),
-        h('div', { className: 'dsub-row', style: { gap: 2 } },
-          ((analytics && analytics.hourly) || []).slice(-24).map((hour, i) => h('span', {
+        ((analytics && analytics.heatmap) || []).filter((row) => row.provider === selected).slice(0, 12).map((row) => h('div', { key: row.ref + ':' + row.model, className: 'dsub-row', style: { gap: 2 } },
+          h('span', { className: 'dsub-dim', style: { width: '130px', minWidth: '130px', overflow: 'hidden', textOverflow: 'ellipsis' } }, row.ref + ' · ' + row.model),
+          (row.hours || []).map((count, i) => h('span', {
             key: i,
-            title: (hour && hour.requests || 0) + ' req',
-            style: { display: 'inline-block', width: 8, height: 18, background: 'rgba(88,166,255,' + Math.min(1, ((hour && hour.requests) || 0) / 10 + 0.1) + ')' },
-          }))),
+            title: count + ' req',
+            style: { display: 'inline-block', width: 8, height: 18, background: 'rgba(88,166,255,' + Math.min(1, (count || 0) / 10 + 0.1) + ')' },
+          })))),
         h('div', { className: 'dsub-row' },
           h('span', { className: 'dsub-h' }, t('modelEditor') + ' · ' + t('discovered') + ' ' + models.length + ' · ' + t('shown') + ' ' + shown.length),
           h('button', { type: 'button', className: 'dsub-mini', onClick: () => setEditing(!editing) }, t('editModels')),
@@ -337,6 +338,33 @@ window.__ModuleLoader__.load({
       )
     }
 
-    return { WebhookTestButton, VaultSnapshotsPanel, ProviderPacksPanel, SourcesPanel, AccountsDashboardPanel }
+    // #802: composer Speed toggle, scoped to the current session.
+    function SpeedToggle(props) {
+      const sessionId = (props && (props.sessionId || (props.session && props.session.id))) || 'default'
+      const [mode, setMode] = React.useState('standard')
+      React.useEffect(() => {
+        fetch('/dsh-subscriptions/speed?sessionId=' + encodeURIComponent(sessionId), { cache: 'no-store' })
+          .then((res) => res.json())
+          .then((out) => setMode((out && out.mode) || 'standard'))
+          .catch(() => {})
+      }, [sessionId])
+      const toggle = () => {
+        const next = mode === 'fast' ? 'standard' : 'fast'
+        setMode(next)
+        fetch('/dsh-subscriptions/speed', {
+          method: 'POST',
+          headers: { 'content-type': 'application/json' },
+          body: JSON.stringify({ sessionId, mode: next }),
+        }).then((res) => res.json()).then((out) => { if (out && out.mode) setMode(out.mode) }).catch(() => {})
+      }
+      return h('button', {
+        type: 'button',
+        className: 'dsub-mini',
+        title: 'Codex Speed',
+        onClick: toggle,
+      }, mode === 'fast' ? '⚡ FAST' : 'Speed')
+    }
+
+    return { WebhookTestButton, VaultSnapshotsPanel, ProviderPacksPanel, SourcesPanel, AccountsDashboardPanel, SpeedToggle }
   }
 })

package/lib/index.js

@@ -481,6 +481,7 @@ export function apply(ctx, rawConfig) {
   ctx.effect(() => registerSubscriptionTools(ctx, {
     subscriptions,
     images: () => ctx.subscriptionImages,
+    attachments: () => (typeof ctx.get === 'function' ? ctx.get('attachments') : null),
   }, { enabled: live().nativeTools || process.env.DSH_SUBSCRIPTIONS_NATIVE_TOOLS === '1' }), 'dsh-subscriptions: native tools')
   ctx.effect(() => () => clearSessionPins(), 'dsh-subscriptions: session pins cleanup')
 

package/lib/native-tools.js

@@ -44,18 +44,26 @@ function outputDir(exec) {
   return path.join(cwd, 'generated', 'subscriptions')
 }
 
-async function saveImages(images, exec) {
+async function saveImages(images, exec, attachments) {
   const dir = outputDir(exec)
   await mkdir(dir, { recursive: true })
   const out = []
+  const stored = []
   for (let i = 0; i < images.length; i += 1) {
     const image = images[i]
     if (!image || typeof image.b64_json !== 'string') continue
+    const data = Buffer.from(image.b64_json, 'base64')
     const file = path.join(dir, `image-${Date.now()}-${i}.png`)
-    await writeFile(file, Buffer.from(image.b64_json, 'base64'))
+    await writeFile(file, data)
     out.push(file)
+    if (attachments && typeof attachments.saveImages === 'function') {
+      try {
+        const refs = await attachments.saveImages([{ data, mediaType: 'image/png', name: `image-${i + 1}.png` }])
+        for (const ref of refs || []) stored.push(ref)
+      } catch { /* file output still works */ }
+    }
   }
-  return out
+  return { files: out, attachments: stored }
 }
 
 export function registerSubscriptionTools(ctx, deps, options = {}) {
@@ -109,9 +117,11 @@ export function registerSubscriptionTools(ctx, deps, options = {}) {
             referenceImages: references.refs,
             signal: exec && exec.signal,
           })
-          const files = await saveImages(rows, exec)
-          if (!files.length) throw new Error('image response contained no images')
-          return textResult(files.map((file) => `Generated image: ${file}`).join('\n'))
+          const saved = await saveImages(rows, exec, deps.attachments && deps.attachments())
+          if (!saved.files.length) throw new Error('image response contained no images')
+          const lines = saved.files.map((file) => `Generated image: ${file}`)
+          for (const ref of saved.attachments) lines.push(`Attachment: ${ref}`)
+          return textResult(lines.join('\n'))
         } catch (err) {
           lastError = err
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.7.48",
+  "version": "0.7.50",
   "description": "Use ChatGPT Codex, Claude, Grok, Antigravity, Kimi, GLM, Cursor, Kiro, Copilot, Qwen, ERNIE, Spark, JetBrains, Perplexity, Replit, and Cody subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",