zeitlich 0.2.25 → 0.2.26

package/dist/index.d.cts

@@ -1,15 +1,16 @@
 import { BashArgs, FileEditArgs, GlobArgs, FileReadArgs, FileWriteArgs } from './workflow.cjs';
 export { AskUserQuestionArgs, GrepArgs, ReadSkillArgs, SubagentArgs, TaskCreateArgs, TaskGetArgs, TaskListArgs, TaskUpdateArgs, WorkflowConfig, WorkflowInput, WorkflowSessionInput, 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 } from './workflow.cjs';
-import { b as SkillProvider, c as SkillMetadata, d as Skill } from './types-7PeMi1bD.cjs';
-export { A as AgentResponse, e as AgentState, f as AgentStateManager, H as Hooks, J as JsonPrimitive, g as JsonSerializable, 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, m as SandboxInit, n as SandboxShutdown, S as ScopedPrefix, o as SessionConfig, p as SessionEndHook, q as SessionEndHookContext, r as SessionResult, s as SessionStartHook, t as SessionStartHookContext, u as SubagentConfig, v as SubagentDefinition, w as SubagentFnResult, x as SubagentHandlerResponse, y as SubagentHooks, z as SubagentSandboxConfig, B as SubagentSandboxShutdown, C as SubagentSessionInput, D as SubagentWorkflow, E as SubagentWorkflowInput, F as ThreadInit, T as ThreadOps, Z as ZeitlichSession } from './types-7PeMi1bD.cjs';
-import { R as RouterContext, j as ToolResultConfig, A as ActivityToolHandler, c as ToolHandlerResponse, B as BaseAgentState, g as RunAgentConfig } 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, p as ParsedToolCallUnion, 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, x as SerializableToolDefinition, S as SessionExitReason, y as TaskStatus, f as TokenUsage, z as ToolArgs, D as ToolCallResult, k as ToolCallResultUnion, i as ToolDefinition, E as ToolHandler, F as ToolHooks, a as ToolMap, T as ToolMessageContent, G as ToolNames, H as ToolResult, J as ToolRouter, b as ToolRouterHooks, K as ToolWithHandler, W as WorkflowTask, L as isTerminalStatus } from './types-D_igp10o.cjs';
+import { b as SkillProvider, 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, i as SandboxInit, j as SandboxShutdown, S as ScopedPrefix, k as SessionConfig, l as SessionEndHook, m as SessionEndHookContext, n as SessionResult, o as SessionStartHook, p as SessionStartHookContext, q as SubagentConfig, r as SubagentDefinition, s as SubagentFnResult, t as SubagentHandlerResponse, u as SubagentHooks, v as SubagentSandboxConfig, w as SubagentSandboxShutdown, x as SubagentSessionInput, y as SubagentWorkflow, z as SubagentWorkflowInput, B as ThreadInit, T as ThreadOps, Z as ZeitlichSession } from './types-DSOefLpY.cjs';
+import { R as RouterContext, g as ToolResultConfig, A as ActivityToolHandler, J as JsonValue, T as ToolHandlerResponse, B as BaseAgentState, f as RunAgentConfig } from './types-mCVxKIZb.cjs';
+export { k as AgentConfig, l as AgentFile, m as AgentState, j as AgentStateManager, n as AgentStatus, o as AppendToolResultFn, I as InferToolResults, p as JsonPrimitive, i as JsonSerializable, q as ParsedToolCall, r as ParsedToolCallUnion, 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, z as SerializableToolDefinition, S as SessionExitReason, C as TaskStatus, e as TokenUsage, D as ToolArgs, E as ToolCallResult, h as ToolCallResultUnion, F as ToolDefinition, G as ToolHandler, H as ToolHooks, a as ToolMap, K as ToolNames, L as ToolResult, M as ToolRouter, b as ToolRouterHooks, N as ToolWithHandler, W as WorkflowTask, O as isTerminalStatus } from './types-mCVxKIZb.cjs';
 import { S as Sandbox, a as SandboxFileSystem, d as SandboxCreateOptions, b as SandboxProvider, f as SandboxSnapshot, P as PrefixedSandboxOps, F as FileStat, D as DirentEntry, E as ExecResult } from './types-ChAMwU3q.cjs';
 export { h as ExecOptions, c as SandboxCapabilities, e as SandboxCreateResult, i as SandboxNotFoundError, j as SandboxNotSupportedError, g as SandboxOps } from './types-ChAMwU3q.cjs';
 import { WorkflowClient } from '@temporalio/client';
