zeitlich 0.2.25 → 0.2.27

package/dist/workflow.d.cts

@@ -1,13 +1,13 @@
-import { o as SessionConfig, Z as ZeitlichSession, n as SandboxShutdown, F as ThreadInit, m as SandboxInit, g as JsonSerializable, f as AgentStateManager, v as SubagentDefinition, y as SubagentHooks, z as SubagentSandboxConfig, u as SubagentConfig, B as SubagentSandboxShutdown, C as SubagentSessionInput, w as SubagentFnResult, c as SkillMetadata, d as Skill } from './types-7PeMi1bD.cjs';
-export { A as AgentResponse, e as AgentState, H as Hooks, J as JsonPrimitive, h as JsonValue, M as ModelInvoker, a as ModelInvokerConfig, i as PostHumanMessageAppendHook, j as PostHumanMessageAppendHookContext, k as PreHumanMessageAppendHook, l as PreHumanMessageAppendHookContext, P as PrefixedThreadOps, R as RunAgentActivity, S as ScopedPrefix, p as SessionEndHook, q as SessionEndHookContext, r as SessionResult, s as SessionStartHook, t as SessionStartHookContext, b as SkillProvider, x as SubagentHandlerResponse, D as SubagentWorkflow, E as SubagentWorkflowInput, T as ThreadOps } from './types-7PeMi1bD.cjs';
+import { k as SessionConfig, Z as ZeitlichSession, j as SandboxShutdown, B as ThreadInit, i as SandboxInit, r as SubagentDefinition, u as SubagentHooks, v as SubagentSandboxConfig, q as SubagentConfig, w as SubagentSandboxShutdown, x as SubagentSessionInput, s as SubagentFnResult, c as SkillMetadata, d as Skill } from './types-DSOefLpY.cjs';
+export { A as AgentResponse, H as Hooks, a as ModelInvoker, M as ModelInvokerConfig, e as PostHumanMessageAppendHook, f as PostHumanMessageAppendHookContext, g as PreHumanMessageAppendHook, h as PreHumanMessageAppendHookContext, P as PrefixedThreadOps, R as RunAgentActivity, S as ScopedPrefix, l as SessionEndHook, m as SessionEndHookContext, n as SessionResult, o as SessionStartHook, p as SessionStartHookContext, b as SkillProvider, t as SubagentHandlerResponse, y as SubagentWorkflow, z as SubagentWorkflowInput, T as ThreadOps } from './types-DSOefLpY.cjs';
 import { g as SandboxOps } from './types-ChAMwU3q.cjs';
 export { h as ExecOptions, E as ExecResult, P as PrefixedSandboxOps, S as Sandbox, c as SandboxCapabilities, d as SandboxCreateOptions, e as SandboxCreateResult, D as SandboxDirentEntry, F as SandboxFileStat, a as SandboxFileSystem, i as SandboxNotFoundError, j as SandboxNotSupportedError, b as SandboxProvider, f as SandboxSnapshot } from './types-ChAMwU3q.cjs';
