discoclaw 0.8.0 → 0.8.1

package/dist/cron/executor.js

@@ -1,3 +1,4 @@
+import { resolveDefaultModel as resolveImagegenDefaultModel } from '../discord/actions-imagegen.js';
 import { acquireCronLock, releaseCronLock } from './job-lock.js';
 import { resolveChannel } from '../discord/action-utils.js';
 import { DiscordTransportClient } from '../discord/transport-client.js';
@@ -211,7 +212,7 @@ export async function executeCronJob(job, ctx) {
             });
         // Inject tiered action schema documentation when discord actions are enabled.
         if (ctx.discordActionsEnabled) {
-            const actionSelection = buildTieredDiscordActionsPromptSection(cronActionFlags, ctx.botDisplayName, { userText: job.def.prompt });
+            const actionSelection = buildTieredDiscordActionsPromptSection(cronActionFlags, ctx.botDisplayName, { userText: job.def.prompt, imagegenDefaultModel: ctx.imagegenCtx ? resolveImagegenDefaultModel(ctx.imagegenCtx) : undefined });
             if (actionSelection.prompt) {
                 prompt += '\n\n---\n' + actionSelection.prompt;
             }

package/dist/discord/actions-config.js

@@ -21,6 +21,7 @@ const ROLE_DESCRIPTIONS = {
     cron: 'Cron auto-tagging and model classification',
     'cron-exec': 'Default model for cron job execution (overridden by per-job settings)',
     voice: 'Voice channel AI responses',
+    imagegen: 'Default model for image generation',
 };
 // ---------------------------------------------------------------------------
 // Executor
@@ -229,6 +230,15 @@ export function executeConfigAction(action, configCtx) {
                         return { ok: false, error: 'Voice subsystem not configured' };
                     }
                     break;
+                case 'imagegen':
+                    if (bp.imagegenCtx) {
+                        bp.imagegenCtx.defaultModel = model;
+                        changes.push(`imagegen → ${model}`);
+                    }
+                    else {
+                        return { ok: false, error: 'Imagegen subsystem not configured' };
+                    }
+                    break;
                 default:
                     return { ok: false, error: `Unknown role: ${String(action.role)}` };
             }
@@ -338,6 +348,21 @@ export function executeConfigAction(action, configCtx) {
                             }
                         }
                         break;
