@tuturuuu/ai 0.12.0 → 0.14.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tuturuuu/ai",
   "license": "MIT",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "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.78",
-    "@ai-sdk/anthropic": "^4.0.50",
-    "@ai-sdk/azure": "^4.0.65",
-    "@ai-sdk/cerebras": "^3.0.45",
-    "@ai-sdk/cohere": "^4.0.38",
-    "@ai-sdk/deepgram": "^3.1.8",
-    "@ai-sdk/deepinfra": "^3.0.45",
-    "@ai-sdk/deepseek": "^3.0.40",
-    "@ai-sdk/elevenlabs": "^3.0.38",
-    "@ai-sdk/fal": "^3.0.38",
-    "@ai-sdk/fireworks": "^3.0.48",
-    "@ai-sdk/gateway": "^4.0.76",
-    "@ai-sdk/gladia": "^3.0.37",
-    "@ai-sdk/google": "^4.0.65",
-    "@ai-sdk/google-vertex": "^5.0.77",
-    "@ai-sdk/groq": "^4.0.38",
-    "@ai-sdk/hume": "^3.0.37",
+    "@ai-sdk/amazon-bedrock": "^5.0.82",
+    "@ai-sdk/anthropic": "^4.0.53",
+    "@ai-sdk/azure": "^4.0.70",
+    "@ai-sdk/cerebras": "^3.0.48",
+    "@ai-sdk/cohere": "^4.0.41",
+    "@ai-sdk/deepgram": "^3.1.11",
+    "@ai-sdk/deepinfra": "^3.0.48",
+    "@ai-sdk/deepseek": "^3.0.44",
+    "@ai-sdk/elevenlabs": "^3.0.41",
+    "@ai-sdk/fal": "^3.0.41",
+    "@ai-sdk/fireworks": "^3.0.51",
+    "@ai-sdk/gateway": "^4.0.80",
+    "@ai-sdk/gladia": "^3.0.40",
+    "@ai-sdk/google": "^4.0.69",
+    "@ai-sdk/google-vertex": "^5.0.81",
+    "@ai-sdk/groq": "^4.0.41",
+    "@ai-sdk/hume": "^3.0.40",
     "@ai-sdk/lmnt": "^3.0.36",
-    "@ai-sdk/luma": "^3.0.38",
-    "@ai-sdk/mistral": "^4.0.40",
-    "@ai-sdk/openai": "^4.0.62",
-    "@ai-sdk/openai-compatible": "^3.0.45",
-    "@ai-sdk/perplexity": "^4.0.40",
-    "@ai-sdk/react": "^4.0.97",
-    "@ai-sdk/replicate": "^3.0.38",
-    "@ai-sdk/revai": "^3.0.37",
-    "@ai-sdk/togetherai": "^3.0.46",
-    "@ai-sdk/xai": "^4.0.55",
+    "@ai-sdk/luma": "^3.0.41",
+    "@ai-sdk/mistral": "^4.0.43",
+    "@ai-sdk/openai": "^4.0.66",
+    "@ai-sdk/openai-compatible": "^3.0.48",
+    "@ai-sdk/perplexity": "^4.0.43",
+    "@ai-sdk/react": "^4.0.110",
+    "@ai-sdk/replicate": "^3.0.41",
+    "@ai-sdk/revai": "^3.0.40",
+    "@ai-sdk/togetherai": "^3.0.49",
+    "@ai-sdk/xai": "^4.0.58",
     "@beeper/chat-adapter-matrix": "^0.2.0",
     "@bitbasti/chat-adapter-webex": "^0.1.0",
     "@chat-adapter/discord": "^4.40.0",
@@ -75,25 +75,25 @@
     "@streamdown/code": "^1.1.1",
     "@streamdown/math": "^1.0.2",
     "@streamdown/mermaid": "^1.0.2",