-import { a as ToolMap, B as BaseAgentState, N as ToolRouterOptions, J as ToolRouter, R as RouterContext, K as ToolWithHandler, p as ParsedToolCallUnion, G as ToolNames, c as ToolHandlerResponse, E as ToolHandler, W as WorkflowTask, A as ActivityToolHandler } from './types-D_igp10o.cjs';
-export { l as AgentConfig, m as AgentFile, h as AgentStatus, n as AppendToolResultFn, C as ContentPart, I as InferToolResults, M as MessageContent, o as ParsedToolCall, q as PostToolUseFailureHook, r as PostToolUseFailureHookContext, d as PostToolUseFailureHookResult, s as PostToolUseHook, t as PostToolUseHookContext, u as PreToolUseHook, v as PreToolUseHookContext, P as PreToolUseHookResult, w as ProcessToolCallsContext, e as RawToolCall, g as RunAgentConfig, x as SerializableToolDefinition, S as SessionExitReason, y as TaskStatus, f as TokenUsage, z as ToolArgs, D as ToolCallResult, k as ToolCallResultUnion, i as ToolDefinition, F as ToolHooks, T as ToolMessageContent, H as ToolResult, j as ToolResultConfig, b as ToolRouterHooks, L as isTerminalStatus } from './types-D_igp10o.cjs';
+import { a as ToolMap, i as JsonSerializable, B as BaseAgentState, j as AgentStateManager, Q as ToolRouterOptions, M as ToolRouter, R as RouterContext, J as JsonValue, N as ToolWithHandler, r as ParsedToolCallUnion, K as ToolNames, T as ToolHandlerResponse, G as ToolHandler, W as WorkflowTask, A as ActivityToolHandler } from './types-mCVxKIZb.cjs';
+export { k as AgentConfig, l as AgentFile, m as AgentState, n as AgentStatus, o as AppendToolResultFn, I as InferToolResults, p as JsonPrimitive, q as ParsedToolCall, s as PostToolUseFailureHook, t as PostToolUseFailureHookContext, c as PostToolUseFailureHookResult, u as PostToolUseHook, v as PostToolUseHookContext, w as PreToolUseHook, x as PreToolUseHookContext, P as PreToolUseHookResult, y as ProcessToolCallsContext, d as RawToolCall, f as RunAgentConfig, z as SerializableToolDefinition, S as SessionExitReason, C as TaskStatus, e as TokenUsage, D as ToolArgs, E as ToolCallResult, h as ToolCallResultUnion, F as ToolDefinition, H as ToolHooks, L as ToolResult, g as ToolResultConfig, b as ToolRouterHooks, O as isTerminalStatus } from './types-mCVxKIZb.cjs';
 import z$1, { z } from 'zod';
-import { a as FileEntryMetadata, e as VirtualFileTree, T as TreeMutation, F as FileEntry } from './types-Bf8KV0Ci.cjs';
-export { b as FileResolver, g as VirtualSandboxState } from './types-Bf8KV0Ci.cjs';
-export { f as filesWithMimeType, h as hasDirectory, a as hasFileWithMimeType } from './queries-BYGBImeC.cjs';
+import { a as FileEntryMetadata, e as VirtualFileTree, T as TreeMutation, F as FileEntry } from './types-DRnz-OZp.cjs';
+export { b as FileResolver, g as VirtualSandboxState } from './types-DRnz-OZp.cjs';
+export { f as filesWithMimeType, h as hasDirectory, a as hasFileWithMimeType } from './queries-DwnE2bu3.cjs';
 import '@temporalio/common';
 import '@temporalio/workflow';
 import '@temporalio/common/lib/interfaces';
@@ -43,10 +43,10 @@ import '@temporalio/common/lib/interfaces';
  * const { finalMessage, exitReason } = await session.runSession({ stateManager });
  * ```
  */
-declare function createSession<T extends ToolMap, M = unknown>(config: SessionConfig<T, M> & {
+declare function createSession<T extends ToolMap, M = unknown, TContent = string>(config: SessionConfig<T, M, TContent> & {
     sandboxOps: SandboxOps;
 }): Promise<ZeitlichSession<M, true>>;
-declare function createSession<T extends ToolMap, M = unknown>(config: SessionConfig<T, M>): Promise<ZeitlichSession<M, false>>;
+declare function createSession<T extends ToolMap, M = unknown, TContent = string>(config: SessionConfig<T, M, TContent>): Promise<ZeitlichSession<M, false>>;
 
 /**
  * Session config fields derived from a main workflow input, ready to spread
@@ -187,7 +187,7 @@ declare function createToolRouter<T extends ToolMap>(options: ToolRouterOptions<
  * }
  * ```
  */
-declare function defineTool<TName extends string, TSchema extends z.ZodType, TResult, TContext extends RouterContext = RouterContext>(tool: ToolWithHandler<TName, TSchema, TResult, TContext>): ToolWithHandler<TName, TSchema, TResult, TContext>;
+declare function defineTool<TName extends string, TSchema extends z.ZodType, TResult, TContext extends RouterContext = RouterContext, TToolResponse = JsonValue>(tool: ToolWithHandler<TName, TSchema, TResult, TContext, TToolResponse>): ToolWithHandler<TName, TSchema, TResult, TContext, TToolResponse>;
 /**
  * Utility to check if there were no tool calls besides a specific one
  */
