@usestratus/sdk 0.15.0 → 1.1.0

package/dist/core/memory-store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"memory-store.js","sourceRoot":"","sources":["../../src/core/memory-store.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,kBAAkB;IACtB,KAAK,GAAG,IAAI,GAAG,EAA2B,CAAC;IAEnD,KAAK,CAAC,IAAI,CAAC,SAAiB,EAAE,QAAyB;QACtD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,SAAiB;QAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,SAAiB;QAC7B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,IAAI;QACT,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IACtC,CAAC;CACD"}

package/dist/core/model.d.ts

@@ -21,6 +21,10 @@ export interface ModelResponse {
     usage?: UsageInfo;
     finishReason?: FinishReason;
     responseId?: string;
+    incompleteDetails?: {
+        reason?: string;
+    };
+    outputItems?: Record<string, unknown>[];
 }
 export type StreamEvent = {
     type: "content_delta";
@@ -42,6 +46,17 @@ export type StreamEvent = {
     type: "hosted_tool_call";
     toolType: string;
     status: "in_progress" | "completed" | "searching" | "generating" | "interpreting";
+} | {
+    type: "subagent_start";
+    agentName: string;
+} | {
+    type: "subagent_delta";
+    agentName: string;
+    content: string;
+} | {
+    type: "subagent_end";
+    agentName: string;
+    result: string;
 } | {
     type: "done";
     response: ModelResponse;

package/dist/core/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/core/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,WAAW,EACX,oBAAoB,EACpB,aAAa,EACb,cAAc,EACd,QAAQ,EACR,cAAc,EACd,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,YAAY;IAC5B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,CAAC,EAAE,CAAC,cAAc,GAAG,oBAAoB,CAAC,EAAE,CAAC;IAClD,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,SAAS;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,QAAQ,GAAG,YAAY,GAAG,gBAAgB,CAAC;AAE/E,MAAM,WAAW,aAAa;IAC7B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,WAAW,GACpB;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,QAAQ,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GACnE;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAClE;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAC9C;IACA,IAAI,EAAE,kBAAkB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,aAAa,GAAG,WAAW,GAAG,WAAW,GAAG,YAAY,GAAG,cAAc,CAAC;CACjF,GACD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,aAAa,CAAA;CAAE,CAAC;AAE7C,MAAM,WAAW,mBAAmB;IACnC,MAAM,CAAC,EAAE,WAAW,CAAC;CACrB;AAED,MAAM,WAAW,KAAK;IACrB,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC1F,mBAAmB,CAClB,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE,mBAAmB,GAC3B,aAAa,CAAC,WAAW,CAAC,CAAC;CAC9B"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/core/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,WAAW,EACX,oBAAoB,EACpB,aAAa,EACb,cAAc,EACd,QAAQ,EACR,cAAc,EACd,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,YAAY;IAC5B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,CAAC,EAAE,CAAC,cAAc,GAAG,oBAAoB,CAAC,EAAE,CAAC;IAClD,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,SAAS;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,QAAQ,GAAG,YAAY,GAAG,gBAAgB,CAAC;AAE/E,MAAM,WAAW,aAAa;IAC7B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;CACxC;AAED,MAAM,MAAM,WAAW,GACpB;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,QAAQ,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GACnE;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAClE;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAC9C;IACA,IAAI,EAAE,kBAAkB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,aAAa,GAAG,WAAW,GAAG,WAAW,GAAG,YAAY,GAAG,cAAc,CAAC;CACjF,GACD;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC7C;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC9D;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAC3D;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,aAAa,CAAA;CAAE,CAAC;AAE7C,MAAM,WAAW,mBAAmB;IACnC,MAAM,CAAC,EAAE,WAAW,CAAC;CACrB;AAED,MAAM,WAAW,KAAK;IACrB,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC1F,mBAAmB,CAClB,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE,mBAAmB,GAC3B,aAAa,CAAC,WAAW,CAAC,CAAC;CAC9B"}

package/dist/core/result.d.ts

@@ -2,6 +2,29 @@ import type { Agent } from "./agent";
 import type { GuardrailRunResult } from "./guardrails";
 import type { FinishReason, UsageInfo } from "./model";
 import type { ChatMessage } from "./types";
+export interface PendingToolCall {
+    toolCallId: string;
+    toolName: string;
+    arguments: string;
+    parsedArguments: unknown;
+}
+export declare class InterruptedRunResult<TOutput = undefined> {
+    readonly interrupted: true;
+    readonly pendingToolCalls: PendingToolCall[];
+    readonly messages: ChatMessage[];
+    readonly currentAgent: Agent<any, TOutput>;
+    readonly context: any;
+    readonly numTurns: number;
+    readonly usage: UsageInfo | undefined;
+    constructor(options: {
+        pendingToolCalls: PendingToolCall[];
+        messages: ChatMessage[];
+        currentAgent: Agent<any, TOutput>;
+        context: any;
+        numTurns: number;
+        usage?: UsageInfo;
+    });
+}
 export interface RunResultOptions<TOutput = undefined> {
     output: string;
     messages: ChatMessage[];
@@ -16,6 +39,7 @@ export interface RunResultOptions<TOutput = undefined> {
     outputGuardrailResults?: GuardrailRunResult[];
 }
 export declare class RunResult<TOutput = undefined> {
+    readonly interrupted: false;
     readonly output: string;
     readonly finalOutput: TOutput extends undefined ? undefined : TOutput;
     readonly messages: ChatMessage[];

package/dist/core/result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["../../src/core/result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C,MAAM,WAAW,gBAAgB,CAAC,OAAO,GAAG,SAAS;IACpD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qBAAqB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC7C,sBAAsB,CAAC,EAAE,kBAAkB,EAAE,CAAC;CAC9C;AAED,qBAAa,SAAS,CAAC,OAAO,GAAG,SAAS;IACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,OAAO,SAAS,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;IACtE,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,QAAQ,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC;IACrC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,qBAAqB,EAAE,SAAS,kBAAkB,EAAE,CAAC;IAC9D,QAAQ,CAAC,sBAAsB,EAAE,SAAS,kBAAkB,EAAE,CAAC;gBAEnD,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC;IAc3C,gGAAgG;IAChG,WAAW,IAAI,WAAW,EAAE;CAG5B"}
+{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["../../src/core/result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C,MAAM,WAAW,eAAe;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,OAAO,CAAC;CACzB;AAED,qBAAa,oBAAoB,CAAC,OAAO,GAAG,SAAS;IACpD,QAAQ,CAAC,WAAW,EAAG,IAAI,CAAU;IACrC,QAAQ,CAAC,gBAAgB,EAAE,eAAe,EAAE,CAAC;IAC7C,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,CAAC;IACjC,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC3C,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,CAAC;gBAE1B,OAAO,EAAE;QACpB,gBAAgB,EAAE,eAAe,EAAE,CAAC;QACpC,QAAQ,EAAE,WAAW,EAAE,CAAC;QACxB,YAAY,EAAE,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAClC,OAAO,EAAE,GAAG,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,SAAS,CAAC;KAClB;CAQD;AAED,MAAM,WAAW,gBAAgB,CAAC,OAAO,GAAG,SAAS;IACpD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qBAAqB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC7C,sBAAsB,CAAC,EAAE,kBAAkB,EAAE,CAAC;CAC9C;AAED,qBAAa,SAAS,CAAC,OAAO,GAAG,SAAS;IACzC,QAAQ,CAAC,WAAW,EAAG,KAAK,CAAU;IACtC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,OAAO,SAAS,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;IACtE,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,QAAQ,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC;IACrC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,qBAAqB,EAAE,SAAS,kBAAkB,EAAE,CAAC;IAC9D,QAAQ,CAAC,sBAAsB,EAAE,SAAS,kBAAkB,EAAE,CAAC;gBAEnD,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC;IAc3C,gGAAgG;IAChG,WAAW,IAAI,WAAW,EAAE;CAG5B"}

package/dist/core/result.js

@@ -1,4 +1,22 @@
+export class InterruptedRunResult {
+    interrupted = true;
+    pendingToolCalls;
+    messages;
+    currentAgent;
+    context;
+    numTurns;
+    usage;
+    constructor(options) {
+        this.pendingToolCalls = options.pendingToolCalls;
+        this.messages = options.messages;
+        this.currentAgent = options.currentAgent;
+        this.context = options.context;
+        this.numTurns = options.numTurns;
+        this.usage = options.usage;
+    }
+}
 export class RunResult {
+    interrupted = false;
     output;
     finalOutput;
     messages;

package/dist/core/result.js.map

@@ -1 +1 @@
-{"version":3,"file":"result.js","sourceRoot":"","sources":["../../src/core/result.ts"],"names":[],"mappings":"AAmBA,MAAM,OAAO,SAAS;IACZ,MAAM,CAAS;IACf,WAAW,CAAkD;IAC7D,QAAQ,CAAgB;IACxB,KAAK,CAAY;IACjB,SAAS,CAAkB;IAC3B,YAAY,CAAgB;IAC5B,QAAQ,CAAS;IACjB,YAAY,CAAS;IACrB,UAAU,CAAU;IACpB,qBAAqB,CAAgC;IACrD,sBAAsB,CAAgC;IAE/D,YAAY,IAA+B;QAC1C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAA8D,CAAC;QACvF,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACtC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,IAAI,EAAE,CAAC;QAC9D,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,IAAI,EAAE,CAAC;IACjE,CAAC;IAED,gGAAgG;IAChG,WAAW;QACV,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;IACzD,CAAC;CACD"}
+{"version":3,"file":"result.js","sourceRoot":"","sources":["../../src/core/result.ts"],"names":[],"mappings":"AAYA,MAAM,OAAO,oBAAoB;IACvB,WAAW,GAAG,IAAa,CAAC;IAC5B,gBAAgB,CAAoB;IACpC,QAAQ,CAAgB;IACxB,YAAY,CAAsB;IAClC,OAAO,CAAM;IACb,QAAQ,CAAS;IACjB,KAAK,CAAwB;IAEtC,YAAY,OAOX;QACA,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QACjD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAC5B,CAAC;CACD;AAgBD,MAAM,OAAO,SAAS;IACZ,WAAW,GAAG,KAAc,CAAC;IAC7B,MAAM,CAAS;IACf,WAAW,CAAkD;IAC7D,QAAQ,CAAgB;IACxB,KAAK,CAAY;IACjB,SAAS,CAAkB;IAC3B,YAAY,CAAgB;IAC5B,QAAQ,CAAS;IACjB,YAAY,CAAS;IACrB,UAAU,CAAU;IACpB,qBAAqB,CAAgC;IACrD,sBAAsB,CAAgC;IAE/D,YAAY,IAA+B;QAC1C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAA8D,CAAC;QACvF,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACtC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,IAAI,EAAE,CAAC;QAC9D,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,IAAI,EAAE,CAAC;IACjE,CAAC;IAED,gGAAgG;IAChG,WAAW;QACV,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;IACzD,CAAC;CACD"}

package/dist/core/run.d.ts

@@ -3,8 +3,15 @@ import type { CostEstimator } from "./cost";
 import type { ToolInputGuardrail, ToolOutputGuardrail } from "./guardrails";
 import type { RunHooks } from "./hooks";
 import type { Model, ModelRequest, StreamEvent } from "./model";
-import { RunResult } from "./result";
+import { InterruptedRunResult, RunResult } from "./result";
+import type { SubAgent } from "./subagent";
 import type { ChatMessage } from "./types";
+export interface ToolApproval {
+    toolCallId: string;
+    decision: "approve" | "deny";
+    /** Message sent to LLM when denied */
+    denyMessage?: string;
+}
 export type ToolErrorFormatter = (toolName: string, error: unknown) => string;
 export type CallModelInputFilter<TContext> = (params: {
     agent: Agent<TContext, any>;
@@ -40,8 +47,10 @@ export interface RunOptions<TContext, TOutput = undefined> {
     toolOutputGuardrails?: ToolOutputGuardrail<TContext>[];
     /** Reset tool_choice to "auto" after the first LLM call to prevent infinite loops */
     resetToolChoice?: boolean;
+    /** Additional subagents available at runtime beyond those defined on the agent */
+    dynamicSubagents?: SubAgent<TContext>[];
 }
-export declare function run<TContext, TOutput = undefined>(agent: Agent<TContext, TOutput>, input: string | ChatMessage[], options?: RunOptions<TContext, TOutput>): Promise<RunResult<TOutput>>;
+export declare function run<TContext, TOutput = undefined>(agent: Agent<TContext, TOutput>, input: string | ChatMessage[], options?: RunOptions<TContext, TOutput>): Promise<RunResult<TOutput> | InterruptedRunResult<TOutput>>;
 export interface StreamOptions<TContext, TOutput = undefined> extends RunOptions<TContext, TOutput> {
 }
 export interface StreamedRunResult<TOutput = undefined> {
@@ -49,4 +58,5 @@ export interface StreamedRunResult<TOutput = undefined> {
     result: Promise<RunResult<TOutput>>;
 }
 export declare function stream<TContext, TOutput = undefined>(agent: Agent<TContext, TOutput>, input: string | ChatMessage[], options?: StreamOptions<TContext, TOutput>): StreamedRunResult<TOutput>;
+export declare function resumeRun<TContext, TOutput = undefined>(interrupted: InterruptedRunResult<TOutput>, approvals: ToolApproval[], options?: RunOptions<TContext, TOutput>): Promise<RunResult<TOutput> | InterruptedRunResult<TOutput>>;
 //# sourceMappingURL=run.d.ts.map

package/dist/core/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/core/run.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/core/run.ts"],"names":[],"mappings":"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"}

package/dist/core/run.js

@@ -3,11 +3,52 @@ import { MaxBudgetExceededError, MaxTurnsExceededError, OutputParseError, RunAbo
 import { runInputGuardrails, runOutputGuardrails, runToolInputGuardrails, runToolOutputGuardrails, } from "./guardrails";
 import { handoffToDefinition } from "./handoff";
 import { isFunctionTool, isHostedTool } from "./hosted-tool";
-import { RunResult } from "./result";
+import { InterruptedRunResult, RunResult } from "./result";
 import { subagentToDefinition, subagentToTool } from "./subagent";
 import { toolToDefinition } from "./tool";
 import { getCurrentTrace } from "./tracing";
 const DEFAULT_MAX_TURNS = 10;
+/**
+ * A simple async channel for pushing events from callbacks and pulling them
+ * from an async generator. Used to relay subagent stream events through the
+ * parent stream in real time.
+ */
+function createStreamEventChannel() {
+    const queue = [];
+    let resolve;
+    let finished = false;
+    return {
+        push(event) {
+            queue.push(event);
+            resolve?.();
+            resolve = undefined;
+        },
+        done() {
+            finished = true;
+            resolve?.();
+            resolve = undefined;
+        },
+        [Symbol.asyncIterator]() {
+            const iter = {
+                async next() {
+                    while (queue.length === 0 && !finished) {
+                        await new Promise((r) => {
+                            resolve = r;
+                        });
+                    }
+                    if (queue.length > 0) {
+                        return { value: queue.shift(), done: false };
+                    }
+                    return { value: undefined, done: true };
+                },
+                [Symbol.asyncIterator]() {
+                    return iter;
+                },
+            };
+            return iter;
+        },
+    };
+}
 function getErrorMessage(error) {
     if (error instanceof Error)
         return error.message;
@@ -97,6 +138,31 @@ async function executeWithTimeout(fn, timeout, toolName) {
         });
     });
 }
+/** Execute a tool with optional timeout and retry logic */
+async function executeToolWithRetry(fn, toolConfig) {
+    const maxAttempts = (toolConfig.retries?.limit ?? 0) + 1;
+    const baseDelay = toolConfig.retries?.delay ?? 1000;
+    const backoff = toolConfig.retries?.backoff ?? "exponential";
+    const shouldRetry = toolConfig.retries?.shouldRetry ?? (() => true);
+    let lastError;
+    for (let attempt = 0; attempt < maxAttempts; attempt++) {
+        try {
+            return await executeWithTimeout(fn, toolConfig.timeout, toolConfig.name);
+        }
+        catch (error) {
+            lastError = error;
+            if (error instanceof ToolTimeoutError)
+                throw error; // Don't retry timeouts
+            if (attempt < maxAttempts - 1 && shouldRetry(error)) {
+                const delay = backoff === "exponential" ? baseDelay * 2 ** attempt : baseDelay;
+                await new Promise((r) => setTimeout(r, delay));
+                continue;
+            }
+            throw error;
+        }
+    }
+    throw lastError;
+}
 function checkAborted(signal) {
     if (signal?.aborted) {
         throw new RunAbortedError();
@@ -140,6 +206,7 @@ export async function run(agent, input, options) {
     const callModelInputFilter = options?.callModelInputFilter;
     const toolInputGuardrails = options?.toolInputGuardrails ?? [];
     const toolOutputGuardrails = options?.toolOutputGuardrails ?? [];
+    const dynamicSubagents = options?.dynamicSubagents;
     // Fire beforeRun hook on the entry agent
     const inputText = typeof input === "string" ? input : extractUserText(input);
     if (agent.hooks.beforeRun) {
@@ -181,7 +248,7 @@ export async function run(agent, input, options) {
     }
     for (let turn = 0; turn < maxTurns; turn++) {
         checkAborted(signal);
-        const toolDefs = await buildToolDefs(currentAgent, ctx.context);
+        const toolDefs = await buildToolDefs(currentAgent, ctx.context, dynamicSubagents);
         let request = {
             messages,
             tools: toolDefs.length > 0 ? toolDefs : undefined,
@@ -273,7 +340,19 @@ export async function run(agent, input, options) {
             }
             return buildFinalResult(agent, currentAgent, messages, ctx, trace, lastFinishReason, lastResponseId, inputGuardrailResults);
         }
-        const { toolMessages, handoffAgent } = await executeToolCallsWithHandoffs(currentAgent, ctx, response.toolCalls, trace, signal, toolErrorFmt, runHooks, toolInputGuardrails, toolOutputGuardrails);
+        // Check for tools that need approval before executing
+        const pendingApprovals = await collectPendingApprovals(currentAgent, response.toolCalls, ctx.context);
+        if (pendingApprovals.length > 0) {
+            return new InterruptedRunResult({
+                pendingToolCalls: pendingApprovals,
+                messages: [...messages],
+                currentAgent,
+                context: ctx.context,
+                numTurns: ctx.numTurns,
+                usage: ctx.usage,
+            });
+        }
+        const { toolMessages, handoffAgent } = await executeToolCallsWithHandoffs(currentAgent, ctx, response.toolCalls, trace, signal, toolErrorFmt, runHooks, toolInputGuardrails, toolOutputGuardrails, undefined, dynamicSubagents);
         messages.push(...toolMessages);
         // Check toolUseBehavior — should we stop instead of calling the LLM again?
         if (await shouldStopAfterToolCalls(currentAgent, response.toolCalls, toolMessages)) {
@@ -410,6 +489,7 @@ async function* streamInternal(agent, input, options, resolveResult, rejectResul
         const callModelInputFilter = options?.callModelInputFilter;
         const toolInputGuardrails = options?.toolInputGuardrails ?? [];
         const toolOutputGuardrails = options?.toolOutputGuardrails ?? [];
+        const dynamicSubagents = options?.dynamicSubagents;
         // Fire beforeRun hook on the entry agent
         const inputText = typeof input === "string" ? input : extractUserText(input);
         if (agent.hooks.beforeRun) {
@@ -451,7 +531,7 @@ async function* streamInternal(agent, input, options, resolveResult, rejectResul
         }
         for (let turn = 0; turn < maxTurns; turn++) {
             checkAborted(signal);
-            const toolDefs = await buildToolDefs(currentAgent, ctx.context);
+            const toolDefs = await buildToolDefs(currentAgent, ctx.context, dynamicSubagents);
             let request = {
                 messages,
                 tools: toolDefs.length > 0 ? toolDefs : undefined,
@@ -546,7 +626,33 @@ async function* streamInternal(agent, input, options, resolveResult, rejectResul
                 resolveResult(result);
                 return;
             }
-            const { toolMessages, handoffAgent } = await executeToolCallsWithHandoffs(currentAgent, ctx, finalResponse.toolCalls, trace, signal, toolErrorFmt, runHooks, toolInputGuardrails, toolOutputGuardrails);
+            // Check for tools that need approval before executing
+            const pendingApprovals = await collectPendingApprovals(currentAgent, finalResponse.toolCalls, ctx.context);
+            if (pendingApprovals.length > 0) {
+                const interrupted = new InterruptedRunResult({
+                    pendingToolCalls: pendingApprovals,
+                    messages: [...messages],
+                    currentAgent,
+                    context: ctx.context,
+                    numTurns: ctx.numTurns,
+                    usage: ctx.usage,
+                });
+                resolveResult(interrupted);
+                return;
+            }
+            // Use a channel to relay subagent stream events in real time
+            const channel = createStreamEventChannel();
+            const toolExecPromise = executeToolCallsWithHandoffs(currentAgent, ctx, finalResponse.toolCalls, trace, signal, toolErrorFmt, runHooks, toolInputGuardrails, toolOutputGuardrails, (event) => channel.push(event), dynamicSubagents).then((result) => {
+                channel.done();
+                return result;
+            }, (error) => {
+                channel.done();
+                throw error;
+            });
+            for await (const event of channel) {
+                yield event;
+            }
+            const { toolMessages, handoffAgent } = await toolExecPromise;
             messages.push(...toolMessages);
             // Check toolUseBehavior
             if (await shouldStopAfterToolCalls(currentAgent, finalResponse.toolCalls, toolMessages)) {
@@ -702,7 +808,7 @@ async function buildFinalResult(entryAgent, currentAgent, messages, ctx, trace,
     }
     return result;
 }
-async function buildToolDefs(agent, context) {
+async function buildToolDefs(agent, context, extraSubagents) {
     const defs = [];
     for (const t of agent.tools) {
         if (isHostedTool(t)) {
@@ -715,7 +821,8 @@ async function buildToolDefs(agent, context) {
             defs.push(toolToDefinition(t));
         }
     }
-    for (const sa of agent.subagents) {
+    const allSubagents = [...agent.subagents, ...(extraSubagents ?? [])];
+    for (const sa of allSubagents) {
         defs.push(subagentToDefinition(sa));
     }
     for (const h of agent.handoffs) {
@@ -773,11 +880,12 @@ function applyResetToolChoice(settings, turn, resetToolChoice) {
     }
     return settings;
 }
-async function executeToolCallsWithHandoffs(agent, ctx, toolCalls, trace, signal, toolErrorFmt, runHooks, toolInputGuardrails, toolOutputGuardrails) {
+async function executeToolCallsWithHandoffs(agent, ctx, toolCalls, trace, signal, toolErrorFmt, runHooks, toolInputGuardrails, toolOutputGuardrails, onStreamEvent, extraSubagents) {
     let handoffAgent;
     // Build O(1) lookup maps
     const handoffsByName = new Map(agent.handoffs.map((h) => [h.toolName, h]));
-    const subagentsByName = new Map(agent.subagents.map((sa) => [sa.toolName, sa]));
+    const allSubagents = [...agent.subagents, ...(extraSubagents ?? [])];
+    const subagentsByName = new Map(allSubagents.map((sa) => [sa.toolName, sa]));
     const functionTools = agent.tools.filter(isFunctionTool);
     const toolsByName = new Map(functionTools.map((t) => [t.name, t]));
     const results = await Promise.all(toolCalls.map(async (tc) => {
@@ -826,20 +934,21 @@ async function executeToolCallsWithHandoffs(agent, ctx, toolCalls, trace, signal
                 if (runHooks?.onToolStart) {
                     await runHooks.onToolStart({ agent, toolName: tcName, context: ctx.context });
                 }
+                const toolOpts = { signal, onStreamEvent };
                 let result;
                 if (trace) {
                     const span = trace.startSpan(`subagent:${matchedSubagent.agent.name}`, "subagent", {
                         toolName: tcName,
                     });
                     try {
-                        result = await saTool.execute(ctx.context, params, { signal });
+                        result = await saTool.execute(ctx.context, params, toolOpts);
                     }
                     finally {
                         trace.endSpan(span);
                     }
                 }
                 else {
-                    result = await saTool.execute(ctx.context, params, { signal });
+                    result = await saTool.execute(ctx.context, params, toolOpts);
                 }
                 // Fire onSubagentStop
                 if (agent.hooks.onSubagentStop) {
@@ -925,14 +1034,18 @@ async function executeToolCallsWithHandoffs(agent, ctx, toolCalls, trace, signal
                     toolName: tcName,
                 });
                 try {
-                    result = await executeWithTimeout(() => tool.execute(ctx.context, params, { signal }), tool.timeout, tcName);
+                    result = await executeToolWithRetry(() => tool.execute(ctx.context, params, { signal }), { timeout: tool.timeout, retries: tool.retries, name: tcName });
                 }
                 finally {
                     trace.endSpan(span);
                 }
             }
             else {
-                result = await executeWithTimeout(() => tool.execute(ctx.context, params, { signal }), tool.timeout, tcName);
+                result = await executeToolWithRetry(() => tool.execute(ctx.context, params, { signal }), {
+                    timeout: tool.timeout,
+                    retries: tool.retries,
+                    name: tcName,
+                });
             }
             // Run tool output guardrails
             if (toolOutputGuardrails && toolOutputGuardrails.length > 0) {
@@ -969,4 +1082,145 @@ async function executeToolCallsWithHandoffs(agent, ctx, toolCalls, trace, signal
     }));
     return { toolMessages: results, handoffAgent };
 }
+async function collectPendingApprovals(agent, toolCalls, context) {
+    const functionTools = agent.tools.filter(isFunctionTool);
+    const toolsByName = new Map(functionTools.map((t) => [t.name, t]));
+    const pending = [];
+    for (const tc of toolCalls) {
+        const matchedTool = toolsByName.get(tc.function.name);
+        if (!matchedTool?.needsApproval)
+            continue;
+        let parsedArgs;
+        try {
+            parsedArgs = JSON.parse(tc.function.arguments);
+        }
+        catch {
+            parsedArgs = undefined;
+        }
+        let needsApproval;
+        if (typeof matchedTool.needsApproval === "function") {
+            needsApproval = await matchedTool.needsApproval(parsedArgs, context);
+        }
+        else {
+            needsApproval = matchedTool.needsApproval;
+        }
+        if (needsApproval) {
+            pending.push({
+                toolCallId: tc.id,
+                toolName: tc.function.name,
+                arguments: tc.function.arguments,
+                parsedArguments: parsedArgs,
+            });
+        }
+    }
+    return pending;
+}
+export async function resumeRun(interrupted, approvals, options) {
+    const agent = interrupted.currentAgent;
+    const messages = [...interrupted.messages];
+    // The last message should be the assistant message with tool_calls
+    const lastMsg = messages[messages.length - 1];
+    if (!lastMsg || lastMsg.role !== "assistant" || !lastMsg.tool_calls) {
+        throw new StratusError("Cannot resume: last message is not an assistant message with tool_calls");
+    }
+    const approvalMap = new Map(approvals.map((a) => [a.toolCallId, a]));
+    const pendingIds = new Set(interrupted.pendingToolCalls.map((p) => p.toolCallId));
+    const functionTools = agent.tools.filter(isFunctionTool);
+    const subagentTools = (interrupted.currentAgent.subagents ?? []).map(subagentToTool);
+    const toolsByName = new Map([...functionTools, ...subagentTools].map((t) => [t.name, t]));
+    const model = options?.model ?? agent.model;
+    if (!model) {
+        throw new StratusError("No model provided. Pass a model to the agent or to run().");
+    }
+    const signal = options?.signal;
+    checkAborted(signal);
+    const context = (options?.context ?? interrupted.context);
+    // Process each tool call from the assistant message
+    const toolMessages = [];
+    for (const tc of lastMsg.tool_calls) {
+        if (pendingIds.has(tc.id)) {
+            // This was a pending approval tool call
+            const approval = approvalMap.get(tc.id);
+            if (!approval || approval.decision === "deny") {
+                const denyMsg = approval?.denyMessage ?? "Tool call denied by user";
+                toolMessages.push({
+                    role: "tool",
+                    tool_call_id: tc.id,
+                    content: denyMsg,
+                });
+            }
+            else {
+                // Approved — execute the tool
+                const matchedTool = toolsByName.get(tc.function.name);
+                if (!matchedTool) {
+                    toolMessages.push({
+                        role: "tool",
+                        tool_call_id: tc.id,
+                        content: `Error: Unknown tool "${tc.function.name}"`,
+                    });
+                    continue;
+                }
+                try {
+                    const params = JSON.parse(tc.function.arguments);
+                    const result = await executeToolWithRetry(() => matchedTool.execute(context, params, { signal }), {
+                        timeout: matchedTool.timeout,
+                        retries: matchedTool.retries,
+                        name: tc.function.name,
+                    });
+                    toolMessages.push({
+                        role: "tool",
+                        tool_call_id: tc.id,
+                        content: result,
+                    });
+                }
+                catch (error) {
+                    toolMessages.push({
+                        role: "tool",
+                        tool_call_id: tc.id,
+                        content: formatToolError(tc.function.name, error, options?.toolErrorFormatter),
+                    });
+                }
+            }
+        }
+        else {
+            // Non-pending tool call — execute it now (it wasn't executed before the interrupt)
+            const matchedTool = toolsByName.get(tc.function.name);
+            if (!matchedTool) {
+                toolMessages.push({
+                    role: "tool",
+                    tool_call_id: tc.id,
+                    content: `Error: Unknown tool "${tc.function.name}"`,
+                });
+                continue;
+            }
+            try {
+                const params = JSON.parse(tc.function.arguments);
+                const result = await executeToolWithRetry(() => matchedTool.execute(context, params, { signal }), {
+                    timeout: matchedTool.timeout,
+                    retries: matchedTool.retries,
+                    name: tc.function.name,
+                });
+                toolMessages.push({
+                    role: "tool",
+                    tool_call_id: tc.id,
+                    content: result,
+                });
+            }
+            catch (error) {
+                toolMessages.push({
+                    role: "tool",
+                    tool_call_id: tc.id,
+                    content: formatToolError(tc.function.name, error, options?.toolErrorFormatter),
+                });
+            }
+        }
+    }
+    messages.push(...toolMessages);
+    // Continue the run from where we left off
+    return run(agent, messages, {
+        ...options,
+        context,
+        model,
+    });
+}
 //# sourceMappingURL=run.js.map