@goodandready/dsh-subscriptions 0.7.20 → 0.7.21

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/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/messages.js

@@ -343,9 +343,19 @@ export function anthropicPayload(options, extraSystem) {
     }
     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: [{

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.21",
   "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",