@@ -578,4 +578,4 @@ declare const createAskUserQuestionHandler: () => ActivityToolHandler<AskUserQue
     }[];
 }>;
 
-export { ActivityToolHandler, AgentStateManager, type AskUserQuestionArgs, BaseAgentState, type BashArgs, type FileEditArgs, FileEntry, FileEntryMetadata, type FileReadArgs, type FileWriteArgs, type GlobArgs, type GrepArgs, JsonSerializable, ParsedToolCallUnion, type ReadSkillArgs, RouterContext, SandboxInit, SandboxOps, SandboxShutdown, SessionConfig, Skill, SkillMetadata, type SubagentArgs, SubagentConfig, SubagentDefinition, SubagentFnResult, SubagentHooks, SubagentSandboxConfig, SubagentSandboxShutdown, SubagentSessionInput, type TaskCreateArgs, type TaskGetArgs, type TaskListArgs, type TaskUpdateArgs, ThreadInit, ToolHandler, ToolHandlerResponse, ToolMap, ToolNames, ToolRouter, ToolWithHandler, TreeMutation, VirtualFileTree, type WorkflowConfig, type WorkflowInput, type WorkflowSessionInput, WorkflowTask, ZeitlichSession, applyVirtualTreeMutations, askUserQuestionTool, bashTool, createAgentStateManager, createAskUserQuestionHandler, createBashToolDescription, createReadSkillHandler, createReadSkillTool, createSession, createTaskCreateHandler, createTaskGetHandler, createTaskListHandler, createTaskUpdateHandler, createToolRouter, defineSubagent, defineSubagentWorkflow, defineTool, defineWorkflow, editTool, formatVirtualFileTree, getShortId, globTool, grepTool, hasNoOtherToolCalls, parseSkillFile, readFileTool, taskCreateTool, taskGetTool, taskListTool, taskUpdateTool, writeFileTool };
+export { ActivityToolHandler, AgentStateManager, type AskUserQuestionArgs, BaseAgentState, type BashArgs, type FileEditArgs, FileEntry, FileEntryMetadata, type FileReadArgs, type FileWriteArgs, type GlobArgs, type GrepArgs, JsonSerializable, JsonValue, ParsedToolCallUnion, type ReadSkillArgs, RouterContext, SandboxInit, SandboxOps, SandboxShutdown, SessionConfig, Skill, SkillMetadata, type SubagentArgs, SubagentConfig, SubagentDefinition, SubagentFnResult, SubagentHooks, SubagentSandboxConfig, SubagentSandboxShutdown, SubagentSessionInput, type TaskCreateArgs, type TaskGetArgs, type TaskListArgs, type TaskUpdateArgs, ThreadInit, ToolHandler, ToolHandlerResponse, ToolMap, ToolNames, ToolRouter, ToolWithHandler, TreeMutation, VirtualFileTree, type WorkflowConfig, type WorkflowInput, type WorkflowSessionInput, WorkflowTask, ZeitlichSession, applyVirtualTreeMutations, askUserQuestionTool, bashTool, createAgentStateManager, createAskUserQuestionHandler, createBashToolDescription, createReadSkillHandler, createReadSkillTool, createSession, createTaskCreateHandler, createTaskGetHandler, createTaskListHandler, createTaskUpdateHandler, createToolRouter, defineSubagent, defineSubagentWorkflow, defineTool, defineWorkflow, editTool, formatVirtualFileTree, getShortId, globTool, grepTool, hasNoOtherToolCalls, parseSkillFile, readFileTool, taskCreateTool, taskGetTool, taskListTool, taskUpdateTool, writeFileTool };

package/dist/workflow.d.ts