-export { f as filesWithMimeType, h as hasDirectory, a as hasFileWithMimeType } from './queries-BYGBImeC.cjs';
-export { F as FileEntry, a as FileEntryMetadata, b as FileResolver, T as TreeMutation, e as VirtualFileTree, g as VirtualSandboxState } from './types-Bf8KV0Ci.cjs';
-import { T as ThreadManagerConfig, B as BaseThreadManager } from './types-35POpVfa.cjs';
+export { f as filesWithMimeType, h as hasDirectory, a as hasFileWithMimeType } from './queries-DwnE2bu3.cjs';
+export { F as FileEntry, a as FileEntryMetadata, b as FileResolver, T as TreeMutation, e as VirtualFileTree, g as VirtualSandboxState } from './types-DRnz-OZp.cjs';
+import { T as ThreadManagerConfig, B as BaseThreadManager } from './types-BDRDbm3h.cjs';
+export { P as ProviderThreadManager } from './types-BDRDbm3h.cjs';
 import 'zod';
 import '@temporalio/common';
 import '@temporalio/workflow';
@@ -43,7 +44,7 @@ import 'ioredis';
  * );
  * ```
  */
-declare function withAutoAppend<TArgs, TResult, TContext extends RouterContext = RouterContext>(threadHandler: (id: string, config: ToolResultConfig) => Promise<void>, handler: ActivityToolHandler<TArgs, TResult, TContext>): ActivityToolHandler<TArgs, TResult, TContext>;
+declare function withAutoAppend<TArgs, TResult, TContext extends RouterContext = RouterContext, TToolResponse = unknown>(threadHandler: (id: string, config: ToolResultConfig) => Promise<void>, handler: ActivityToolHandler<TArgs, TResult, TContext, TToolResponse>): ActivityToolHandler<TArgs, TResult, TContext>;
 
 /**
  * Extended router context with a resolved {@link Sandbox} instance.
@@ -93,12 +94,12 @@ interface SandboxContext extends RouterContext {
  * });
  * ```
  */
-declare function withSandbox<TArgs, TResult, TSandbox extends Sandbox = Sandbox>(manager: {
+declare function withSandbox<TArgs, TResult, TSandbox extends Sandbox = Sandbox, TToolResponse = JsonValue>(manager: {
     getSandbox(id: string): Promise<TSandbox>;
 }, handler: (args: TArgs, context: RouterContext & {
     sandbox: TSandbox;
     sandboxId: string;
-}) => Promise<ToolHandlerResponse<TResult>>): ActivityToolHandler<TArgs, TResult | null>;
+}) => Promise<ToolHandlerResponse<TResult, TToolResponse>>): ActivityToolHandler<TArgs, TResult | null, RouterContext, TToolResponse | string>;
 
 /**
  * Query the parent workflow's state from within an activity.
@@ -148,7 +149,7 @@ interface AgentStateContext<S extends BaseAgentState = BaseAgentState> extends R
  * );
  * ```
  */
