@capekai/core 1.0.4 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capekai/core",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Bun-native composable agent runtime and framework for Capek.",
   "license": "MIT",
   "repository": {
@@ -77,8 +77,8 @@
   "dependencies": {
     "@ai-sdk/deepseek": "^2.0.35",
     "@ai-sdk/openai": "^3.0.84",
-    "@capekai/tool": "^1.0.2",
-    "@capekai/types": "^1.0.1",
+    "@capekai/tool": "^1.0.3",
+    "@capekai/types": "^1.0.2",
     "@openrouter/ai-sdk-provider": "^2.3.3",
     "@zip.js/zip.js": "^2.7.60",
     "ai": "^6.0.116",

package/src/core/message-utils.ts

@@ -4,6 +4,7 @@ import { isTextPart, isToolPart, isImagePart, isFilePart, parseToolInput } from
 import { stripVisualization } from '../utils/strip-visualization';
 import { getAttachment } from '../storage/runtime';
 import { isToolOutputArtifactReference, RETRIEVE_TOOL_OUTPUT_NAME } from '../tool-output/policy';
+import { toolModelOutputToAiSdk } from '../tools/model-output';
 
 type AiSdkContent = string | Array<{
   type: 'text' | 'tool-call' | 'tool-result' | 'image' | 'file';
@@ -121,7 +122,9 @@ export async function convertToAiSdkMessages(
               type: 'tool-result' as const,
               toolCallId: toolPart.callId,
               toolName: toolPart.name,
-              output: { type: 'json' as const, value: stripVisualization(toolPart.state.output) },
+              output: toolPart.state.modelOutput
+                ? toolModelOutputToAiSdk(toolPart.state.modelOutput)
+                : { type: 'json' as const, value: stripVisualization(toolPart.state.output) },
             });
           }
         } else if (toolPart.state.status === 'error') {

package/src/core/stream-handlers.ts

@@ -2,6 +2,7 @@ import type { TextPart, ToolPart, ReasoningPart, MessageEvent } from '@capekai/t
 import { createPart, updatePart, getPart, persistStreamingPartSnapshots } from '../storage/runtime';
 import { parseToolInput } from './part-utils';
 import { randomUUID } from 'crypto';
+import { isCapekToolOutputEnvelope } from '../tools/model-output';
 
 const STREAM_PART_PERSIST_INTERVAL_MS = 300;
 
@@ -184,8 +185,11 @@ export function createStreamHandlers(ctx: StreamHandlerContext) {
         const latestPart = await getPart(existingToolPart.id) as ToolPart | null;
         const latestState = latestPart?.state;
 
+        const capekOutput = isCapekToolOutputEnvelope(delta.output) ? delta.output : undefined;
         let resultData: unknown;
-        if (typeof delta.output === 'string') {
+        if (capekOutput) {
+          resultData = capekOutput.value;
+        } else if (typeof delta.output === 'string') {
           try {
             resultData = JSON.parse(delta.output);
           } catch {
@@ -218,6 +222,7 @@ export function createStreamHandlers(ctx: StreamHandlerContext) {
                 status: 'completed' as const,
                 input: existingToolPart.state.input,
                 output: resultData,
+                ...(capekOutput && { modelOutput: capekOutput.modelOutput }),
                 startedAt: Date.now(),
                 completedAt: Date.now(),
                 ...(existingChildSessionId && { childSessionId: existingChildSessionId }),

package/src/core/tool-builders/external-tools.ts

@@ -20,6 +20,10 @@ import {
 import { isToolAllowedInContext, type ToolExecutionScope } from '../tool-capabilities';
 import type { ToolMap } from './types';
 import type { BroadcastFn } from '../../runtime/host-dependencies';
+import {
+  capekToolOutputToAiSdk,
+  createCapekToolOutputEnvelope,
+} from '../../tools/model-output';
 
 export interface ExternalToolsOptions {
   toolNames: string[];
@@ -88,6 +92,7 @@ export async function buildExternalTools(options: ExternalToolsOptions): Promise
     tools[name] = tool({
       description: definition.description,
       inputSchema: jsonSchema(definition.inputSchema),
+      toModelOutput: ({ output }) => capekToolOutputToAiSdk(output),
       execute: async (args: Record<string, unknown>, { toolCallId }: { toolCallId: string }) => {
         const toolAbortController = interruptManager.registerToolExecution(sessionId, toolCallId);
 
@@ -121,11 +126,10 @@ export async function buildExternalTools(options: ExternalToolsOptions): Promise
             return { error: result.error ?? 'Tool execution failed' };
           }
 
-          if (result.visualization && result.result && typeof result.result === 'object') {
-            return { ...result.result as Record<string, unknown>, _visualization: result.visualization };
-          }
-
-          return result.result;
+          const clientResult = result.visualization && result.result && typeof result.result === 'object'
+            ? { ...result.result as Record<string, unknown>, _visualization: result.visualization }
+            : result.result;
+          return createCapekToolOutputEnvelope(clientResult, result.modelOutput);
         } finally {
           interruptManager.unregisterToolExecution(sessionId, toolCallId);
           await rejectPendingAsksByToolCallId(toolCallId);

package/src/tool-output/policy.ts

@@ -34,6 +34,10 @@ import type {
   ToolOutputPolicyContext,
   ToolOutputPolicyOptions,
 } from './contracts';
+import {
+  isCapekToolOutputEnvelope,
+  type CapekToolOutputEnvelope,
+} from '../tools/model-output';
 
 export const TOOL_OUTPUT_THRESHOLD_CHARS = 50_000;
 export const TOOL_OUTPUT_PREVIEW_CHARS = 10_000;
@@ -116,6 +120,13 @@ export function createToolOutputService(
   const outputPolicyWrappedTools = new WeakSet<object>();
 
   async function applyToolOutputPolicy(result: unknown, context: ToolOutputPolicyContext): Promise<unknown> {
+    if (isCapekToolOutputEnvelope(result)) {
+      return {
+        ...result,
+        value: await applyToolOutputPolicy(result.value, context),
+      } satisfies CapekToolOutputEnvelope;
+    }
+
     const visualization = result && typeof result === 'object' && !Array.isArray(result)
       ? (result as Record<string, unknown>)._visualization
       : undefined;

package/src/tools/model-output.ts

@@ -0,0 +1,75 @@
+import type { JSONValue, Tool } from 'ai';
+import type { ToolModelOutputPart } from '@capekai/types';
+
+type AiSdkToolResultOutput = Awaited<ReturnType<NonNullable<Tool['toModelOutput']>>>;
+
+const CAPEK_TOOL_OUTPUT_TYPE = 'capek-tool-output';
+
+export interface CapekToolOutputEnvelope {
+  type: typeof CAPEK_TOOL_OUTPUT_TYPE;
+  value: unknown;
+  modelOutput: ToolModelOutputPart[];
+}
+
+function isToolModelOutputPart(value: unknown): value is ToolModelOutputPart {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return false;
+  const part = value as Record<string, unknown>;
+  if (part.type === 'text') {
+    return typeof part.text === 'string';
+  }
+  if (part.type === 'image') {
+    return typeof part.data === 'string'
+      && part.data.length > 0
+      && !part.data.startsWith('data:')
+      && typeof part.mediaType === 'string'
+      && part.mediaType.startsWith('image/');
+  }
+  return false;
+}
+
+export function normalizeToolModelOutput(value: unknown): ToolModelOutputPart[] | undefined {
+  if (!Array.isArray(value) || value.length === 0 || !value.every(isToolModelOutputPart)) {
+    return undefined;
+  }
+  return value;
+}
+
+export function createCapekToolOutputEnvelope(
+  value: unknown,
+  modelOutput: unknown,
+): unknown {
+  const normalized = normalizeToolModelOutput(modelOutput);
+  return normalized
+    ? { type: CAPEK_TOOL_OUTPUT_TYPE, value, modelOutput: normalized }
+    : value;
+}
+
+export function isCapekToolOutputEnvelope(value: unknown): value is CapekToolOutputEnvelope {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return false;
+  const record = value as Record<string, unknown>;
+  return record.type === CAPEK_TOOL_OUTPUT_TYPE
+    && 'value' in record
+    && normalizeToolModelOutput(record.modelOutput) !== undefined;
+}
+
+export function toolModelOutputToAiSdk(parts: ToolModelOutputPart[]): AiSdkToolResultOutput {
+  return {
+    type: 'content',
+    value: parts.map((part) => part.type === 'text'
+      ? { type: 'text' as const, text: part.text }
+      : {
+          type: 'image-data' as const,
+          data: part.data,
+          mediaType: part.mediaType,
+        }),
+  };
+}
+
+export function capekToolOutputToAiSdk(output: unknown): AiSdkToolResultOutput {
+  if (isCapekToolOutputEnvelope(output)) {
+    return toolModelOutputToAiSdk(output.modelOutput);
+  }
+  return typeof output === 'string'
+    ? { type: 'text', value: output }
+    : { type: 'json', value: (output ?? null) as JSONValue };
+}