@@ -1,13 +1,13 @@
-import { o as SessionConfig, Z as ZeitlichSession, n as SandboxShutdown, F as ThreadInit, m as SandboxInit, g as JsonSerializable, f as AgentStateManager, v as SubagentDefinition, y as SubagentHooks, z as SubagentSandboxConfig, u as SubagentConfig, B as SubagentSandboxShutdown, C as SubagentSessionInput, w as SubagentFnResult, c as SkillMetadata, d as Skill } from './types-hmferhc2.js';
-export { A as AgentResponse, e as AgentState, H as Hooks, J as JsonPrimitive, h as JsonValue, M as ModelInvoker, a as ModelInvokerConfig, i as PostHumanMessageAppendHook, j as PostHumanMessageAppendHookContext, k as PreHumanMessageAppendHook, l as PreHumanMessageAppendHookContext, P as PrefixedThreadOps, R as RunAgentActivity, S as ScopedPrefix, p as SessionEndHook, q as SessionEndHookContext, r as SessionResult, s as SessionStartHook, t as SessionStartHookContext, b as SkillProvider, x as SubagentHandlerResponse, D as SubagentWorkflow, E as SubagentWorkflowInput, T as ThreadOps } from './types-hmferhc2.js';
+import { k as SessionConfig, Z as ZeitlichSession, j as SandboxShutdown, B as ThreadInit, i as SandboxInit, r as SubagentDefinition, u as SubagentHooks, v as SubagentSandboxConfig, q as SubagentConfig, w as SubagentSandboxShutdown, x as SubagentSessionInput, s as SubagentFnResult, c as SkillMetadata, d as Skill } from './types-CvJyXDYt.js';
+export { A as AgentResponse, H as Hooks, a as ModelInvoker, M as ModelInvokerConfig, e as PostHumanMessageAppendHook, f as PostHumanMessageAppendHookContext, g as PreHumanMessageAppendHook, h as PreHumanMessageAppendHookContext, P as PrefixedThreadOps, R as RunAgentActivity, S as ScopedPrefix, l as SessionEndHook, m as SessionEndHookContext, n as SessionResult, o as SessionStartHook, p as SessionStartHookContext, b as SkillProvider, t as SubagentHandlerResponse, y as SubagentWorkflow, z as SubagentWorkflowInput, T as ThreadOps } from './types-CvJyXDYt.js';
 import { g as SandboxOps } from './types-ChAMwU3q.js';
 export { h as ExecOptions, E as ExecResult, P as PrefixedSandboxOps, S as Sandbox, c as SandboxCapabilities, d as SandboxCreateOptions, e as SandboxCreateResult, D as SandboxDirentEntry, F as SandboxFileStat, a as SandboxFileSystem, i as SandboxNotFoundError, j as SandboxNotSupportedError, b as SandboxProvider, f as SandboxSnapshot } from './types-ChAMwU3q.js';
-import { a as ToolMap, B as BaseAgentState, N as ToolRouterOptions, J as ToolRouter, R as RouterContext, K as ToolWithHandler, p as ParsedToolCallUnion, G as ToolNames, c as ToolHandlerResponse, E as ToolHandler, W as WorkflowTask, A as ActivityToolHandler } from './types-D_igp10o.js';
-export { l as AgentConfig, m as AgentFile, h as AgentStatus, n as AppendToolResultFn, C as ContentPart, I as InferToolResults, M as MessageContent, o as ParsedToolCall, q as PostToolUseFailureHook, r as PostToolUseFailureHookContext, d as PostToolUseFailureHookResult, s as PostToolUseHook, t as PostToolUseHookContext, u as PreToolUseHook, v as PreToolUseHookContext, P as PreToolUseHookResult, w as ProcessToolCallsContext, e as RawToolCall, g as RunAgentConfig, x as SerializableToolDefinition, S as SessionExitReason, y as TaskStatus, f as TokenUsage, z as ToolArgs, D as ToolCallResult, k as ToolCallResultUnion, i as ToolDefinition, F as ToolHooks, T as ToolMessageContent, H as ToolResult, j as ToolResultConfig, b as ToolRouterHooks, L as isTerminalStatus } from './types-D_igp10o.js';
+import { a as ToolMap, i as JsonSerializable, B as BaseAgentState, j as AgentStateManager, Q as ToolRouterOptions, M as ToolRouter, R as RouterContext, J as JsonValue, N as ToolWithHandler, r as ParsedToolCallUnion, K as ToolNames, T as ToolHandlerResponse, G as ToolHandler, W as WorkflowTask, A as ActivityToolHandler } from './types-mCVxKIZb.js';
+export { k as AgentConfig, l as AgentFile, m as AgentState, n as AgentStatus, o as AppendToolResultFn, I as InferToolResults, p as JsonPrimitive, q as ParsedToolCall, s as PostToolUseFailureHook, t as PostToolUseFailureHookContext, c as PostToolUseFailureHookResult, u as PostToolUseHook, v as PostToolUseHookContext, w as PreToolUseHook, x as PreToolUseHookContext, P as PreToolUseHookResult, y as ProcessToolCallsContext, d as RawToolCall, f as RunAgentConfig, z as SerializableToolDefinition, S as SessionExitReason, C as TaskStatus, e as TokenUsage, D as ToolArgs, E as ToolCallResult, h as ToolCallResultUnion, F as ToolDefinition, H as ToolHooks, L as ToolResult, g as ToolResultConfig, b as ToolRouterHooks, O as isTerminalStatus } from './types-mCVxKIZb.js';
 import z$1, { z } from 'zod';
