zeitlich 0.2.1 → 0.2.2

package/src/tools/edit/handler.ts

@@ -14,8 +14,8 @@ export interface EditResult {
  * Edit handler response
  */
 export interface EditHandlerResponse {
-  content: string;
-  result: EditResult;
+  toolResponse: string;
+  data: EditResult;
 }
 
 /**
@@ -55,8 +55,8 @@ export async function editHandler(
   // Validate old_string !== new_string
   if (old_string === new_string) {
     return {
-      content: `Error: old_string and new_string must be different.`,
-      result: {
+      toolResponse: `Error: old_string and new_string must be different.`,
+      data: {
         path: file_path,
         success: false,
         replacements: 0,
@@ -69,8 +69,8 @@ export async function editHandler(
     const exists = await fs.exists(file_path);
     if (!exists) {
       return {
-        content: `Error: File "${file_path}" does not exist.`,
-        result: {
+        toolResponse: `Error: File "${file_path}" does not exist.`,
+        data: {
           path: file_path,
           success: false,
           replacements: 0,
@@ -84,8 +84,8 @@ export async function editHandler(
     // Check if old_string exists in the file
     if (!content.includes(old_string)) {
       return {
-        content: `Error: Could not find the specified text in "${file_path}". Make sure old_string matches exactly (whitespace-sensitive).`,
-        result: {
+        toolResponse: `Error: Could not find the specified text in "${file_path}". Make sure old_string matches exactly (whitespace-sensitive).`,
+        data: {
           path: file_path,
           success: false,
           replacements: 0,
@@ -101,8 +101,8 @@ export async function editHandler(
     // Check uniqueness if not replace_all
     if (!replace_all && occurrences > 1) {
       return {
-        content: `Error: old_string appears ${occurrences} times in "${file_path}". Either provide more context to make it unique, or use replace_all: true.`,
-        result: {
+        toolResponse: `Error: old_string appears ${occurrences} times in "${file_path}". Either provide more context to make it unique, or use replace_all: true.`,
+        data: {
           path: file_path,
           success: false,
           replacements: 0,
@@ -135,8 +135,8 @@ export async function editHandler(
       : `Replaced 1 occurrence`;
 
     return {
-      content: `${summary} in ${file_path}`,
-      result: {
+      toolResponse: `${summary} in ${file_path}`,
+      data: {
         path: file_path,
         success: true,
         replacements,
@@ -145,8 +145,8 @@ export async function editHandler(
   } catch (error) {
     const message = error instanceof Error ? error.message : "Unknown error";
     return {
-      content: `Error editing file "${file_path}": ${message}`,
-      result: {
+      toolResponse: `Error editing file "${file_path}": ${message}`,
+      data: {
         path: file_path,
         success: false,
         replacements: 0,

package/src/tools/glob/handler.ts

@@ -13,8 +13,8 @@ export interface GlobResult {
  * Glob handler response
  */
 export interface GlobHandlerResponse {
-  content: string;
-  result: GlobResult;
+  toolResponse: string;
+  data: GlobResult;
 }
 
 /**
@@ -31,8 +31,8 @@ export async function globHandler(
   const _bash = new Bash({ fs });
 
   return Promise.resolve({
-    content: "Hello, world!",
-    result: { files: [] },
+    toolResponse: "Hello, world!",
+    data: { files: [] },
   });
 
   // try {

package/src/tools/task/handler.ts

@@ -24,7 +24,7 @@ export interface TaskHandlerResult<TResult = unknown> {
  *   {
  *     name: "researcher",
  *     description: "Researches topics",
- *     workflowType: "researcherWorkflow",
+ *     workflow: "researcherWorkflow",
  *     resultSchema: z.object({ findings: z.string() }),
  *   },
  * ]);
@@ -47,11 +47,21 @@ export function createTaskHandler(subagents: SubagentConfig[]) {
     const childWorkflowId = `${parentWorkflowId}-${args.subagent}-${uuid4()}`;
 
     // Execute the child workflow
-    const childResult = await executeChild(config.workflowType, {
+    const input: SubagentInput = {
+      prompt: args.prompt,
+      ...(config.context && { context: config.context }),
+    };
+
+    const childOpts = {
       workflowId: childWorkflowId,
-      args: [{ prompt: args.prompt } satisfies SubagentInput],
+      args: [input],
       taskQueue: config.taskQueue ?? parentTaskQueue,
-    });
+    };
+
+    const childResult =
+      typeof config.workflow === "string"
+        ? await executeChild(config.workflow, childOpts)
+        : await executeChild(config.workflow, childOpts);
 
     // Validate result if schema provided, otherwise pass through as-is
     const validated = config.resultSchema
@@ -59,14 +69,14 @@ export function createTaskHandler(subagents: SubagentConfig[]) {
       : childResult;
 
     // Format content - stringify objects, pass strings through
-    const content =
+    const toolResponse =
       typeof validated === "string"
         ? validated
         : JSON.stringify(validated, null, 2);
 
     return {
-      content,
-      result: {
+      toolResponse,
+      data: {
         result: validated,
         childWorkflowId,
       },

package/src/tools/task/tool.ts

@@ -44,7 +44,7 @@ Usage notes:
  *   {
  *     name: "researcher",
  *     description: "Researches topics and gathers information",
- *     workflowType: "researcherWorkflow",
+ *     workflow: "researcherWorkflow",
  *     resultSchema: z.object({ findings: z.string() }),
  *   },
  * ]);

package/src/tools/task-create/handler.ts

@@ -5,6 +5,7 @@ import type {
 import type { ToolHandlerResponse } from "../../lib/tool-router";
 import type { WorkflowTask } from "../../lib/types";
 import type { TaskCreateToolSchemaType } from "./tool";
+import { uuid4 } from "@temporalio/workflow";
 
 /**
  * Creates a TaskCreate handler that adds tasks to the workflow state.
@@ -18,18 +19,14 @@ import type { TaskCreateToolSchemaType } from "./tool";
  */
 export function createTaskCreateHandler<
   TCustom extends JsonSerializable<TCustom>,
->({
-  stateManager,
-  idGenerator,
-}: {
-  stateManager: AgentStateManager<TCustom>;
-  idGenerator: () => string;
-}): (args: TaskCreateToolSchemaType) => ToolHandlerResponse<WorkflowTask> {
+>(
+  stateManager: AgentStateManager<TCustom>
+): (args: TaskCreateToolSchemaType) => ToolHandlerResponse<WorkflowTask> {
   return (
     args: TaskCreateToolSchemaType
   ): ToolHandlerResponse<WorkflowTask> => {
     const task: WorkflowTask = {
-      id: idGenerator(),
+      id: uuid4(),
       subject: args.subject,
       description: args.description,
       activeForm: args.activeForm,
@@ -42,8 +39,8 @@ export function createTaskCreateHandler<
     stateManager.setTask(task);
 
     return {
-      content: JSON.stringify(task, null, 2),
-      result: task,
+      toolResponse: JSON.stringify(task, null, 2),
+      data: task,
     };
   };
 }

package/src/tools/task-get/handler.ts

@@ -25,14 +25,14 @@ export function createTaskGetHandler<TCustom extends JsonSerializable<TCustom>>(
 
     if (!task) {
       return {
-        content: JSON.stringify({ error: `Task not found: ${args.taskId}` }),
-        result: null,
+        toolResponse: JSON.stringify({ error: `Task not found: ${args.taskId}` }),
+        data: null,
       };
     }
 
     return {
-      content: JSON.stringify(task, null, 2),
-      result: task,
+      toolResponse: JSON.stringify(task, null, 2),
+      data: task,
     };
   };
 }

package/src/tools/task-list/handler.ts

@@ -26,8 +26,8 @@ export function createTaskListHandler<
     const taskList = stateManager.getTasks();
 
     return {
-      content: JSON.stringify(taskList, null, 2),
-      result: taskList,
+      toolResponse: JSON.stringify(taskList, null, 2),
+      data: taskList,
     };
   };
 }

