@hybridaione/hybridclaw 0.2.1 → 0.2.2

package/src/token-efficiency.ts

@@ -73,6 +73,22 @@ export function estimateTokenCountFromText(text: string | null | undefined): num
   return Math.max(1, Math.ceil(normalized.length / DEFAULT_CHARS_PER_TOKEN));
 }
 
+function normalizeMessageContentToText(content: ChatMessage['content']): string {
+  if (typeof content === 'string') return content;
+  if (!Array.isArray(content)) return '';
+  const chunks: string[] = [];
+  for (const part of content) {
+    if (part?.type === 'text' && typeof part.text === 'string') {
+      chunks.push(part.text);
+      continue;
+    }
+    if (part?.type === 'image_url' && part.image_url?.url) {
+      chunks.push('[image]');
+    }
+  }
+  return chunks.join('\n');
+}
+
 export function estimateTokenCountFromMessages(
   messages: Array<Pick<ChatMessage, 'role' | 'content'>>,
 ): number {
@@ -82,7 +98,7 @@ export function estimateTokenCountFromMessages(
   for (const message of messages) {
     total += 4; // Approximate per-message framing overhead.
     total += estimateTokenCountFromText(message.role);
-    total += estimateTokenCountFromText(message.content);
+    total += estimateTokenCountFromText(normalizeMessageContentToText(message.content));
   }
   return total;
 }

package/src/types.ts

@@ -1,8 +1,23 @@
 // --- HybridAI API types ---
 
+export interface ChatContentTextPart {
+  type: 'text';
+  text: string;
+}
+
+export interface ChatContentImageUrlPart {
+  type: 'image_url';
+  image_url: {
+    url: string;
+  };
+}
+
+export type ChatContentPart = ChatContentTextPart | ChatContentImageUrlPart;
+export type ChatMessageContent = string | ChatContentPart[] | null;
+
 export interface ChatMessage {
   role: 'system' | 'user' | 'assistant' | 'tool';
-  content: string | null;
+  content: ChatMessageContent;
   tool_calls?: ToolCall[];
   tool_call_id?: string;
 }
@@ -24,6 +39,15 @@ export interface HybridAIBot {
 
 // --- Container IPC types ---
 
+export interface MediaContextItem {
+  path: string | null;
+  url: string;
+  originalUrl: string;
+  mimeType: string | null;
+  sizeBytes: number;
+  filename: string;
+}
+
 export interface ContainerInput {
   sessionId: string;
   messages: ChatMessage[];
@@ -37,6 +61,8 @@ export interface ContainerInput {
   channelId: string;
   scheduledTasks?: { id: number; cronExpr: string; runAt: string | null; everyMs: number | null; prompt: string; enabled: number; lastRun: string | null; createdAt: string }[];
   allowedTools?: string[];
+  blockedTools?: string[];
+  media?: MediaContextItem[];
 }
 
 export interface ToolExecution {

package/tests/discord.basic.test.ts

@@ -0,0 +1,43 @@
+import { expect, test } from 'vitest';
+
+import { buildResponseText } from '../src/channels/discord/delivery.js';
+import { rewriteUserMentions, type MentionLookup } from '../src/channels/discord/mentions.js';
+
+function createLookup(entries: Record<string, string[]>): MentionLookup {
+  const byAlias = new Map<string, Set<string>>();
+  for (const [alias, ids] of Object.entries(entries)) {
+    byAlias.set(alias, new Set(ids));
+  }
+  return { byAlias };
+}
+
+test('rewriteUserMentions rewrites a uniquely-resolved @alias', () => {
+  const lookup = createLookup({ alice: ['123456789012345678'] });
+  const output = rewriteUserMentions('Ping @alice please.', lookup);
+  expect(output).toBe('Ping <@123456789012345678> please.');
+});
+
+test('rewriteUserMentions does not rewrite ambiguous aliases', () => {
+  const lookup = createLookup({ bob: ['111111111111111111', '222222222222222222'] });
+  const output = rewriteUserMentions('hi @bob', lookup);
+  expect(output).toBe('hi @bob');
+});
+
+test('rewriteUserMentions keeps @everyone and @here untouched', () => {
+  const lookup = createLookup({
+    everyone: ['333333333333333333'],
+    here: ['444444444444444444'],
+  });
+  const output = rewriteUserMentions('notify @everyone and @here', lookup);
+  expect(output).toBe('notify @everyone and @here');
+});
+
+test('buildResponseText appends tool footer when tools were used', () => {
+  const output = buildResponseText('Done.', ['vision_analyze', 'message']);
+  expect(output).toBe('Done.\n*Tools: vision_analyze, message*');
+});
+
+test('buildResponseText leaves text unchanged when no tools were used', () => {
+  const output = buildResponseText('Done.');
+  expect(output).toBe('Done.');
+});

package/tests/gateway-service.media-routing.test.ts

@@ -0,0 +1,33 @@
+import { expect, test } from 'vitest';
+
+import { resolveMediaToolPolicy } from '../src/gateway-service.js';
+import type { MediaContextItem } from '../src/types.js';
+
+const SAMPLE_MEDIA: MediaContextItem[] = [
+  {
+    path: '/discord-media-cache/2026-03-04/sample.png',
+    url: 'https://cdn.discordapp.com/attachments/1/2/sample.png',
+    originalUrl: 'https://cdn.discordapp.com/attachments/1/2/sample.png',
+    mimeType: 'image/png',
+    sizeBytes: 1234,
+    filename: 'sample.png',
+  },
+];
+
+test('Discord image question blocks browser_vision and prioritizes vision_analyze', () => {
+  const policy = resolveMediaToolPolicy('Was steht auf dem Bild?', SAMPLE_MEDIA);
+  expect(policy.prioritizeVisionTool).toBe(true);
+  expect(policy.blockedTools).toEqual(['browser_vision']);
+});
+
+test('Explicit browser-tab question does not block browser_vision', () => {
+  const policy = resolveMediaToolPolicy('What is on the current browser tab?', SAMPLE_MEDIA);
+  expect(policy.prioritizeVisionTool).toBe(false);
+  expect(policy.blockedTools).toBeUndefined();
+});
+
+test('No media context leaves tool policy unchanged', () => {
+  const policy = resolveMediaToolPolicy('Was steht auf dem Bild?', []);
+  expect(policy.prioritizeVisionTool).toBe(false);
+  expect(policy.blockedTools).toBeUndefined();
+});

package/tests/token-efficiency.basic.test.ts

@@ -0,0 +1,32 @@
+import { expect, test } from 'vitest';
+
+import { estimateTokenCountFromMessages, estimateTokenCountFromText } from '../src/token-efficiency.js';
+import type { ChatMessage } from '../src/types.js';
+
+test('estimateTokenCountFromText uses simple chars-per-token heuristic', () => {
+  expect(estimateTokenCountFromText('')).toBe(0);
+  expect(estimateTokenCountFromText('abcd')).toBe(1);
+  expect(estimateTokenCountFromText('abcde')).toBe(2);
+});
+
+test('estimateTokenCountFromMessages supports multimodal content arrays', () => {
+  const messages: Array<Pick<ChatMessage, 'role' | 'content'>> = [
+    {
+      role: 'user',
+      content: [
+        { type: 'text', text: 'hello' },
+        { type: 'image_url', image_url: { url: '/discord-media-cache/example.png' } },
+      ],
+    },
+  ];
+  const tokenCount = estimateTokenCountFromMessages(messages);
+  expect(tokenCount).toBe(11);
+});
+
+test('estimateTokenCountFromMessages handles null message content', () => {
+  const messages: Array<Pick<ChatMessage, 'role' | 'content'>> = [
+    { role: 'assistant', content: null },
+  ];
+  const tokenCount = estimateTokenCountFromMessages(messages);
+  expect(tokenCount).toBe(9);
+});

package/vitest.e2e.config.ts

@@ -0,0 +1,15 @@
+import { defineConfig } from 'vitest/config';
+import unitConfig from './vitest.unit.config.js';
+
+const base = unitConfig as unknown as Record<string, unknown>;
+const baseTest = (unitConfig as { test?: { exclude?: string[] } }).test ?? {};
+const exclude = (baseTest.exclude ?? []).filter((entry) => entry !== 'tests/**/*.e2e.test.ts');
+
+export default defineConfig({
+  ...base,
+  test: {
+    ...baseTest,
+    include: ['tests/**/*.e2e.test.ts'],
+    exclude,
+  },
+});

package/vitest.integration.config.ts

@@ -0,0 +1,15 @@
+import { defineConfig } from 'vitest/config';
+import unitConfig from './vitest.unit.config.js';
+
+const base = unitConfig as unknown as Record<string, unknown>;
+const baseTest = (unitConfig as { test?: { exclude?: string[] } }).test ?? {};
+const exclude = (baseTest.exclude ?? []).filter((entry) => entry !== 'tests/**/*.integration.test.ts');
+
+export default defineConfig({
+  ...base,
+  test: {
+    ...baseTest,
+    include: ['tests/**/*.integration.test.ts'],
+    exclude,
+  },
+});

package/vitest.live.config.ts

@@ -0,0 +1,16 @@
+import { defineConfig } from 'vitest/config';
+import unitConfig from './vitest.unit.config.js';
+
+const base = unitConfig as unknown as Record<string, unknown>;
+const baseTest = (unitConfig as { test?: { exclude?: string[] } }).test ?? {};
+const exclude = (baseTest.exclude ?? []).filter((entry) => entry !== 'tests/**/*.live.test.ts');
+
+export default defineConfig({
+  ...base,
+  test: {
+    ...baseTest,
+    include: ['tests/**/*.live.test.ts'],
+    exclude,
+    maxWorkers: 1,
+  },
+});

package/vitest.unit.config.ts

@@ -0,0 +1,15 @@
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    include: ['tests/**/*.test.ts'],
+    exclude: [
+      'tests/**/*.integration.test.ts',
+      'tests/**/*.e2e.test.ts',
+      'tests/**/*.live.test.ts',
+      'node_modules/**',
+      'dist/**',
+      'container/**',
+    ],
+  },
+});