-import { a as FileEntryMetadata, e as VirtualFileTree, T as TreeMutation, F as FileEntry } from './types-LVKmCNds.js';
-export { b as FileResolver, g as VirtualSandboxState } from './types-LVKmCNds.js';
-export { f as filesWithMimeType, h as hasDirectory, a as hasFileWithMimeType } from './queries-DwBe2CAA.js';
+import { a as FileEntryMetadata, e as VirtualFileTree, T as TreeMutation, F as FileEntry } from './types-DFUNSYbj.js';
+export { b as FileResolver, g as VirtualSandboxState } from './types-DFUNSYbj.js';
+export { f as filesWithMimeType, h as hasDirectory, a as hasFileWithMimeType } from './queries-BCgJ9Sr5.js';
 import '@temporalio/common';
 import '@temporalio/workflow';
 import '@temporalio/common/lib/interfaces';
@@ -43,10 +43,10 @@ import '@temporalio/common/lib/interfaces';
  * const { finalMessage, exitReason } = await session.runSession({ stateManager });
  * ```
  */
-declare function createSession<T extends ToolMap, M = unknown>(config: SessionConfig<T, M> & {
+declare function createSession<T extends ToolMap, M = unknown, TContent = string>(config: SessionConfig<T, M, TContent> & {
     sandboxOps: SandboxOps;
 }): Promise<ZeitlichSession<M, true>>;
-declare function createSession<T extends ToolMap, M = unknown>(config: SessionConfig<T, M>): Promise<ZeitlichSession<M, false>>;
+declare function createSession<T extends ToolMap, M = unknown, TContent = string>(config: SessionConfig<T, M, TContent>): Promise<ZeitlichSession<M, false>>;
 
 /**
  * Session config fields derived from a main workflow input, ready to spread
@@ -187,7 +187,7 @@ declare function createToolRouter<T extends ToolMap>(options: ToolRouterOptions<
  * }
  * ```
  */
-declare function defineTool<TName extends string, TSchema extends z.ZodType, TResult, TContext extends RouterContext = RouterContext>(tool: ToolWithHandler<TName, TSchema, TResult, TContext>): ToolWithHandler<TName, TSchema, TResult, TContext>;
+declare function defineTool<TName extends string, TSchema extends z.ZodType, TResult, TContext extends RouterContext = RouterContext, TToolResponse = JsonValue>(tool: ToolWithHandler<TName, TSchema, TResult, TContext, TToolResponse>): ToolWithHandler<TName, TSchema, TResult, TContext, TToolResponse>;
 /**
  * Utility to check if there were no tool calls besides a specific one
  */
@@ -578,4 +578,4 @@ declare const createAskUserQuestionHandler: () => ActivityToolHandler<AskUserQue
     }[];
 }>;
 
