@swirls/looms 0.0.2 → 0.2.0

package/dist/agent/definitions.d.ts

@@ -1,6 +1,6 @@
 import type { StandardSchemaV1 } from '@standard-schema/spec';
 import type { Schema } from 'effect';
-import type { InferDefinedSchema, JsonValue, RuntimeEffect, SchemaInput } from '@swirls/looms/core';
+import { type JsonValue, type RuntimeEffect, type SchemaInput } from '@swirls/looms/core';
 import type { StopWhen } from './stop-when';
 import type { Message, ToolCall } from './types';
 export interface ToolContext {
@@ -12,8 +12,7 @@ export interface FunctionTool<TName extends string = string, TInput = JsonValue,
     readonly kind: 'function';
     readonly name: TName;
     readonly description: string;
-    readonly input?: StandardSchemaV1<any, TInput> | Schema.Schema<TInput>;
-    readonly inputSchema?: JsonValue;
+    readonly input?: StandardSchemaV1<any, TInput> | Schema.ConstraintDecoder<TInput>;
     handler(input: TInput, ctx: ToolContext): Promise<TOutput> | TOutput;
 }
 export interface ThreadTool {
@@ -21,12 +20,13 @@ export interface ThreadTool {
     readonly name: string;
     readonly description: string;
     readonly input?: SchemaInput;
-    readonly inputSchema?: JsonValue;
     readonly childKind: string;
     readonly childName: string;
+    readonly childVersion: string;
     readonly child: {
         kind: string;
         name: string;
+        version?: string;
     };
     mapInput?(input: JsonValue): JsonValue;
 }
@@ -35,7 +35,6 @@ export interface EffectsTool {
     readonly name: string;
     readonly description: string;
     readonly input?: SchemaInput;
-    readonly inputSchema?: JsonValue;
     effects(input: JsonValue): RuntimeEffect[];
     waitOn?: {
         type: string | readonly string[];
@@ -46,6 +45,7 @@ export type ToolLike = FunctionTool | ThreadTool | EffectsTool;
 export type AgentToolEntry = ToolLike | {
     kind: string;
     name: string;
+    version?: string;
     instructions?: string;
     description?: string;
     input?: SchemaInput;
@@ -57,6 +57,7 @@ export interface AgentTurnContext<TInput = JsonValue> {
     readonly input: TInput;
     readonly tools: ToolLike[];
     readonly instructions: string;
+    readonly signal?: AbortSignal;
 }
 export interface AgentTurnResult<TOutput extends JsonValue = JsonValue> {
     message: Message;
@@ -71,9 +72,11 @@ export interface AgentTurnResult<TOutput extends JsonValue = JsonValue> {
 export interface AgentDefinition<TName extends string = string, TInput = JsonValue, TOutput extends JsonValue = JsonValue> {
     readonly kind: 'agent';
     readonly name: TName;
+    readonly version: string;
+    readonly description?: string;
     readonly model?: string;
     readonly instructions: string;
-    readonly input?: StandardSchemaV1<any, TInput> | Schema.Schema<TInput>;
+    readonly input?: StandardSchemaV1<any, TInput> | Schema.ConstraintDecoder<TInput>;
     readonly tools?: ToolLike[];
     readonly maxTurns?: number;
     readonly conversational?: boolean;
@@ -81,33 +84,37 @@ export interface AgentDefinition<TName extends string = string, TInput = JsonVal
     runTurn?(ctx: AgentTurnContext<TInput>): Promise<AgentTurnResult<TOutput>> | AgentTurnResult<TOutput>;
 }
 export type AnyAgentDefinition = AgentDefinition;
+export interface AgentSessionDefinition<TName extends string = string> {
+    readonly kind: 'agent-session';
+    readonly name: TName;
+    readonly version: string;
+    readonly description?: string;
+    /** The agent definition is pinned when the session definition is created. */
+    readonly agent: Pick<AgentDefinition, 'kind' | 'name' | 'version'>;
+    /** Max idle milliseconds before parking. Zero waits indefinitely. */
+    readonly idleTimeoutMs: number;
+}
+export declare function defineAgentSession<TName extends string>(def: {
+    readonly name: TName;
+    readonly description?: string;
+    readonly agent: Pick<AgentDefinition, 'kind' | 'name' | 'version'>;
+    readonly version?: string;
+    readonly idleTimeoutMs?: number;
+}): AgentSessionDefinition<TName>;
 export declare function normalizeTools(tools?: ReadonlyArray<AgentToolEntry>): ToolLike[];
-export declare function defineTool<TName extends string, TSchema = undefined, TInput = InferDefinedSchema<TSchema>, TOutput extends JsonValue = JsonValue>(def: {
-    name: TName;
-    description: string;
-    input?: TSchema;
-    inputSchema?: JsonValue;
-    handler: (input: TInput, ctx: ToolContext) => Promise<TOutput> | TOutput;
-}): FunctionTool<TName, TInput, TOutput>;
-export declare function defineAgent<TName extends string, TSchema = undefined, TInput = InferDefinedSchema<TSchema>, TOutput extends JsonValue = JsonValue>(def: {
-    name: TName;
-    model?: string;
-    instructions: string;
-    input?: TSchema;
-    tools?: AgentToolEntry[];
-    maxTurns?: number;
-    conversational?: boolean;
-    stopWhen?: StopWhen;
-    runTurn?: (ctx: AgentTurnContext<TInput>) => Promise<AgentTurnResult<TOutput>> | AgentTurnResult<TOutput>;
+export declare function defineTool<TName extends string, TInput = JsonValue, TOutput extends JsonValue = JsonValue>(def: Omit<FunctionTool<TName, TInput, TOutput>, 'kind'>): FunctionTool<TName, TInput, TOutput>;
+export declare function defineAgent<TName extends string, TInput = JsonValue, TOutput extends JsonValue = JsonValue>(def: Omit<AgentDefinition<TName, TInput, TOutput>, 'kind' | 'version' | 'tools'> & {
+    readonly version?: string;
+    readonly tools?: AgentToolEntry[];
 }): AgentDefinition<TName, TInput, TOutput>;
 export declare function asThreadTool(def: {
     name?: string;
     description?: string;
     input?: SchemaInput;
-    inputSchema?: JsonValue;
     child: {
         kind: string;
         name: string;
+        version?: string;
     };
     mapInput?: (input: JsonValue) => JsonValue;
 }): ThreadTool;
@@ -115,27 +122,38 @@ export declare function asAgentTool(def: {
     name?: string;
     description?: string;
     input?: SchemaInput;
-    inputSchema?: JsonValue;
     agent: {
         kind: 'agent';
         name: string;
+        version?: string;
         instructions?: string;
         input?: SchemaInput;
-        inputSchema?: JsonValue;
     };
     mapInput?: (input: JsonValue) => JsonValue;
 }): ThreadTool;
+type EvaluatorToolTarget = {
+    kind: 'evaluator';
+    name: string;
+    description?: string;
+    input?: SchemaInput;
+};
+export declare function asEvaluatorTool(def: {
+    name?: string;
+    description?: string;
+    input?: SchemaInput;
+    evaluator: EvaluatorToolTarget;
+    mapInput?: (input: JsonValue) => JsonValue;
+}): ThreadTool;
 export declare function asWorkflowTool(def: {
     name?: string;
     description?: string;
     input?: SchemaInput;
-    inputSchema?: JsonValue;
     workflow: {
         kind: 'workflow';
         name: string;
+        version?: string;
         description?: string;
         input?: SchemaInput;
-        inputSchema?: JsonValue;
     };
     mapInput?: (input: JsonValue) => JsonValue;
 }): ThreadTool;
@@ -143,10 +161,10 @@ export declare function asEffectsTool(def: {
     name: string;
     description: string;
     input?: SchemaInput;
-    inputSchema?: JsonValue;
     effects: (input: JsonValue) => RuntimeEffect[];
     waitOn?: {
         type: string | readonly string[];
         match?: JsonValue;
     };
 }): EffectsTool;
+export {};

package/dist/agent/definitions.js

@@ -1,7 +1,30 @@
+import { DEFAULT_DEFINITION_VERSION, } from '@swirls/looms/core';
+export function defineAgentSession(def) {
+    const definition = {
+        kind: 'agent-session',
+        name: def.name,
+        version: def.version ?? DEFAULT_DEFINITION_VERSION,
+        agent: {
+            kind: 'agent',
+            name: def.agent.name,
+            version: def.agent.version,
+        },
+        idleTimeoutMs: Math.max(0, def.idleTimeoutMs ?? 0),
+    };
+    if (def.description === undefined) {
+        return definition;
+    }
+    return { ...definition, description: def.description };
+}
 export function normalizeTools(tools = []) {
     return tools.map((entry) => {
-        if (entry.kind === 'function' || entry.kind === 'thread' || entry.kind === 'effects') {
-            // SAFETY: kind discriminant matches ToolLike.
+        if (entry.kind === 'function' && 'handler' in entry) {
+            return entry;
+        }
+        if (entry.kind === 'thread' && 'child' in entry) {
+            return entry;
+        }
+        if (entry.kind === 'effects' && 'effects' in entry) {
             return entry;
         }
         return asThreadTool({
@@ -16,15 +39,13 @@ export function normalizeTools(tools = []) {
     });
 }
 export function defineTool(def) {
-    // SAFETY: factory fields match FunctionTool.
-    return { kind: 'function', ...def, input: def.input };
+    return { kind: 'function', ...def };
 }
 export function defineAgent(def) {
-    // SAFETY: factory fields match AgentDefinition.
     return {
         kind: 'agent',
         ...def,
-        input: def.input,
+        version: def.version ?? DEFAULT_DEFINITION_VERSION,
         tools: def.tools ? normalizeTools(def.tools) : undefined,
     };
 }
@@ -34,9 +55,9 @@ export function asThreadTool(def) {
         name: def.name ?? def.child.name,
         description: def.description ?? def.child.name,
         input: def.input,
-        inputSchema: def.inputSchema,
         childKind: def.child.kind,
         childName: def.child.name,
+        childVersion: def.child.version ?? DEFAULT_DEFINITION_VERSION,
         child: def.child,
         mapInput: def.mapInput,
     };
@@ -46,8 +67,16 @@ export function asAgentTool(def) {
         name: def.name,
         description: def.description ?? def.agent.instructions,
         input: def.input ?? def.agent.input,
-        inputSchema: def.inputSchema ?? def.agent.inputSchema,
-        child: { kind: 'agent', name: def.agent.name },
+        child: { kind: 'agent', name: def.agent.name, version: def.agent.version },
+        mapInput: def.mapInput,
+    });
+}
+export function asEvaluatorTool(def) {
+    return asThreadTool({
+        name: def.name,
+        description: def.description ?? def.evaluator.description,
+        input: def.input ?? def.evaluator.input,
+        child: { kind: 'evaluator', name: def.evaluator.name },
         mapInput: def.mapInput,
     });
 }
@@ -56,8 +85,7 @@ export function asWorkflowTool(def) {
         name: def.name,
         description: def.description ?? def.workflow.description,
         input: def.input ?? def.workflow.input,
-        inputSchema: def.inputSchema ?? def.workflow.inputSchema,
-        child: { kind: 'workflow', name: def.workflow.name },
+        child: { kind: 'workflow', name: def.workflow.name, version: def.workflow.version },
         mapInput: def.mapInput,
     });
 }
@@ -67,7 +95,6 @@ export function asEffectsTool(def) {
         name: def.name,
         description: def.description,
         input: def.input,
-        inputSchema: def.inputSchema,
         effects: def.effects,
         waitOn: def.waitOn,
     };