-declare function withParentWorkflowState<TArgs, TResult, S extends BaseAgentState = BaseAgentState>(client: WorkflowClient, handler: (args: TArgs, context: AgentStateContext<S>) => Promise<ToolHandlerResponse<TResult>>): ActivityToolHandler<TArgs, TResult>;
+declare function withParentWorkflowState<TArgs, TResult, S extends BaseAgentState = BaseAgentState, TToolResponse = JsonValue>(client: WorkflowClient, handler: (args: TArgs, context: AgentStateContext<S>) => Promise<ToolHandlerResponse<TResult, TToolResponse>>): ActivityToolHandler<TArgs, TResult, RouterContext, TToolResponse>;
 
 /**
  * Loads skills from a directory following the agentskills.io layout:
@@ -381,4 +382,4 @@ declare const toTree: (fs: SandboxFileSystem, opts?: {
     sort?: boolean;
 }) => Promise<string>;
 
-export { ActivityToolHandler, type AgentStateContext, BaseAgentState, BaseThreadManager, BashArgs, ExecResult, FileEditArgs, FileReadArgs, FileSystemSkillProvider, FileWriteArgs, GlobArgs, NodeFsSandboxFileSystem, PrefixedSandboxOps, RouterContext, RunAgentConfig, Sandbox, type SandboxContext, SandboxCreateOptions, DirentEntry as SandboxDirentEntry, FileStat as SandboxFileStat, SandboxFileSystem, SandboxManager, SandboxProvider, SandboxSnapshot, Skill, SkillMetadata, SkillProvider, ThreadManagerConfig, ToolHandlerResponse, ToolResultConfig, bashHandler, createRunAgentActivity, createThreadManager, editHandler, globHandler, queryParentWorkflowState, readFileHandler, toTree, withAutoAppend, withParentWorkflowState, withSandbox, writeFileHandler };
+export { ActivityToolHandler, type AgentStateContext, BaseAgentState, BaseThreadManager, BashArgs, ExecResult, FileEditArgs, FileReadArgs, FileSystemSkillProvider, FileWriteArgs, GlobArgs, JsonValue, NodeFsSandboxFileSystem, PrefixedSandboxOps, RouterContext, RunAgentConfig, Sandbox, type SandboxContext, SandboxCreateOptions, DirentEntry as SandboxDirentEntry, FileStat as SandboxFileStat, SandboxFileSystem, SandboxManager, SandboxProvider, SandboxSnapshot, Skill, SkillMetadata, SkillProvider, ThreadManagerConfig, ToolHandlerResponse, ToolResultConfig, bashHandler, createRunAgentActivity, createThreadManager, editHandler, globHandler, queryParentWorkflowState, readFileHandler, toTree, withAutoAppend, withParentWorkflowState, withSandbox, writeFileHandler };

package/dist/index.d.ts

@@ -1,15 +1,16 @@
 import { BashArgs, FileEditArgs, GlobArgs, FileReadArgs, FileWriteArgs } from './workflow.js';
 export { AskUserQuestionArgs, GrepArgs, ReadSkillArgs, SubagentArgs, TaskCreateArgs, TaskGetArgs, TaskListArgs, TaskUpdateArgs, WorkflowConfig, WorkflowInput, WorkflowSessionInput, 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 } from './workflow.js';
-import { b as SkillProvider, c as SkillMetadata, d as Skill } from './types-hmferhc2.js';
-export { A as AgentResponse, e as AgentState, f as AgentStateManager, H as Hooks, J as JsonPrimitive, g as JsonSerializable, 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, m as SandboxInit, n as SandboxShutdown, S as ScopedPrefix, o as SessionConfig, p as SessionEndHook, q as SessionEndHookContext, r as SessionResult, s as SessionStartHook, t as SessionStartHookContext, u as SubagentConfig, v as SubagentDefinition, w as SubagentFnResult, x as SubagentHandlerResponse, y as SubagentHooks, z as SubagentSandboxConfig, B as SubagentSandboxShutdown, C as SubagentSessionInput, D as SubagentWorkflow, E as SubagentWorkflowInput, F as ThreadInit, T as ThreadOps, Z as ZeitlichSession } from './types-hmferhc2.js';
-import { R as RouterContext, j as ToolResultConfig, A as ActivityToolHandler, c as ToolHandlerResponse, B as BaseAgentState, g as RunAgentConfig } 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, p as ParsedToolCallUnion, 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, x as SerializableToolDefinition, S as SessionExitReason, y as TaskStatus, f as TokenUsage, z as ToolArgs, D as ToolCallResult, k as ToolCallResultUnion, i as ToolDefinition, E as ToolHandler, F as ToolHooks, a as ToolMap, T as ToolMessageContent, G as ToolNames, H as ToolResult, J as ToolRouter, b as ToolRouterHooks, K as ToolWithHandler, W as WorkflowTask, L as isTerminalStatus } from './types-D_igp10o.js';
+import { b as SkillProvider, 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, i as SandboxInit, j as SandboxShutdown, S as ScopedPrefix, k as SessionConfig, l as SessionEndHook, m as SessionEndHookContext, n as SessionResult, o as SessionStartHook, p as SessionStartHookContext, q as SubagentConfig, r as SubagentDefinition, s as SubagentFnResult, t as SubagentHandlerResponse, u as SubagentHooks, v as SubagentSandboxConfig, w as SubagentSandboxShutdown, x as SubagentSessionInput, y as SubagentWorkflow, z as SubagentWorkflowInput, B as ThreadInit, T as ThreadOps, Z as ZeitlichSession } from './types-CvJyXDYt.js';
+import { R as RouterContext, g as ToolResultConfig, A as ActivityToolHandler, J as JsonValue, T as ToolHandlerResponse, B as BaseAgentState, f as RunAgentConfig } from './types-mCVxKIZb.js';
+export { k as AgentConfig, l as AgentFile, m as AgentState, j as AgentStateManager, n as AgentStatus, o as AppendToolResultFn, I as InferToolResults, p as JsonPrimitive, i as JsonSerializable, q as ParsedToolCall, r as ParsedToolCallUnion, 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, z as SerializableToolDefinition, S as SessionExitReason, C as TaskStatus, e as TokenUsage, D as ToolArgs, E as ToolCallResult, h as ToolCallResultUnion, F as ToolDefinition, G as ToolHandler, H as ToolHooks, a as ToolMap, K as ToolNames, L as ToolResult, M as ToolRouter, b as ToolRouterHooks, N as ToolWithHandler, W as WorkflowTask, O as isTerminalStatus } from './types-mCVxKIZb.js';
 import { S as Sandbox, a as SandboxFileSystem, d as SandboxCreateOptions, b as SandboxProvider, f as SandboxSnapshot, P as PrefixedSandboxOps, F as FileStat, D as DirentEntry, E as ExecResult } from './types-ChAMwU3q.js';
 export { h as ExecOptions, c as SandboxCapabilities, e as SandboxCreateResult, i as SandboxNotFoundError, j as SandboxNotSupportedError, g as SandboxOps } from './types-ChAMwU3q.js';
 import { WorkflowClient } from '@temporalio/client';
-export { f as filesWithMimeType, h as hasDirectory, a as hasFileWithMimeType } from './queries-DwBe2CAA.js';
-export { F as FileEntry, a as FileEntryMetadata, b as FileResolver, T as TreeMutation, e as VirtualFileTree, g as VirtualSandboxState } from './types-LVKmCNds.js';
-import { T as ThreadManagerConfig, B as BaseThreadManager } from './types-35POpVfa.js';
+export { f as filesWithMimeType, h as hasDirectory, a as hasFileWithMimeType } from './queries-BCgJ9Sr5.js';
+export { F as FileEntry, a as FileEntryMetadata, b as FileResolver, T as TreeMutation, e as VirtualFileTree, g as VirtualSandboxState } from './types-DFUNSYbj.js';
+import { T as ThreadManagerConfig, B as BaseThreadManager } from './types-WNSeZbWa.js';
+export { P as ProviderThreadManager } from './types-WNSeZbWa.js';
 import 'zod';
 import '@temporalio/common';
 import '@temporalio/workflow';
@@ -43,7 +44,7 @@ import 'ioredis';
  * );
  * ```
  */
