@rowan-agent/agent 0.10.2 → 0.11.1

package/dist/index.d.ts

@@ -98,6 +98,7 @@ type ExecutionContinuationState = {
 
 type PhaseInteractionKind = "user_input" | "permission" | "elicitation" | "confirmation";
 type PhaseInteractionStatus = "pending" | "answered" | "denied" | "cancelled" | "expired";
+type PhaseInteractionOrigin = "tool_call" | "phase";
 type PhaseInteraction = Readonly<{
     id: string;
     phase: string;
@@ -106,6 +107,8 @@ type PhaseInteraction = Readonly<{
     payload?: JsonValue;
     createdAt: string;
     status: PhaseInteractionStatus;
+    origin?: PhaseInteractionOrigin;
+    toolCallId?: string;
 }>;
 type PhaseInteractionState = Readonly<{
     requests: readonly PhaseInteraction[];
@@ -119,6 +122,8 @@ type PhaseInteractionDriver = Readonly<{
         kind: PhaseInteractionKind;
         prompt: string;
         payload?: JsonValue;
+        origin?: PhaseInteractionOrigin;
+        toolCallId?: string;
     }>): PhaseInteraction;
     pending(): readonly PhaseInteraction[];
     answers(): ReadonlyMap<string, JsonValue>;
@@ -348,10 +353,10 @@ type RunStateChanged = DurableEventBase & (Readonly<{
     kind: "run_state_changed";
     from: "running";
     to: "input_required";
-    request: Readonly<{
+    request?: Readonly<{
         id: InputRequestId;
         phase: string;
-        prompt: AssistantMessage;
+        prompt?: AssistantMessage;
     }>;
     interactions: readonly PhaseInteraction[];
     answers: Readonly<Record<string, JsonValue>>;
@@ -1666,7 +1671,7 @@ type ExecutionCheckpoint = Readonly<{
 type InputRequest = Readonly<{
     id: InputRequestId;
     phase: string;
-    messageId: MessageId;
+    messageId?: MessageId;
     createdAt: string;
 }>;
 type OwnerLease = Readonly<{
@@ -1682,7 +1687,7 @@ type RunClaim = Readonly<{
 }>;
 type InputRequiredCommit = Readonly<{
     run: RunRecord;
-    prompt: AssistantMessage;
+    prompt?: AssistantMessage;
     request: InputRequest;
     interactions: readonly PhaseInteraction[];
 }>;
@@ -1783,7 +1788,7 @@ type RunSnapshot = RunSnapshotBase & (Readonly<{
     request: Readonly<{
         id: InputRequestId;
         phase: string;
-        prompt: AssistantMessage;
+        prompt?: AssistantMessage;
     }>;
     interactions: readonly PhaseInteraction[];
     answers: Readonly<Record<string, JsonValue>>;
@@ -1802,7 +1807,7 @@ type RunBoundary = Readonly<{
     type: "input_required";
     requestId: InputRequestId;
     phase: string;
-    prompt: AssistantMessage;
+    prompt?: AssistantMessage;
     interactions: readonly PhaseInteraction[];
     answers: Readonly<Record<string, JsonValue>>;
 }> | Readonly<{
@@ -1902,7 +1907,7 @@ interface OwnedStore {
         expectedRevision: number;
         requestId?: InputRequestId;
         phase: string;
-        prompt: AssistantMessage;
+        prompt?: AssistantMessage;
         checkpoint: ExecutionCheckpoint;
         interactions?: readonly PhaseInteraction[];
         interactionAnswers?: Readonly<Record<string, JsonValue>>;
@@ -2319,7 +2324,7 @@ declare class InMemoryStore implements DurableStore {
         expectedRevision: number;
         requestId?: InputRequestId;
         phase: string;
-        prompt: AssistantMessage;
+        prompt?: AssistantMessage;
         checkpoint: ExecutionCheckpoint;
         interactions?: readonly PhaseInteraction[];
         interactionAnswers?: Readonly<Record<string, JsonValue>>;
@@ -2515,7 +2520,7 @@ declare class SqliteStore implements DurableStore {
         expectedRevision: number;
         requestId?: InputRequestId;
         phase: string;
-        prompt: AssistantMessage;
+        prompt?: AssistantMessage;
         checkpoint: ExecutionCheckpoint;
         interactions?: readonly PhaseInteraction[];
         interactionAnswers?: Readonly<Record<string, JsonValue>>;
@@ -2813,4 +2818,4 @@ declare function parseFrontmatter<T = Record<string, unknown>>(raw: string): Fro
 
 declare function createCoreTools(input?: CoreToolContext): Tool[];
 
-export { type AfterToolCall, type AgentConfiguration, type AgentDefinition, type AgentId, type AgentListCursor, type AgentRecord, type AgentRun, AgentRuntime, type AgentRuntimeOptions, type AgentSummary, type AnyRuntimeError, type AssistantContent, type AssistantMessage, type BeforeToolCall, COMPACT_PHASE_ID, type ConfigProvider, type ConfigPutResult, type ConfigResolution, type ConfigToken, type ConfigurationSnapshot, type ContextCandidate, type ContextCompactionRecord, type ContextStatus, type CoreToolContext, DEFAULT_PHASE_ID, type DefinitionLayer, type DurableConsumer, type DurableRunEvent, type DurableStore, type DurableToolResult, type EventCursor, type EventId, type ExecutionCheckpoint, type ExecutionId, type ExecutionToken, type ExtensionAPI, type ExtensionActivationError, type ExtensionActivationResult, type ExtensionContribution, type ExtensionDisposer, type ExtensionFactory, type ExtensionFactoryResult, ExtensionLifetimeError, type ExtensionLifetimeErrorCode, type ExtensionLoadInput, type FrontmatterResult, type HistorySeed, type HookEvent, type HookEventType, type HookHandler, InMemoryConfigProvider, InMemoryStore, type InputRequest, type InputRequestId, type InputRequiredCommit, type InvocationCatalogEntry, type InvocationSource, type JsonObject, type JsonPrimitive, type JsonValue, type LoadExtensionsResult, type LoadInput, type LoadResult, type LoadedExtension, type Message, type MessageBase, type MessageCommitted, type MessageContent, type MessageDelta, type MessageId, type MessageRevised, type MessageRevisionResult, type Metadata, type OpaqueId, type Outcome, type OwnerLease, type OwnerToken, type Page, type Phase, type PhaseContext, type PhaseContribution, type PhaseExecution, type PhaseExecutionIdentity, type PhaseInput, type PhaseInteraction, PhaseInteractionBoundary, PhaseInteractionCancelledError, type PhaseInteractionDriver, type PhaseInteractionKind, type PhaseInteractionState, type PhaseInteractionStatus, type PhaseInvocation, type PhaseMessageManager, type PhaseOutput, type PhaseRegistry, type PhaseRegistrySelection, type PhaseSettingsBadge, type PhaseSettingsContext, type PhaseSettingsControl, type PhaseSettingsDefinition, type PhaseSettingsItem, type PhaseSettingsOption, type PhaseSettingsProvider, type PhaseSettingsSection, type PhaseState, type PhaseStatus, type PhaseStatusState, type ResolvedResourceView, type ResourceDiagnostic, type ResourceKind, type ResourceRef, ResourceRegistry, ResourceRegistryError, type ResourceRegistryErrorCode, type ResourceSourceId, type ResourceView, type RetentionResult, type RunBoundary, type RunClaim, type RunEvent, type RunFailure, type RunId, type RunListCursor, type RunRecord, type RunSnapshot, type RunState, type RunStateChanged, type RunSummary, RuntimeBootstrapRegistry, RuntimeError, type RuntimeErrorCode, type RuntimeErrorDetails, RuntimeExtensionLifetime, STOP_PHASE_ID, type Skill, SqliteStore, type TextContent, type ThinkingContent, type ThinkingDelta, type Tool, type ToolCallId, type ToolCallInteractionRequest, type ToolCallSnapshot, type ToolCallState, type ToolContribution, type ToolDefinition, type ToolExecutionResult$1 as ToolExecutionResult, type ToolInvocationContext, type ToolMessage, type ToolMessageContent, type ToolProgress, type ToolResultContent, type ToolStateChanged, type ToolUseContent, type UserContent, type UserInput, type UserMessage, brandConfigToken, createCompactPhase, createCorePhases, createCoreTools, createDefaultPhase, createStopPhase, isConfigurationSnapshot, isRuntimeError, loadExtensionsFromPath as loadExtensions, loadPhase, loadPhaseSettings, loadPhases, loadSkill, loadSkills, parseAgentDefinition, parseFrontmatter, resolveConfigurationSnapshot };
+export { type AfterToolCall, type AgentConfiguration, type AgentDefinition, type AgentId, type AgentListCursor, type AgentRecord, type AgentRun, AgentRuntime, type AgentRuntimeOptions, type AgentSummary, type AnyRuntimeError, type AssistantContent, type AssistantMessage, type BeforeToolCall, COMPACT_PHASE_ID, type ConfigProvider, type ConfigPutResult, type ConfigResolution, type ConfigToken, type ConfigurationSnapshot, type ContextCandidate, type ContextCompactionRecord, type ContextStatus, type CoreToolContext, DEFAULT_PHASE_ID, type DefinitionLayer, type DurableConsumer, type DurableRunEvent, type DurableStore, type DurableToolResult, type EventCursor, type EventId, type ExecutionCheckpoint, type ExecutionId, type ExecutionToken, type ExtensionAPI, type ExtensionActivationError, type ExtensionActivationResult, type ExtensionContribution, type ExtensionDisposer, type ExtensionFactory, type ExtensionFactoryResult, ExtensionLifetimeError, type ExtensionLifetimeErrorCode, type ExtensionLoadInput, type FrontmatterResult, type HistorySeed, type HookEvent, type HookEventType, type HookHandler, InMemoryConfigProvider, InMemoryStore, type InputRequest, type InputRequestId, type InputRequiredCommit, type InvocationCatalogEntry, type InvocationSource, type JsonObject, type JsonPrimitive, type JsonValue, type LoadExtensionsResult, type LoadInput, type LoadResult, type LoadedExtension, type Message, type MessageBase, type MessageCommitted, type MessageContent, type MessageDelta, type MessageId, type MessageRevised, type MessageRevisionResult, type Metadata, type OpaqueId, type Outcome, type OwnerLease, type OwnerToken, type Page, type Phase, type PhaseContext, type PhaseContribution, type PhaseExecution, type PhaseExecutionIdentity, type PhaseInput, type PhaseInteraction, PhaseInteractionBoundary, PhaseInteractionCancelledError, type PhaseInteractionDriver, type PhaseInteractionKind, type PhaseInteractionOrigin, type PhaseInteractionState, type PhaseInteractionStatus, type PhaseInvocation, type PhaseMessageManager, type PhaseOutput, type PhaseRegistry, type PhaseRegistrySelection, type PhaseSettingsBadge, type PhaseSettingsContext, type PhaseSettingsControl, type PhaseSettingsDefinition, type PhaseSettingsItem, type PhaseSettingsOption, type PhaseSettingsProvider, type PhaseSettingsSection, type PhaseState, type PhaseStatus, type PhaseStatusState, type ResolvedResourceView, type ResourceDiagnostic, type ResourceKind, type ResourceRef, ResourceRegistry, ResourceRegistryError, type ResourceRegistryErrorCode, type ResourceSourceId, type ResourceView, type RetentionResult, type RunBoundary, type RunClaim, type RunEvent, type RunFailure, type RunId, type RunListCursor, type RunRecord, type RunSnapshot, type RunState, type RunStateChanged, type RunSummary, RuntimeBootstrapRegistry, RuntimeError, type RuntimeErrorCode, type RuntimeErrorDetails, RuntimeExtensionLifetime, STOP_PHASE_ID, type Skill, SqliteStore, type TextContent, type ThinkingContent, type ThinkingDelta, type Tool, type ToolCallId, type ToolCallInteractionRequest, type ToolCallSnapshot, type ToolCallState, type ToolContribution, type ToolDefinition, type ToolExecutionResult$1 as ToolExecutionResult, type ToolInvocationContext, type ToolMessage, type ToolMessageContent, type ToolProgress, type ToolResultContent, type ToolStateChanged, type ToolUseContent, type UserContent, type UserInput, type UserMessage, brandConfigToken, createCompactPhase, createCorePhases, createCoreTools, createDefaultPhase, createStopPhase, isConfigurationSnapshot, isRuntimeError, loadExtensionsFromPath as loadExtensions, loadPhase, loadPhaseSettings, loadPhases, loadSkill, loadSkills, parseAgentDefinition, parseFrontmatter, resolveConfigurationSnapshot };

package/dist/index.js

@@ -677,7 +677,18 @@ function createReadTool(context) {
           error: invalidLimit
         });
       }
-      const fileStat = await stat(resolved.absolutePath);
+      let fileStat;
+      try {
+        fileStat = await stat(resolved.absolutePath);
+      } catch (error) {
+        return toolResult({
+          context: toolContext,
+          toolName: "read",
+          ok: false,
+          content: null,
+          error: error instanceof Error ? error.message : String(error)
+        });
+      }
       if (!fileStat.isFile()) {
         return toolResult({
           context: toolContext,
@@ -687,7 +698,18 @@ function createReadTool(context) {
           error: `Not a file: ${resolved.relativePath}`
         });
       }
-      const bytes = await readFile2(resolved.absolutePath);
+      let bytes;
+      try {
+        bytes = await readFile2(resolved.absolutePath);
+      } catch (error) {
+        return toolResult({
+          context: toolContext,
+          toolName: "read",
+          ok: false,
+          content: null,
+          error: error instanceof Error ? error.message : String(error)
+        });
+      }
       const source = new TextDecoder().decode(bytes);
       const sourceLines = source.split(/\r\n|\n|\r/);
       const requestedOffset = parsed.offset ?? 1;
@@ -1380,6 +1402,8 @@ function createPhaseInteractionDriver(state, phase, signal) {
         kind: input.kind,
         prompt: input.prompt,
         ...input.payload === void 0 ? {} : { payload: input.payload },
+        ...input.origin === void 0 ? {} : { origin: input.origin },
+        ...input.toolCallId === void 0 ? {} : { toolCallId: input.toolCallId },
         createdAt: createTimestamp(),
         status: "pending"
       };
@@ -6380,19 +6404,20 @@ var AgentRuntime = class _AgentRuntime {
         return;
       }
       if (result.type === "input_required") {
+        const isToolCallInteraction = result.interactions?.some((i) => i.origin === "tool_call");
         const output = result.interactions && result.interactions.length > 0 ? void 0 : latestAssistant(
           run,
           result.messages.slice(modelMessages.length),
           modelMessages.length
         );
-        const prompt = output ?? promptMessage(run, result.request.prompt, result.messages.length);
+        const prompt = isToolCallInteraction ? void 0 : output ?? promptMessage(run, result.request.prompt, result.messages.length);
         await this.owned.commitInputRequired({
           runId: run.id,
           execution: claim.execution,
           expectedRevision: executionRevision,
           requestId: createId("input"),
           phase: result.request.phase,
-          prompt,
+          ...prompt ? { prompt } : {},
           checkpoint: result.checkpoint,
           interactions: result.interactions,
           interactionAnswers: claim.run.interactionAnswers
@@ -6735,7 +6760,9 @@ var AgentRuntime = class _AgentRuntime {
               id: decision.interaction.id,
               kind: decision.interaction.kind,
               prompt: decision.interaction.prompt,
-              payload: decision.interaction.payload
+              payload: decision.interaction.payload,
+              origin: "tool_call",
+              toolCallId
             });
             input.driver.suspend({
               checkpoint: {
@@ -7055,7 +7082,7 @@ function boundaryFromSnapshot(snapshot) {
         type: "input_required",
         requestId: snapshot.request.id,
         phase: snapshot.request.phase,
-        prompt: snapshot.request.prompt,
+        ...snapshot.request.prompt ? { prompt: snapshot.request.prompt } : {},
         interactions: snapshot.interactions,
         answers: snapshot.answers
       };
@@ -7630,24 +7657,28 @@ var InMemoryStore = class _InMemoryStore {
     const requestId = input.requestId ?? createId("input");
     const operationKey = `input_required:${requestId}`;
     const interactions = input.interactions ?? [];
-    const operationPayload = canonicalJson([input.runId, input.expectedRevision, input.phase, input.prompt.id, input.checkpoint, interactions, input.interactionAnswers ?? null]);
+    const operationPayload = canonicalJson([input.runId, input.expectedRevision, input.phase, input.prompt ? input.prompt.id : null, input.checkpoint, interactions, input.interactionAnswers ?? null]);
     const replay = this.replayOperation(operationKey, operationPayload);
     if (replay) return clone(replay);
     const run = this.requireRun(input.runId);
     this.assertExecution(run, input.execution, input.expectedRevision);
     this.assertState(run, ["running"]);
     this.assertNoOpenTools(run);
-    const prompt = {
-      ...clone(input.prompt),
-      sequenceWithinRun: this.nextMessageSequence(run.id)
-    };
+    const isToolCallInteraction = interactions.length > 0 && interactions.some((interaction) => interaction.origin === "tool_call");
+    let prompt;
+    if (input.prompt && !isToolCallInteraction) {
+      prompt = {
+        ...clone(input.prompt),
+        sequenceWithinRun: this.nextMessageSequence(run.id)
+      };
+      this.messages.set(prompt.id, prompt);
+    }
     const request = {
       id: requestId,
       phase: input.phase,
-      messageId: prompt.id,
+      ...prompt ? { messageId: prompt.id } : {},
       createdAt: createTimestamp()
     };
-    this.messages.set(prompt.id, prompt);
     run.state = "input_required";
     run.checkpoint = clone(input.checkpoint);
     run.openInputRequest = request;
@@ -7662,9 +7693,16 @@ var InMemoryStore = class _InMemoryStore {
     delete run.execution;
     run.revision += 1;
     run.updatedAt = createTimestamp();
-    this.appendMessage(run, prompt);
+    if (prompt) {
+      this.appendMessage(run, prompt);
+    }
     this.appendTransition(run, "running", "input_required", request, prompt, void 0, void 0, void 0, interactions, run.interactionAnswers ?? {});
-    const result = { run: clone(run), prompt: clone(prompt), request: clone(request), interactions: clone(interactions) };
+    const result = {
+      run: clone(run),
+      ...prompt ? { prompt: clone(prompt) } : {},
+      request: clone(request),
+      interactions: clone(interactions)
+    };
     this.writeOperationReceipt(operationKey, operationPayload, result);
     return result;
   }
@@ -7717,28 +7755,33 @@ var InMemoryStore = class _InMemoryStore {
     this.assertRevision(run, input.expectedRevision);
     this.assertState(run, ["input_required"]);
     const openInteractions = run.openInteractions ?? [];
-    if (!openInteractions.some((interaction) => interaction.id === input.interactionId)) {
+    const targetInteraction = openInteractions.find((interaction) => interaction.id === input.interactionId);
+    if (!targetInteraction) {
       throw new RuntimeError("input_request_conflict", { runId: run.id, requestId: input.interactionId, reason: "not_found" });
     }
-    const message = {
-      id: createId("msg"),
-      agentId: run.agentId,
-      runId: run.id,
-      role: "user",
-      content: typeof input.input === "string" ? input.input : JSON.stringify(input.input),
-      metadata: { kind: "phase_interaction", interactionId: input.interactionId },
-      sequenceWithinRun: this.nextMessageSequence(run.id),
-      createdAt: createTimestamp()
-    };
-    this.messages.set(message.id, message);
+    const isToolCall = targetInteraction.origin === "tool_call";
+    const now = createTimestamp();
+    if (!isToolCall) {
+      const message = {
+        id: createId("msg"),
+        agentId: run.agentId,
+        runId: run.id,
+        role: "user",
+        content: typeof input.input === "string" ? input.input : JSON.stringify(input.input),
+        metadata: { kind: "phase_interaction", interactionId: input.interactionId },
+        sequenceWithinRun: this.nextMessageSequence(run.id),
+        createdAt: now
+      };
+      this.messages.set(message.id, message);
+      this.appendMessage(run, message);
+    }
     run.openInteractions = openInteractions.filter((interaction) => interaction.id !== input.interactionId);
     run.interactionAnswers = {
       ...run.interactionAnswers ?? {},
       [input.interactionId]: clone(input.input)
     };
     run.revision += 1;
-    run.updatedAt = message.createdAt;
-    this.appendMessage(run, message);
+    run.updatedAt = now;
     if (run.openInteractions.length === 0) {
       delete run.openInteractions;
       delete run.openInputRequest;
@@ -8039,12 +8082,16 @@ var InMemoryStore = class _InMemoryStore {
         return { ...base, state: run.state };
       case "input_required": {
         const request = run.openInputRequest;
-        const prompt = request && this.messages.get(request.messageId);
-        if (!prompt || prompt.role !== "assistant") throw new Error(`Run ${run.id} has an invalid input prompt.`);
+        const prompt = request?.messageId ? this.messages.get(request.messageId) : void 0;
+        if (request?.messageId && (!prompt || prompt.role !== "assistant")) throw new Error(`Run ${run.id} has an invalid input prompt.`);
         return {
           ...base,
           state: "input_required",
-          request: { id: request.id, phase: request.phase, prompt: clone(prompt) },
+          request: {
+            id: request?.id ?? "",
+            phase: request?.phase ?? "",
+            ...prompt ? { prompt: clone(prompt) } : {}
+          },
           interactions: clone(run.openInteractions ?? []),
           answers: clone(run.interactionAnswers ?? {})
         };
@@ -8366,7 +8413,13 @@ ${record.summary}`,
       kind: "run_state_changed",
       from,
       to,
-      ...to === "input_required" && request && prompt ? { request: { id: request.id, phase: request.phase, prompt } } : {},
+      ...to === "input_required" && request ? {
+        request: {
+          id: request.id,
+          phase: request.phase,
+          ...prompt ? { prompt } : {}
+        }
+      } : {},
       ...to === "input_required" ? { interactions: clone(interactions ?? []), answers: clone(answers ?? {}) } : {},
       ...to === "completed" && outcome ? { outcome } : {},
       ...to === "failed" && failure ? { failure } : {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowan-agent/agent",
-  "version": "0.10.2",
+  "version": "0.11.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -23,7 +23,7 @@
     "build": "tsup && bun scripts/check-public-interface.ts"
   },
   "dependencies": {
-    "@rowan-agent/models": "0.6.7",
+    "@rowan-agent/models": "0.6.8",
     "jiti": "2.7.0",
     "typebox": "^1.0.0",
     "yaml": "^2.7.0"