-    "@tuturuuu/google": "0.1.0",
-    "@tuturuuu/internal-api": "0.38.0",
-    "@tuturuuu/supabase": "0.5.1",
-    "@tuturuuu/utils": "0.28.0",
-    "@vercel/sandbox": "^3.2.1",
+    "@tuturuuu/google": "0.1.1",
+    "@tuturuuu/internal-api": "0.39.0",
+    "@tuturuuu/supabase": "0.5.2",
+    "@tuturuuu/utils": "0.29.0",
+    "@vercel/sandbox": "^3.3.0",
     "@zernio/chat-sdk-adapter": "^0.5.1",
-    "ai": "^7.0.94",
+    "ai": "^7.0.107",
     "bash-tool": "^1.3.19",
     "chat": "^4.40.0",
     "chat-adapter-baileys": "^2.1.0",
     "chat-adapter-blooio": "^0.1.0",
     "chat-adapter-imessage": "^1.1.0",
-    "chat-adapter-mattermost": "^1.1.3",
+    "chat-adapter-mattermost": "^2.0.0",
     "chat-adapter-sendblue": "^0.2.0",
     "chat-adapter-zalo": "^0.1.0",
     "chat-state-cloudflare-do": "^0.2.0",
     "chat-state-mysql": "^0.1.0",
     "dayjs": "^1.11.23",
-    "next": "^16.3.4",
+    "next": "^16.3.5",
     "qrcode": "^1.5.4",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",
@@ -101,15 +101,15 @@
     "streamdown": "^2.6.0",
     "unified": "^11.0.5",
     "uuid": "^14.0.2",