package/src/tools/task-update/handler.ts

@@ -29,8 +29,8 @@ export function createTaskUpdateHandler<
 
     if (!task) {
       return {
-        content: JSON.stringify({ error: `Task not found: ${args.taskId}` }),
-        result: null,
+        toolResponse: JSON.stringify({ error: `Task not found: ${args.taskId}` }),
+        data: null,
       };
     }
 
@@ -72,8 +72,8 @@ export function createTaskUpdateHandler<
     stateManager.setTask(task);
 
     return {
-      content: JSON.stringify(task, null, 2),
-      result: task,
+      toolResponse: JSON.stringify(task, null, 2),
+      data: task,
     };
   };
 }

package/src/workflow.ts

@@ -33,7 +33,7 @@ export type {
 } from "./lib/state-manager";
 
 // Tool router (includes registry functionality)
-export { createToolRouter, hasNoOtherToolCalls } from "./lib/tool-router";
+export { createToolRouter, hasNoOtherToolCalls, defineTool, defineSubagent } from "./lib/tool-router";
 export type {
   // Tool definition types
   ToolDefinition,
@@ -81,11 +81,13 @@ export type {
   PostToolUseFailureHook,
   PostToolUseFailureHookContext,
   PostToolUseFailureHookResult,
+  ToolHooks,
   SessionStartHook,
   SessionStartHookContext,
   SessionEndHook,
   SessionEndHookContext,
   SubagentConfig,
+  SubagentHooks,
   SubagentInput,
   TaskStatus,
   WorkflowTask,