discoclaw 1.1.4 → 1.1.6

package/dist/discord/message-coordinator.js

@@ -2633,7 +2633,6 @@ 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;
@@ -2705,7 +2704,6 @@ export function createMessageCreateHandler(params, queue, statusRef) {
                             try {
                                 const historyResult = await fetchMessageHistory(msg.channel, msg.id, { budgetChars: params.messageHistoryBudget, fetchLimit: params.messageHistoryFetchLimit, maxAgeMs: params.messageHistoryMaxAgeMs, botDisplayName: params.botDisplayName });
                                 historySection = historyResult.text;
-                                historyAttachments = historyResult.historyAttachments;
                             }
                             catch (err) {
                                 params.log?.warn({ err }, 'discord:history fetch failed');
@@ -2937,7 +2935,7 @@ export function createMessageCreateHandler(params, queue, statusRef) {
                             hasChannelContext: Boolean(channelCtx.contextPath),
                             permissionTier: tools.permissionTier,
                         }, 'invoke:start');
-                        // Collect images across sources. Priority: direct > reply-ref > history.
+                        // Collect images across sources. Priority: direct > reply-ref.
                         // Each source fills the remaining MAX_IMAGES_PER_INVOCATION budget.
                         let inputImages;
                         // 1. Direct message attachments (highest priority — full budget).
@@ -3021,41 +3019,12 @@ 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).
-                        // Skip for Codex runtime: `codex exec resume` does not support --image,
-                        // so history images would force a session reset on every turn that has
-                        // any image in recent channel history. Direct-message images (from the
-                        // user's current message) still work — they trigger a fresh session.
-                        const skipHistoryImages = params.runtime.id === 'codex';
-                        if (!skipHistoryImages && 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');
-                                }
-                            }
-                        }
+                        // History images are intentionally NOT injected here. The text
+                        // history already notes `[attachment/embed]` when media was present,
+                        // and the reply-reference mechanism (source #2 above) handles cases
+                        // where the user explicitly wants the model to see an older image.
+                        // Injecting history images as raw content blocks caused the model to
+                        // analyze or act on stale images unprompted.
                         let currentPrompt = prompt;
                         let followUpDepth = 0;
                         let pendingFollowUp = null;

package/dist/discord/message-coordinator.test.js

@@ -3,8 +3,8 @@
  * rule is injected alongside the live action inventory so the model trusts
  * the per-turn inventory over generic product knowledge.
  *
- * Also tests image input precedence across direct, reply-reference, and
- * history sources.
+ * Also tests image input precedence across direct and reply-reference
+ * sources (history images are intentionally excluded).
  */
 import fs from 'node:fs/promises';
 import os from 'node:os';
@@ -413,115 +413,18 @@ describe('image input precedence — direct > reply-ref > history', () => {
         await handler(msg);
         expect(runtime.images).toEqual([directImg, refImg]);
     });