-    "zca-js": "^2.1.2",
-    "zod": "^4.5.4"
+    "zca-js": "^2.2.0",
+    "zod": "^4.6.2"
   },
   "devDependencies": {
-    "@tuturuuu/types": "0.30.0",
+    "@tuturuuu/types": "0.31.0",
     "@tuturuuu/typescript-config": "0.1.2",
-    "@types/node": "^26.5.0",
+    "@types/node": "^26.5.1",
     "@types/qrcode": "^1.5.6",
-    "@types/react": "^19.2.18",
+    "@types/react": "~19.2.18",
     "typescript": "7.0.2"
   },
   "exports": {

package/src/chat/google/assistant-message-parts.ts

@@ -0,0 +1,105 @@
+import { randomUUID } from 'node:crypto';
+
+type Part = Record<string, unknown>;
+type Step = {
+  content?: readonly unknown[];
+  text?: string;
+  reasoningText?: string;
+  toolCalls?: readonly Part[];
+  toolResults?: readonly Part[];
+};
+
+/** Keep provider content order; tool results update their original call slot. */
+export function collectAssistantMessageParts(response: {
+  steps?: readonly Step[];
+  text?: string;
+  reasoningText?: string;
+  sources?: readonly { sourceId?: string; url?: string; title?: string }[];
+}): Part[] {
+  const parts: Part[] = [];
+  const calls = new Map<string, Part>();
+  const append = (value: unknown): void => {
+    if (!value || typeof value !== 'object') return;
+    const part = value as Part;
+    if (part.type === 'text' || part.type === 'reasoning') {
+      if (typeof part.text === 'string' && part.text.length)
+        parts.push({ ...part });
+    } else if (
+      part.type === 'tool-call' ||
+      part.type === 'tool-result' ||
+      part.type === 'tool-error'
+    ) {
+      const id =
+        typeof part.toolCallId === 'string' ? part.toolCallId : randomUUID();
+      let call = calls.get(id);
+      if (!call) {
+        call = {
+          type: 'dynamic-tool',
+          toolName: part.toolName ?? 'tool',
+          toolCallId: id,
+          state: 'input-available',
+        };
+        calls.set(id, call);
+        parts.push(call);
+      }
+      if (part.type === 'tool-call') {
+        call.input = part.input ?? part.args ?? part.arguments ?? {};
+      } else if (part.type === 'tool-error') {
+        call.state = 'output-error';
+        call.errorText =
+          typeof part.error === 'string' ? part.error : 'Tool execution failed';
+      } else {
+        call.state = 'output-available';
+        call.output = part.output ?? part.result ?? null;
+      }
+    } else if (part.type === 'source' && part.sourceType === 'url') {
+      parts.push({ ...part, type: 'source-url' });
+    } else if (part.type === 'file') {
+      const file = part.file as
+        | { mediaType?: string; base64?: string }
+        | undefined;
+      if (file?.mediaType && file.base64)
+        parts.push({
+          type: 'file',
+          mediaType: file.mediaType,
+          url: `data:${file.mediaType};base64,${file.base64}`,
+        });
+    }
+  };
+  for (const step of response.steps ?? []) {
+    parts.push({ type: 'step-start' });
+    if (step.content?.length) {
+      step.content.forEach(append);
+    } else {
+      // Legacy callers have only per-step aggregates; never flatten across steps.
+      if (step.reasoningText)
+        append({ type: 'reasoning', text: step.reasoningText });
+      if (step.text) append({ type: 'text', text: step.text });
+      for (const part of step.toolCalls ?? [])
+        append({ ...part, type: 'tool-call' });
+    }
+    for (const part of step.toolResults ?? [])
+      append({ ...part, type: 'tool-result' });
+  }
+  if (!parts.some((part) => part.type === 'text') && response.text)
+    append({ type: 'text', text: response.text });
+  if (
+    !parts.some((part) => part.type === 'reasoning') &&
+    response.reasoningText
+  )
+    append({ type: 'reasoning', text: response.reasoningText });
+  for (const source of response.sources ?? []) {
+    if (
+      source.url &&
+      !parts.some(
+        (part) => part.type === 'source-url' && part.url === source.url
+      )
+    )
+      parts.push({
+        ...source,
+        type: 'source-url',
+        sourceId: source.sourceId ?? source.url,
+      });
+  }
+  return parts;
+}

package/src/chat/google/chat-tools.ts

@@ -0,0 +1,7 @@
+import type { ToolSet } from 'ai';
+import { createGoogleSearchToolSet } from '../../tools/google-search-tool';
+
+/** Mira search must retain its executor and grounding validation boundary. */
+export function resolveChatTools(miraTools?: ToolSet | null): ToolSet {
+  return miraTools ?? createGoogleSearchToolSet();
+}

package/src/chat/google/google-search-usage.ts

@@ -0,0 +1,62 @@
+import { isGoogleSearchToolName } from '../../tools/google-search-events';
+
+type SearchStep = {
+  toolCalls?: ReadonlyArray<{ toolName?: string }>;
+  sources?: ReadonlyArray<unknown>;
+  providerMetadata?: {
+    google?: { groundingMetadata?: { webSearchQueries?: unknown } };
+  };
+};
+
+/** Count provider search units, without counting top-level/step metadata twice. */
+export function countGoogleSearchQueries(
+  model: string,
+  response: SearchStep & { steps?: SearchStep[] },
+  allToolCalls: ReadonlyArray<{ toolName?: string }>
+): number {
+  const perQuery = /(?:^|\/)gemini-3(?:[.-]|$)/.test(model);
+  const legacyGemini = /(?:^|\/)gemini-[12](?:[.-]|$)/.test(model);
+  const countStep = (step: SearchStep): number | null => {
+    const raw =
+      step.providerMetadata?.google?.groundingMetadata?.webSearchQueries;
+    const queries = Array.isArray(raw)
+      ? new Set(
+          raw
+            .filter(
+              (query): query is string =>
+                typeof query === 'string' && query.trim().length > 0
+            )
+            .map((query) => query.trim())
+        ).size
+      : null;
+    if (perQuery && queries !== null) return queries;
+    const calls =
+      step.toolCalls?.filter((call) => isGoogleSearchToolName(call.toolName))
+        .length ?? 0;
+    const units = queries || calls || (step.sources?.length ? 1 : 0);
+    if (!units) return null;
+    return legacyGemini ? 1 : calls || units;
+  };
+  // Each SDK step is a separate provider prompt; Gemini 2.x uses one unit per
+  // grounded prompt, while Gemini 3 uses its distinct nonempty search queries.
+  let observedStep = false;
+  const steps =
+    response.steps?.reduce((total, step, index) => {
+      const finalMetadata =
+        response.providerMetadata?.google?.groundingMetadata?.webSearchQueries;
+      const stepMetadata =
+        step.providerMetadata?.google?.groundingMetadata?.webSearchQueries;
+      const effectiveStep =
+        index === response.steps!.length - 1 &&
+        !Array.isArray(stepMetadata) &&
+        Array.isArray(finalMetadata)
+          ? { ...step, providerMetadata: response.providerMetadata }
+          : step;
+      const units = countStep(effectiveStep);
+      observedStep ||= units !== null;
+      return total + (units ?? 0);
+    }, 0) ?? 0;
+  return observedStep
+    ? steps
+    : (countStep({ ...response, toolCalls: allToolCalls }) ?? 0);
+}

package/src/chat/google/mira-step-preparation.ts

@@ -3,17 +3,20 @@ import {
   buildActiveToolsFromSelected,
   countRenderUiAttemptsInSteps,
   extractSelectedToolsFromSteps,
+  getWorkspaceArtifactProgress,
   hasRenderableRenderUiInSteps,
   hasSuccessfulWorkspaceContextResolutionInSteps,
   hasToolCallInSteps,
   removeWorkspaceDiscoveryTools,
   wasToolEverSelectedInSteps,
 } from '../mira-render-ui-policy';
+import { getMiraToolLoopReason } from '../mira-tool-loop-guard';
 
 export type PrepareMiraToolStepInput = {
   steps: unknown[];
   forceGoogleSearch: boolean;
   forceRenderUi: boolean;
+  forceWorkspaceArtifact?: boolean;
   needsParallelChecks: boolean;
   needsWorkspaceContextResolution: boolean;
   needsWorkspaceMembersTool: boolean;
@@ -24,26 +27,41 @@ export function prepareMiraToolStep({
   steps,
   forceGoogleSearch,
   forceRenderUi,
+  forceWorkspaceArtifact,
   needsParallelChecks,
   needsWorkspaceContextResolution,
   needsWorkspaceMembersTool,
   preferMarkdownTables,
 }: PrepareMiraToolStepInput): {
-  toolChoice?: 'required';
+  toolChoice?: 'required' | 'none';
   activeTools: string[];
 } {
+  if (forceWorkspaceArtifact) forceRenderUi = false;
+  const artifact = getWorkspaceArtifactProgress(steps);
+  if (forceWorkspaceArtifact && !artifact.completed && artifact.attempts >= 3)
+    return { toolChoice: 'none', activeTools: [] };
+  if (
+    forceWorkspaceArtifact &&
+    !artifact.completed &&
+    (!needsWorkspaceContextResolution ||
+      hasSuccessfulWorkspaceContextResolutionInSteps(steps))
+  ) {
+    return { toolChoice: 'required', activeTools: ['show_workspace_artifact'] };
+  }
+  if (getMiraToolLoopReason(steps))
+    return { toolChoice: 'none', activeTools: [] };
   if (steps.length === 0) {
     if (forceGoogleSearch) {
       return {
         toolChoice: 'required',
-        activeTools: ['google_search', 'select_tools'],
+        activeTools: ['google_search'],
       };
     }
 
     if (needsParallelChecks) {
       return {
         toolChoice: 'required',
-        activeTools: ['run_parallel_checks', 'select_tools'],
+        activeTools: ['run_parallel_checks', 'search_tools', 'select_tools'],
       };
     }
 
@@ -54,6 +72,7 @@ export function prepareMiraToolStep({
           'list_accessible_workspaces',
           'get_workspace_context',
           'set_workspace_context',
+          'search_tools',
           'select_tools',
         ],
       };
@@ -65,13 +84,14 @@ export function prepareMiraToolStep({
         activeTools: [
           'get_workspace_context',
           'list_workspace_members',
+          'search_tools',
           'select_tools',
         ],
       };
     }
 
     return {
-      activeTools: ['select_tools', 'no_action_needed'],
+      activeTools: ['search_tools', 'select_tools', 'no_action_needed'],
     };
   }
 
@@ -106,11 +126,17 @@ export function prepareMiraToolStep({
     return {
       toolChoice: 'required',
       activeTools: hasListedAccessibleWorkspaces
-        ? ['get_workspace_context', 'set_workspace_context', 'select_tools']
+        ? [
+            'get_workspace_context',
+            'set_workspace_context',
+            'search_tools',
+            'select_tools',
+          ]
         : [
             'list_accessible_workspaces',
             'get_workspace_context',
             'set_workspace_context',
+            'search_tools',
             'select_tools',
           ],
     };
@@ -131,6 +157,7 @@ export function prepareMiraToolStep({
       'get_workspace_context',
       'list_workspace_members',
       ...selected,
+      'search_tools',
       'select_tools',
     ];
 
@@ -141,14 +168,7 @@ export function prepareMiraToolStep({
   }
 
   if (forceGoogleSearch && !hasToolCallInSteps(steps, 'google_search')) {
-    const active = buildActiveToolsFromSelected(toolsForBuild)
-      .filter((toolName) => toolName !== 'no_action_needed')
-      .concat('google_search', 'select_tools');
-
-    return {
-      toolChoice: 'required',
-      activeTools: Array.from(new Set(active)),
-    };
+    return { toolChoice: 'required', activeTools: ['google_search'] };
   }
 
   if (
@@ -157,7 +177,7 @@ export function prepareMiraToolStep({
   ) {
     const active = buildActiveToolsFromSelected(toolsForBuild)
       .filter((toolName) => toolName !== 'no_action_needed')
-      .concat('run_parallel_checks', 'select_tools');
+      .concat('run_parallel_checks', 'search_tools', 'select_tools');
 
     return {
       toolChoice: 'required',
@@ -178,6 +198,7 @@ export function prepareMiraToolStep({
           toolName !== 'select_tools' && toolName !== 'no_action_needed'
       ),
       'render_ui',
+      'search_tools',
       'select_tools',
     ];
 
@@ -199,7 +220,7 @@ export function prepareMiraToolStep({
   ) {
     const active = buildActiveToolsFromSelected(toolsForBuild)
       .filter((toolName) => toolName !== 'no_action_needed')
-      .concat('render_ui', 'select_tools');
+      .concat('render_ui', 'search_tools', 'select_tools');
     return {
       toolChoice: 'required',
       activeTools: Array.from(new Set(active)),
@@ -209,7 +230,7 @@ export function prepareMiraToolStep({
   if (hasRenderableRenderUiInSteps(steps)) {
     const active = buildActiveToolsFromSelected(toolsForBuild)
       .filter((toolName) => toolName !== 'render_ui')
-      .concat('select_tools');
+      .concat('search_tools', 'select_tools');
     return {
       activeTools: Array.from(new Set(active)),
     };

package/src/chat/google/route-credits.ts

@@ -44,15 +44,14 @@ export async function performCreditPreflight({
       )
     : null;
 
-  if (
-    cappedMaxOutput === null &&
-    creditCheck &&
-    creditCheck.remainingCredits <= 0
-  ) {
+  if (cappedMaxOutput === null) {
     return {
       error: Response.json(
-        { error: 'AI credits insufficient', code: 'CREDITS_EXHAUSTED' },
-        { status: 403 }
+        {
+          error: 'AI request budget could not be verified',
+          code: 'CREDIT_CHECK_FAILED',
+        },
+        { status: 503 }
       ),
     };
   }

package/src/chat/google/route-message-preparation.ts

@@ -377,3 +377,36 @@ export async function persistLatestUserMessage({
   console.log('User message saved to database');
   return null;
 }
+
+export function splitSystemMessages(messages: ModelMessage[]) {
+  const systemMessages: string[] = [];
+  const nonSystemMessages: ModelMessage[] = [];
+  for (const message of messages) {
+    if (message.role === 'system') {
+      const systemMessage = getTextContent(message.content);
+      if (systemMessage) systemMessages.push(systemMessage);
+      continue;
+    }
+    nonSystemMessages.push(message);
+  }
+  return {
+    messages: nonSystemMessages,
+    system: systemMessages.join('\n\n').trim(),
+  };
+}
+function getTextContent(content: ModelMessage['content']) {
+  if (typeof content === 'string') return content.trim();
+  if (!Array.isArray(content)) return '';
+  return content
+    .map((part) => (part.type === 'text' ? part.text.trim() : ''))
+    .filter(Boolean)
+    .join('\n')
+    .trim();
+}
+
+export function mergeSystemInstructions(...instructions: Array<string | null>) {
+  return instructions
+    .map((instruction) => instruction?.trim())
+    .filter(Boolean)
+    .join('\n\n');
+}

package/src/chat/google/route-mira-runtime.ts

@@ -1,19 +1,21 @@
 import type { TypedSupabaseClient } from '@tuturuuu/supabase/next/client';
+import type { PermissionId } from '@tuturuuu/types';
 import { normalizeWorkspaceContextId } from '@tuturuuu/utils/constants';
 import { getPermissions } from '@tuturuuu/utils/workspace-helper';
 import type { NextRequest } from 'next/server';
-import { buildMiraContext } from '../../tools/context-builder';
+import { createMiraSdkToolSearch } from '../../tools/mira-sdk-tool-search';
 import {
   createMiraStreamTools,
   type MiraToolContext,
 } from '../../tools/mira-tools';
 import type { MiraWorkspaceContextState } from '../../tools/workspace-context';
 import { resolveWorkspaceContextState } from '../../tools/workspace-context';
+import { buildMiraPrompt } from '../mira-prompt';
 import { buildMiraSystemInstruction } from '../mira-system-instruction';
 import type { ChatRequestTaskBoardContext } from './chat-request-schema';
 
 type PermissionResultLike = {
-  withoutPermission?: (permission: unknown) => boolean;
+  withoutPermission?: (permission: PermissionId) => boolean;
 };
 
 type SupabaseClientLike = TypedSupabaseClient;
@@ -171,6 +173,9 @@ export async function prepareMiraRuntime({
 }: PrepareMiraRuntimeParams): Promise<{
   miraSystemPrompt?: string;
   miraTools?: ReturnType<typeof createMiraStreamTools>;
+  prepareMiraDiscoveryStep?: ReturnType<
+    typeof createMiraSdkToolSearch
+  >['prepareStep'];
 }> {
   if (!isMiraMode || !wsId) {
     return {};
@@ -188,26 +193,29 @@ export async function prepareMiraRuntime({
     });
   } catch (workspaceContextErr) {
     console.error(
-      'Failed to resolve Mira workspace context, falling back to current workspace:',
+      'Failed to verify Mira workspace context:',
       workspaceContextErr
     );
-    resolvedWorkspaceContext = {
-      workspaceContextId: wsId,
-      wsId,
-      name: 'Current workspace',
-      personal: false,
-      memberCount: 0,
+    return {
+      miraSystemPrompt:
+        'You are Mira. Workspace access could not be verified for this request. Do not claim to read or change workspace data. Explain that the user can retry after access is restored; answer unrelated general questions normally.',
     };
   }
 
   let withoutPermission: PermissionResultLike['withoutPermission'];
   const denyPermissionByDefault = () => true;
   withoutPermission = denyPermissionByDefault;
+  const permissionCache = new Map<
+    string,
+    Promise<PermissionResultLike | null>
+  >();
   try {
-    const permissionsResult = (await getPermissions({
+    const pending = getPermissions({
       wsId: resolvedWorkspaceContext.wsId,
       ...(user ? { user } : { request }),
-    })) as PermissionResultLike | null;
+    });
+    permissionCache.set(resolvedWorkspaceContext.wsId, pending);
+    const permissionsResult = await pending;
     if (permissionsResult?.withoutPermission) {
       withoutPermission = permissionsResult.withoutPermission;
     }
@@ -223,36 +231,46 @@ export async function prepareMiraRuntime({
     chatId,
     supabase: miraSupabase,
     timezone,
+    requestHeaders: request.headers,
+    authorizeWorkspaceTools: async (targetWsId, permissions) => {
+      let pending = permissionCache.get(targetWsId);
+      if (!pending) {
+        pending = getPermissions({
+          wsId: targetWsId,
+          ...(user ? { user } : { request }),
+        });
+        permissionCache.set(targetWsId, pending);
+      }
+      try {
+        const resolved = await pending;
+        return (
+          !!resolved?.withoutPermission &&
+          permissions.every(
+            (permission) => !resolved.withoutPermission?.(permission)
+          )
+        );
+      } catch {
+        return false;
+      }
+    },
   };
 
   let miraSystemPrompt: string;
   try {
-    const { contextString, soul, isFirstInteraction } = await buildMiraContext({
+    const taskBoardInstruction = await buildTaskBoardContextInstruction({
+      resolvedWorkspaceContext,
+      supabase: miraSupabase,
+      taskBoardContext,
+    });
+    miraSystemPrompt = await buildMiraPrompt({
       userId,
       wsId: resolvedWorkspaceContext.wsId,
       supabase: miraSupabase,
       timezone,
       withoutPermission,
+      workspaceContext: resolvedWorkspaceContext,
+      taskBoardInstruction,
     });
-    const dynamicInstruction = buildMiraSystemInstruction({
-      soul,
-      isFirstInteraction,
-      withoutPermission,
-    });
-    const workspaceContextInstruction = `## Workspace Context\n\nCurrent task/calendar/finance workspace context: ${resolvedWorkspaceContext.name} (${resolvedWorkspaceContext.personal ? 'personal' : 'shared'} workspace).\nUse this workspace for "my tasks", "my calendar", and "my finance" requests. Only switch to another workspace when the user explicitly names a different workspace.`;
-    const taskBoardContextInstruction = await buildTaskBoardContextInstruction({
-      resolvedWorkspaceContext,
-      supabase: miraSupabase,
-      taskBoardContext,
-    });
-    miraSystemPrompt = [
-      contextString,
-      workspaceContextInstruction,
-      taskBoardContextInstruction,
-      dynamicInstruction,
-    ]
-      .filter(Boolean)
-      .join('\n\n');
   } catch (ctxErr) {
     console.error(
       'Failed to build Mira context (continuing with default instruction):',
@@ -261,8 +279,14 @@ export async function prepareMiraRuntime({
     miraSystemPrompt = buildMiraSystemInstruction({ withoutPermission });
   }
 
+  const discovery = createMiraSdkToolSearch(
+    createMiraStreamTools(ctx, withoutPermission, getSteps),
+    ctx,
+    withoutPermission
+  );
   return {
     miraSystemPrompt,
-    miraTools: createMiraStreamTools(ctx, withoutPermission, getSteps),
+    miraTools: discovery.tools,
+    prepareMiraDiscoveryStep: discovery.prepareStep,
   };
 }