-declare function withAutoAppend<TArgs, TResult, TContext extends RouterContext = RouterContext>(threadHandler: (id: string, config: ToolResultConfig) => Promise<void>, handler: ActivityToolHandler<TArgs, TResult, TContext>): ActivityToolHandler<TArgs, TResult, TContext>;
+declare function withAutoAppend<TArgs, TResult, TContext extends RouterContext = RouterContext, TToolResponse = unknown>(threadHandler: (id: string, config: ToolResultConfig) => Promise<void>, handler: ActivityToolHandler<TArgs, TResult, TContext, TToolResponse>): ActivityToolHandler<TArgs, TResult, TContext>;
 
 /**
  * Extended router context with a resolved {@link Sandbox} instance.
@@ -93,12 +94,12 @@ interface SandboxContext extends RouterContext {
  * });
  * ```
  */
-declare function withSandbox<TArgs, TResult, TSandbox extends Sandbox = Sandbox>(manager: {
+declare function withSandbox<TArgs, TResult, TSandbox extends Sandbox = Sandbox, TToolResponse = JsonValue>(manager: {
     getSandbox(id: string): Promise<TSandbox>;
 }, handler: (args: TArgs, context: RouterContext & {
     sandbox: TSandbox;
     sandboxId: string;
-}) => Promise<ToolHandlerResponse<TResult>>): ActivityToolHandler<TArgs, TResult | null>;
+}) => Promise<ToolHandlerResponse<TResult, TToolResponse>>): ActivityToolHandler<TArgs, TResult | null, RouterContext, TToolResponse | string>;
 
 /**
  * Query the parent workflow's state from within an activity.
@@ -148,7 +149,7 @@ interface AgentStateContext<S extends BaseAgentState = BaseAgentState> extends R
  * );
  * ```
  */
