@goodandready/dsh-subscriptions 0.7.20 → 0.7.22

package/lib/adapter-manager.js

@@ -68,6 +68,7 @@ export function createAdapterManager({
     recordHistory,
     fetchImpl: fetch,
     fetchForRef,
+    attachments: () => (typeof ctx.get === 'function' ? ctx.get('attachments') : null),
     hideDeprecatedModels: () => Boolean(live().hideDeprecatedModels),
     cascadingFallback: (...args) => cascadeFallbackStream(...args),
     ollamaFallback: typeof ollamaFallback === 'function' ? ollamaFallback : async function* ({ err }) { yield { type: 'finish', reason: { kind: 'error', failure: { code: err?.code || 'RATE_LIMIT', message: err?.message || 'all subscription accounts exhausted' } } } },

package/lib/adapter.js

@@ -13,6 +13,7 @@ import { pickFetch } from './proxy.js'
 import { quotaSnapshot, parseBody } from './ratelimit.js'
 import { toTokenUsage } from './wire.js'
 import { isSwitchableError } from './rotate.js'
+import { hydrateAttachmentImages } from './images.js'
 
 // #94: isDeprecatedId imported from ./models-catalog.js
 
@@ -156,8 +157,16 @@ export class SubscriptionAdapter extends LlmAdapter {
       const sessionId = options.sessionId || options.session_id || options.conversationId
       const effectiveReasoning = resolveEffectiveReasoning(sessionId, options)
       const decisionTrace = {}
-      const streamOptions = {
+      const hydratedOptions = {
         ...options,
+        messages: await hydrateAttachmentImages(
+          options.messages,
+          typeof deps.attachments === 'function' ? deps.attachments() : null,
+          options.signal,
+        ),
+      }
+      const streamOptions = {
+        ...hydratedOptions,
         ...(provider === 'codex' && getSpeedMode(sessionId) === 'fast' ? { service_tier: 'priority' } : {}),
         ...(effectiveReasoning.effort ? { reasoningEffort: effectiveReasoning.effort } : {}),
         ...(effectiveReasoning.budgetTokens ? { thinkingBudget: effectiveReasoning.budgetTokens } : {}),

package/lib/alerts.js

@@ -56,11 +56,19 @@ export function toNotifyPayload(body) {
 }
 const DEDUP_WINDOW_MS = 10 * 60 * 1000 // 10 minutes cooldown per (ref + type)
 
+/**
+ * Last billing status announced per account. A condition that simply
+ * persists — the provider page still says `past_due` — is news the first
+ * time and noise on every later dedupe window.
+ */
+const lastBillingStatus = new Map()
+
 const alertBuffer = []
 const lastAlertTime = new Map()
 
 export function clearAlerts() {
   alertBuffer.length = 0
+  lastBillingStatus.clear()
   lastAlertTime.clear()
 }
 
@@ -309,6 +317,11 @@ export function notifyBillingAlert({
     ? `Billing alert: ${provider || 'Account'} (${ref || 'slot'}) has payment issue (${status}).`
     : `Subscription renewal alert: ${provider || 'Account'} (${ref || 'slot'}) renewal is overdue.`
 
+  // Announce a billing state once, and re-arm when it clears.
+  const billingKey = `${provider || "account"}:${ref || "slot"}`
+  if (lastBillingStatus.get(billingKey) === status) return null
+  lastBillingStatus.set(billingKey, status)
+
   const alert = recordAlert({
     type: 'billing_status',
     ref,

package/lib/client.css

@@ -5,3 +5,5 @@
 .dsub-tabs{display:flex;flex-wrap:wrap;gap:6px;margin:0 0 12px}.dsub-tab{appearance:none;font:inherit;font-size:12px;font-weight:600;cursor:pointer;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-secondary);border-radius:999px;padding:5px 12px}.dsub-tab:hover{color:var(--dsw-alias-label-primary);border-color:var(--dsw-alias-label-tertiary)}.dsub-tabActive{background:var(--dsw-alias-brand-primary);border-color:var(--dsw-alias-brand-primary);color:var(--dsw-alias-label-primary-foreground)}.dsub-wrap[data-tab=overview]>:not([data-pane=overview]):not(.dsub-header-bar):not(.dsub-tabs):not(.dsub-foot):not(.dsub-modalWrap),.dsub-wrap[data-tab=accounts]>:not([data-pane=accounts]):not(.dsub-header-bar):not(.dsub-tabs):not(.dsub-foot):not(.dsub-modalWrap),.dsub-wrap[data-tab=routing]>:not([data-pane=routing]):not(.dsub-header-bar):not(.dsub-tabs):not(.dsub-foot):not(.dsub-modalWrap),.dsub-wrap[data-tab=models]>:not([data-pane=models]):not(.dsub-header-bar):not(.dsub-tabs):not(.dsub-foot):not(.dsub-modalWrap),.dsub-wrap[data-tab=vault]>:not([data-pane=vault]):not(.dsub-header-bar):not(.dsub-tabs):not(.dsub-foot):not(.dsub-modalWrap),.dsub-wrap[data-tab=notifications]>:not([data-pane=notifications]):not(.dsub-header-bar):not(.dsub-tabs):not(.dsub-foot):not(.dsub-modalWrap),.dsub-wrap[data-tab=advanced]>:not([data-pane=advanced]):not(.dsub-header-bar):not(.dsub-tabs):not(.dsub-foot):not(.dsub-modalWrap){display:none}
 
 .dsub-wrap[data-tab=overview]>[data-pane]:not([data-pane=overview]),.dsub-wrap[data-tab=accounts]>[data-pane]:not([data-pane=accounts]),.dsub-wrap[data-tab=routing]>[data-pane]:not([data-pane=routing]),.dsub-wrap[data-tab=models]>[data-pane]:not([data-pane=models]),.dsub-wrap[data-tab=vault]>[data-pane]:not([data-pane=vault]),.dsub-wrap[data-tab=notifications]>[data-pane]:not([data-pane=notifications]),.dsub-wrap[data-tab=advanced]>[data-pane]:not([data-pane=advanced]),.dsub-wrap[data-tab=overview] [data-pane]:not([data-pane=overview]),.dsub-wrap[data-tab=accounts] [data-pane]:not([data-pane=accounts]),.dsub-wrap[data-tab=routing] [data-pane]:not([data-pane=routing]),.dsub-wrap[data-tab=models] [data-pane]:not([data-pane=models]),.dsub-wrap[data-tab=vault] [data-pane]:not([data-pane=vault]),.dsub-wrap[data-tab=notifications] [data-pane]:not([data-pane=notifications]),.dsub-wrap[data-tab=advanced] [data-pane]:not([data-pane=advanced]),.dsub-wrap[data-tab=overview]>.dsub-block:not([data-pane]),.dsub-wrap[data-tab=accounts]>.dsub-block:not([data-pane]){display:none}
+
+.dsub-accountCardAction{cursor:pointer}.dsub-accountCardAction:focus-visible{outline:2px solid var(--dsw-alias-brand-primary);outline-offset:-2px}

package/lib/client.js

@@ -3585,6 +3585,7 @@ h('div', { className: 'dsub-row' },
       const [state, setState] = React.useState({ logged: [], usage: 0, accounts: [], open: false, active: null, loading: false })
       const [toasts, setToasts] = React.useState([])
       const lastAlertTsRef = React.useRef(Date.now() - 30000)
+      const lastErrorRef = React.useRef({ text: '', at: 0 })
 
       const dismissToast = (id) => {
         setToasts((prev) => prev.filter((t) => t.id !== id))
@@ -3592,11 +3593,23 @@ h('div', { className: 'dsub-row' },
       const reportError = (message) => {
         const text = cleanErrorMessage(message)
         if (!text) return
+        const now = Date.now()
+        const last = lastErrorRef.current
+        if (last.text === text && now - last.at < 60000) return
+        lastErrorRef.current = { text: text, at: now }
+        const id = 'err_' + now
         setToasts((prev) => prev.some((toast) => toast.message === text)
           ? prev
-          : [{ id: 'err_' + Date.now(), message: text, cls: 'dsub-toast-bad' }, ...prev].slice(0, 3))
+          : [{ id: id, message: text, cls: 'dsub-toast-bad' }, ...prev].slice(0, 3))
+        setTimeout(() => dismissToast(id), 12000)
       }
 
+      const hostDown = (() => { let last = 0; return (msg) => { const now = Date.now(); if (now - last < 120000) return; last = now; reportError(msg) } })()
+      const fetchConfig = (attempt) => fetch('/dsh-subscriptions/config', { cache: 'no-store' }).catch((e) => {
+        if ((attempt || 0) < 1) return new Promise((res) => setTimeout(res, 700)).then(() => fetchConfig((attempt || 0) + 1))
+        throw e
+      })
+
       const pollAlerts = () => {
         fetch('/dsh-subscriptions/alerts?limit=5', { cache: 'no-store' })
           .then((res) => res.json())
@@ -3615,25 +3628,25 @@ h('div', { className: 'dsub-row' },
               }
             }
           })
-          .catch((e) => reportError(t('hostOffline') + ': ' + String(e && e.message || e)))
+          .catch((e) => hostDown(t('hostOffline') + ': ' + String(e && e.message || e)))
       }
 
       const pull = () => {
         setState((s) => Object.assign({}, s, { loading: true }))
         refreshLoggedIn().then((r) => {
-          if (r.error) reportError(t('hostOffline') + ': ' + r.error)
+          if (r.error) hostDown(t('hostOffline') + ': ' + r.error)
           const logged = r.logged || []
-          fetch('/dsh-subscriptions/config', { cache: 'no-store' })
+          fetchConfig(0)
             .then((res) => res.json())
             .then((cfg) => {
               setState((s) => Object.assign({}, s, { logged, usage: r.usage, accounts: (cfg && cfg.accounts) || [], active: r.active, loading: false }))
             })
             .catch((e) => {
-              reportError(t('hostOffline') + ': ' + String(e && e.message || e))
+              hostDown(t('hostOffline') + ': ' + String(e && e.message || e))
               setState((s) => Object.assign({}, s, { logged, usage: r.usage, accounts: [], active: r.active, loading: false }))
             })
         }).catch((e) => {
-          reportError(t('hostOffline') + ': ' + String(e && e.message || e))
+          hostDown(t('hostOffline') + ': ' + String(e && e.message || e))
           setState((s) => Object.assign({}, s, { loading: false }))
         })
       }
@@ -3747,6 +3760,25 @@ h('div', { className: 'dsub-row' },
       }, [state.accounts, now])
 
       // Accounts list
+      const openSettings = () => {
+        setState((s) => Object.assign({}, s, { open: false }))
+        const clientCtx = props.ctx || window.__dshCtx
+
+        try {
+          const nav = (clientCtx && clientCtx.pluginNavigation) || (window.__dshCtx && window.__dshCtx.pluginNavigation)
+          if (nav && typeof nav.openBundle === 'function') {
+            nav.openBundle(PKG)
+          }
+        } catch { /* bestEffort */ }
+
+        try {
+          const layout = (clientCtx && clientCtx.layout) || (window.__dshCtx && window.__dshCtx.layout)
+          if (layout && typeof layout.selectPanel === 'function') {
+            layout.selectPanel('plugins')
+          }
+        } catch { /* bestEffort */ }
+      }
+
       const rows = state.accounts.map((a, i) => {
         const isLogged = state.logged.includes(a.provider)
         const cooled = a.cooldownUntil && a.cooldownUntil > now
@@ -3771,7 +3803,20 @@ h('div', { className: 'dsub-row' },
           else { statusClass = 'dsub-statusOk'; statusText = (pct != null ? pct + '% · ' : '') + t('subsLogged') }
         }
 
-        return h('div', { className: 'dsub-accountCard', key: i },
+        return h('div', {
+          className: 'dsub-accountCard dsub-accountCardAction',
+          key: i,
+          role: 'button',
+          tabIndex: 0,
+          title: t('subsOpenSettings'),
+          onClick: openSettings,
+          onKeyDown: (e) => {
+            if (e.key === 'Enter' || e.key === ' ') {
+              e.preventDefault()
+              openSettings()
+            }
+          },
+        },
           h('div', { className: 'dsub-brandBadge ' + b.cls }, b.icon),
           h('div', { className: 'dsub-accInfo' },
             h('div', { className: 'dsub-accNameRow' },
@@ -3856,22 +3901,7 @@ h('div', { className: 'dsub-row' },
                 href: '#',
                 onClick: (e) => {
                   e.preventDefault()
-                  setState((s) => Object.assign({}, s, { open: false }))
-                  const clientCtx = props.ctx || window.__dshCtx
-
-                  try {
-                    const nav = (clientCtx && clientCtx.pluginNavigation) || (window.__dshCtx && window.__dshCtx.pluginNavigation)
-                    if (nav && typeof nav.openBundle === 'function') {
-                      nav.openBundle(PKG)
-                    }
-                  } catch { /* bestEffort */ }
-
-                  try {
-                    const layout = (clientCtx && clientCtx.layout) || (window.__dshCtx && window.__dshCtx.layout)
-                    if (layout && typeof layout.selectPanel === 'function') {
-                      layout.selectPanel('plugins')
-                    }
-                  } catch { /* bestEffort */ }
+                  openSettings()
                 },
               }, t('subsOpenSettings')),
             ),

package/lib/images.js

@@ -174,6 +174,38 @@ export function normalizeImage(item) {
   return null
 }
 
+export async function hydrateAttachmentImages(messages, attachments, signal) {
+  if (!attachments || typeof attachments.readImageRequest !== 'function' || !Array.isArray(messages)) return messages
+  return Promise.all(messages.map(async (message) => {
+    if (!message || !Array.isArray(message.content)) return message
+    const content = await Promise.all(message.content.map(async (block) => {
+      if (!block || block.type !== 'image' || !block.attachment) return block
+      try {
+        const ref = block.attachment
+        const version = await attachments.readImageRequest(ref, {
+          width: Number(ref.width) || 1568,
+          height: Number(ref.height) || 1568,
+          maxBytes: 5 * 1024 * 1024,
+        }, signal)
+        return {
+          type: 'image',
+          source: {
+            type: 'base64',
+            media_type: version.mediaType || ref.mediaType || 'image/jpeg',
+            data: Buffer.from(version.data).toString('base64'),
+          },
+        }
+      } catch {
+        return {
+          type: 'text',
+          text: '[image attachment unavailable: ' + String(block.attachment.attachmentId || block.attachment.name || 'unknown') + ']',
+        }
+      }
+    }))
+    return { ...message, content }
+  }))
+}
+
 export function extractImages(content) {
   if (!Array.isArray(content)) {
     const norm = normalizeImage(content)

package/lib/import-auth.js

@@ -255,7 +255,7 @@ async function discoverLocalCliSessionsInner() {
     const claudeEntry = {
       provider: 'claude',
       source: 'file',
-      path: homeFile('.claude', 'credentials.json'),
+      path: claudeCreds.sourcePath || homeFile('.claude', '.credentials.json'),
       email: claudeCreds.email || 'Claude Code CLI User',
       hasRefreshToken: !!claudeCreds.refreshToken,
     }

package/lib/instructions.js

@@ -17,12 +17,12 @@ export const INSTRUCTIONS = {
     title: "Claude Code",
     stepsEn: [
       "1. Run \"claude login\" in server console.",
-      "2. Click \"📥 From CLI\" — plugin will import ~/.claude/credentials.json.",
+      "2. Click \"📥 From CLI\" — plugin will import ~/.claude/.credentials.json.",
       "3. Or paste your Session Token / API Key from Anthropic Console and click \"Save token\".",
     ],
     stepsZh: [
       "1. 在服务器控制台运行 \"claude login\"。",
-      "2. 点击 \"📥 从 CLI 导入\" — 插件将自动导入 ~/.claude/credentials.json。",
+      "2. 点击 \"📥 从 CLI 导入\" — 插件将自动导入 ~/.claude/.credentials.json。",
       "3. 或者从 Anthropic 控制台复制您的 Session Token 或 API Key 并点击 \"保存令牌\"。",
     ],
     link: "https://console.anthropic.com/settings/keys",

package/lib/messages.js

@@ -338,14 +338,24 @@ export function anthropicPayload(options, extraSystem) {
           input: safeJson(call.arguments),
         })
       }
-      messages.push({ role: "assistant", content: blocks.length ? blocks : [{ type: "text", text: "" }] })
+      messages.push({ role: "assistant", content: blocks.length ? blocks : [{ type: "text", text: " " }] })
       continue
     }
     if (message.role === "tool") {
       const toolUseId = String(message.toolCallId || message.tool_call_id || message.tool_use_id || message.id || "")
-      const content = typeof message.content === "string"
+      const images = extractImages(message.content)
+      let content = typeof message.content === "string"
         ? message.content
         : (flattenText(message.content) || JSON.stringify(message.content || ""))
+      if (images.length) {
+        const blocks = []
+        if (content) blocks.push({ type: "text", text: content })
+        for (const img of images) {
+          const blk = toAnthropicImage(img)
+          if (blk) blocks.push(blk)
+        }
+        if (blocks.length) content = blocks
+      }
       messages.push({
         role: "user",
         content: [{
@@ -375,7 +385,7 @@ export function anthropicPayload(options, extraSystem) {
         content: content || "",
       })
     }
-    messages.push({ role: "user", content: blocks.length ? blocks : [{ type: "text", text: "" }] })
+    messages.push({ role: "user", content: blocks.length ? blocks : [{ type: "text", text: " " }] })
   }
 
   const useCacheControl = options.cacheControl !== false
@@ -415,11 +425,26 @@ export function anthropicPayload(options, extraSystem) {
       const targetIdx = userTurnIndices[userTurnIndices.length - 2]
       const targetMsg = messages[targetIdx]
       if (Array.isArray(targetMsg.content) && targetMsg.content.length > 0) {
-        const lastBlockIdx = targetMsg.content.length - 1
-        const lastBlock = targetMsg.content[lastBlockIdx]
-        targetMsg.content[lastBlockIdx] = {
-          ...lastBlock,
-          cache_control: { type: "ephemeral" },
+        // Anthropic rejects cache_control on an empty text block, so stamp
+        // the last block that can carry it: non-empty text, or an image.
+        let targetBlockIdx = -1
+        for (let i = targetMsg.content.length - 1; i >= 0; i -= 1) {
+          const block = targetMsg.content[i]
+          if (block === null || block === undefined) continue
+          if (block.type === "image") {
+            targetBlockIdx = i
+            break
+          }
+          if (block.type === "text" && typeof block.text === "string" && block.text.trim() !== "") {
+            targetBlockIdx = i
+            break
+          }
+        }
+        if (targetBlockIdx >= 0) {
+          targetMsg.content[targetBlockIdx] = {
+            ...targetMsg.content[targetBlockIdx],
+            cache_control: { type: "ephemeral" },
+          }
         }
       }
     }
@@ -432,7 +457,9 @@ export function anthropicPayload(options, extraSystem) {
     ...(system ? { system } : {}),
     messages,
     ...(tools && tools.length ? { tools } : {}),
-    ...(options.temperature != null ? { temperature: options.temperature } : {}),
+    // temperature is deliberately not sent to Anthropic: the API accepts
+    // only 1 while extended thinking is enabled, so forwarding the session
+    // value turns every other setting into a 400.
   }
 }
 

package/lib/vendors/claude-cli.js

@@ -3,13 +3,20 @@ import { homedir } from 'node:os'
 import { join } from 'node:path'
 
 /**
- * Read Claude Code CLI credentials. `home` is a test seam: when omitted the
- * real user home is used, so production behaviour is unchanged.
+ * Credential file names Claude Code has used, newest first. Current releases
+ * write `.credentials.json` (dotted); the undotted name is kept as a fallback so
+ * machines with an older or hand-made file keep working.
  */
-export async function readClaudeCredentials(home) {
-  const p = join(home || homedir(), '.claude', 'credentials.json')
+export const CLAUDE_CREDENTIAL_FILES = ['.credentials.json', 'credentials.json']
+
+/** Absolute candidate paths for the Claude Code OAuth grant, newest first. */
+export function claudeCredentialsPaths(home) {
+  return CLAUDE_CREDENTIAL_FILES.map((file) => join(home || homedir(), '.claude', file))
+}
+
+async function readGrantFrom(file) {
   try {
-    const text = await readFile(p, 'utf8')
+    const text = await readFile(file, 'utf8')
     const json = JSON.parse(text)
     if (!json) return null
     const oauth = json.claudeAiOauth || json.oauth || json
@@ -20,6 +27,7 @@ export async function readClaudeCredentials(home) {
         expiresAt: oauth.expiresAt || (oauth.expires_in ? Date.now() + oauth.expires_in * 1000 : Date.now() + 3600000),
         subscriptionType: oauth.subscriptionType || 'Claude Code',
         email: oauth.email || json.email || 'Claude Code CLI User',
+        sourcePath: file,
       }
     }
     return null
@@ -27,3 +35,18 @@ export async function readClaudeCredentials(home) {
     return null
   }
 }
+
+/**
+ * Read Claude Code CLI credentials. `home` is a test seam: when omitted the
+ * real user home is used, so production behaviour is unchanged.
+ *
+ * Candidates are tried newest first, because Claude Code moved from
+ * `~/.claude/credentials.json` to the dotted `~/.claude/.credentials.json`.
+ */
+export async function readClaudeCredentials(home) {
+  for (const file of claudeCredentialsPaths(home)) {
+    const grant = await readGrantFrom(file)
+    if (grant) return grant
+  }
+  return null
+}

package/lib/vendors/claude.js

@@ -73,10 +73,10 @@ export function defaults() {
     redirectUri: 'https://console.anthropic.com/oauth/code/callback',
     claudeCcVersion: '2.1.289.7e2',
     models: [
-      { id: 'claude-opus-5', name: 'Claude Opus 5' },
-      { id: 'claude-sonnet-5', name: 'Claude Sonnet 5' },
-      { id: 'claude-fable-5', name: 'Claude Fable 5' },
-      { id: 'claude-haiku-4-5-20251001', name: 'Claude Haiku 4.5' },
+      { id: 'claude-opus-5', name: 'Claude Opus 5', inputModalities: ['text', 'image'] },
+      { id: 'claude-sonnet-5', name: 'Claude Sonnet 5', inputModalities: ['text', 'image'] },
+      { id: 'claude-fable-5', name: 'Claude Fable 5', inputModalities: ['text', 'image'] },
+      { id: 'claude-haiku-4-5-20251001', name: 'Claude Haiku 4.5', inputModalities: ['text', 'image'] },
     ],
     systemPrefix: IDENTITY,
   }
@@ -189,9 +189,10 @@ export async function listModels(blob, cfg, fetchImpl) {
   const rawDefault = (cfg && cfg.models && cfg.models.length) ? cfg.models : defaults().models
   const defaultCatalog = modelCatalog(id, rawDefault.map((entry) => {
     const model = typeof entry === "string" ? { id: entry, name: entry } : { ...entry }
-    const levels = effortLevelsForModel(model.id || model.name)
-    if (!levels) return model
-    return { ...model, reasoning: { efforts: levels.map((level) => ({ id: level, name: level })) } }
+    const withVision = { ...model, inputModalities: model.inputModalities || ['text', 'image'] }
+    const levels = effortLevelsForModel(withVision.id || withVision.name)
+    if (!levels) return withVision
+    return { ...withVision, reasoning: { efforts: levels.map((level) => ({ id: level, name: level })) } }
   }))
 
   if (!blob || !blob.accessToken) return defaultCatalog
@@ -223,6 +224,7 @@ export async function listModels(blob, cfg, fetchImpl) {
         id: modelId,
         name: item.display_name || modelId,
         ...(levels ? { reasoning: { efforts: levels.map((level) => ({ id: level, name: level })) } } : {}),
+        inputModalities: ['text', 'image'],
       })
     }
     if (!rows.length) return defaultCatalog

package/package.json

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