@tuturuuu/ai 0.7.0 → 0.8.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tuturuuu/ai",
   "license": "MIT",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/tutur3u/platform",
@@ -22,34 +22,34 @@
     "type-check": "tsc --project tsconfig.typecheck.json"
   },
   "dependencies": {
-    "@ai-sdk/amazon-bedrock": "^5.0.42",
-    "@ai-sdk/anthropic": "^4.0.29",
-    "@ai-sdk/azure": "^4.0.30",
-    "@ai-sdk/cerebras": "^3.0.22",
-    "@ai-sdk/cohere": "^4.0.20",
-    "@ai-sdk/deepgram": "^3.0.20",
-    "@ai-sdk/deepinfra": "^3.0.22",
-    "@ai-sdk/deepseek": "^3.0.21",
-    "@ai-sdk/elevenlabs": "^3.0.21",
-    "@ai-sdk/fal": "^3.0.21",
-    "@ai-sdk/fireworks": "^3.0.24",
-    "@ai-sdk/gateway": "^4.0.40",
-    "@ai-sdk/gladia": "^3.0.20",
-    "@ai-sdk/google": "^4.0.33",
-    "@ai-sdk/google-vertex": "^5.0.40",
-    "@ai-sdk/groq": "^4.0.21",
-    "@ai-sdk/hume": "^3.0.20",
-    "@ai-sdk/lmnt": "^3.0.20",
-    "@ai-sdk/luma": "^3.0.21",
-    "@ai-sdk/mistral": "^4.0.22",
-    "@ai-sdk/openai": "^4.0.29",
-    "@ai-sdk/openai-compatible": "^3.0.22",
-    "@ai-sdk/perplexity": "^4.0.22",
-    "@ai-sdk/react": "^4.0.54",
-    "@ai-sdk/replicate": "^3.0.21",
-    "@ai-sdk/revai": "^3.0.20",
-    "@ai-sdk/togetherai": "^3.0.23",
-    "@ai-sdk/xai": "^4.0.27",
+    "@ai-sdk/amazon-bedrock": "^5.0.48",
+    "@ai-sdk/anthropic": "^4.0.34",
+    "@ai-sdk/azure": "^4.0.35",
+    "@ai-sdk/cerebras": "^3.0.25",
+    "@ai-sdk/cohere": "^4.0.23",
+    "@ai-sdk/deepgram": "^3.0.23",
+    "@ai-sdk/deepinfra": "^3.0.25",
+    "@ai-sdk/deepseek": "^3.0.24",
+    "@ai-sdk/elevenlabs": "^3.0.24",
+    "@ai-sdk/fal": "^3.0.24",
+    "@ai-sdk/fireworks": "^3.0.27",
+    "@ai-sdk/gateway": "^4.0.44",
+    "@ai-sdk/gladia": "^3.0.23",
+    "@ai-sdk/google": "^4.0.37",
+    "@ai-sdk/google-vertex": "^5.0.45",
+    "@ai-sdk/groq": "^4.0.24",
+    "@ai-sdk/hume": "^3.0.23",
+    "@ai-sdk/lmnt": "^3.0.23",
+    "@ai-sdk/luma": "^3.0.24",
+    "@ai-sdk/mistral": "^4.0.25",
+    "@ai-sdk/openai": "^4.0.34",
+    "@ai-sdk/openai-compatible": "^3.0.25",
+    "@ai-sdk/perplexity": "^4.0.25",
+    "@ai-sdk/react": "^4.0.59",
+    "@ai-sdk/replicate": "^3.0.24",
+    "@ai-sdk/revai": "^3.0.23",
+    "@ai-sdk/togetherai": "^3.0.26",
+    "@ai-sdk/xai": "^4.0.31",
     "@beeper/chat-adapter-matrix": "^0.2.0",
     "@bitbasti/chat-adapter-webex": "^0.1.0",
     "@chat-adapter/discord": "^4.36.0",
@@ -68,7 +68,7 @@
     "@chat-adapter/whatsapp": "^4.36.0",
     "@json-render/core": "^0.19.0",
     "@json-render/react": "^0.19.0",
-    "@liveblocks/chat-sdk-adapter": "^3.23.0",
+    "@liveblocks/chat-sdk-adapter": "^3.23.1",
     "@octokit/rest": "^22.0.1",
     "@resend/chat-sdk-adapter": "^0.2.2",
     "@streamdown/cjk": "^1.0.3",
@@ -76,12 +76,12 @@
     "@streamdown/math": "^1.0.2",
     "@streamdown/mermaid": "^1.0.2",
     "@tuturuuu/google": "0.1.0",
-    "@tuturuuu/internal-api": "0.27.0",
+    "@tuturuuu/internal-api": "0.29.0",
     "@tuturuuu/supabase": "0.5.0",
-    "@tuturuuu/utils": "0.22.0",
+    "@tuturuuu/utils": "0.23.0",
     "@vercel/sandbox": "^2.9.2",
     "@zernio/chat-sdk-adapter": "^0.5.0",
-    "ai": "^7.0.51",
+    "ai": "^7.0.56",
     "bash-tool": "^1.3.18",
     "chat": "^4.36.0",
     "chat-adapter-baileys": "^2.1.0",
@@ -103,7 +103,7 @@
     "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@tuturuuu/types": "0.26.0",
+    "@tuturuuu/types": "0.27.0",
     "@tuturuuu/typescript-config": "0.1.1",
     "@types/node": "^26.1.2",
     "@types/qrcode": "^1.5.6",

package/src/chat/google/message-file-processing.ts

@@ -8,12 +8,119 @@ type ChatFile = {
 };
 
 const FILE_DOWNLOAD_CONCURRENCY = 4;
+// Supabase storage `list` defaults to 100 rows, so a chat that accumulated more
+// resources than this silently lost everything past the first page.
+const STORAGE_LIST_PAGE_SIZE = 100;
+const STORAGE_LIST_MAX_PAGES = 20;
+// Every request re-sends the chat's whole resource set, so an unbounded chat
+// would eventually build a request no provider will accept. Attachments are
+// admitted oldest-first until the budget is spent.
+const MAX_INJECTED_ATTACHMENT_BYTES = 32 * 1024 * 1024;
+
+// Storage only records a media type when the uploader knew one. Without this,
+// an image whose content type was lost on the way in reads as
+// `application/octet-stream`, misses the `image/` check, and reaches the model
+// as "this format cannot be passed directly" — invisible, with no error.
+const MEDIA_TYPE_BY_EXTENSION: Record<string, string> = {
+  aac: 'audio/aac',
+  avif: 'image/avif',
+  csv: 'text/csv',
+  flac: 'audio/flac',
+  gif: 'image/gif',
+  heic: 'image/heic',
+  jpeg: 'image/jpeg',
+  jpg: 'image/jpeg',
+  json: 'application/json',
+  m4a: 'audio/mp4',
+  md: 'text/markdown',
+  mov: 'video/quicktime',
+  mp3: 'audio/mpeg',
+  mp4: 'video/mp4',
+  ogg: 'audio/ogg',
+  opus: 'audio/ogg',
+  pdf: 'application/pdf',
+  png: 'image/png',
+  txt: 'text/plain',
+  wav: 'audio/wav',
+  webm: 'video/webm',
+  webp: 'image/webp',
+};
+
+const UNKNOWN_MEDIA_TYPE = 'application/octet-stream';
+
+export function resolveAttachmentMediaType(
+  fileName: string,
+  metadataMediaType?: string | null
+): string {
+  if (metadataMediaType && metadataMediaType !== UNKNOWN_MEDIA_TYPE) {
+    return metadataMediaType;
+  }
+
+  const extension = fileName.split('.').pop()?.toLowerCase();
+  if (extension && MEDIA_TYPE_BY_EXTENSION[extension]) {
+    return MEDIA_TYPE_BY_EXTENSION[extension];
+  }
+
+  return metadataMediaType || UNKNOWN_MEDIA_TYPE;
+}
 
 function maskIdentifier(value: string): string {
   if (value.length <= 8) return value;
   return `${value.slice(0, 4)}...${value.slice(-4)}`;
 }
 
+type StorageListClient = {
+  storage: {
+    from: (bucket: string) => {
+      list: (
+        path: string,
+        options: Record<string, unknown>
+      ) => Promise<{
+        data:
+          | { name: string; metadata?: Record<string, unknown> | null }[]
+          | null;
+        error: unknown;
+      }>;
+    };
+  };
+};
+
+export async function listAllChatResourceFiles(
+  sbAdmin: StorageListClient,
+  storagePath: string
+) {
+  const files: { name: string; metadata?: Record<string, unknown> | null }[] =
+    [];
+
+  for (let page = 0; page < STORAGE_LIST_MAX_PAGES; page += 1) {
+    const { data, error } = await sbAdmin.storage
+      .from('workspaces')
+      .list(storagePath, {
+        limit: STORAGE_LIST_PAGE_SIZE,
+        offset: page * STORAGE_LIST_PAGE_SIZE,
+        sortBy: { column: 'created_at', order: 'asc' },
+      });
+
+    if (error) {
+      console.error('Error listing files:', error);
+      // Keep whatever paged in rather than dropping the whole set.
+      return { files, truncated: false };
+    }
+
+    if (!data || data.length === 0) break;
+
+    files.push(...data);
+    if (data.length < STORAGE_LIST_PAGE_SIZE) {
+      return { files, truncated: false };
+    }
+  }
+
+  return {
+    files,
+    truncated: files.length >= STORAGE_LIST_PAGE_SIZE * STORAGE_LIST_MAX_PAGES,
+  };
+}
+
 async function getAllChatFiles(
   wsId: string,
   chatId: string,
@@ -23,24 +130,19 @@ async function getAllChatFiles(
     const sbAdmin = await createAdminClient();
 
     const storagePath = `${wsId}/chats/ai/resources/${chatId}`;
-    const { data: files, error: listError } = await sbAdmin.storage
-      .from('workspaces')
-      .list(storagePath, {
-        sortBy: { column: 'created_at', order: 'asc' },
-      });
-
-    if (listError) {
-      console.error('Error listing files:', listError);
-      return [];
-    }
+    const { files, truncated } = await listAllChatResourceFiles(
+      sbAdmin,
+      storagePath
+    );
 
     console.info('[Google Chat Files] listed chat files', {
       wsId: maskIdentifier(wsId),
       chatId: maskIdentifier(chatId),
-      fileCount: files?.length ?? 0,
+      fileCount: files.length,
+      truncated,
     });
 
-    if (!files || files.length === 0) {
+    if (files.length === 0) {
       return [];
     }
 
@@ -57,10 +159,11 @@ async function getAllChatFiles(
 
           const file = files[currentIndex]!;
           const fileName = file.name || 'unknown';
-          const mediaType =
-            file.metadata?.mediaType ||
-            file.metadata?.mimetype ||
-            'application/octet-stream';
+          const mediaType = resolveAttachmentMediaType(
+            fileName,
+            (file.metadata?.mediaType as string | undefined) ||
+              (file.metadata?.mimetype as string | undefined)
+          );
 
           const { data: fileData, error: downloadError } = await sbAdmin.storage
             .from('workspaces')
@@ -116,6 +219,14 @@ function addFilesToContent(
     'text/csv',
     'application/json',
     'text/markdown',
+    // Gemini accepts audio natively; without these an attached recording
+    // reached the model only as a "cannot be passed directly" note.
+    'audio/aac',
+    'audio/flac',
+    'audio/mp4',
+    'audio/mpeg',
+    'audio/ogg',
+    'audio/wav',
   ]);
 
   if (typeof existingContent === 'string') {
@@ -132,8 +243,21 @@ function addFilesToContent(
     }
   }
 
+  let injectedBytes = 0;
+  let skippedForBudget = 0;
+
   for (const file of chatFiles) {
     const { content, mediaType, fileName } = file;
+    const byteLength =
+      content instanceof ArrayBuffer ? content.byteLength : content.length;
+
+    // Oldest-first: an early attachment the conversation is actually about
+    // should not be evicted by a later one.
+    if (injectedBytes + byteLength > MAX_INJECTED_ATTACHMENT_BYTES) {
+      skippedForBudget += 1;
+      continue;
+    }
+    injectedBytes += byteLength;
 
     if (mediaType.startsWith('image/')) {
       const imagePart: ImagePart = {
@@ -172,6 +296,14 @@ function addFilesToContent(
     }
   }
 
+  if (skippedForBudget > 0) {
+    // Say so rather than answering as though nothing was attached.
+    contentParts.push({
+      type: 'text',
+      text: `${skippedForBudget} older attachment(s) were omitted from this request because the conversation exceeds the attachment size budget. Ask the user to re-attach anything you need.`,
+    });
+  }
+
   return contentParts;
 }
 

package/src/studio/metering.ts

@@ -188,7 +188,10 @@ export async function beginAiStudioRun(
 }
 
 export type BeginExternalAiStudioRunInput = {
-  actorId: string;
+  /** Null for machine credentials, which run without a user. */
+  actorId: string | null;
+  /** Set when a bound API key authenticated the request, for rotation traceability. */
+  apiKeyId?: string | null;
   externalAppId: string;
   feature: string;
   idempotencyKey?: string | null;
@@ -205,13 +208,18 @@ export async function beginExternalAiStudioRun(
   const { data, error } = await sbAdmin
     .schema('private')
     .rpc('begin_external_ai_studio_run', {
+      p_api_key_id: input.apiKeyId ?? undefined,
       p_external_app_id: input.externalAppId,
       p_feature: input.feature,
       p_idempotency_key: input.idempotencyKey ?? undefined,
       p_metadata: input.metadata,
       p_model_id: input.modelId,
       p_request_id: input.requestId,
-      p_user_id: input.actorId,
+      // Explicit null, never undefined: p_user_id has no default, so omitting it
+      // makes PostgREST fail to resolve the function. A machine credential
+      // genuinely has no user, and the column accepts NULL — the generated RPC
+      // types just cannot express a nullable argument.
+      p_user_id: input.actorId as unknown as string,
       p_ws_id: input.workspaceId,
     });
 
@@ -277,8 +285,20 @@ export async function settleAiStudioRun(
   }
 }
 
+export type SettleExternalAiStudioRunInput = Omit<
+  SettleAiStudioRunInput,
+  'actualCredits'
+> & {
+  /**
+   * What this run would have billed had it been metered. Recorded, not charged,
+   * so an app's consumption of its unmetered allocation is a reportable number
+   * rather than an invisible zero.
+   */
+  unmeteredCredits?: number;
+};
+
 export async function settleExternalAiStudioRun(
-  input: Omit<SettleAiStudioRunInput, 'actualCredits'>
+  input: SettleExternalAiStudioRunInput
 ): Promise<void> {
   const sbAdmin = await createAdminClient({ noCookie: true });
   const { data, error } = await sbAdmin
@@ -297,6 +317,7 @@ export async function settleExternalAiStudioRun(
       p_reasoning_tokens: input.reasoningTokens ?? 0,
       p_run_id: input.runId,
       p_status: input.status,
+      p_unmetered_credits: Math.max(0, input.unmeteredCredits ?? 0),
     });
 
   if (error || !data?.[0]?.success) {