@goodandready/dsh-subscriptions 0.7.49 → 0.7.51

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

@@ -1090,6 +1090,7 @@ window.__ModuleLoader__.load({
     const SourcesPanel = lazyPanel('SourcesPanel')
     const AccountsDashboardPanel = lazyPanel('AccountsDashboardPanel')
     const SpeedToggle = lazyPanel('SpeedToggle')
+    const GeneratedMediaRow = lazyPanel('GeneratedMediaRow')
 
     // #839 model-list helpers
     function modelListSearchText(model) {
@@ -3912,6 +3913,17 @@ h('div', { className: 'dsub-row' },
         }, SpeedToggle))
       }, 'dsh-subscriptions: composer speed toggle')
 
+      ctx.effect(() => {
+        if (!ctx.slots || typeof ctx.slots.inject !== 'function') return () => {}
+        const offs = ['image_generate', 'video_generate'].map((key) => ctx.slots.inject('tool.call.toolview', () => ctx.slots.register({
+          name: 'tool.call.toolview',
+          key,
+          locale: NS,
+          children: { 'tool.call.images': { kind: 'single', scope: 'session' } },
+        }, GeneratedMediaRow)))
+        return () => { for (const off of offs) if (typeof off === 'function') off() }
+      }, 'dsh-subscriptions: generated media rows')
+
       ctx.effect(() => {
         const cleanups = []
         const registerLegacySeats = () => {

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')),
@@ -364,6 +365,24 @@ window.__ModuleLoader__.load({
       }, mode === 'fast' ? '⚡ FAST' : 'Speed')
     }
 
-    return { WebhookTestButton, VaultSnapshotsPanel, ProviderPacksPanel, SourcesPanel, AccountsDashboardPanel, SpeedToggle }
+    // #801: inline image/video result row for generated media.
+    function GeneratedMediaRow(props) {
+      const block = (props && props.block) || {}
+      const content = Array.isArray(block.content) ? block.content : []
+      const text = content.map((part) => (part && part.text) || '').join('\n')
+      const refs = []
+      for (const match of text.matchAll(/Attachment:\s*(\S+)/g)) refs.push(match[1])
+      const urls = []
+      for (const match of text.matchAll(/https?:\/\/\S+\.(?:mp4|webm|mov)\S*/g)) urls.push(match[0])
+      return h('div', { className: 'dsub-section-card' },
+        h('div', { className: 'dsub-sub' }, text.split('\n').filter((line) => !line.startsWith('Attachment:')).join('\n').slice(0, 500)),
+        refs.length && props.renderSlot
+          ? props.renderSlot('tool.call.images', { images: refs.map((attachment) => ({ attachment })) })
+          : null,
+        urls.map((url, i) => h('video', { key: i, src: url, controls: true, style: { maxWidth: '100%', marginTop: 8 } })),
+      )
+    }
+
+    return { WebhookTestButton, VaultSnapshotsPanel, ProviderPacksPanel, SourcesPanel, AccountsDashboardPanel, SpeedToggle, GeneratedMediaRow }
   }
 })

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/media-video.js

@@ -0,0 +1,48 @@
+const ASPECTS = new Set(['16:9', '9:16', '1:1', '4:3', '3:4', '3:2', '2:3'])
+const RESOLUTIONS = new Set(['480p', '720p', '1080p'])
+
+/** #801: validate video generation parameters before dispatch. */
+export function validateVideoRequest({ duration, aspectRatio, resolution, imageUrl } = {}) {
+  const seconds = duration == null ? 5 : Number(duration)
+  if (!Number.isFinite(seconds) || seconds < 1 || seconds > 15) {
+    const err = new Error('duration must be between 1 and 15 seconds')
+    err.code = 'INVALID_VIDEO_PARAMS'
+    throw err
+  }
+  if (aspectRatio != null && !ASPECTS.has(String(aspectRatio))) {
+    const err = new Error('unsupported aspect ratio')
+    err.code = 'INVALID_VIDEO_PARAMS'
+    throw err
+  }
+  if (resolution != null && !RESOLUTIONS.has(String(resolution))) {
+    const err = new Error('unsupported resolution')
+    err.code = 'INVALID_VIDEO_PARAMS'
+    throw err
+  }
+  if (imageUrl != null && !/^https?:\/\//i.test(String(imageUrl))) {
+    const err = new Error('imageUrl must be http(s)')
+    err.code = 'INVALID_VIDEO_PARAMS'
+    throw err
+  }
+  return {
+    duration: seconds,
+    ...(aspectRatio ? { aspectRatio: String(aspectRatio) } : {}),
+    ...(resolution ? { resolution: String(resolution) } : {}),
+    ...(imageUrl ? { imageUrl: String(imageUrl) } : {}),
+  }
+}
+
+export function videoPollDelay(attempt) {
+  const n = Number(attempt) || 0
+  return Math.min(4000, 500 * 2 ** n)
+}
+
+export function extractVideoResult(payload) {
+  const body = payload && typeof payload === 'object' ? payload : {}
+  const data = body.data && typeof body.data === 'object' ? body.data : body
+  return {
+    id: data.id || data.video_id || data.request_id || null,
+    status: String(data.status || '').toLowerCase(),
+    url: data.url || data.video_url || (Array.isArray(data.output) ? data.output[0] : null),
+  }
+}