-    it('reply-ref images appear before history images', async () => {
-        const refImg = fakeImage('ref-1');
-        const histImg = fakeImage('hist-1');
-        // No direct attachments → downloadMessageImages not called for direct.
-        mockReplyRef.mockResolvedValue({ section: '[User]: hi', images: [refImg] });
-        // History returns attachments.
+    it('history images are never injected into the prompt', async () => {
+        // History returns attachments, but they should NOT be downloaded.
         const histAtt = fakeAttachment('hist.png');
         mockFetchHistory.mockResolvedValue({ text: 'history text', historyAttachments: [histAtt] });
-        // downloadMessageImages called once for history attachments.
-        mockDownloadImages.mockResolvedValueOnce({ images: [histImg], errors: [] });
-        const runtime = makeImageCaptureRuntime();
-        const reply = makeReply();
-        const msg = makeGuildMessage(reply);
-        const params = makeParams(runtime, { messageHistoryBudget: 500 });
-        const queue = { run: vi.fn(async (_key, fn) => fn()) };
-        const handler = await makeHandler(params, queue);
-        await handler(msg);
-        expect(runtime.images).toEqual([refImg, histImg]);
-    });
-    it('history images are downloaded newest-first (preserving fetchMessageHistory order)', async () => {
-        const histImgA = fakeImage('hist-a');
-        const histImgB = fakeImage('hist-b');
-        // History returns attachments in newest-first order.
-        const attNew = fakeAttachment('new.png');
-        const attOld = fakeAttachment('old.png');
-        mockFetchHistory.mockResolvedValue({
-            text: 'history',
-            historyAttachments: [attNew, attOld],
-        });
-        // downloadMessageImages receives them in the same order and returns both.
-        mockDownloadImages.mockResolvedValueOnce({ images: [histImgA, histImgB], errors: [] });
-        const runtime = makeImageCaptureRuntime();
-        const reply = makeReply();
-        const msg = makeGuildMessage(reply);
-        const params = makeParams(runtime, { messageHistoryBudget: 500 });
-        const queue = { run: vi.fn(async (_key, fn) => fn()) };
-        const handler = await makeHandler(params, queue);
-        await handler(msg);
-        // Verify downloadMessageImages received attachments in newest-first order.
-        expect(mockDownloadImages).toHaveBeenCalledWith([attNew, attOld], expect.any(Number));
-        expect(runtime.images).toEqual([histImgA, histImgB]);
-    });
-    it('duplicate URLs between direct and history are only counted once', async () => {
-        const directImg = fakeImage('direct-shared');
-        const histImg = fakeImage('hist-unique');
-        const sharedUrl = 'https://cdn.discordapp.com/shared.png';
-        const directAtt = fakeAttachment('shared.png', sharedUrl);
-        const histAttShared = fakeAttachment('shared.png', sharedUrl);
-        const histAttUnique = fakeAttachment('unique.png');
-        // Direct download returns one image.
-        mockDownloadImages
-            .mockResolvedValueOnce({ images: [directImg], errors: [] })
-            // History download receives only the unique attachment (deduped).
-            .mockResolvedValueOnce({ images: [histImg], errors: [] });
-        mockFetchHistory.mockResolvedValue({
-            text: 'history',
-            historyAttachments: [histAttShared, histAttUnique],
-        });
-        const runtime = makeImageCaptureRuntime();
-        const reply = makeReply();
-        const attachments = new Map([['1', directAtt]]);
-        const msg = makeGuildMessage(reply, { attachments });
-        const params = makeParams(runtime, { messageHistoryBudget: 500 });
-        const queue = { run: vi.fn(async (_key, fn) => fn()) };
-        const handler = await makeHandler(params, queue);
-        await handler(msg);
-        // The second downloadMessageImages call should only receive the unique attachment.
-        expect(mockDownloadImages).toHaveBeenCalledTimes(2);
-        const historyCall = mockDownloadImages.mock.calls[1];
-        expect(historyCall[0]).toEqual([histAttUnique]);
-        expect(runtime.images).toEqual([directImg, histImg]);
-    });
-    it('history download is skipped when higher-priority sources exhaust the cap', async () => {
-        // Fill budget with direct images (MAX_IMAGES_PER_INVOCATION).
-        const directImages = Array.from({ length: MAX_IMAGES_PER_INVOCATION }, (_, i) => fakeImage(`direct-${i}`));
-        mockDownloadImages.mockResolvedValueOnce({ images: directImages, errors: [] });
-        // History has attachments, but budget should be exhausted.
-        const histAtt = fakeAttachment('hist.png');
-        mockFetchHistory.mockResolvedValue({
-            text: 'history',
-            historyAttachments: [histAtt],
-        });
-        const runtime = makeImageCaptureRuntime();
-        const reply = makeReply();
-        const directAtts = Array.from({ length: MAX_IMAGES_PER_INVOCATION }, (_, i) => fakeAttachment(`img-${i}.png`));
-        const attachments = new Map(directAtts.map((a, i) => [String(i), a]));
-        const msg = makeGuildMessage(reply, { attachments });
-        const params = makeParams(runtime, { messageHistoryBudget: 500 });
-        const queue = { run: vi.fn(async (_key, fn) => fn()) };
-        const handler = await makeHandler(params, queue);
-        await handler(msg);
-        // downloadMessageImages should be called only once (for direct), not for history.
-        expect(mockDownloadImages).toHaveBeenCalledTimes(1);
-        expect(runtime.images).toEqual(directImages);
-    });
-    it('history images are skipped for codex runtime to avoid session reset', async () => {
-        const histAtt = fakeAttachment('hist.png');
-        mockFetchHistory.mockResolvedValue({ text: 'history', historyAttachments: [histAtt] });
-        // Do NOT set mockResolvedValueOnce — download should never be called.
         const runtime = makeImageCaptureRuntime();
-        // Override runtime id to 'codex'.
-        runtime.id = 'codex';
         const reply = makeReply();
         const msg = makeGuildMessage(reply);
         const params = makeParams(runtime, { messageHistoryBudget: 500 });
         const queue = { run: vi.fn(async (_key, fn) => fn()) };
         const handler = await makeHandler(params, queue);
         await handler(msg);
-        // History images should NOT be downloaded for codex runtime.
+        // downloadMessageImages should NOT be called for history attachments.
         expect(mockDownloadImages).not.toHaveBeenCalled();
         expect(runtime.images).toBeUndefined();
     });

package/dist/discord/message-history.js

@@ -18,13 +18,13 @@ export function formatRelativeTime(deltaMs) {
     const weeks = Math.floor(days / 7);
     return `${weeks}w ago`;
 }
-const EMPTY_RESULT = { text: '', historyAttachments: [] };
+const EMPTY_RESULT = { text: '' };
 /**
  * Fetch recent messages from a Discord channel and format them as conversation
  * history suitable for prepending to a prompt.
  *
- * Returns text in chronological order and attachments newest-first so the
- * caller can trim to an image budget starting from the most recent.
+ * Returns text in chronological order. Messages with attachments or embeds
+ * but no text content are represented as `[attachment]` / `[embed]`.
  */
 export async function fetchMessageHistory(channel, beforeMessageId, opts) {
     if (opts.budgetChars <= 0)
@@ -65,7 +65,23 @@ export async function fetchMessageHistory(channel, beforeMessageId, opts) {
     for (let i = sorted.length - 1; i >= 0 && remaining > 0; i--) {
         const m = sorted[i];
         const author = m.author.bot ? (opts.botDisplayName ?? 'Discoclaw') : (m.author.displayName || m.author.username);
-        const content = String(m.content ?? '');
+        let content = String(m.content ?? '').trim();
+        if (!content) {
+            const atts = m.attachments;
+            const hasAttachments = atts && typeof atts.size === 'number'
+                && atts.size > 0;
+            const embeds = m.embeds;
+            const hasEmbeds = Array.isArray(embeds) && embeds.length > 0;
+            if (hasAttachments) {
+                content = '[attachment]';
+            }
+            else if (hasEmbeds) {
+                content = '[embed]';
+            }
+            else {
+                continue;
+            }
+        }
         const ts = typeof m.createdTimestamp === 'number' ? m.createdTimestamp : 0;
         const age = ts > 0 ? formatRelativeTime(now - ts) : '';
         const tag = age ? `${author}, ${age}` : author;
@@ -88,17 +104,6 @@ export async function fetchMessageHistory(channel, beforeMessageId, opts) {
             remaining -= full.length + 1; // +1 for newline separator
         }
     }
-    // Extract attachments newest-first for downstream image budget trimming.
-    const historyAttachments = [];
-    for (let i = sorted.length - 1; i >= 0; i--) {
-        const m = sorted[i];
-        const atts = m.attachments;
-        if (atts && typeof atts.values === 'function') {
-            for (const a of atts.values()) {
-                historyAttachments.push(a);
-            }
-        }
-    }
     const text = selected.length > 0 ? selected.join('\n') : '';
-    return { text, historyAttachments };
+    return { text };
 }

package/dist/discord/message-history.test.js

@@ -1,21 +1,20 @@
 import { describe, expect, it, vi } from 'vitest';
 import { fetchMessageHistory, formatRelativeTime } from './message-history.js';
 /** Helper: create a fake Discord message. */
-function fakeMsg(id, content, username, bot = false, attachments, createdTimestamp) {
+function fakeMsg(id, content, username, bot = false, opts) {
     return {
         id,
         content,
         author: { username, displayName: username, bot },
-        ...(createdTimestamp !== undefined ? { createdTimestamp } : {}),
-        ...(attachments
-            ? { attachments: new Map(attachments.map((a, i) => [String(i), a])) }
+        ...(opts?.createdTimestamp !== undefined ? { createdTimestamp: opts.createdTimestamp } : {}),
+        ...(opts?.attachmentCount
+            ? { attachments: new Map(Array.from({ length: opts.attachmentCount }, (_, i) => [String(i), { url: `https://cdn.discordapp.com/${i}.png`, name: `${i}.png` }])) }
+            : {}),
+        ...(opts?.embedCount
+            ? { embeds: Array.from({ length: opts.embedCount }, () => ({ type: 'rich' })) }
             : {}),
     };
 }
-/** Shorthand for an image attachment. */
-function imgAtt(name, url = `https://cdn.discordapp.com/${name}`) {
-    return { url, name, contentType: 'image/png', size: 1024 };
-}
 /** Helper: create a fake channel whose messages.fetch returns the given messages (newest-first). */
 function fakeChannel(messages) {
     return {
@@ -87,13 +86,11 @@ describe('fetchMessageHistory', () => {
         };
         const result = await fetchMessageHistory(ch, '1', { budgetChars: 3000 });
         expect(result.text).toBe('');
-        expect(result.historyAttachments).toEqual([]);
     });
     it('returns empty result when no prior messages exist', async () => {
         const ch = fakeChannel([]);
         const result = await fetchMessageHistory(ch, '1', { budgetChars: 3000 });
         expect(result.text).toBe('');
-        expect(result.historyAttachments).toEqual([]);
     });
     it('returns empty result when budget is 0', async () => {
         const ch = fakeChannel([
@@ -101,7 +98,6 @@ describe('fetchMessageHistory', () => {
         ]);
         const result = await fetchMessageHistory(ch, '2', { budgetChars: 0 });
         expect(result.text).toBe('');
-        expect(result.historyAttachments).toEqual([]);
     });
     it('can fetch the latest messages and exclude specific message ids', async () => {
         const fetch = vi.fn(async () => new Map([
@@ -119,85 +115,60 @@ describe('fetchMessageHistory', () => {
         expect(fetch).toHaveBeenCalledWith({ limit: 11 });
         expect(result.text).toBe('[User]: earlier context\n[User]: latest follow-up');
     });
-    // --- Image / attachment extraction tests ---
-    it('extracts image attachments from channel history messages', async () => {
-        const att1 = imgAtt('screenshot.png');
-        const att2 = imgAtt('diagram.png');
+    // --- Attachment / embed text marker tests ---
+    it('renders empty-content messages with attachments as [attachment]', async () => {
         const ch = fakeChannel([
-            fakeMsg('3', 'here is a screenshot', 'User', false, [att1]),
-            fakeMsg('2', 'no images here', 'User'),
-            fakeMsg('1', 'and a diagram', 'User', false, [att2]),
+            fakeMsg('2', 'look at this', 'User'),
+            fakeMsg('1', '', 'User', false, { attachmentCount: 1 }),
         ]);
-        const result = await fetchMessageHistory(ch, '4', { budgetChars: 5000 });
-        expect(result.historyAttachments).toHaveLength(2);
-        // Newest-first ordering: att1 (msg 3) before att2 (msg 1)
-        expect(result.historyAttachments[0]).toBe(att1);
-        expect(result.historyAttachments[1]).toBe(att2);
+        const result = await fetchMessageHistory(ch, '3', { budgetChars: 5000 });
+        const lines = result.text.split('\n');
+        expect(lines).toHaveLength(2);
+        expect(lines[0]).toBe('[User]: [attachment]');
+        expect(lines[1]).toBe('[User]: look at this');
     });
-    it('returns attachments newest-first across multiple messages', async () => {
-        const a1 = imgAtt('old.png');
-        const a2 = imgAtt('mid.png');
-        const a3 = imgAtt('new.png');
+    it('renders empty-content messages with embeds as [embed]', async () => {
         const ch = fakeChannel([
-            fakeMsg('3', 'newest', 'User', false, [a3]),
-            fakeMsg('2', 'middle', 'User', false, [a2]),
-            fakeMsg('1', 'oldest', 'User', false, [a1]),
+            fakeMsg('1', '', 'User', false, { embedCount: 1 }),
         ]);
-        const result = await fetchMessageHistory(ch, '4', { budgetChars: 5000 });
-        expect(result.historyAttachments).toEqual([a3, a2, a1]);
+        const result = await fetchMessageHistory(ch, '2', { budgetChars: 5000 });
+        expect(result.text).toBe('[User]: [embed]');
     });
-    it('returns multiple attachments from a single message in order', async () => {
-        const a1 = imgAtt('first.png');
-        const a2 = imgAtt('second.png');
+    it('prefers [attachment] over [embed] when both present', async () => {
         const ch = fakeChannel([
-            fakeMsg('1', 'two images', 'User', false, [a1, a2]),
+            fakeMsg('1', '', 'User', false, { attachmentCount: 1, embedCount: 1 }),
         ]);
         const result = await fetchMessageHistory(ch, '2', { budgetChars: 5000 });
-        expect(result.historyAttachments).toEqual([a1, a2]);
+        expect(result.text).toBe('[User]: [attachment]');
     });
-    it('returns empty attachments when messages have no images', async () => {
+    it('skips empty-content messages with no attachments or embeds', async () => {
         const ch = fakeChannel([
-            fakeMsg('2', 'just text', 'User'),
-            fakeMsg('1', 'more text', 'User'),
+            fakeMsg('2', 'visible', 'User'),
+            fakeMsg('1', '', 'User'),
         ]);
         const result = await fetchMessageHistory(ch, '3', { budgetChars: 5000 });
-        expect(result.historyAttachments).toEqual([]);
+        expect(result.text).toBe('[User]: visible');
     });
-    it('does not include attachments from excluded messages', async () => {
-        const att = imgAtt('excluded.png');
+    it('keeps text content as-is when message also has attachments', async () => {
         const ch = fakeChannel([
-            fakeMsg('2', 'keep this', 'User'),
-            fakeMsg('1', 'exclude this', 'User', false, [att]),
+            fakeMsg('1', 'here is my screenshot', 'User', false, { attachmentCount: 2 }),
         ]);
-        const result = await fetchMessageHistory(ch, '3', {
-            budgetChars: 5000,
-            excludeMessageIds: ['1'],
-        });
-        expect(result.text).toBe('[User]: keep this');
-        expect(result.historyAttachments).toEqual([]);
+        const result = await fetchMessageHistory(ch, '2', { budgetChars: 5000 });
+        expect(result.text).toBe('[User]: here is my screenshot');
     });
-    it('text is chronological while attachments are newest-first', async () => {
-        const oldAtt = imgAtt('old.png');
-        const newAtt = imgAtt('new.png');
+    it('does not include historyAttachments in result', async () => {
         const ch = fakeChannel([
-            fakeMsg('2', 'new message', 'User', false, [newAtt]),
-            fakeMsg('1', 'old message', 'User', false, [oldAtt]),
+            fakeMsg('1', '', 'User', false, { attachmentCount: 1 }),
         ]);
-        const result = await fetchMessageHistory(ch, '3', { budgetChars: 5000 });
-        // Text: chronological (old first)
-        const lines = result.text.split('\n');
-        expect(lines[0]).toContain('old message');
-        expect(lines[1]).toContain('new message');
-        // Attachments: newest-first
-        expect(result.historyAttachments[0]).toBe(newAtt);
-        expect(result.historyAttachments[1]).toBe(oldAtt);
+        const result = await fetchMessageHistory(ch, '2', { budgetChars: 5000 });
+        expect(result).not.toHaveProperty('historyAttachments');
     });
     // --- Temporal signal tests ---
     it('includes relative timestamps when createdTimestamp is present', async () => {
         const now = 1700000000000;
         const ch = fakeChannel([
-            fakeMsg('2', 'recent msg', 'Alice', false, undefined, now - 5 * 60_000), // 5m ago
-            fakeMsg('1', 'old msg', 'Bob', false, undefined, now - 3 * 86_400_000), // 3d ago
+            fakeMsg('2', 'recent msg', 'Alice', false, { createdTimestamp: now - 5 * 60_000 }), // 5m ago
+            fakeMsg('1', 'old msg', 'Bob', false, { createdTimestamp: now - 3 * 86_400_000 }), // 3d ago
         ]);
         const result = await fetchMessageHistory(ch, '3', { budgetChars: 5000, now });
         const lines = result.text.split('\n');
@@ -207,7 +178,7 @@ describe('fetchMessageHistory', () => {
     it('shows "just now" for messages under 60 seconds old', async () => {
         const now = 1700000000000;
         const ch = fakeChannel([
-            fakeMsg('1', 'fresh', 'User', false, undefined, now - 10_000), // 10s ago
+            fakeMsg('1', 'fresh', 'User', false, { createdTimestamp: now - 10_000 }), // 10s ago
         ]);
         const result = await fetchMessageHistory(ch, '2', { budgetChars: 5000, now });
         expect(result.text).toBe('[User, just now]: fresh');
@@ -222,7 +193,7 @@ describe('fetchMessageHistory', () => {
     it('includes age label on bot messages too', async () => {
         const now = 1700000000000;
         const ch = fakeChannel([
-            fakeMsg('1', 'bot reply', 'Discoclaw', true, undefined, now - 2 * 3600_000), // 2h ago
+            fakeMsg('1', 'bot reply', 'Discoclaw', true, { createdTimestamp: now - 2 * 3600_000 }), // 2h ago
         ]);
         const result = await fetchMessageHistory(ch, '2', { budgetChars: 5000, now });
         expect(result.text).toBe('[Discoclaw, 2h ago]: bot reply');
@@ -230,7 +201,7 @@ describe('fetchMessageHistory', () => {
     it('shows hours correctly at boundary', async () => {
         const now = 1700000000000;
         const ch = fakeChannel([
-            fakeMsg('1', 'msg', 'User', false, undefined, now - 23 * 3600_000), // 23h ago
+            fakeMsg('1', 'msg', 'User', false, { createdTimestamp: now - 23 * 3600_000 }), // 23h ago
         ]);
         const result = await fetchMessageHistory(ch, '2', { budgetChars: 5000, now });
         expect(result.text).toBe('[User, 23h ago]: msg');
@@ -238,9 +209,9 @@ describe('fetchMessageHistory', () => {
     it('filters out messages older than maxAgeMs', async () => {
         const now = 1700000000000;
         const ch = fakeChannel([
-            fakeMsg('3', 'recent', 'User', false, undefined, now - 60_000), // 1m ago
-            fakeMsg('2', 'stale', 'User', false, undefined, now - 25 * 3600_000), // 25h ago
-            fakeMsg('1', 'ancient', 'User', false, undefined, now - 72 * 3600_000), // 3d ago
+            fakeMsg('3', 'recent', 'User', false, { createdTimestamp: now - 60_000 }), // 1m ago
+            fakeMsg('2', 'stale', 'User', false, { createdTimestamp: now - 25 * 3600_000 }), // 25h ago
+            fakeMsg('1', 'ancient', 'User', false, { createdTimestamp: now - 72 * 3600_000 }), // 3d ago
         ]);
         // maxAgeMs = 24h — only the 1m-ago message should survive
         const result = await fetchMessageHistory(ch, '4', { budgetChars: 5000, now, maxAgeMs: 24 * 3600_000 });
@@ -251,16 +222,15 @@ describe('fetchMessageHistory', () => {
     it('returns empty when all messages exceed maxAgeMs', async () => {
         const now = 1700000000000;
         const ch = fakeChannel([
-            fakeMsg('1', 'old', 'User', false, undefined, now - 48 * 3600_000),
+            fakeMsg('1', 'old', 'User', false, { createdTimestamp: now - 48 * 3600_000 }),
         ]);
         const result = await fetchMessageHistory(ch, '2', { budgetChars: 5000, now, maxAgeMs: 24 * 3600_000 });
         expect(result.text).toBe('');
-        expect(result.historyAttachments).toEqual([]);
     });
     it('does not filter by age when maxAgeMs is 0', async () => {
         const now = 1700000000000;
         const ch = fakeChannel([
-            fakeMsg('1', 'ancient', 'User', false, undefined, now - 100 * 86_400_000),
+            fakeMsg('1', 'ancient', 'User', false, { createdTimestamp: now - 100 * 86_400_000 }),
         ]);
         const result = await fetchMessageHistory(ch, '2', { budgetChars: 5000, now, maxAgeMs: 0 });
         expect(result.text).toContain('ancient');
@@ -268,7 +238,7 @@ describe('fetchMessageHistory', () => {
     it('shows weeks for messages older than 30 days', async () => {
         const now = 1700000000000;
         const ch = fakeChannel([
-            fakeMsg('1', 'ancient', 'User', false, undefined, now - 45 * 86_400_000), // 45d ago
+            fakeMsg('1', 'ancient', 'User', false, { createdTimestamp: now - 45 * 86_400_000 }), // 45d ago
         ]);
         const result = await fetchMessageHistory(ch, '2', { budgetChars: 5000, now });
         expect(result.text).toBe('[User, 6w ago]: ancient');

package/dist/discord/thread-context.js

@@ -1,4 +1,3 @@
-import { downloadMessageImages } from './image-download.js';
 import { countPinnedMessages, normalizePinnedMessages } from './pinned-message-utils.js';
 const DEFAULT_BUDGET_CHARS = 3000;
 const DEFAULT_RECENT_LIMIT = 10;
@@ -10,14 +9,6 @@ function hasMedia(m) {
     const embLen = m.embeds && ('length' in m.embeds ? m.embeds.length : 0);
     return (attSize ?? 0) > 0 || (embLen ?? 0) > 0;
 }
-function extractAttachmentLikes(attachments) {
-    if (!attachments)
-        return [];
-    if (typeof attachments.values === 'function') {
-        return [...attachments.values()];
-    }
-    return [];
-}
 function formatMessageLine(m, botName, suffix) {
     const content = String(m.content ?? '').trim();
     const author = m.author.bot
@@ -140,9 +131,7 @@ export async function resolveThreadContext(channel, currentMessageId, opts = {})
         }
     }
     // 4. Recent thread messages (before the current command message)
-    const historyImageBudget = opts.historyImageBudget ?? 0;
-    let fetchedRecent = [];
-    if (recentLimit > 0 && (remaining > 50 || historyImageBudget > 0)) {
+    if (recentLimit > 0 && remaining > 50) {
         try {
             const messages = await channel.messages.fetch({
                 before: currentMessageId,
@@ -152,63 +141,40 @@ export async function resolveThreadContext(channel, currentMessageId, opts = {})
                 // Sort by snowflake ID (ascending = chronological).
                 const sorted = Array.from(messages.values())
                     .sort((a, b) => a.id < b.id ? -1 : a.id > b.id ? 1 : 0);
-                fetchedRecent = sorted;
-                if (remaining > 50) {
-                    const lines = [];
-                    for (const m of sorted) {
-                        // Deduplicate: skip the starter message if it appears in recent messages
-                        if (m.id && seenMessageIds.has(m.id))
-                            continue;
-                        const line = formatMessageLine(m, botName);
-                        if (!line)
-                            continue;
-                        if (line.length <= remaining) {
-                            lines.push(line);
-                            remaining -= line.length + 1;
-                            if (m.id)
-                                seenMessageIds.add(m.id);
-                        }
-                        else if (remaining > 50 && m.author.bot) {
-                            lines.push(line.slice(0, remaining - 3) + '...');
-                            remaining = 0;
-                            break;
-                        }
-                        else {
-                            break;
-                        }
+                const lines = [];
+                for (const m of sorted) {
+                    // Deduplicate: skip the starter message if it appears in recent messages
+                    if (m.id && seenMessageIds.has(m.id))
+                        continue;
+                    const line = formatMessageLine(m, botName);
+                    if (!line)
+                        continue;
+                    if (line.length <= remaining) {
+                        lines.push(line);
+                        remaining -= line.length + 1;
+                        if (m.id)
+                            seenMessageIds.add(m.id);
+                    }
+                    else if (remaining > 50 && m.author.bot) {
+                        lines.push(line.slice(0, remaining - 3) + '...');
+                        remaining = 0;
+                        break;
                     }
-                    if (lines.length > 0) {
-                        sections.push('Recent thread messages:');
-                        sections.push(...lines);
+                    else {
+                        break;
                     }
                 }
+                if (lines.length > 0) {
+                    sections.push('Recent thread messages:');
+                    sections.push(...lines);
+                }
             }
         }
         catch (err) {
             opts.log?.warn({ err }, 'thread-context: failed to fetch recent messages');
         }
     }
-    // 5. Download images from thread history (newest-first)
-    const images = [];
-    if (historyImageBudget > 0 && fetchedRecent.length > 0) {
-        const candidates = [];
-        for (let i = fetchedRecent.length - 1; i >= 0; i--) {
-            candidates.push(...extractAttachmentLikes(fetchedRecent[i].attachments));
-        }
-        if (candidates.length > 0) {
-            try {
-                const dlResult = await downloadMessageImages(candidates, historyImageBudget);
-                images.push(...dlResult.images);
-                if (dlResult.errors.length > 0) {
-                    opts.log?.warn({ errors: dlResult.errors }, 'thread-context: image download errors');
-                }
-            }
-            catch (err) {
-                opts.log?.warn({ err }, 'thread-context: image download failed');
-            }
-        }
-    }
-    if (sections.length === 0 && images.length === 0)
+    if (sections.length === 0)
         return null;
-    return { section: sections.join('\n'), images };
+    return { section: sections.join('\n') };
 }

package/dist/discord/thread-context.test.js

@@ -1,9 +1,4 @@
-import { describe, expect, it, vi, beforeEach } from 'vitest';
-import { downloadMessageImages } from './image-download.js';
-vi.mock('./image-download.js', () => ({
-    downloadMessageImages: vi.fn(),
-}));
-const mockDownload = vi.mocked(downloadMessageImages);
+import { describe, expect, it, vi } from 'vitest';
 import { resolveThreadContext } from './thread-context.js';
 // ---------------------------------------------------------------------------
 // Helpers
@@ -49,9 +44,6 @@ function fakeNonThread() {
 // Tests
 // ---------------------------------------------------------------------------
 describe('resolveThreadContext', () => {
-    beforeEach(() => {
-        mockDownload.mockReset();
-    });
     it('returns null for non-thread channels', async () => {
         const result = await resolveThreadContext(fakeNonThread(), '100');
         expect(result).toBeNull();
@@ -410,27 +402,17 @@ describe('resolveThreadContext', () => {
         expect(aliceIdx).toBeLessThan(bobIdx);
         expect(bobIdx).toBeLessThan(charlieIdx);
     });
-    // ---------------------------------------------------------------------------
-    // Thread-history image tests
-    // ---------------------------------------------------------------------------
-    it('returns empty images array when historyImageBudget is not set', async () => {
+    it('does not include images field in result', async () => {
         const ch = fakeThread({
             name: 'no-img-thread',
             messages: [fakeMsg('2', 'hello', 'Alice')],
         });
         const result = await resolveThreadContext(ch, '100');
         expect(result).not.toBeNull();
-        expect(result.images).toEqual([]);
-        expect(mockDownload).not.toHaveBeenCalled();
+        expect(result).not.toHaveProperty('images');
     });
-    it('supports AttachmentLike map in ThreadMessage attachments for hasMedia', async () => {
-        const att = {
-            url: 'https://cdn.discordapp.com/img.png',
-            name: 'img.png',
-            contentType: 'image/png',
-            size: 1024,
-        };
-        const attachments = new Map([['1', att]]);
+    it('supports Map-based attachments for hasMedia detection', async () => {
+        const attachments = new Map([['1', { size: 1024 }]]);
         const ch = fakeThread({
             name: 'att-test',
             messages: [fakeMsg('2', '', 'Alice', false, { attachments })],
@@ -439,146 +421,4 @@ describe('resolveThreadContext', () => {
         expect(result).not.toBeNull();
         expect(result.section).toContain('[Alice]: [attachment/embed]');
     });
-    it('extracts and downloads images from thread history when historyImageBudget > 0', async () => {
-        const att = {
-            url: 'https://cdn.discordapp.com/img.png',
-            name: 'img.png',
-            contentType: 'image/png',
-            size: 1024,
-        };
-        const attachments = new Map([['1', att]]);
-        const fakeImage = { base64: 'abc', mediaType: 'image/png' };
-        mockDownload.mockResolvedValueOnce({ images: [fakeImage], errors: [] });
-        const ch = fakeThread({
-            name: 'img-thread',
-            messages: [fakeMsg('2', 'check this', 'Alice', false, { attachments })],
-        });
-        const result = await resolveThreadContext(ch, '100', { historyImageBudget: 5 });
-        expect(result).not.toBeNull();
-        expect(result.images).toEqual([fakeImage]);
-        expect(mockDownload).toHaveBeenCalledOnce();
-        expect(mockDownload).toHaveBeenCalledWith([att], 5);
-    });
-    it('passes all attachment types to downloadMessageImages for filtering', async () => {
-        const textAtt = {
-            url: 'https://cdn.discordapp.com/file.txt',
-            name: 'file.txt',
-            contentType: 'text/plain',
-            size: 100,
-        };
-        const imgAtt = {
-            url: 'https://cdn.discordapp.com/img.png',
-            name: 'img.png',
-            contentType: 'image/png',
-            size: 1024,
-        };
-        const attachments = new Map([['1', textAtt], ['2', imgAtt]]);
-        const fakeImage = { base64: 'abc', mediaType: 'image/png' };
-        mockDownload.mockResolvedValueOnce({ images: [fakeImage], errors: [] });
-        const ch = fakeThread({
-            name: 'mixed-att-thread',
-            messages: [fakeMsg('2', 'mixed', 'Alice', false, { attachments })],
-        });
-        const result = await resolveThreadContext(ch, '100', { historyImageBudget: 5 });
-        expect(result).not.toBeNull();
-        expect(result.images).toEqual([fakeImage]);
-        // Both attachments passed — downloadMessageImages handles filtering
-        expect(mockDownload).toHaveBeenCalledWith([textAtt, imgAtt], 5);
-    });
-    it('selects thread-history images newest-first', async () => {
-        const oldAtt = {
-            url: 'https://cdn.discordapp.com/old.png',
-            name: 'old.png',
-            contentType: 'image/png',
-            size: 1024,
-        };
-        const newAtt = {
-            url: 'https://cdn.discordapp.com/new.png',
-            name: 'new.png',
-            contentType: 'image/png',
-            size: 1024,
-        };
-        mockDownload.mockResolvedValueOnce({
-            images: [{ base64: 'new', mediaType: 'image/png' }],
-            errors: [],
-        });
-        const ch = fakeThread({
-            name: 'order-thread',
-            messages: [
-                fakeMsg('2', 'old msg', 'Alice', false, {
-                    attachments: new Map([['1', oldAtt]]),
-                }),
-                fakeMsg('3', 'new msg', 'Bob', false, {
-                    attachments: new Map([['2', newAtt]]),
-                }),
-            ],
-        });
-        const result = await resolveThreadContext(ch, '100', { historyImageBudget: 1 });
-        expect(result).not.toBeNull();
-        // downloadMessageImages receives new attachment first (newest-first)
-        expect(mockDownload).toHaveBeenCalledWith([newAtt, oldAtt], 1);
-    });
-    it('handles partial image download failures gracefully', async () => {
-        const att1 = {
-            url: 'https://cdn.discordapp.com/good.png',
-            name: 'good.png',
-            contentType: 'image/png',
-            size: 1024,
-        };
-        const att2 = {
-            url: 'https://cdn.discordapp.com/bad.png',
-            name: 'bad.png',
-            contentType: 'image/png',
-            size: 1024,
-        };
-        const attachments = new Map([['1', att1], ['2', att2]]);
-        const fakeImage = { base64: 'abc', mediaType: 'image/png' };
-        mockDownload.mockResolvedValueOnce({
-            images: [fakeImage],
-            errors: ['bad.png: download failed'],
-        });
-        const log = { warn: vi.fn(), info: vi.fn(), error: vi.fn(), debug: vi.fn() };
-        const ch = fakeThread({
-            name: 'partial-fail-thread',
-            messages: [fakeMsg('2', 'images here', 'Alice', false, { attachments })],
-        });
-        const result = await resolveThreadContext(ch, '100', { historyImageBudget: 5, log });
-        expect(result).not.toBeNull();
-        expect(result.images).toEqual([fakeImage]);
-        expect(result.section).toContain('[Alice]: images here');
-        expect(log.warn).toHaveBeenCalledWith({ errors: ['bad.png: download failed'] }, 'thread-context: image download errors');
-    });
-    it('handles complete image download failure gracefully', async () => {
-        const att = {
-            url: 'https://cdn.discordapp.com/img.png',
-            name: 'img.png',
-            contentType: 'image/png',
-            size: 1024,
-        };
-        const attachments = new Map([['1', att]]);
-        mockDownload.mockRejectedValueOnce(new Error('network error'));
-        const log = { warn: vi.fn(), info: vi.fn(), error: vi.fn(), debug: vi.fn() };
-        const ch = fakeThread({
-            name: 'crash-thread',
-            messages: [fakeMsg('2', 'oops', 'Alice', false, { attachments })],
-        });
-        const result = await resolveThreadContext(ch, '100', { historyImageBudget: 5, log });
-        expect(result).not.toBeNull();
-        expect(result.images).toEqual([]);
-        expect(result.section).toContain('[Alice]: oops');
-        expect(log.warn).toHaveBeenCalled();
-    });
-    it('skips image download when messages have no attachments', async () => {
-        const ch = fakeThread({
-            name: 'text-only-thread',
-            messages: [
-                fakeMsg('2', 'just text', 'Alice'),
-                fakeMsg('3', 'more text', 'Bob'),
-            ],
-        });
-        const result = await resolveThreadContext(ch, '100', { historyImageBudget: 5 });
-        expect(result).not.toBeNull();
-        expect(result.images).toEqual([]);
-        expect(mockDownload).not.toHaveBeenCalled();
-    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discoclaw",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "Personal AI orchestrator that turns Discord into a persistent workspace",
   "license": "MIT",
   "repository": {

package/templates/instructions/SYSTEM_DEFAULTS.md

@@ -19,6 +19,10 @@ Before claiming insufficient info: check workspace files → durable memory →
 
 Use tools immediately — Read/Bash/Grep — don't narrate plans. CWD is the workspace dir; code lives in `~/code/discoclaw`. Don't defer what you can do now. Task status updates are coordination, not investigation.
 
+## Check Before Creating
+
+Before implementing requested functionality, search the codebase to confirm it doesn't already exist. Re-read the actual file content rather than relying on what you recall from earlier in the session — your memory of what you read vs. what you generated can drift.
+
 ## Runtime Registry
 
 | Key | Type | Backend |