-export { ActivityToolHandler, AgentStateManager, type AskUserQuestionArgs, BaseAgentState, type BashArgs, type FileEditArgs, FileEntry, FileEntryMetadata, type FileReadArgs, type FileWriteArgs, type GlobArgs, type GrepArgs, JsonSerializable, ParsedToolCallUnion, type ReadSkillArgs, RouterContext, SandboxInit, SandboxOps, SandboxShutdown, SessionConfig, Skill, SkillMetadata, type SubagentArgs, SubagentConfig, SubagentDefinition, SubagentFnResult, SubagentHooks, SubagentSandboxConfig, SubagentSandboxShutdown, SubagentSessionInput, type TaskCreateArgs, type TaskGetArgs, type TaskListArgs, type TaskUpdateArgs, ThreadInit, ToolHandler, ToolHandlerResponse, ToolMap, ToolNames, ToolRouter, ToolWithHandler, TreeMutation, VirtualFileTree, type WorkflowConfig, type WorkflowInput, type WorkflowSessionInput, WorkflowTask, ZeitlichSession, applyVirtualTreeMutations, askUserQuestionTool, bashTool, createAgentStateManager, createAskUserQuestionHandler, createBashToolDescription, createReadSkillHandler, createReadSkillTool, createSession, createTaskCreateHandler, createTaskGetHandler, createTaskListHandler, createTaskUpdateHandler, createToolRouter, defineSubagent, defineSubagentWorkflow, defineTool, defineWorkflow, editTool, formatVirtualFileTree, getShortId, globTool, grepTool, hasNoOtherToolCalls, parseSkillFile, readFileTool, taskCreateTool, taskGetTool, taskListTool, taskUpdateTool, writeFileTool };
+export { ActivityToolHandler, AgentStateManager, type AskUserQuestionArgs, BaseAgentState, type BashArgs, type FileEditArgs, FileEntry, FileEntryMetadata, type FileReadArgs, type FileWriteArgs, type GlobArgs, type GrepArgs, JsonSerializable, JsonValue, ParsedToolCallUnion, type ReadSkillArgs, RouterContext, SandboxInit, SandboxOps, SandboxShutdown, SessionConfig, Skill, SkillMetadata, type SubagentArgs, SubagentConfig, SubagentDefinition, SubagentFnResult, SubagentHooks, SubagentSandboxConfig, SubagentSandboxShutdown, SubagentSessionInput, type TaskCreateArgs, type TaskGetArgs, type TaskListArgs, type TaskUpdateArgs, ThreadInit, ToolHandler, ToolHandlerResponse, ToolMap, ToolNames, ToolRouter, ToolWithHandler, TreeMutation, VirtualFileTree, type WorkflowConfig, type WorkflowInput, type WorkflowSessionInput, WorkflowTask, ZeitlichSession, applyVirtualTreeMutations, askUserQuestionTool, bashTool, createAgentStateManager, createAskUserQuestionHandler, createBashToolDescription, createReadSkillHandler, createReadSkillTool, createSession, createTaskCreateHandler, createTaskGetHandler, createTaskListHandler, createTaskUpdateHandler, createToolRouter, defineSubagent, defineSubagentWorkflow, defineTool, defineWorkflow, editTool, formatVirtualFileTree, getShortId, globTool, grepTool, hasNoOtherToolCalls, parseSkillFile, readFileTool, taskCreateTool, taskGetTool, taskListTool, taskUpdateTool, writeFileTool };

package/dist/workflow.js

@@ -1,4 +1,4 @@
-import { defineSignal, uuid4, setHandler, defineUpdate, ApplicationFailure, condition, defineQuery, workflowInfo, getExternalWorkflowHandle, startChild } from '@temporalio/workflow';
+import { defineSignal, uuid4, setHandler, defineUpdate, ApplicationFailure, condition, defineQuery, workflowInfo, getExternalWorkflowHandle, log, startChild } from '@temporalio/workflow';
 import z14, { z } from 'zod';
 import { ApplicationFailure as ApplicationFailure$1 } from '@temporalio/common';
 