package/lib/native-tools.js

@@ -1,6 +1,7 @@
 import { mkdir, writeFile } from 'node:fs/promises'
 import path from 'node:path'
 import { validateReferenceImages } from './media-reference.js'
+import { validateVideoRequest, videoPollDelay, extractVideoResult } from './media-video.js'
 
 const TOOL_OUTPUT = {
   schema: {
@@ -44,18 +45,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 +118,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
         }
@@ -194,11 +205,18 @@ export function registerSubscriptionTools(ctx, deps, options = {}) {
         prompt: { type: 'string', description: 'Video prompt' },
         duration: { type: 'number', description: 'Duration in seconds (1-15)' },
         aspect_ratio: { type: 'string', description: 'e.g. 16:9, 1:1, 9:16' },
-        image_url: { type: 'string', description: 'Optional source image URL' },
+        resolution: { type: 'string', enum: ['480p', '720p', '1080p'] },
+        image_url: { type: 'string', description: 'Optional source image URL (image-to-video)' },
       },
       required: ['prompt'],
     },
     async execute(args, exec) {
+      const params = validateVideoRequest({
+        duration: args && args.duration,
+        aspectRatio: args && args.aspect_ratio,
+        resolution: args && args.resolution,
+        imageUrl: args && args.image_url,
+      })
       const res = await deps.subscriptions.request({
         provider: 'grok',
         path: '/v1/videos',
@@ -207,15 +225,33 @@ export function registerSubscriptionTools(ctx, deps, options = {}) {
         body: {
           model: 'grok-imagine-video-1.5',
           prompt: args && args.prompt,
-          duration: args && args.duration,
-          aspect_ratio: args && args.aspect_ratio,
-          image_url: args && args.image_url,
+          duration: params.duration,
+          ...(params.aspectRatio ? { aspect_ratio: params.aspectRatio } : {}),
+          ...(params.resolution ? { resolution: params.resolution } : {}),
+          ...(params.imageUrl ? { image_url: params.imageUrl } : {}),
         },
         signal: exec && exec.signal,
       })
-      const data = await res.json().catch(() => ({}))
+      let data = await res.json().catch(() => ({}))
       if (!res.ok) throw new Error(`video_generate HTTP ${res.status}: ${extractResponseText(data)}`)
-      return textResult(`Video request submitted: ${JSON.stringify(data).slice(0, 1000)}`)
+      let result = extractVideoResult(data)
+      for (let attempt = 0; result.id && !result.url && result.status !== 'failed' && attempt < 5; attempt += 1) {
+        await new Promise((resolve) => setTimeout(resolve, videoPollDelay(attempt)))
+        const poll = await deps.subscriptions.request({
+          provider: 'grok',
+          path: '/v1/videos/' + encodeURIComponent(result.id),
+          method: 'GET',
+          headers: { Accept: 'application/json' },
+          signal: exec && exec.signal,
+        })
+        data = await poll.json().catch(() => ({}))
+        if (!poll.ok) break
+        result = extractVideoResult(data)
+      }
+      if (result.status === 'failed') throw new Error('video generation failed')
+      return textResult(result.url
+        ? 'Video: ' + result.url
+        : `Video request submitted: ${JSON.stringify(data).slice(0, 1000)}`)
     },
   })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.7.49",
+  "version": "0.7.51",
   "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",