|
|
@@ -8,10 +8,12 @@ import {
|
|
|
} from 'node:fs';
|
|
|
import * as os from 'node:os';
|
|
|
import * as path from 'node:path';
|
|
|
-
|
|
|
+import { resolveImageRouting } from '../config/constants';
|
|
|
import { processImageAttachments } from './image-hook';
|
|
|
+import type { MessageWithParts } from './types';
|
|
|
|
|
|
const TEST_DIR = path.join(os.tmpdir(), `image-hook-test-${process.pid}`);
|
|
|
+const IMG = { type: 'image', url: 'data:image/png;base64,AAAA' };
|
|
|
|
|
|
function makeTestDir(name: string): { workDir: string; saveDir: string } {
|
|
|
const workDir = path.join(TEST_DIR, name);
|
|
|
@@ -21,32 +23,37 @@ function makeTestDir(name: string): { workDir: string; saveDir: string } {
|
|
|
}
|
|
|
|
|
|
function makeOldFile(dir: string, name: string): string {
|
|
|
- const fp = path.join(dir, name);
|
|
|
- writeFileSync(fp, 'data');
|
|
|
+ const filePath = path.join(dir, name);
|
|
|
+ writeFileSync(filePath, 'data');
|
|
|
const past = new Date(Date.now() - 2 * 60 * 60 * 1000);
|
|
|
- utimesSync(fp, past, past);
|
|
|
- return fp;
|
|
|
+ utimesSync(filePath, past, past);
|
|
|
+ return filePath;
|
|
|
}
|
|
|
|
|
|
-describe('image-hook catch logging', () => {
|
|
|
- afterAll(() => {
|
|
|
- rmSync(TEST_DIR, { recursive: true, force: true });
|
|
|
- });
|
|
|
+function makeUserMsg(parts: MessageWithParts['parts']): MessageWithParts {
|
|
|
+ return { info: { role: 'user', sessionID: 's1' }, parts };
|
|
|
+}
|
|
|
+
|
|
|
+function imagePartCount(message: MessageWithParts): number {
|
|
|
+ return message.parts.filter((part) => part.type === 'image').length;
|
|
|
+}
|
|
|
+
|
|
|
+afterAll(() => {
|
|
|
+ rmSync(TEST_DIR, { recursive: true, force: true });
|
|
|
+});
|
|
|
|
|
|
+describe('image-hook catch logging', () => {
|
|
|
it('survives file cleanup failure without throwing', () => {
|
|
|
const { workDir, saveDir } = makeTestDir('cleanup-fail-1');
|
|
|
-
|
|
|
makeOldFile(saveDir, 'old-image.png');
|
|
|
-
|
|
|
- // Make the directory read-only to cause unlinkSync to fail
|
|
|
chmodSync(saveDir, 0o555);
|
|
|
|
|
|
try {
|
|
|
- // Must not throw despite failed cleanup
|
|
|
expect(() => {
|
|
|
processImageAttachments({
|
|
|
messages: [],
|
|
|
workDir,
|
|
|
+ imageRouting: 'auto',
|
|
|
disabledAgents: new Set<string>(),
|
|
|
log: () => {},
|
|
|
});
|
|
|
@@ -61,7 +68,6 @@ describe('image-hook catch logging', () => {
|
|
|
const sessionDir = path.join(saveDir, 'ses-abc');
|
|
|
mkdirSync(sessionDir, { recursive: true });
|
|
|
makeOldFile(sessionDir, 'img.png');
|
|
|
-
|
|
|
chmodSync(sessionDir, 0o555);
|
|
|
|
|
|
try {
|
|
|
@@ -69,6 +75,7 @@ describe('image-hook catch logging', () => {
|
|
|
processImageAttachments({
|
|
|
messages: [],
|
|
|
workDir,
|
|
|
+ imageRouting: 'auto',
|
|
|
disabledAgents: new Set<string>(),
|
|
|
log: () => {},
|
|
|
});
|
|
|
@@ -78,3 +85,121 @@ describe('image-hook catch logging', () => {
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
+
|
|
|
+describe('processImageAttachments image routing', () => {
|
|
|
+ it('direct mode leaves image parts untouched', () => {
|
|
|
+ const message = makeUserMsg([IMG]);
|
|
|
+ processImageAttachments({
|
|
|
+ messages: [message],
|
|
|
+ workDir: path.join(TEST_DIR, 'direct'),
|
|
|
+ imageRouting: 'direct',
|
|
|
+ disabledAgents: new Set<string>(),
|
|
|
+ log: () => {},
|
|
|
+ });
|
|
|
+ expect(imagePartCount(message)).toBe(1);
|
|
|
+ });
|
|
|
+
|
|
|
+ it('auto mode saves image parts and adds an @observer nudge', () => {
|
|
|
+ const message = makeUserMsg([IMG]);
|
|
|
+ processImageAttachments({
|
|
|
+ messages: [message],
|
|
|
+ workDir: path.join(TEST_DIR, 'auto'),
|
|
|
+ imageRouting: 'auto',
|
|
|
+ disabledAgents: new Set<string>(),
|
|
|
+ log: () => {},
|
|
|
+ });
|
|
|
+ expect(imagePartCount(message)).toBe(0);
|
|
|
+ const textParts = message.parts.filter((part) => part.type === 'text');
|
|
|
+ expect(textParts).toHaveLength(1);
|
|
|
+ expect(textParts[0]?.text).toContain('@observer');
|
|
|
+ });
|
|
|
+
|
|
|
+ it('resolves omitted image routing to auto and intercepts for Observer', () => {
|
|
|
+ const message = makeUserMsg([IMG]);
|
|
|
+ processImageAttachments({
|
|
|
+ messages: [message],
|
|
|
+ workDir: path.join(TEST_DIR, 'omitted-routing'),
|
|
|
+ imageRouting: resolveImageRouting(undefined),
|
|
|
+ disabledAgents: new Set<string>(),
|
|
|
+ log: () => {},
|
|
|
+ });
|
|
|
+ expect(imagePartCount(message)).toBe(0);
|
|
|
+ expect(message.parts.some((part) => part.type === 'text')).toBe(true);
|
|
|
+ });
|
|
|
+
|
|
|
+ it('keeps images when auto mode has observer disabled', () => {
|
|
|
+ const message = makeUserMsg([IMG]);
|
|
|
+ processImageAttachments({
|
|
|
+ messages: [message],
|
|
|
+ workDir: path.join(TEST_DIR, 'disabled'),
|
|
|
+ imageRouting: 'auto',
|
|
|
+ disabledAgents: new Set(['observer']),
|
|
|
+ log: () => {},
|
|
|
+ });
|
|
|
+ expect(imagePartCount(message)).toBe(1);
|
|
|
+ });
|
|
|
+
|
|
|
+ it('keeps images when auto mode cannot save them', () => {
|
|
|
+ const message = makeUserMsg([
|
|
|
+ { type: 'image', url: 'https://example.com/image.png' },
|
|
|
+ ]);
|
|
|
+ processImageAttachments({
|
|
|
+ messages: [message],
|
|
|
+ workDir: path.join(TEST_DIR, 'unsaved'),
|
|
|
+ imageRouting: 'auto',
|
|
|
+ disabledAgents: new Set<string>(),
|
|
|
+ log: () => {},
|
|
|
+ });
|
|
|
+ expect(imagePartCount(message)).toBe(1);
|
|
|
+ expect(message.parts).toHaveLength(1);
|
|
|
+ });
|
|
|
+
|
|
|
+ it('strips only attachments saved successfully', () => {
|
|
|
+ const message = makeUserMsg([
|
|
|
+ IMG,
|
|
|
+ { type: 'image', url: 'https://example.com/image.png' },
|
|
|
+ ]);
|
|
|
+ processImageAttachments({
|
|
|
+ messages: [message],
|
|
|
+ workDir: path.join(TEST_DIR, 'mixed'),
|
|
|
+ imageRouting: 'auto',
|
|
|
+ disabledAgents: new Set<string>(),
|
|
|
+ log: () => {},
|
|
|
+ });
|
|
|
+ expect(imagePartCount(message)).toBe(1);
|
|
|
+ expect(message.parts.some((part) => part.type === 'text')).toBe(true);
|
|
|
+ });
|
|
|
+
|
|
|
+ it('continues after an earlier message cannot save its images', () => {
|
|
|
+ const failed = makeUserMsg([
|
|
|
+ { type: 'image', url: 'https://example.com/image.png' },
|
|
|
+ ]);
|
|
|
+ const saved = makeUserMsg([IMG]);
|
|
|
+ processImageAttachments({
|
|
|
+ messages: [failed, saved],
|
|
|
+ workDir: path.join(TEST_DIR, 'multiple'),
|
|
|
+ imageRouting: 'auto',
|
|
|
+ disabledAgents: new Set<string>(),
|
|
|
+ log: () => {},
|
|
|
+ });
|
|
|
+ expect(imagePartCount(failed)).toBe(1);
|
|
|
+ expect(imagePartCount(saved)).toBe(0);
|
|
|
+ });
|
|
|
+
|
|
|
+ it('ignores non-user messages and non-image parts', () => {
|
|
|
+ const userText = makeUserMsg([{ type: 'text', text: 'hello' }]);
|
|
|
+ const assistant = {
|
|
|
+ info: { role: 'assistant', sessionID: 's1' },
|
|
|
+ parts: [{ type: 'text', text: 'hi' }],
|
|
|
+ } as unknown as MessageWithParts;
|
|
|
+ processImageAttachments({
|
|
|
+ messages: [userText, assistant],
|
|
|
+ workDir: path.join(TEST_DIR, 'non-image'),
|
|
|
+ imageRouting: 'auto',
|
|
|
+ disabledAgents: new Set<string>(),
|
|
|
+ log: () => {},
|
|
|
+ });
|
|
|
+ expect(userText.parts).toHaveLength(1);
|
|
|
+ expect(assistant.parts).toHaveLength(1);
|
|
|
+ });
|
|
|
+});
|
Alvin Unreal