@rowan-agent/agent 0.25.0 → 0.26.0

package/dist/index.js

@@ -9,12 +9,15 @@ import Schema2 from "typebox/schema";
 function escapeXml(value) {
   return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
 }
+function escapeXmlText(value) {
+  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
 function buildStructuredSection(tag, items) {
   const lines = [];
   for (const item of items) {
     lines.push(`  <${tag}>`);
     for (const [key, value] of Object.entries(item)) {
-      lines.push(`    <${key}>${escapeXml(value)}</${key}>`);
+      lines.push(`    <${key}>${escapeXmlText(value)}</${key}>`);
     }
     lines.push(`  </${tag}>`);
   }
@@ -26,9 +29,9 @@ function buildSkillsDescription(skills) {
   const lines = ["<available_skills>"];
   for (const skill of visibleSkills) {
     lines.push("  <skill>");
-    lines.push(`    <name>${escapeXml(skill.name)}</name>`);
-    lines.push(`    <description>${escapeXml(skill.description)}</description>`);
-    lines.push(`    <location>${escapeXml(skill.filePath)}</location>`);
+    lines.push(`    <name>${escapeXmlText(skill.name)}</name>`);
+    lines.push(`    <description>${escapeXmlText(skill.description)}</description>`);
+    lines.push(`    <location>${escapeXmlText(skill.filePath)}</location>`);
     lines.push("  </skill>");
   }
   lines.push("</available_skills>");
@@ -67,7 +70,7 @@ function detectResourceType(filePath) {
 function jsonToXml(value, depth) {
   const indent = "  ".repeat(depth);
   if (value === null || value === void 0) return "";
-  if (typeof value !== "object") return `${indent}${escapeXml(String(value))}`;
+  if (typeof value !== "object") return `${indent}${escapeXmlText(String(value))}`;
   if (Array.isArray(value)) {
     return value.map((item) => {
       if (typeof item === "object" && item !== null) {
@@ -75,7 +78,7 @@ function jsonToXml(value, depth) {
 ${jsonToXml(item, depth + 1)}
 ${indent}</item>`;
       }
-      return `${indent}<item>${escapeXml(String(item))}</item>`;
+      return `${indent}<item>${escapeXmlText(String(item))}</item>`;
     }).join("\n");
   }
   return Object.entries(value).map(([key, val]) => {
@@ -85,7 +88,7 @@ ${indent}</item>`;
 ${jsonToXml(val, depth + 1)}
 ${indent}</${tag}>`;
     }
-    return `${indent}<${tag}>${escapeXml(String(val))}</${tag}>`;
+    return `${indent}<${tag}>${escapeXmlText(String(val))}</${tag}>`;
   }).join("\n");
 }
 function buildPhaseDirectiveMessage(phase, output) {
@@ -102,7 +105,7 @@ function buildPhaseDirectiveMessage(phase, output) {
   if (output.results && output.results.length > 0 || output.instruction) {
     parts.push(`  <prev_phase_outputs>`);
     if (output.instruction) {
-      parts.push(`    <instruction>${escapeXml(output.instruction)}</instruction>`);
+      parts.push(`    <instruction>${escapeXmlText(output.instruction)}</instruction>`);
     }
     for (const r of output.results ?? []) {
       parts.push(`    <phase name="${escapeXml(r.name)}">`);
@@ -2496,13 +2499,10 @@ function createCompactPhase() {
       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);
-      if (instructions) {
-        working.messages.push(createMessage("user", `Additional compaction instructions:
-${instructions}`, {
-          kind: "phase_input",
-          phase: COMPACT_PHASE_ID
-        }));
-      }
+      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));
@@ -2522,26 +2522,16 @@ ${instructions}`, {
           kind: "phase_tool",
           phase: COMPACT_PHASE_ID
         }));
-        for (const call of normalizedCalls) {
-          const tool = tools.find((candidate) => candidate.name === call.name);
-          let toolResult2;
-          try {
-            toolResult2 = await tool.execute(call.args, {
-              skills: working.skills,
-              toolCallId: call.id
-            });
-          } catch (error) {
-            toolResult2 = {
-              toolCallId: call.id,
-              toolName: call.name,
-              ok: false,
-              content: null,
-              error: error instanceof Error ? error.message : String(error)
-            };
-          }
+        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: call.id,
+            toolUseId: toolResult2.toolCallId,
             content: JSON.stringify(toolResult2),
             isError: !toolResult2.ok
           }], {
@@ -2568,6 +2558,22 @@ ${instructions}`, {
     }
   };
 }
+function buildCompactionPrompt(instructions) {
+  const lines = [
+    "The conversation above is to be summarized, not continued. Do not answer, carry out, or use Tools for any request in it.",
+    "Output only the summary in a fixed structure:",
+    "- Goal and state",
+    "- Decisions with reasons",
+    "- Open requests left unfinished",
+    "- Files and archive references",
+    "- Facts to keep"
+  ];
+  if (instructions) {
+    lines.push("", `Additional compaction instructions:
+${instructions}`);
+  }
+  return lines.join("\n");
+}
 function compactInstructions(context) {
   const payload = context.state.payload;
   if (typeof payload === "object" && payload !== null && "instructions" in payload) {

package/package.json

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