@rowan-agent/agent 0.27.0 → 0.29.0

package/dist/index.js

@@ -2235,6 +2235,19 @@ async function loadSkills(targetPath) {
 var PHASE_MARKER = "PHASE.md";
 var SKILL_MARKER2 = "SKILL.md";
 var RESOURCE_MARKERS = /* @__PURE__ */ new Set([PHASE_MARKER, SKILL_MARKER2]);
+var KNOWN_PHASE_KEYS = /* @__PURE__ */ new Set([
+  "name",
+  "description",
+  "target",
+  "input",
+  "prompt-guidelines",
+  "tools",
+  "model",
+  "isolated",
+  "disable-auto-invocation",
+  "disable-implicit-invocation",
+  "skills"
+]);
 function resolvePhasePath(input) {
   const resolved = resolve4(input);
   return existsSync2(resolved) && statSync2(resolved).isDirectory() ? join2(resolved, PHASE_MARKER) : resolved;
@@ -2274,6 +2287,15 @@ async function loadPhase(targetPath) {
   }
   diagnostics.push(...description.warnings);
   diagnostics.push(...validatePhaseTarget(metadata.target));
+  const extraMetadata = {};
+  for (const [key, value] of Object.entries(metadata)) {
+    if (KNOWN_PHASE_KEYS.has(key)) continue;
+    if (isJsonValue(value)) {
+      extraMetadata[key] = value;
+    } else {
+      diagnostics.push(`metadata key "${key}" must be a JSON-safe value`);
+    }
+  }
   warnResourceDiagnostics("phase", resolved, diagnostics);
   const baseDir = dirname4(resolved);
   const skills = await loadPhaseSkills(baseDir);
@@ -2299,7 +2321,8 @@ async function loadPhase(targetPath) {
     content: definition.prompt,
     model: definition.model,
     disableAutoInvocation: metadata["disable-auto-invocation"] === true,
-    disableImplicitInvocation: metadata["disable-implicit-invocation"] === true
+    disableImplicitInvocation: metadata["disable-implicit-invocation"] === true,
+    ...Object.keys(extraMetadata).length > 0 ? { metadata: Object.freeze(extraMetadata) } : {}
   };
   const codePath = await discoverPhaseCode(baseDir);
   if (codePath) {
@@ -3706,7 +3729,8 @@ async function executeToolCall(input) {
       contentBlocks: input.contentBlocks,
       driver: input.driver,
       options: input.options,
-      ...input.providerInitiated ? { providerInitiated: true } : {}
+      ...input.providerInitiated ? { providerInitiated: true } : {},
+      ...input.phase !== void 0 ? { phase: input.phase } : {}
     });
   } else {
     const toolContext = {
@@ -3736,7 +3760,8 @@ async function executeToolCalls(input) {
       contentBlocks: input.contentBlocks,
       driver: input.driver,
       model: input.model,
-      usage: input.usage
+      usage: input.usage,
+      ...input.phase !== void 0 ? { phase: input.phase } : {}
     });
     if (results2.length !== input.toolCalls.length) throw new Error("Runtime returned an invalid Tool batch result");
     return results2.map((result, index) => ({
@@ -3752,6 +3777,10 @@ async function executeToolCalls(input) {
   return results;
 }
 function createPhaseExecution(config, state, phase, messageManager, toolExecutionManager, registry) {
+  const phaseInfo = Object.freeze({
+    name: phase.name,
+    ...phase.metadata !== void 0 ? { metadata: phase.metadata } : {}
+  });
   const interaction = createRunInteractionDriver(state, phase.name, config.signal);
   const executePhaseTool = async (phaseContext, toolCall, options, providerInitiated = false) => {
     return runTurn(async () => {
@@ -3770,7 +3799,8 @@ function createPhaseExecution(config, state, phase, messageManager, toolExecutio
         toolCall,
         driver: interaction,
         options,
-        providerInitiated
+        providerInitiated,
+        phase: phaseInfo
       });
       await toolExecutionManager.end(result.toolCallId, result.toolName, result, !result.ok);
       return result;
@@ -3779,22 +3809,6 @@ function createPhaseExecution(config, state, phase, messageManager, toolExecutio
   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);
@@ -3896,7 +3910,6 @@ function createPhaseExecution(config, state, phase, messageManager, toolExecutio
     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);
@@ -3917,7 +3930,8 @@ function createPhaseExecution(config, state, phase, messageManager, toolExecutio
           contentBlocks,
           driver: interaction,
           model: meta?.model,
-          usage: meta?.usage
+          usage: meta?.usage,
+          phase: phaseInfo
         });
         for (const result of results) {
           await toolExecutionManager.end(result.toolCallId, result.toolName, result, !result.ok);
@@ -4701,7 +4715,8 @@ function snapshotPhase(phase) {
     ...phase.promptGuidelines ? { promptGuidelines: Object.freeze([...phase.promptGuidelines]) } : {},
     skills: Object.freeze((phase.skills ?? []).map((skill) => Object.freeze({ ...skill }))),
     ...phase.input ? { input: Object.freeze({ ...phase.input }) } : {},
-    ...phase.model ? { model: Object.freeze({ ...phase.model }) } : {}
+    ...phase.model ? { model: Object.freeze({ ...phase.model }) } : {},
+    ...phase.metadata ? { metadata: Object.freeze({ ...phase.metadata }) } : {}
   });
 }
 function snapshotConfiguration(config) {
@@ -5267,7 +5282,8 @@ function assembleRegisteredExtensions(snapshot, runner, options = {}) {
         ...input.context.agentMetadata === void 0 ? {} : { agentMetadata: input.context.agentMetadata },
         answer: input.answer,
         scope: input.context.scope,
-        turn: input.context.turn
+        turn: input.context.turn,
+        ...input.context.phase === void 0 ? {} : { phase: input.context.phase }
       });
       if (decision.interaction !== void 0) {
         return { interaction: decision.interaction };
@@ -5285,7 +5301,8 @@ function assembleRegisteredExtensions(snapshot, runner, options = {}) {
           toolCallId: input.context.toolCallId,
           metadata: input.context.runMetadata,
           scope: input.context.scope,
-          turn: input.context.turn
+          turn: input.context.turn,
+          ...input.context.phase === void 0 ? {} : { phase: input.context.phase }
         }
       );
       return fromLoopResult(result);
@@ -8612,7 +8629,8 @@ var ExtensionRunner = class {
       ...context?.agentMetadata !== void 0 ? { agentMetadata: context.agentMetadata } : {},
       ...context?.answer !== void 0 ? { answer: context.answer } : {},
       scope,
-      turn
+      turn,
+      ...context?.phase !== void 0 ? { phase: context.phase } : {}
     });
     return result ?? { allow: true };
   }
@@ -8628,7 +8646,8 @@ var ExtensionRunner = class {
       ...context?.toolCallId !== void 0 ? { toolCallId: context.toolCallId } : {},
       ...context?.metadata !== void 0 ? { metadata: context.metadata } : {},
       scope,
-      turn
+      turn,
+      ...context?.phase !== void 0 ? { phase: context.phase } : {}
     });
     return hookResult?.result ?? result;
   }
@@ -9398,7 +9417,8 @@ function snapshotResourceValue(kind, value) {
     ...phase.promptGuidelines ? { promptGuidelines: Object.freeze([...phase.promptGuidelines]) } : {},
     skills: Object.freeze((phase.skills ?? []).map((skill) => Object.freeze({ ...skill }))),
     ...phase.input ? { input: Object.freeze({ ...phase.input }) } : {},
-    ...phase.model ? { model: Object.freeze({ ...phase.model }) } : {}
+    ...phase.model ? { model: Object.freeze({ ...phase.model }) } : {},
+    ...phase.metadata ? { metadata: Object.freeze({ ...phase.metadata }) } : {}
   };
   return Object.freeze(snapshot);
 }
@@ -10643,7 +10663,7 @@ var AgentRuntime = class _AgentRuntime {
         onContext: assembly.setContext,
         runtime: {
           interact: (request) => this.liveInteract(run.id, request, controller.signal),
-          tools: ({ toolCall, contentBlocks, driver, options, providerInitiated, model: callModel, usage: callUsage }) => {
+          tools: ({ toolCall, contentBlocks, driver, options, providerInitiated, model: callModel, usage: callUsage, phase: callPhase }) => {
             const task = toolQueue.then(async () => {
               if (!providerInitiated) {
                 const execution = await this.executeToolBatch({
@@ -10659,6 +10679,7 @@ var AgentRuntime = class _AgentRuntime {
                   options,
                   model: callModel ?? model,
                   usage: callUsage,
+                  phase: callPhase,
                   onRevision: (rev) => {
                     executionRevision = rev;
                   }
@@ -10685,6 +10706,7 @@ var AgentRuntime = class _AgentRuntime {
                       interactionIds,
                       model: callModel ?? model,
                       usage: callUsage,
+                      phase: callPhase,
                       onRevision: (rev) => {
                         executionRevision = rev;
                       }
@@ -10775,7 +10797,7 @@ var AgentRuntime = class _AgentRuntime {
             toolQueue = task.then(() => void 0, () => void 0);
             return task;
           },
-          toolsBatch: ({ toolCalls, contentBlocks, driver, options, model: batchModel, usage: batchUsage }) => {
+          toolsBatch: ({ toolCalls, contentBlocks, driver, options, model: batchModel, usage: batchUsage, phase: batchPhase }) => {
             const task = toolQueue.then(async () => {
               const execution = await this.executeToolBatch({
                 run,
@@ -10790,6 +10812,7 @@ var AgentRuntime = class _AgentRuntime {
                 options,
                 model: batchModel ?? model,
                 usage: batchUsage,
+                phase: batchPhase,
                 onRevision: (rev) => {
                   executionRevision = rev;
                 }
@@ -10979,6 +11002,7 @@ var AgentRuntime = class _AgentRuntime {
           scope,
           ...cwd ? { cwd } : {},
           turn,
+          ...input.phase === void 0 ? {} : { phase: input.phase },
           interaction: createRunInteractionDriver({
             currentPhase: "default",
             attempt: 0,
@@ -11119,7 +11143,8 @@ var AgentRuntime = class _AgentRuntime {
             signal: input.signal,
             afterToolCall: input.toolConfig.afterToolCall,
             currentToolState,
-            options: input.options
+            options: input.options,
+            ...input.phase === void 0 ? {} : { phase: input.phase }
           });
           results2.push(toolResult2);
         }
@@ -11227,6 +11252,7 @@ var AgentRuntime = class _AgentRuntime {
         scope,
         ...cwd ? { cwd } : {},
         turn,
+        ...input.phase === void 0 ? {} : { phase: input.phase },
         interaction: interactionDriver,
         reportProgress: () => {
         }
@@ -11439,7 +11465,8 @@ var AgentRuntime = class _AgentRuntime {
         afterToolCall: input.toolConfig.afterToolCall,
         currentToolState,
         options: input.options,
-        providerInitiated: input.providerInitiated
+        providerInitiated: input.providerInitiated,
+        ...input.phase === void 0 ? {} : { phase: input.phase }
       });
       results.push(toolResult2);
     }
@@ -11490,6 +11517,7 @@ var AgentRuntime = class _AgentRuntime {
       scope: input.scope,
       ...input.cwd ? { cwd: input.cwd } : {},
       turn: input.turn,
+      ...input.phase === void 0 ? {} : { phase: input.phase },
       interaction: interactionDriver,
       reportProgress: (progress) => {
         const active = this.executions.get(input.runId);

package/package.json

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