@rowan-agent/agent 0.26.0 → 0.28.0

package/dist/index.d.ts

@@ -11,24 +11,18 @@ type ModelInvokeOutput = {
     model?: ModelRef;
     usage?: LlmTokenUsage;
 };
-/** Snapshot of phase-level context for restore */
-type PhaseContextSnapshot = {
-    systemPrompt: string;
-    messages: AgentMessage[];
-    currentPhase: string;
-    availablePhases: string[];
-    turnNumber: number;
-    payload?: unknown;
+type InternalModelLoopOptions = {
+    prompt: string;
+    tools?: readonly string[];
+    maxToolRounds?: number;
 };
 /** Execution capabilities for a phase — operates on PhaseContext. */
 type PhaseExecution = {
-    snapshot(): PhaseContextSnapshot;
-    restore(snapshot: PhaseContextSnapshot): void;
     invokeModel(context: PhaseContext, options?: {
         output?: "reply" | "internal";
     }): Promise<ModelInvokeOutput>;
+    runInternalModelLoop(context: PhaseContext, options: InternalModelLoopOptions): Promise<ModelInvokeOutput>;
     reportStatus(status: PhaseStatus): Promise<void>;
-    executeTool(context: AgentContext, toolCall: ToolCall): Promise<ToolResult>;
     executeTools(context: AgentContext, toolCalls: readonly ToolCall[], contentBlocks?: readonly ContentBlock[], meta?: {
         model?: ModelRef;
         usage?: LlmTokenUsage;
@@ -3402,4 +3396,4 @@ declare function parseFrontmatter<T = Record<string, unknown>>(raw: string): Fro
 
 declare function createCoreTools(input?: CoreToolContext): Tool$1[];
 
-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 EntryPhaseSpec, type EventCursor, type EventId, type ExecutionCheckpoint, type ExecutionId, type ExecutionToken, type ExtensionAPI, type ExtensionActivationError, type ExtensionActivationResult, type ExtensionCapability, type ExtensionCapabilityContribution, type ExtensionContribution, type ExtensionDisposer, type ExtensionFactory, type ExtensionFactoryResult, type ExtensionHost, ExtensionLifetimeError, type ExtensionLifetimeErrorCode, type ExtensionLoadInput, type ExtensionStateStore, type ExtensionToolContribution, type FrontmatterResult, type HistorySeed, type HookEvent, type HookEventType, type HookHandler, type HostApiExtension, InMemoryConfigProvider, InMemoryExtensionHost, InMemoryStore, type InteractionRecord, type InvocationCatalogEntry, type InvocationSource, type JsonObject, type JsonPrimitive, type JsonValue, type LiveInteractionEvent, 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 ModelRetry, type OpaqueId, type Outcome$1 as Outcome, type OwnerLease, type OwnerToken, type Page, type Phase, type PhaseContext, type PhaseContribution, type PhaseExecution, type PhaseExecutionIdentity, type PhaseInput, type PhaseInvocation, type PhaseMessageManager, type PhaseOutput, type PhaseRegistry, type PhaseRegistrySelection, 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 RunEndEvent, type RunEvent, type RunFailure, type RunId, type RunInteraction, RunInteractionBoundary, RunInteractionCancelledError, type RunInteractionDriver, type RunInteractionKind, type RunInteractionRequest, type RunInteractionState, type RunInteractionStatus, type RunListCursor, type RunRecord, type RunSnapshot, type RunStartEvent, type RunState, type RunStateChanged, type RunSummary, RuntimeBootstrapRegistry, RuntimeError, type RuntimeErrorCode, type RuntimeErrorDetails, RuntimeExtensionLifetime, STOP_PHASE_ID, type SettingsBadge, type SettingsControl, type SettingsDefinition, type SettingsItem, type SettingsOption, type SettingsSection, type Skill, type SkillRegistration, SqliteStore, type TextContent, type ThinkingContent, type ThinkingDelta, type Tool$1 as Tool, type ToolCallContext, type ToolCallDelta, type ToolCallId, type ToolCallPresentationInput, type ToolCallPresentationOutput, type ToolCallSnapshot, type ToolCallState, type ToolContribution, type ToolDefinition, type ToolExecutionResult, type ToolInvocationContext, type ToolMessage, type ToolMessageContent, type ToolResultContent, type ToolStateChanged, type ToolUseContent, type UserContent, type UserInput, type UserMessage, type WithdrawnUserInput, brandConfigToken, createCompactPhase, createCorePhases, createCoreTools, createDefaultPhase, createStopPhase, extensionSourceId, isConfigurationSnapshot, isRuntimeError, loadExtensionsFromPath as loadExtensions, loadPhase, loadPhases, loadSkill, loadSkills, mergeToolCall, 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 EntryPhaseSpec, type EventCursor, type EventId, type ExecutionCheckpoint, type ExecutionId, type ExecutionToken, type ExtensionAPI, type ExtensionActivationError, type ExtensionActivationResult, type ExtensionCapability, type ExtensionCapabilityContribution, type ExtensionContribution, type ExtensionDisposer, type ExtensionFactory, type ExtensionFactoryResult, type ExtensionHost, ExtensionLifetimeError, type ExtensionLifetimeErrorCode, type ExtensionLoadInput, type ExtensionStateStore, type ExtensionToolContribution, type FrontmatterResult, type HistorySeed, type HookEvent, type HookEventType, type HookHandler, type HostApiExtension, InMemoryConfigProvider, InMemoryExtensionHost, InMemoryStore, type InteractionRecord, type InternalModelLoopOptions, type InvocationCatalogEntry, type InvocationSource, type JsonObject, type JsonPrimitive, type JsonValue, type LiveInteractionEvent, 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 ModelInvokeOutput, type ModelRetry, type OpaqueId, type Outcome$1 as Outcome, type OwnerLease, type OwnerToken, type Page, type Phase, type PhaseContext, type PhaseContribution, type PhaseExecution, type PhaseExecutionIdentity, type PhaseInput, type PhaseInvocation, type PhaseMessageManager, type PhaseOutput, type PhaseRegistry, type PhaseRegistrySelection, 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 RunEndEvent, type RunEvent, type RunFailure, type RunId, type RunInteraction, RunInteractionBoundary, RunInteractionCancelledError, type RunInteractionDriver, type RunInteractionKind, type RunInteractionRequest, type RunInteractionState, type RunInteractionStatus, type RunListCursor, type RunRecord, type RunSnapshot, type RunStartEvent, type RunState, type RunStateChanged, type RunSummary, RuntimeBootstrapRegistry, RuntimeError, type RuntimeErrorCode, type RuntimeErrorDetails, RuntimeExtensionLifetime, STOP_PHASE_ID, type SettingsBadge, type SettingsControl, type SettingsDefinition, type SettingsItem, type SettingsOption, type SettingsSection, type Skill, type SkillRegistration, SqliteStore, type TextContent, type ThinkingContent, type ThinkingDelta, type Tool$1 as Tool, type ToolCallContext, type ToolCallDelta, type ToolCallId, type ToolCallPresentationInput, type ToolCallPresentationOutput, type ToolCallSnapshot, type ToolCallState, type ToolContribution, type ToolDefinition, type ToolExecutionResult, type ToolInvocationContext, type ToolMessage, type ToolMessageContent, type ToolResultContent, type ToolStateChanged, type ToolUseContent, type UserContent, type UserInput, type UserMessage, type WithdrawnUserInput, brandConfigToken, createCompactPhase, createCorePhases, createCoreTools, createDefaultPhase, createStopPhase, extensionSourceId, isConfigurationSnapshot, isRuntimeError, loadExtensionsFromPath as loadExtensions, loadPhase, loadPhases, loadSkill, loadSkills, mergeToolCall, parseAgentDefinition, parseFrontmatter, resolveConfigurationSnapshot };

package/dist/index.js

@@ -2479,6 +2479,84 @@ function createStopPhase() {
     disableImplicitInvocation: false
   };
 }
+async function runInternalModelLoop(context, execution, phase, options) {
+  const working = { ...context, messages: [...context.messages] };
+  working.messages.push(createMessage("user", options.prompt, {
+    kind: "phase_input",
+    phase
+  }));
+  let result = await execution.invokeModel(working, { output: "internal" });
+  const maxRounds = options.maxToolRounds ?? 8;
+  const isAllowedTool = (name) => {
+    if (name === PhaseRouteTool) return false;
+    if (options.tools) {
+      return options.tools.includes(name);
+    }
+    return context.tools.some((tool) => tool.name === name);
+  };
+  for (let attempt = 0; attempt < maxRounds && result.toolCalls.length > 0; attempt += 1) {
+    if (!result.toolCalls.some((call) => isAllowedTool(call.name))) break;
+    const normalizedCalls = result.toolCalls.map((call) => ({
+      ...call,
+      args: typeof call.args === "string" ? (() => {
+        try {
+          return JSON.parse(call.args);
+        } catch {
+          return call.args;
+        }
+      })() : call.args
+    }));
+    const toolUseParts = normalizedCalls.map((call) => ({
+      type: "tool_use",
+      id: call.id,
+      name: call.name,
+      input: call.args
+    }));
+    const assistantContent = result.contentBlocks.length > 0 ? contentBlocksToMessageContent(result.contentBlocks) : result.text ? [{ type: "text", text: result.text }, ...toolUseParts] : toolUseParts;
+    working.messages.push(createMessage("assistant", assistantContent, {
+      kind: "phase_tool",
+      phase
+    }));
+    const allowedCalls = normalizedCalls.filter((call) => isAllowedTool(call.name));
+    const executedResults = allowedCalls.length > 0 ? await execution.executeTools(
+      working,
+      allowedCalls,
+      result.contentBlocks,
+      result.model ? { model: result.model, usage: result.usage } : void 0
+    ) : [];
+    const executedByCallId = new Map(executedResults.map((r) => [r.toolCallId, r]));
+    const createErrorResult = (call) => {
+      const message = `Tool ${call.name} is not available in Phase ${phase}`;
+      return {
+        toolCallId: call.id,
+        toolName: call.name,
+        ok: false,
+        error: message,
+        content: message
+      };
+    };
+    const toolResults = normalizedCalls.map((call) => {
+      if (isAllowedTool(call.name)) {
+        const executed = executedByCallId.get(call.id);
+        if (executed) return executed;
+      }
+      return createErrorResult(call);
+    });
+    for (const toolResult2 of toolResults) {
+      working.messages.push(createMessage("tool", [{
+        type: "tool_result",
+        toolUseId: toolResult2.toolCallId,
+        content: JSON.stringify(toolResult2),
+        isError: !toolResult2.ok
+      }], {
+        kind: "phase_tool",
+        phase
+      }));
+    }
+    result = await execution.invokeModel(working, { output: "internal" });
+  }
+  return result;
+}
 function createCompactPhase() {
   return {
     name: COMPACT_PHASE_ID,
@@ -2496,51 +2574,11 @@ function createCompactPhase() {
         kind: "compacting",
         message: "Compacting conversation context."
       });
-      const tools = context.tools.filter((tool) => tool.name === "read" || tool.name === "bash");
-      const working = { ...context, tools, skills: [...context.skills], messages: [...context.messages] };
       const instructions = compactInstructions(context);
-      working.messages.push(createMessage("user", buildCompactionPrompt(instructions), {
-        kind: "phase_input",
-        phase: COMPACT_PHASE_ID
-      }));
-      let result = await execution.invokeModel(working, { output: "internal" });
-      for (let attempt = 0; attempt < 8 && result.toolCalls.length > 0; attempt += 1) {
-        const calls = result.toolCalls.filter((call) => tools.some((tool) => tool.name === call.name));
-        if (calls.length === 0) break;
-        const normalizedCalls = calls.map((call) => ({
-          ...call,
-          args: typeof call.args === "string" ? (() => {
-            try {
-              return JSON.parse(call.args);
-            } catch {
-              return call.args;
-            }
-          })() : call.args
-        }));
-        const assistantContent = result.contentBlocks.length > 0 ? contentBlocksToMessageContent(result.contentBlocks) : normalizedCalls.map((call) => ({ type: "tool_use", id: call.id, name: call.name, input: call.args }));
-        working.messages.push(createMessage("assistant", assistantContent, {
-          kind: "phase_tool",
-          phase: COMPACT_PHASE_ID
-        }));
-        const toolResults = await execution.executeTools(
-          working,
-          normalizedCalls,
-          result.contentBlocks,
-          result.model ? { model: result.model, usage: result.usage } : void 0
-        );
-        for (const toolResult2 of toolResults) {
-          working.messages.push(createMessage("tool", [{
-            type: "tool_result",
-            toolUseId: toolResult2.toolCallId,
-            content: JSON.stringify(toolResult2),
-            isError: !toolResult2.ok
-          }], {
-            kind: "phase_tool",
-            phase: COMPACT_PHASE_ID
-          }));
-        }
-        result = await execution.invokeModel(working, { output: "internal" });
-      }
+      const result = await execution.runInternalModelLoop(context, {
+        prompt: buildCompactionPrompt(instructions),
+        tools: ["read", "bash"]
+      });
       return {
         route: "stop",
         phase: COMPACT_PHASE_ID,
@@ -3738,25 +3776,9 @@ function createPhaseExecution(config, state, phase, messageManager, toolExecutio
       return result;
     });
   };
-  return {
+  const execution = {
     interaction,
     messages: messageManager,
-    snapshot() {
-      return {
-        systemPrompt: config.context.systemPrompt,
-        messages: [...config.context.messages],
-        currentPhase: state.currentPhase ?? "",
-        availablePhases: Array.from(registry.phases.keys()),
-        turnNumber: state.metrics.iterations
-      };
-    },
-    restore(snapshot) {
-      config.context.systemPrompt = snapshot.systemPrompt;
-      config.context.messages.length = 0;
-      config.context.messages.push(...snapshot.messages);
-      state.currentPhase = snapshot.currentPhase;
-      state.metrics.iterations = snapshot.turnNumber;
-    },
     async invokeModel(phaseContext, options = {}) {
       if (config.beforePrompt) {
         phaseContext = await config.beforePrompt(phase.name, phaseContext);
@@ -3852,10 +3874,12 @@ function createPhaseExecution(config, state, phase, messageManager, toolExecutio
       await config.onModelTranscript?.(result.transcript, { phase: phase.name, model: phase.model ?? config.model });
       return result;
     },
+    async runInternalModelLoop(phaseContext, options) {
+      return runInternalModelLoop(phaseContext, execution, phase.name, options);
+    },
     async reportStatus(status) {
       await config.onPhaseStatus?.(phase.name, status);
     },
-    executeTool: executePhaseTool,
     async executeTools(phaseContext, toolCalls, contentBlocks, meta) {
       return runTurn(async () => {
         const tools = phaseContext.tools.filter((tool) => tool.name !== PhaseRouteTool);
@@ -3885,6 +3909,7 @@ function createPhaseExecution(config, state, phase, messageManager, toolExecutio
       });
     }
   };
+  return execution;
 }
 function parallelPhaseReply(produced) {
   const last = [...produced].reverse().find((message) => message.role === "assistant");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowan-agent/agent",
-  "version": "0.26.0",
+  "version": "0.28.0",
   "license": "MIT",
   "repository": {
     "type": "git",