@goodandready/dsh-subscriptions 0.7.49 → 0.7.50

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.panels.js

@@ -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')),

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.49",
+  "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",