-declare function withParentWorkflowState<TArgs, TResult, S extends BaseAgentState = BaseAgentState>(client: WorkflowClient, handler: (args: TArgs, context: AgentStateContext<S>) => Promise<ToolHandlerResponse<TResult>>): ActivityToolHandler<TArgs, TResult>;
+declare function withParentWorkflowState<TArgs, TResult, S extends BaseAgentState = BaseAgentState, TToolResponse = JsonValue>(client: WorkflowClient, handler: (args: TArgs, context: AgentStateContext<S>) => Promise<ToolHandlerResponse<TResult, TToolResponse>>): ActivityToolHandler<TArgs, TResult, RouterContext, TToolResponse>;
 
 /**
  * Loads skills from a directory following the agentskills.io layout:
@@ -381,4 +382,4 @@ declare const toTree: (fs: SandboxFileSystem, opts?: {
     sort?: boolean;
 }) => Promise<string>;
 
-export { ActivityToolHandler, type AgentStateContext, BaseAgentState, BaseThreadManager, BashArgs, ExecResult, FileEditArgs, FileReadArgs, FileSystemSkillProvider, FileWriteArgs, GlobArgs, NodeFsSandboxFileSystem, PrefixedSandboxOps, RouterContext, RunAgentConfig, Sandbox, type SandboxContext, SandboxCreateOptions, DirentEntry as SandboxDirentEntry, FileStat as SandboxFileStat, SandboxFileSystem, SandboxManager, SandboxProvider, SandboxSnapshot, Skill, SkillMetadata, SkillProvider, ThreadManagerConfig, ToolHandlerResponse, ToolResultConfig, bashHandler, createRunAgentActivity, createThreadManager, editHandler, globHandler, queryParentWorkflowState, readFileHandler, toTree, withAutoAppend, withParentWorkflowState, withSandbox, writeFileHandler };
+export { ActivityToolHandler, type AgentStateContext, BaseAgentState, BaseThreadManager, BashArgs, ExecResult, FileEditArgs, FileReadArgs, FileSystemSkillProvider, FileWriteArgs, GlobArgs, JsonValue, NodeFsSandboxFileSystem, PrefixedSandboxOps, RouterContext, RunAgentConfig, Sandbox, type SandboxContext, SandboxCreateOptions, DirentEntry as SandboxDirentEntry, FileStat as SandboxFileStat, SandboxFileSystem, SandboxManager, SandboxProvider, SandboxSnapshot, Skill, SkillMetadata, SkillProvider, ThreadManagerConfig, ToolHandlerResponse, ToolResultConfig, bashHandler, createRunAgentActivity, createThreadManager, editHandler, globHandler, queryParentWorkflowState, readFileHandler, toTree, withAutoAppend, withParentWorkflowState, withSandbox, writeFileHandler };

package/dist/index.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 { randomUUID, randomFillSync } from 'crypto';
 import { ApplicationFailure as ApplicationFailure$1 } from '@temporalio/common';
@@ -118,6 +118,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({
@@ -136,6 +137,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 },
@@ -167,6 +169,7 @@ function createToolRouter(options) {
     if (!resultAppended) {
       const config = {
         threadId: options.threadId,
+        threadKey: options.threadKey,
         toolCallId: toolCall.id,
         toolName: toolCall.name,
         content
@@ -258,6 +261,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 && {
@@ -277,6 +281,7 @@ function createToolRouter(options) {
               uuid4(),
               {
                 threadId: options.threadId,
+                threadKey: options.threadKey,
                 toolCallId: toolCall.id,
                 toolName: toolCall.name,
                 content: response.toolResponse
@@ -484,9 +489,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,
@@ -501,8 +507,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
+          });
+        }
       })
     );
   };
@@ -655,6 +667,7 @@ async function createSession({
   hooks = {},
   appendSystemPrompt = true,
   waitForInputTimeout = "48h",
+  threadKey,
   sandboxOps,
   thread: threadInit,
   sandbox: sandboxInit,
@@ -699,6 +712,7 @@ async function createSession({
     tools,
     appendToolResult,
     threadId,
+    threadKey,
     hooks,
     plugins,
     parallel: processToolsInParallel
@@ -727,7 +741,7 @@ async function createSession({
               threadId
             });
           }
-          await appendHumanMessage(threadId, uuid4(), message);
+          await appendHumanMessage(threadId, uuid4(), message, threadKey);
           if (hooks.onPostHumanMessageAppend) {
             await hooks.onPostHumanMessageAppend({
               message,
@@ -795,7 +809,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() === "") {
@@ -804,12 +818,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) {
@@ -818,6 +832,7 @@ async function createSession({
           stateManager.setTools(toolRouter.getToolDefinitions());
           const { message, rawToolCalls, usage } = await runAgent({
             threadId,
+            threadKey,
             agentName,
             metadata
           });
@@ -842,6 +857,7 @@ async function createSession({
             } catch (error) {
               await appendToolResult(uuid4(), {
                 threadId,
+                threadKey,
                 toolCallId: tc.id ?? "",
                 toolName: tc.name,
                 content: JSON.stringify({
@@ -1137,6 +1153,7 @@ function withAutoAppend(threadHandler, handler) {
     const response = await handler(args, context);
     await threadHandler(v4_default(), {
       threadId: context.threadId,
+      ...context.threadKey && { threadKey: context.threadKey },
       toolCallId: context.toolCallId,
       toolName: context.toolName,
       content: response.toolResponse
@@ -1904,7 +1921,7 @@ redis.call('SET', KEYS[1], '1', 'EX', tonumber(ARGV[1]))
 return 1
 `;
 function getThreadKey(threadId, key) {
-  return `thread:${threadId}:${key}`;
+  return `${key}:thread:${threadId}`;
 }
 function createThreadManager(config) {
   const {