@capekai/core 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capekai/core",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "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.3",
     "@openrouter/ai-sdk-provider": "^2.3.3",
     "@zip.js/zip.js": "^2.7.60",
     "ai": "^6.0.116",

package/src/core/agent.ts

@@ -121,6 +121,7 @@ export async function* streamChat(options: ChatOptions): AsyncGenerator<MessageE
     broadcastFn: options.broadcastFn,
     additionalPaths: effectiveAdditionalPaths,
     agentId: preconfig.id,
+    workspaceRootId: session?.workspaceRootId ?? undefined,
   });
 
   const selfDelegationAvailable = Boolean(aiTools.task)

package/src/core/build-tools.ts

@@ -33,6 +33,7 @@ export interface BuildToolsOptions {
   broadcastFn?: AskBroadcastFn;
   additionalPaths?: string[];
   agentId?: string | null;
+  workspaceRootId?: string;
 }
 
 export async function buildAiSdkTools(
@@ -53,6 +54,7 @@ export async function buildAiSdkTools(
     broadcastFn,
     additionalPaths,
     agentId,
+    workspaceRootId,
   } = options;
 
   // Resolve root session ID by walking up the parent chain
@@ -92,6 +94,7 @@ export async function buildAiSdkTools(
     modelId,
     providerId,
     additionalPaths,
+    workspaceRootId,
   });
   const tools: ToolMap = { ...externalTools };
 

package/src/core/chat-handler.ts

@@ -6,6 +6,7 @@ import {
   isDefaultSessionTitle,
   isSandboxActive,
   emitTerminal,
+  resolveSessionWorkspace,
 } from '../runtime/host-dependencies';
 import { getDefaultPreconfig, getPreconfigOrAgent } from '../context';
 import {
@@ -552,8 +553,15 @@ export async function handleChat<Origin>(
   }
 
   const workspace = session.workspaceId ? await getWorkspace(session.workspaceId) : null;
-  const workspacePath = workspace?.path;
-  const additionalPaths = workspace?.additionalPaths;
+  const workspaceContext = await resolveSessionWorkspace({
+    sessionId,
+    workspaceId: session.workspaceId || undefined,
+    workspaceRootId: session.workspaceRootId ?? undefined,
+    workspacePath: workspace?.path,
+    additionalPaths: workspace?.additionalPaths,
+  });
+  const workspacePath = workspaceContext.workspacePath;
+  const additionalPaths = workspaceContext.additionalPaths;
 
   const preconfig = session.preconfigId
     ? await getPreconfigOrAgent(session.preconfigId)
@@ -810,8 +818,15 @@ export async function handleSessionEditMessage<Origin>(
     });
 
     const workspace = session.workspaceId ? await getWorkspace(session.workspaceId) : null;
-    const workspacePath = workspace?.path;
-    const additionalPaths = workspace?.additionalPaths;
+    const workspaceContext = await resolveSessionWorkspace({
+      sessionId: msg.sessionId,
+      workspaceId: session.workspaceId || undefined,
+      workspaceRootId: session.workspaceRootId ?? undefined,
+      workspacePath: workspace?.path,
+      additionalPaths: workspace?.additionalPaths,
+    });
+    const workspacePath = workspaceContext.workspacePath;
+    const additionalPaths = workspaceContext.additionalPaths;
 
     const preconfig = session.preconfigId
       ? await getPreconfigOrAgent(session.preconfigId)

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

@@ -19,7 +19,11 @@ import {
 } from '../../runtime/domain-tool-source';
 import { isToolAllowedInContext, type ToolExecutionScope } from '../tool-capabilities';
 import type { ToolMap } from './types';