@@ -114,6 +114,7 @@ function createToolRouter(options) {
     if (preResult.skip) {
       await appendToolResult(uuid4(), {
         threadId: options.threadId,
+        threadKey: options.threadKey,
         toolCallId: toolCall.id,
         toolName: toolCall.name,
         content: JSON.stringify({
@@ -132,6 +133,7 @@ function createToolRouter(options) {
       if (tool) {
         const routerContext = {
           threadId: options.threadId,
+          ...options.threadKey && { threadKey: options.threadKey },
           toolCallId: toolCall.id,
           toolName: toolCall.name,
           ...sandboxId !== void 0 && { sandboxId },
@@ -163,6 +165,7 @@ function createToolRouter(options) {
     if (!resultAppended) {
       const config = {
         threadId: options.threadId,
+        threadKey: options.threadKey,
         toolCallId: toolCall.id,
         toolName: toolCall.name,
         content
@@ -254,6 +257,7 @@ function createToolRouter(options) {
       const processOne = async (toolCall) => {
         const routerContext = {
           threadId: options.threadId,
+          ...options.threadKey && { threadKey: options.threadKey },
           toolCallId: toolCall.id,
           toolName: toolCall.name,
           ...context?.sandboxId !== void 0 && {
@@ -273,6 +277,7 @@ function createToolRouter(options) {
               uuid4(),
               {
                 threadId: options.threadId,
+                threadKey: options.threadKey,
                 toolCallId: toolCall.id,
                 toolName: toolCall.name,
                 content: response.toolResponse
@@ -480,9 +485,10 @@ function createSubagentHandler(subagents) {
     }
     let finalToolResponse = toolResponse;
     if (allowsContinuation && childThreadId) {
-      finalToolResponse = typeof toolResponse === "string" ? `${toolResponse}
+      const responseStr = typeof toolResponse === "string" ? toolResponse : JSON.stringify(toolResponse);
+      finalToolResponse = `${responseStr}
 
-[${config.agentName} Thread ID: ${childThreadId}]` : toolResponse;
+[${config.agentName} Thread ID: ${childThreadId}]`;
     }
     return {
       toolResponse: finalToolResponse,
@@ -497,8 +503,14 @@ function createSubagentHandler(subagents) {
     pendingDestroys.clear();
     await Promise.all(
       handles.map(async (handle) => {
-        await handle.signal(destroySandboxSignal);
-        await handle.result();
+        try {
+          await handle.signal(destroySandboxSignal);
+          await handle.result();
+        } catch (err) {
+          log.warn("Failed to signal destroySandbox to child workflow", {
+            error: err
+          });
+        }
       })
     );
   };
@@ -651,6 +663,7 @@ async function createSession({
   hooks = {},
   appendSystemPrompt = true,
   waitForInputTimeout = "48h",
+  threadKey,
   sandboxOps,
   thread: threadInit,
   sandbox: sandboxInit,
@@ -695,6 +708,7 @@ async function createSession({
     tools,
     appendToolResult,
     threadId,
+    threadKey,
     hooks,
     plugins,
     parallel: processToolsInParallel
@@ -723,7 +737,7 @@ async function createSession({
               threadId
             });
           }
-          await appendHumanMessage(threadId, uuid4(), message);
+          await appendHumanMessage(threadId, uuid4(), message, threadKey);
           if (hooks.onPostHumanMessageAppend) {
             await hooks.onPostHumanMessageAppend({
               message,
@@ -791,7 +805,7 @@ async function createSession({
       }
       const systemPrompt = stateManager.getSystemPrompt();
       if (threadMode === "fork" && sourceThreadId) {
-        await forkThread(sourceThreadId, threadId);
+        await forkThread(sourceThreadId, threadId, threadKey);
       } else if (threadMode === "continue") ; else {
         if (appendSystemPrompt) {
           if (!systemPrompt || systemPrompt.trim() === "") {
@@ -800,12 +814,12 @@ async function createSession({
               nonRetryable: true
             });
           }
-          await appendSystemMessage(threadId, uuid4(), systemPrompt);
+          await appendSystemMessage(threadId, uuid4(), systemPrompt, threadKey);
         } else {
-          await initializeThread(threadId);
+          await initializeThread(threadId, threadKey);
         }
       }
-      await appendHumanMessage(threadId, uuid4(), await buildContextMessage());
+      await appendHumanMessage(threadId, uuid4(), await buildContextMessage(), threadKey);
       let exitReason = "completed";
       try {
         while (stateManager.isRunning() && !stateManager.isTerminal() && stateManager.getTurns() < maxTurns) {
@@ -814,6 +828,7 @@ async function createSession({
           stateManager.setTools(toolRouter.getToolDefinitions());
           const { message, rawToolCalls, usage } = await runAgent({
             threadId,
+            threadKey,
             agentName,
             metadata
           });
@@ -838,6 +853,7 @@ async function createSession({
             } catch (error) {
               await appendToolResult(uuid4(), {
                 threadId,
+                threadKey,
                 toolCallId: tc.id ?? "",
                 toolName: tc.name,
                 content: JSON.stringify({