+                    case 'imagegen':
+                        if (bp.imagegenCtx) {
+                            // Restore the fallback-resolved default (env setting or provider-based fallback).
+                            const igEnvDefault = defaults['imagegen'];
+                            if (igEnvDefault) {
+                                bp.imagegenCtx.defaultModel = igEnvDefault;
+                            }
+                            else {
+                                // Clear override so resolveDefaultModel falls back to provider detection.
+                                bp.imagegenCtx.defaultModel = undefined;
+                            }
+                            const resolvedIg = resolveDefaultModel(bp.imagegenCtx);
+                            resetChanges.push(`imagegen → ${resolvedIg}`);
+                        }
+                        break;
                 }
                 // Clear the override marker regardless of whether we had a default.
                 if (configCtx.overrideSources) {
@@ -382,7 +407,7 @@ export function executeConfigAction(action, configCtx) {
             if (bp.imagegenCtx) {
                 const igModel = resolveDefaultModel(bp.imagegenCtx);
                 const igProvider = resolveProvider(igModel);
-                rows.push(['imagegen', igModel, `Image generation (${igProvider})`, '']);
+                rows.push(['imagegen', igModel, `Image generation (${igProvider})`, ovr('imagegen')]);
             }
             else {
                 rows.push(['imagegen', 'setup-required', 'Image generation (setup required)', '']);
@@ -474,7 +499,7 @@ export function configActionsPromptSection() {
 <discord-action>{"type":"modelSet","role":"chat","model":"sonnet"}</discord-action>
 <discord-action>{"type":"modelSet","role":"fast","model":"haiku"}</discord-action>
 \`\`\`
-- \`role\` (required): One of \`chat\`, \`plan-run\`, \`fast\`, \`forge-drafter\`, \`forge-auditor\`, \`summary\`, \`cron\`, \`cron-exec\`, \`voice\`.
+- \`role\` (required): One of \`chat\`, \`plan-run\`, \`fast\`, \`forge-drafter\`, \`forge-auditor\`, \`summary\`, \`cron\`, \`cron-exec\`, \`voice\`, \`imagegen\`.
 - \`model\` (required): Model tier (\`fast\`, \`capable\`, \`deep\`), concrete model name (\`haiku\`, \`sonnet\`, \`opus\`), runtime name (\`openrouter\`, \`gemini\` — for \`chat\` and \`voice\` roles, swaps the active runtime adapter independently), or \`default\` (for cron-exec only, to revert to the startup default for that role). For the \`voice\` role, setting a model name that belongs to a different provider's tier map (e.g. \`sonnet\` while voice is on Gemini) will auto-switch the voice runtime to match.
 
 **Roles:**
@@ -489,6 +514,7 @@ export function configActionsPromptSection() {
 | \`cron\` | Cron auto-tagging and model classification (overrides fast) |
 | \`cron-exec\` | Default model for cron job execution; per-job overrides (via \`cronUpdate\`) take priority |
 | \`voice\` | Voice channel AI responses |
+| \`imagegen\` | Default model for image generation |
 
 Changes are **persisted** to \`models.json\` and survive restart. Use \`!models reset\` to clear overrides and revert to defaults.
 

package/dist/discord/actions-imagegen.js

@@ -269,7 +269,10 @@ export async function executeImagegenAction(action, ctx, imagegenCtx) {
 // ---------------------------------------------------------------------------
 // Prompt section
 // ---------------------------------------------------------------------------
-export function imagegenActionsPromptSection() {
+export function imagegenActionsPromptSection(resolvedDefaultModel) {
+    const modelFieldDoc = resolvedDefaultModel
+        ? `- \`model\` (optional): Default is \`${resolvedDefaultModel}\`. Omit this field to use the default; only set it when a different model is explicitly needed. Supported families/examples:`
+        : `- \`model\` (optional): Default depends on configuration. Supported families/examples:`;
     return `### Image Generation
 
 **generateImage** — Generate an image and post it to a channel:
@@ -278,7 +281,7 @@ export function imagegenActionsPromptSection() {
 \`\`\`
 - \`prompt\` (required): Text description of the image to generate.
 - \`channel\` (optional): Channel name (with or without #) or channel ID to post the image to. Defaults to the current channel/thread if omitted.
-- \`model\` (optional): Model to use. Default depends on configuration (auto-detected from available API keys). Common supported families/examples:
+${modelFieldDoc}
   - OpenAI: \`dall-e-3\`, \`gpt-image-1\`
   - Gemini (Imagen): \`imagen-4.0-generate-001\`, \`imagen-4.0-fast-generate-001\`, \`imagen-4.0-ultra-generate-001\`
   - Gemini (native): \`gemini-3.1-flash-image-preview\`, \`gemini-3-pro-image-preview\`

package/dist/discord/actions-imagegen.test.js

@@ -84,6 +84,16 @@ describe('imagegenActionsPromptSection', () => {
         expect(section).toContain('channel');
         expect(section).toContain('dall-e-3');
     });
+    it('includes resolved default model when provided', () => {
+        const section = imagegenActionsPromptSection('gpt-image-1');
+        expect(section).toContain('Default is `gpt-image-1`');
+        expect(section).toContain('Omit this field to use the default');
+    });
+    it('omits default model note when not provided', () => {
+        const section = imagegenActionsPromptSection();
+        expect(section).not.toContain('Default is `');
+        expect(section).toContain('Default depends on configuration');
+    });
 });
 describe('resolveProvider', () => {
     it('detects gemini from imagen- prefix', () => {

package/dist/discord/actions-messaging.js

@@ -4,6 +4,22 @@ import * as path from 'node:path';
 import { resolveChannel, fmtTime, findChannelRaw, describeChannelType } from './action-utils.js';
 import { NO_MENTIONS } from './allowed-mentions.js';
 import { isPathUnderRoots } from '../runtime/tools/path-security.js';
+/** Serialize Discord attachments into compact image metadata lines. */
+function formatAttachments(attachments) {
+    if (!attachments)
+        return '';
+    const parts = [];
+    for (const a of attachments) {
+        const tag = [];
+        if (a.contentType)
+            tag.push(a.contentType);
+        if (a.width && a.height)
+            tag.push(`${a.width}x${a.height}`);
+        const detail = tag.length ? ` (${tag.join(', ')})` : '';
+        parts.push(`[Attachment: ${a.name || 'unknown'}${detail}]`);
+    }
+    return parts.join(' ');
+}
 /** Serialize Discord embeds into a compact text representation. */
 function formatEmbeds(embeds, truncate) {
     if (!embeds?.length)
@@ -240,8 +256,17 @@ export async function executeMessagingAction(action, ctx, requesterMember) {
                 const time = fmtTime(m.createdAt);
                 const content = m.content || '';
                 const embed = formatEmbeds(m.embeds, 200);
-                const combined = content || embed || '(no text)';
-                const text = (content && embed ? `${content} [Embed: ${embed}]` : combined).slice(0, 300);
+                const attach = formatAttachments(m.attachments?.values());
+                const parts = [];
+                if (content && embed)
+                    parts.push(`${content} [Embed: ${embed}]`);
+                else if (content)
+                    parts.push(content);
+                else if (embed)
+                    parts.push(embed);
+                if (attach)
+                    parts.push(attach);
+                const text = (parts.length ? parts.join(' ') : '(no text)').slice(0, 300);
                 return `[${author}] ${text} (${time}, id:${m.id})`;
             });
             return { ok: true, summary: `Messages in #${channel.name}:\n${lines.join('\n')}` };
@@ -263,8 +288,17 @@ export async function executeMessagingAction(action, ctx, requesterMember) {
             const time = fmtTime(message.createdAt);
             const contentText = message.content || '';
             const embedText = formatEmbeds(message.embeds, action.full ? undefined : 2000);
-            const body = contentText || embedText || '(no text)';
-            const combined = contentText && embedText ? `${contentText}\n[Embeds]\n${embedText}` : body;
+            const attachText = formatAttachments(message.attachments?.values());
+            const parts = [];
+            if (contentText && embedText)
+                parts.push(`${contentText}\n[Embeds]\n${embedText}`);
+            else if (contentText)
+                parts.push(contentText);
+            else if (embedText)
+                parts.push(embedText);
+            if (attachText)
+                parts.push(attachText);
+            const combined = parts.length ? parts.join('\n') : '(no text)';
             const text = action.full ? combined : combined.slice(0, 2000);
             return { ok: true, summary: `[${author}]: ${text} (${time}, #${messageChannel.name}, id:${message.id})` };
         }
@@ -560,6 +594,7 @@ export function messagingActionsPromptSection() {
 - \`channel\` (required): Channel name or ID.
 - \`limit\` (optional): 1–20, default 10.
 - \`before\` (optional): Message ID to fetch messages before.
+- Summaries include image attachment metadata (filename, content type, dimensions) when present.
 
 **fetchMessage** — Fetch a single message by ID:
 \`\`\`
@@ -567,6 +602,7 @@ export function messagingActionsPromptSection() {
 \`\`\`
 - Use \`fetchMessage\` to retrieve the full content of any Discord message by channel and message ID. This works for pinned prompts, status messages, and any other message you have the IDs for.
 - \`full\` (optional): When true, returns the complete message content without truncation. Default: false (content truncated to 2000 chars).
+- Includes image attachment metadata (filename, content type, dimensions) when present.
 
 **editMessage** — Edit a bot message:
 \`\`\`

package/dist/discord/actions-messaging.test.js

@@ -51,12 +51,27 @@ function makeEmbed(overrides = {}) {
         footer: overrides.footer ?? null,
     };
 }
+function makeAttachment(overrides = {}) {
+    return {
+        name: overrides.name ?? 'image.png',
+        contentType: overrides.contentType ?? 'image/png',
+        width: overrides.width ?? null,
+        height: overrides.height ?? null,
+        ...overrides,
+    };
+}
+function makeAttachmentsCollection(attachments) {
+    return {
+        values() { return attachments[Symbol.iterator](); },
+    };
+}
 function makeMockMessage(id, overrides = {}) {
     const { author: authorName, ...rest } = overrides;
     return {
         id,
         content: rest.content ?? 'Hello',
         embeds: rest.embeds ?? [],
+        attachments: rest.attachments ?? undefined,
         author: { username: authorName ?? 'testuser' },
         createdAt: new Date('2025-01-15T12:00:00Z'),
         createdTimestamp: new Date('2025-01-15T12:00:00Z').getTime(),
@@ -445,6 +460,91 @@ describe('readMessages', () => {
         await executeMessagingAction({ type: 'readMessages', channel: '#general', limit: 50 }, ctx);
         expect(ch.messages.fetch).toHaveBeenCalledWith({ limit: 20 });
     });
+    it('shows attachment metadata for image-only message', async () => {
+        const msg = makeMockMessage('m1', {
+            content: '',
+            author: 'alice',
+            attachments: makeAttachmentsCollection([
+                makeAttachment({ name: 'photo.png', contentType: 'image/png', width: 1920, height: 1080 }),
+            ]),
+        });
+        const fetchedMessages = new Map([['m1', msg]]);
+        const ch = makeMockChannel({ name: 'general', fetchedMessages });
+        const ctx = makeCtx([ch]);
+        const result = await executeMessagingAction({ type: 'readMessages', channel: '#general', limit: 5 }, ctx);
+        expect(result.ok).toBe(true);
+        const summary = result.summary;
+        expect(summary).toContain('[Attachment: photo.png (image/png, 1920x1080)]');
+        expect(summary).not.toContain('(no text)');
+    });
+    it('shows content plus attachment metadata for mixed message', async () => {
+        const msg = makeMockMessage('m1', {
+            content: 'Check this out',
+            author: 'alice',
+            attachments: makeAttachmentsCollection([
+                makeAttachment({ name: 'screenshot.jpg', contentType: 'image/jpeg', width: 800, height: 600 }),
+            ]),
+        });
+        const fetchedMessages = new Map([['m1', msg]]);
+        const ch = makeMockChannel({ name: 'general', fetchedMessages });
+        const ctx = makeCtx([ch]);
+        const result = await executeMessagingAction({ type: 'readMessages', channel: '#general', limit: 5 }, ctx);
+        expect(result.ok).toBe(true);
+        const summary = result.summary;
+        expect(summary).toContain('Check this out');
+        expect(summary).toContain('[Attachment: screenshot.jpg (image/jpeg, 800x600)]');
+    });
+    it('shows embed plus attachment metadata for embed+image message', async () => {
+        const msg = makeMockMessage('m1', {
+            content: '',
+            author: 'alice',
+            embeds: [makeEmbed({ title: 'Link Preview' })],
+            attachments: makeAttachmentsCollection([
+                makeAttachment({ name: 'thumb.png', contentType: 'image/png' }),
+            ]),
+        });
+        const fetchedMessages = new Map([['m1', msg]]);
+        const ch = makeMockChannel({ name: 'general', fetchedMessages });
+        const ctx = makeCtx([ch]);
+        const result = await executeMessagingAction({ type: 'readMessages', channel: '#general', limit: 5 }, ctx);
+        expect(result.ok).toBe(true);
+        const summary = result.summary;
+        expect(summary).toContain('Title: Link Preview');
+        expect(summary).toContain('[Attachment: thumb.png (image/png)]');
+    });
+    it('degrades cleanly when attachment fields are missing', async () => {
+        const msg = makeMockMessage('m1', {
+            content: '',
+            author: 'alice',
+            attachments: makeAttachmentsCollection([
+                makeAttachment({ name: null, contentType: null, width: null, height: null }),
+            ]),
+        });
+        const fetchedMessages = new Map([['m1', msg]]);
+        const ch = makeMockChannel({ name: 'general', fetchedMessages });
+        const ctx = makeCtx([ch]);
+        const result = await executeMessagingAction({ type: 'readMessages', channel: '#general', limit: 5 }, ctx);
+        expect(result.ok).toBe(true);
+        const summary = result.summary;
+        expect(summary).toContain('[Attachment: unknown]');
+        expect(summary).not.toContain('null');
+    });
+    it('shows attachment with dimensions but no content type', async () => {
+        const msg = makeMockMessage('m1', {
+            content: '',
+            author: 'alice',
+            attachments: makeAttachmentsCollection([
+                makeAttachment({ name: 'photo.webp', contentType: null, width: 640, height: 480 }),
+            ]),
+        });
+        const fetchedMessages = new Map([['m1', msg]]);
+        const ch = makeMockChannel({ name: 'general', fetchedMessages });
+        const ctx = makeCtx([ch]);
+        const result = await executeMessagingAction({ type: 'readMessages', channel: '#general', limit: 5 }, ctx);
+        expect(result.ok).toBe(true);
+        const summary = result.summary;
+        expect(summary).toContain('[Attachment: photo.webp (640x480)]');
+    });
 });
 describe('fetchMessage', () => {
     it('fetches and formats a single message', async () => {
@@ -630,6 +730,75 @@ describe('fetchMessage', () => {
         const summary = result.summary;
         expect(summary).not.toContain('x'.repeat(3000));
     });
+    it('shows attachment metadata for image-only message', async () => {
+        const msg = makeMockMessage('msg1', {
+            content: '',
+            author: 'alice',
+            attachments: makeAttachmentsCollection([
+                makeAttachment({ name: 'photo.png', contentType: 'image/png', width: 1920, height: 1080 }),
+            ]),
+        });
+        const ch = makeMockChannel({ id: 'ch1', name: 'general' });
+        ch.messages.fetch = vi.fn(async () => msg);
+        const ctx = makeCtx([ch]);
+        const result = await executeMessagingAction({ type: 'fetchMessage', channelId: 'ch1', messageId: 'msg1' }, ctx);
+        expect(result.ok).toBe(true);
+        const summary = result.summary;
+        expect(summary).toContain('[Attachment: photo.png (image/png, 1920x1080)]');
+        expect(summary).not.toContain('(no text)');
+    });
+    it('shows content plus attachment metadata for mixed message', async () => {
+        const msg = makeMockMessage('msg1', {
+            content: 'Look at this',
+            author: 'alice',
+            attachments: makeAttachmentsCollection([
+                makeAttachment({ name: 'screenshot.jpg', contentType: 'image/jpeg', width: 800, height: 600 }),
+            ]),
+        });
+        const ch = makeMockChannel({ id: 'ch1', name: 'general' });
+        ch.messages.fetch = vi.fn(async () => msg);
+        const ctx = makeCtx([ch]);
+        const result = await executeMessagingAction({ type: 'fetchMessage', channelId: 'ch1', messageId: 'msg1' }, ctx);
+        expect(result.ok).toBe(true);
+        const summary = result.summary;
+        expect(summary).toContain('Look at this');
+        expect(summary).toContain('[Attachment: screenshot.jpg (image/jpeg, 800x600)]');
+    });
+    it('shows embed plus attachment metadata for embed+image message', async () => {
+        const msg = makeMockMessage('msg1', {
+            content: '',
+            author: 'alice',
+            embeds: [makeEmbed({ title: 'Link Preview' })],
+            attachments: makeAttachmentsCollection([
+                makeAttachment({ name: 'thumb.png', contentType: 'image/png' }),
+            ]),
+        });
+        const ch = makeMockChannel({ id: 'ch1', name: 'general' });
+        ch.messages.fetch = vi.fn(async () => msg);
+        const ctx = makeCtx([ch]);
+        const result = await executeMessagingAction({ type: 'fetchMessage', channelId: 'ch1', messageId: 'msg1' }, ctx);
+        expect(result.ok).toBe(true);
+        const summary = result.summary;
+        expect(summary).toContain('Title: Link Preview');
+        expect(summary).toContain('[Attachment: thumb.png (image/png)]');
+    });
+    it('degrades cleanly when attachment fields are missing', async () => {
+        const msg = makeMockMessage('msg1', {
+            content: '',
+            author: 'alice',
+            attachments: makeAttachmentsCollection([
+                makeAttachment({ name: null, contentType: null, width: null, height: null }),
+            ]),
+        });
+        const ch = makeMockChannel({ id: 'ch1', name: 'general' });
+        ch.messages.fetch = vi.fn(async () => msg);
+        const ctx = makeCtx([ch]);
+        const result = await executeMessagingAction({ type: 'fetchMessage', channelId: 'ch1', messageId: 'msg1' }, ctx);
+        expect(result.ok).toBe(true);
+        const summary = result.summary;
+        expect(summary).toContain('[Attachment: unknown]');
+        expect(summary).not.toContain('null');
+    });
 });
 describe('editMessage', () => {
     it('edits a message', async () => {

package/dist/discord/actions.js

@@ -599,7 +599,7 @@ function isActionSchemaCategoryEnabled(flags, category) {
         case 'spawn': return Boolean(flags.spawn);
     }
 }
-function renderActionSchemaCategorySection(category) {
+function renderActionSchemaCategorySection(category, renderCtx) {
     switch (category) {
         case 'messaging':
             return `${messagingActionsPromptSection()}\n\n${reactionPromptSection()}`;
@@ -628,7 +628,7 @@ function renderActionSchemaCategorySection(category) {
         case 'loop':
             return loopActionsPromptSection();
         case 'imagegen':
-            return imagegenActionsPromptSection();
+            return imagegenActionsPromptSection(renderCtx?.imagegenDefaultModel);
         case 'voice':
             return voiceActionsPromptSection();
         case 'spawn':
@@ -762,10 +762,13 @@ export function buildTieredDiscordActionsPromptSection(flags, botDisplayName, op
     const intro = discordActionsIntroSection();
     sections.push(intro);
     sectionLogs.push({ section: 'intro', content: intro });
+    const renderCtx = opts?.imagegenDefaultModel
+        ? { imagegenDefaultModel: opts.imagegenDefaultModel }
+        : undefined;
     for (const category of includedCategories) {
         if (category === 'defer')
             continue;
-        const section = renderActionSchemaCategorySection(category);
+        const section = renderActionSchemaCategorySection(category, renderCtx);
         if (!section)
             continue;
         sections.push(section);

package/dist/discord/deferred-runner.js

@@ -5,6 +5,7 @@ import { fmtTime, resolveChannel } from './action-utils.js';
 import { NO_MENTIONS } from './allowed-mentions.js';
 import { DeferScheduler as DeferSchedulerImpl } from './defer-scheduler.js';
 import { resolveDiscordChannelContext } from './channel-context.js';
+import { resolveDefaultModel } from './actions-imagegen.js';
 import { resolveGroundedToolCapabilities } from '../runtime/tool-capabilities.js';
 import { appendUnavailableActionTypesNotice, appendParseFailureNotice } from './output-common.js';
 import { buildPromptSectionEstimates, buildContextFiles, buildOpenTasksSection, buildScheduledSelfInvocationPrompt, inlineContextFilesWithMeta, loadWorkspacePaFiles, resolveEffectiveTools, } from './prompt-common.js';
@@ -141,6 +142,7 @@ export function configureDeferredScheduler(opts) {
                 channelContextPath: channelCtx.contextPath,
                 isThread: threadParentId !== null,
                 userText: action.prompt,
+                imagegenDefaultModel: opts.state.imagegenCtx ? resolveDefaultModel(opts.state.imagegenCtx) : undefined,
             });
             actionsReferenceSection = actionSelection.prompt;
             actionSchemaSelection = {

package/dist/discord/message-coordinator.js

@@ -11,6 +11,7 @@ import { shouldTriggerFollowUp } from './action-categories.js';
 import { countPinnedMessages, normalizePinnedMessages } from './pinned-message-utils.js';
 import { buildForgeCompletionWatchdogDetail, buildForgeCrashWatchdogDetail, buildForgePostProcessingWatchdogDetail, } from './actions-forge.js';
 import { executePlanAction } from './actions-plan.js';
+import { resolveDefaultModel } from './actions-imagegen.js';
 import { autoImplementForgePlan } from './forge-auto-implement.js';
 import { resolveGroundedToolCapabilities } from '../runtime/tool-capabilities.js';
 import { fetchMessageHistory } from './message-history.js';
@@ -236,8 +237,8 @@ async function gatherConversationContext(opts) {
     if (contextParts.length === 0 && params.messageHistoryBudget > 0) {
         try {
             const history = await fetchMessageHistory(msg.channel, msg.id, { budgetChars: params.messageHistoryBudget, botDisplayName: params.botDisplayName });
-            if (history) {
-                contextParts.push(`Context (recent channel messages):\n${history}`);
+            if (history.text) {
+                contextParts.push(`Context (recent channel messages):\n${history.text}`);
             }
         }
         catch (err) {
@@ -2350,6 +2351,7 @@ export function createMessageCreateHandler(params, queue, statusRef) {
                     let stopReactionRemoved = false;
                     // Declared before try so they remain accessible after the finally block closes.
                     let historySection = '';
+                    let historyAttachments = [];
                     let summarySection = '';
                     let existingSummaryText = null;
                     let existingSummaryUpdatedAt;
@@ -2405,7 +2407,9 @@ export function createMessageCreateHandler(params, queue, statusRef) {
                         const contextFiles = buildContextFiles([...paFiles, ...memoryFiles], params.discordChannelContext, channelCtx.contextPath);
                         if (params.messageHistoryBudget > 0) {
                             try {
-                                historySection = await fetchMessageHistory(msg.channel, msg.id, { budgetChars: params.messageHistoryBudget, botDisplayName: params.botDisplayName });
+                                const historyResult = await fetchMessageHistory(msg.channel, msg.id, { budgetChars: params.messageHistoryBudget, botDisplayName: params.botDisplayName });
+                                historySection = historyResult.text;
+                                historyAttachments = historyResult.historyAttachments;
                             }
                             catch (err) {
                                 params.log?.warn({ err }, 'discord:history fetch failed');
@@ -2530,6 +2534,7 @@ export function createMessageCreateHandler(params, queue, statusRef) {
                                 channelContextPath: channelCtx.contextPath,
                                 isThread,
                                 userText: batch.map((m) => String(m.content ?? '')).join(' '),
+                                imagegenDefaultModel: params.imagegenCtx ? resolveDefaultModel(params.imagegenCtx) : undefined,
                             });
                             actionsReferenceSection = actionSelection.prompt;
                             actionSchemaSelection = {
@@ -2606,20 +2611,15 @@ export function createMessageCreateHandler(params, queue, statusRef) {
                             hasChannelContext: Boolean(channelCtx.contextPath),
                             permissionTier: tools.permissionTier,
                         }, 'invoke:start');
-                        // Collect images from reply reference (downloaded first, takes priority).
+                        // Collect images across sources. Priority: direct > reply-ref > history.
+                        // Each source fills the remaining MAX_IMAGES_PER_INVOCATION budget.
                         let inputImages;
-                        const replyRefImages = replyRef?.images ?? [];
-                        const replyRefImageCount = replyRefImages.length;
-                        if (replyRefImageCount > 0) {
-                            inputImages = [...replyRefImages];
-                            params.log?.info({ imageCount: replyRefImageCount }, 'discord:reply-ref images downloaded');
-                        }
-                        // Download image attachments from the user message (remaining budget).
+                        // 1. Direct message attachments (highest priority — full budget).
                         if (msg.attachments && msg.attachments.size > 0) {
                             try {
-                                const dlResult = await downloadMessageImages([...msg.attachments.values()], MAX_IMAGES_PER_INVOCATION - replyRefImageCount);
+                                const dlResult = await downloadMessageImages([...msg.attachments.values()], MAX_IMAGES_PER_INVOCATION);
                                 if (dlResult.images.length > 0) {
-                                    inputImages = [...(inputImages ?? []), ...dlResult.images];
+                                    inputImages = [...dlResult.images];
                                     params.log?.info({ imageCount: dlResult.images.length }, 'discord:images downloaded');
                                 }
                                 if (dlResult.errors.length > 0) {
@@ -2651,6 +2651,17 @@ export function createMessageCreateHandler(params, queue, statusRef) {
                                 params.log?.warn({ err }, 'discord:text attachment download failed');
                             }
                         }
+                        // 2. Reply-reference images (remaining budget).
+                        const replyRefImages = replyRef?.images ?? [];
+                        if (replyRefImages.length > 0) {
+                            const directCount = inputImages?.length ?? 0;
+                            const refBudget = MAX_IMAGES_PER_INVOCATION - directCount;
+                            if (refBudget > 0) {
+                                const toAdd = replyRefImages.slice(0, refBudget);
+                                inputImages = [...(inputImages ?? []), ...toAdd];
+                                params.log?.info({ imageCount: toAdd.length }, 'discord:reply-ref images');
+                            }
+                        }
                         // Fetch YouTube transcripts for URLs found in the message.
                         try {
                             const ytResult = await fetchYouTubeTranscripts(msg.content ?? '');
@@ -2667,6 +2678,36 @@ export function createMessageCreateHandler(params, queue, statusRef) {
                         catch (err) {
                             params.log?.warn({ err }, 'discord:youtube transcript fetch failed');
                         }
+                        // 3. History images from thread/channel context (remaining budget).
+                        if (historyAttachments.length > 0) {
+                            const currentCount = inputImages?.length ?? 0;
+                            const historyImageBudget = MAX_IMAGES_PER_INVOCATION - currentCount;
+                            if (historyImageBudget > 0) {
+                                try {
+                                    // Deduplicate: exclude attachment URLs already processed from the direct message.
+                                    const directUrls = new Set();
+                                    if (msg.attachments) {
+                                        for (const att of msg.attachments.values()) {
+                                            directUrls.add(att.url);
+                                        }
+                                    }
+                                    const deduped = historyAttachments.filter(a => !directUrls.has(a.url));
+                                    if (deduped.length > 0) {
+                                        const dlResult = await downloadMessageImages(deduped, historyImageBudget);
+                                        if (dlResult.images.length > 0) {
+                                            inputImages = [...(inputImages ?? []), ...dlResult.images];
+                                            params.log?.info({ imageCount: dlResult.images.length }, 'discord:history images downloaded');
+                                        }
+                                        if (dlResult.errors.length > 0) {
+                                            params.log?.warn({ errors: dlResult.errors }, 'discord:history image download errors');
+                                        }
+                                    }
+                                }
+                                catch (err) {
+                                    params.log?.warn({ err }, 'discord:history image download failed');
+                                }
+                            }
+                        }
                         let currentPrompt = prompt;
                         let followUpDepth = 0;
                         let pendingFollowUp = null;