-import type { BroadcastFn } from '../../runtime/host-dependencies';
+import { resolveToolDefinition, type BroadcastFn } from '../../runtime/host-dependencies';
+import {
+  capekToolOutputToAiSdk,
+  createCapekToolOutputEnvelope,
+} from '../../tools/model-output';
 
 export interface ExternalToolsOptions {
   toolNames: string[];
@@ -35,6 +39,7 @@ export interface ExternalToolsOptions {
   modelId?: string;
   providerId?: string;
   additionalPaths?: string[];
+  workspaceRootId?: string;
 }
 
 export async function buildExternalTools(options: ExternalToolsOptions): Promise<ToolMap> {
@@ -52,6 +57,7 @@ export async function buildExternalTools(options: ExternalToolsOptions): Promise
     modelId,
     providerId,
     additionalPaths,
+    workspaceRootId,
   } = options;
 
   const tools: ToolMap = {};
@@ -79,7 +85,14 @@ export async function buildExternalTools(options: ExternalToolsOptions): Promise
     const loadedTool = await getTool(name);
     if (!loadedTool) continue;
 
-    const { definition } = loadedTool;
+    const definition = await resolveToolDefinition({
+      sessionId,
+      workspaceId,
+      workspaceRootId,
+      workspacePath,
+      definition: loadedTool.definition,
+    });
+    if (!definition) continue;
 
     if (!isToolAllowedInContext(definition.capabilities, executionScopes)) {
       continue;
@@ -88,6 +101,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 +135,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/internal/hosts.ts

@@ -22,7 +22,9 @@ export {
   type PermissionRequestStatus,
   type RuntimeHost,
   type SandboxBindings,
+  type SessionWorkspaceContext,
   type TitleHost,
+  type ToolPolicyHost,
   type WorkspaceCapabilityBindings,
 } from '../runtime/host';
 export { createStandaloneHost } from '../runtime/standalone-host';

package/src/runtime/host-dependencies.ts

@@ -1,5 +1,6 @@
 import type { Session } from '@capekai/types';
-import { getRuntimeHost } from './host';
+import type { ToolDefinition } from '@capekai/tool';
+import { getOptionalRuntimeHost, getRuntimeHost } from './host';
 import type { RuntimeAudience, RuntimeDelivery, RuntimeEvent } from './events';
 
 type HostRuntimeAudience = Exclude<RuntimeAudience, { scope: 'origin' }>;
@@ -66,6 +67,38 @@ export const generateSessionTitle = (...args: Parameters<ReturnType<typeof getRu
   getRuntimeHost().titles.generateSessionTitle(...args);
 export const getToolWorkspaceHost = (...args: Parameters<ReturnType<typeof getRuntimeHost>['workspace']['createToolWorkspaceHost']>) =>
   getRuntimeHost().workspace.createToolWorkspaceHost(...args);
+
+export async function resolveSessionWorkspace(options: {
+  sessionId: string;
+  workspaceId?: string;
+  workspaceRootId?: string;
+  workspacePath?: string;
+  additionalPaths?: string[];
+}): Promise<{ workspacePath?: string; additionalPaths?: string[] }> {
+  const resolver = getRuntimeHost().workspace.resolveSessionWorkspace;
+  if (resolver) {
+    return await resolver(options);
+  }
+  if (options.workspaceRootId) {
+    throw new Error('Session workspace root requires a host resolver');
+  }
+  return {
+    workspacePath: options.workspacePath,
+    additionalPaths: options.additionalPaths,
+  };
+}
+
+export async function resolveToolDefinition(options: {
+  sessionId: string;
+  workspaceId?: string;
+  workspaceRootId?: string;
+  workspacePath?: string;
+  definition: ToolDefinition;
+}): Promise<ToolDefinition | null> {
+  const resolver = getOptionalRuntimeHost()?.toolPolicy?.resolveDefinition;
+  return resolver ? await resolver(options) : options.definition;
+}
+
 export const isSandboxActive = (): boolean => getRuntimeHost().sandbox.isSandboxActive();
 
 export type { RuntimeEventSink, RuntimeEventSink as BroadcastFn } from './events';

package/src/runtime/host.ts

@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
 import type { HostLayout } from './host-layout';
-import type { Ask } from '@capekai/tool';
+import type { Ask, ToolDefinition } from '@capekai/tool';
 import type {
   AskRequestMessage, AskTimedOutMessage, AutoApproveSeverity, MessageWithParts, Session,
 } from '@capekai/types';
@@ -82,7 +82,19 @@ export interface TitleHost {
   generateSessionTitle(messages: MessageWithParts[]): Promise<string | null>;
 }
 
+export interface SessionWorkspaceContext {
+  workspacePath?: string;
+  additionalPaths?: string[];
+}
+
 export interface WorkspaceCapabilityBindings {
+  resolveSessionWorkspace?(options: {
+    sessionId: string;
+    workspaceId?: string;
+    workspaceRootId?: string;
+    workspacePath?: string;
+    additionalPaths?: string[];
+  }): SessionWorkspaceContext | Promise<SessionWorkspaceContext>;
   createToolWorkspaceHost(options: {
     workspaceId?: string;
     workspacePath?: string;
@@ -91,6 +103,16 @@ export interface WorkspaceCapabilityBindings {
   }): WorkspaceCapabilityHost;
 }
 
+export interface ToolPolicyHost {
+  resolveDefinition?(options: {
+    sessionId: string;
+    workspaceId?: string;
+    workspaceRootId?: string;
+    workspacePath?: string;
+    definition: ToolDefinition;
+  }): ToolDefinition | null | Promise<ToolDefinition | null>;
+}
+
 export interface SandboxBindings {
   isSandboxActive(): boolean;
 }
@@ -100,6 +122,7 @@ export interface RuntimeHost {
   delivery: DeliveryHost;
   titles: TitleHost;
   workspace: WorkspaceCapabilityBindings;
+  toolPolicy?: ToolPolicyHost;
   sandbox: SandboxBindings;
   /** Host-supplied filesystem layout policy. */
   layout?: HostLayout;
@@ -122,8 +145,12 @@ export function withRuntimeHost<T>(value: RuntimeHost, callback: () => T): T {
   return scopedHost.run(value, callback);
 }
 
+export function getOptionalRuntimeHost(): RuntimeHost | null {
+  return scopedHost.getStore() ?? host;
+}
+
 export function getRuntimeHost(): RuntimeHost {
-  const active = scopedHost.getStore() ?? host;
+  const active = getOptionalRuntimeHost();
   if (!active) throw new Error('Runtime host has not been configured');
   return active;
 }

package/src/subagent/child-session.ts

@@ -5,6 +5,7 @@ import {
   emitTerminal,
   emitToAskTargets,
   emitToController,
+  resolveSessionWorkspace,
 } from '../runtime/host-dependencies';
 import { getLLMSubagentMaxSteps } from '../configuration/runtime';
 import {
@@ -59,9 +60,21 @@ export async function executeChildSession(options: {
     streamChat = streamChatWithRetry,
   } = options;
 
-  // Resolve additionalPaths from workspace
-  const workspace = workspaceId ? await getWorkspace(workspaceId) : null;
-  const additionalPaths = workspace?.additionalPaths;
+  // Re-resolve the child session's host-owned root. Async child execution may
+  // enter after the parent context was assembled, so the persisted child
+  // binding is authoritative.
+  const childSession = await getSession(childSessionId);
+  const effectiveWorkspaceId = workspaceId ?? childSession?.workspaceId ?? undefined;
+  const workspace = effectiveWorkspaceId ? await getWorkspace(effectiveWorkspaceId) : null;
+  const workspaceContext = await resolveSessionWorkspace({
+    sessionId: childSessionId,
+    workspaceId: effectiveWorkspaceId,
+    workspaceRootId: childSession?.workspaceRootId ?? undefined,
+    workspacePath: workspacePath ?? workspace?.path,
+    additionalPaths: workspace?.additionalPaths,
+  });
+  const effectiveWorkspacePath = workspaceContext.workspacePath;
+  const additionalPaths = workspaceContext.additionalPaths;
 
   let messages: MessageWithParts[];
 
@@ -172,8 +185,8 @@ export async function executeChildSession(options: {
       sessionId: childSessionId,
       preconfig,
       messages,
-      workspacePath,
-      workspaceId,
+      workspacePath: effectiveWorkspacePath,
+      workspaceId: effectiveWorkspaceId,
       additionalPaths,
       modelId: modelId ?? undefined,
       providerId: providerId ?? undefined,

package/src/subagent/task-tool.ts

@@ -429,6 +429,7 @@ async function runSubagent(
       childSession = await createSessionFn({
         id: randomUUID(),
         workspaceId: workspaceId || parentSession?.workspaceId || '',
+        workspaceRootId: parentSession?.workspaceRootId ?? null,
         preconfigId: subagent_type,
         title: `${description} (@${subagent_type} subagent)`,
         status: 'active',

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 };
+}