bosun 0.42.1 → 0.42.2

package/agent/primary-agent.mjs

@@ -9,6 +9,7 @@ import { loadConfig } from "../config/config.mjs";
 import { ensureCodexConfig, printConfigSummary } from "../shell/codex-config.mjs";
 import { ensureRepoConfigs, printRepoConfigSummary } from "../config/repo-config.mjs";
 import { resolveRepoRoot } from "../config/repo-root.mjs";
+import { buildArchitectEditorFrame } from "../lib/repo-map.mjs";
 import { getAgentToolConfig, getEffectiveTools } from "./agent-tool-config.mjs";
 import { getSessionTracker } from "../infra/session-tracker.mjs";
 import { getEntry, getEntryContent, resolveAgentProfileLibraryMetadata } from "../infra/library-manager.mjs";
@@ -191,133 +192,9 @@ function appendAttachmentsToPrompt(message, attachments) {
   return { message: `${message}${lines.join("\n")}`, appended: true };
 }
 
-function normalizeRepoMap(repoMap) {
-  if (!repoMap || typeof repoMap !== "object") return null;
-  const root = String(repoMap.root || repoMap.repoRoot || "").trim();
-  const files = Array.isArray(repoMap.files)
-    ? repoMap.files
-        .filter((entry) => entry && typeof entry === "object")
-        .map((entry) => ({
-          path: String(entry.path || entry.file || "").trim(),
-          summary: String(entry.summary || entry.description || "").trim(),
-          symbols: Array.isArray(entry.symbols)
-            ? entry.symbols.map((symbol) => String(symbol || "").trim()).filter(Boolean)
-            : [],
-        }))
-        .filter((entry) => entry.path)
-    : [];
-  if (!root && files.length === 0) return null;
-  return { root, files };
-}
-
-function formatRepoMap(repoMap) {
-  const normalized = normalizeRepoMap(repoMap);
-  if (!normalized) return "";
-  const lines = ["## Repo Map"];
-  if (normalized.root) lines.push(`- Root: ${normalized.root}`);
-  for (const file of normalized.files) {
-    const parts = [file.path];
-    if (file.symbols.length) parts.push(`symbols: ${file.symbols.join(", ")}`);
-    if (file.summary) parts.push(file.summary);
-    lines.push(`- ${parts.join(" — ")}`);
-  }
-  return lines.join("\n");
-}
-
-function summarizePathSegment(segment) {
-  return String(segment || "")
-    .replace(/[-_]+/g, " ")
-    .replace(/\.m?js$/i, "")
-    .replace(/\s+/g, " ")
-    .trim();
-}
-
-function inferRepoMapEntry(pathValue) {
-  const path = String(pathValue || "").trim().replace(/\\/g, "/");
-  if (!path) return null;
-  const name = path.split("/").pop() || path;
-  const stem = summarizePathSegment(name);
-  const dir = path.includes("/") ? path.split("/").slice(0, -1).join("/") : "";
-  const dirHint = dir ? summarizePathSegment(dir.split("/").pop()) : "";
-  const symbols = [];
-  const lowerStem = stem.toLowerCase();
-  if (lowerStem) {
-    const compact = lowerStem
-      .split(" ")
-      .filter(Boolean)
-      .map((part, index) => (index === 0 ? part : part.charAt(0).toUpperCase() + part.slice(1)))
-      .join("");
-    if (compact) {
-      symbols.push(compact);
-      if (!compact.startsWith("test")) symbols.push(`test${compact.charAt(0).toUpperCase()}${compact.slice(1)}`);
-    }
-  }
-  const summaryParts = [];
-  if (dirHint) summaryParts.push(`${dirHint} module`);
-  if (stem) summaryParts.push(stem);
-  return {
-    path,
-    summary: summaryParts.join(" — "),
-    symbols: [...new Set(symbols)].slice(0, 3),
-  };
-}
 
-function deriveRepoMap(options = {}) {
-  const explicit = normalizeRepoMap(options.repoMap);
-  if (explicit) return explicit;
-  const changedFiles = Array.isArray(options.changedFiles)
-    ? options.changedFiles.map((value) => String(value || "").trim()).filter(Boolean)
-    : [];
-  if (!changedFiles.length) return null;
-  const root = String(options.repoRoot || options.cwd || resolveRepoRoot() || "").trim();
-  const files = changedFiles
-    .map((pathValue) => inferRepoMapEntry(pathValue))
-    .filter(Boolean)
-    .slice(0, Number(options.repoMapFileLimit) > 0 ? Number(options.repoMapFileLimit) : 12);
-  if (!root && files.length === 0) return null;
-  return { root, files };
-}
 
-function inferExecutionRole(options = {}, effectiveMode = "agent") {
-  const explicitRole = String(options.executionRole || "").trim().toLowerCase();
-  if (explicitRole) return explicitRole;
-  if (effectiveMode === "plan") return "architect";
-  const architectPlan = String(options.architectPlan || options.planSummary || "").trim();
-  if (architectPlan) return "editor";
-  return "";
-}
-function buildArchitectEditorFrame(options = {}, effectiveMode = "agent") {
-  const executionRole = inferExecutionRole(options, effectiveMode);
-  const repoMapBlock = formatRepoMap(deriveRepoMap(options));
-  const architectPlan = String(options.architectPlan || options.planSummary || "").trim();
-  const lines = ["## Architect/Editor Execution"];
-
-  if (executionRole === "architect") {
-    lines.push(
-      "You are the architect phase.",
-      "Do not implement code changes in this phase.",
-      "Use the repo map to produce a compact structural plan that an editor can execute and validate.",
-      "Editor handoff: include ordered implementation steps, touched files, risks, and validation guidance.",
-    );
-  } else if (executionRole === "editor") {
-    lines.push(
-      "You are the editor phase.",
-      "Implement the approved plan with focused edits and verification.",
-      "Prefer the supplied repo map over broad rediscovery unless validation reveals drift.",
-    );
-    if (architectPlan) {
-      lines.push("", "## Architect Plan", architectPlan);
-    }
-  } else {
-    return repoMapBlock;
-  }
-
-  if (repoMapBlock) {
-    lines.push("", repoMapBlock);
-  }
 
-  return lines.join("\n");
-}
 
 function summarizeContextCompressionItems(items) {
   if (!Array.isArray(items) || items.length === 0) return null;
@@ -1190,8 +1067,9 @@ export async function execPrimaryPrompt(userMessage, options = {}) {
   const messageWithAttachments = attachments.length && !attachmentsAppended
     ? appendAttachmentsToPrompt(userMessage, attachments).message
     : userMessage;
+  const architectEditorFrame = buildArchitectEditorFrame(options, effectiveMode);
   const toolContract = buildPrimaryToolCapabilityContract(options);
-  const messageWithToolContract = [selectedProfile.block, toolContract, messageWithAttachments]
+  const messageWithToolContract = [selectedProfile.block, architectEditorFrame, toolContract, messageWithAttachments]
     .filter(Boolean)
     .join("\n\n");
   const framedMessage = modePrefix ? modePrefix + messageWithToolContract : messageWithToolContract;
@@ -1680,3 +1558,5 @@ export async function execSdkCommand(command, args = "", adapterName, options =
 }
 
 
+
+

package/infra/session-tracker.mjs

@@ -264,6 +264,8 @@ export class SessionTracker {
       lastActivityAt: Date.now(),
       metadata: {},
       insights: buildSessionInsights({ messages: [] }),
+      trajectory: { version: 1, replayable: true, steps: [] },
+      summary: null,
     });
     const session = this.#sessions.get(taskId);
     this.#markDirty(taskId);
@@ -319,6 +321,7 @@ export class SessionTracker {
       if (Number.isFinite(maxMessages) && maxMessages > 0) {
         while (session.messages.length > maxMessages) session.messages.shift();
       }
+      this.#appendTrajectoryStep(session, event);
       this.#refreshDerivedState(session);
       this.#markDirty(taskId);
       emitSessionEvent(session, msg);
@@ -352,6 +355,7 @@ export class SessionTracker {
       if (Number.isFinite(maxMessages) && maxMessages > 0) {
         while (session.messages.length > maxMessages) session.messages.shift();
       }
+      this.#appendTrajectoryStep(session, event);
       this.#refreshDerivedState(session);
       this.#markDirty(taskId);
       emitSessionEvent(session, msg);
@@ -369,6 +373,7 @@ export class SessionTracker {
     if (Number.isFinite(maxMessages) && maxMessages > 0) {
       while (session.messages.length > maxMessages) session.messages.shift();
     }
+    this.#appendTrajectoryStep(session, event);
     this.#refreshDerivedState(session);
     this.#markDirty(taskId);
     emitSessionEvent(session, msg);
@@ -619,6 +624,8 @@ export class SessionTracker {
       metadata,
       maxMessages: resolvedMax,
       insights: buildSessionInsights({ messages: [] }),
+      trajectory: { version: 1, replayable: true, steps: [] },
+      summary: null,
     };
     this.#sessions.set(id, session);
     this.#markDirty(id);
@@ -797,6 +804,13 @@ export class SessionTracker {
     this.#flushDirty();
   }
 
+  /**
+   * Flush all dirty sessions to disk immediately (alias for flush).
+   */
+  flushNow() {
+    this.#flushDirty();
+  }
+
   /**
    * Stop all timers and flush pending writes (for cleanup).
    */
@@ -1003,6 +1017,84 @@ export class SessionTracker {
     return true;
   }
 
+  #appendTrajectoryStep(session, event) {
+    if (!session) return;
+    if (!session.trajectory) {
+      session.trajectory = { version: 1, replayable: true, steps: [] };
+    }
+    const step = this.#extractTrajectoryStep(event, session);
+    if (step) {
+      session.trajectory.steps.push(step);
+    }
+  }
+
+  #extractTrajectoryStep(event, session) {
+    const ts = new Date().toISOString();
+    const id = `step-${Date.now()}-${randomToken(6)}`;
+
+    // String event
+    if (typeof event === "string") {
+      return { id, kind: "system", summary: event.trim().slice(0, 200), timestamp: ts };
+    }
+
+    // Direct message format (role/content)
+    if (event?.role && event?.content !== undefined) {
+      const content = String(event.content).slice(0, 200);
+      const timestamp = event.timestamp || ts;
+      if (event.role === "user") return { id, kind: "user_message", summary: content, timestamp };
+      if (event.role === "assistant") return { id, kind: "assistant", summary: content, timestamp };
+      return { id, kind: event.role, summary: content, timestamp };
+    }
+
+    // SDK item.started events
+    if (event?.type === "item.started" && event?.item) {
+      const item = event.item;
+      if (item.type === "command_execution") {
+        return { id, kind: "tool_call", summary: `Ran ${item.command || "unknown"}`, timestamp: ts };
+      }
+      if (item.type === "reasoning") {
+        return { id, kind: "reasoning", summary: item.text || "", timestamp: ts };
+      }
+      if (item.type === "function_call" || item.type === "mcp_tool_call") {
+        return { id, kind: "tool_call", summary: `${item.name || "call"} ${item.arguments || ""}`.trim(), timestamp: ts };
+      }
+      return null;
+    }
+
+    // SDK item.completed events
+    if (event?.type === "item.completed" && event?.item) {
+      const item = event.item;
+      if (item.type === "reasoning") {
+        return { id, kind: "reasoning", summary: item.text || "", timestamp: ts };
+      }
+      if (item.type === "function_call" || item.type === "mcp_tool_call") {
+        return { id, kind: "tool_call", summary: `${item.name || "call"} ${item.arguments || ""}`.trim(), timestamp: ts };
+      }
+      if (item.type === "command_execution") {
+        const cmd = item.command || "";
+        const hasPriorStart = (session?.trajectory?.steps || []).some(
+          (s) => s.kind === "tool_call" && s.summary === `Ran ${cmd}`,
+        );
+        if (hasPriorStart) {
+          return { id, kind: "tool_result", summary: `${cmd} (exit ${item.exit_code ?? "?"})`, timestamp: ts };
+        }
+        return { id, kind: "command", summary: cmd, timestamp: ts };
+      }
+      if (item.type === "agent_message") {
+        return { id, kind: "assistant", summary: item.text || "", timestamp: ts };
+      }
+      return null;
+    }
+
+    // Assistant message events
+    if (event?.type === "assistant.message") {
+      const content = event?.data?.content || event?.content || "";
+      return { id, kind: "agent_message", summary: content.slice(0, 200), timestamp: ts };
+    }
+
+    return null;
+  }
+
   #refreshDerivedState(session) {
     if (!session) return;
     try {
@@ -1013,6 +1105,22 @@ export class SessionTracker {
     } catch {
       // Inspector insights are best-effort only.
     }
+    try {
+      const steps = session.trajectory?.steps || [];
+      const totalSteps = steps.length;
+      const isFailed = session.status === "failed";
+      const isLong = totalSteps > 12;
+      const failedOrLongRun = isFailed || isLong;
+      const resumable = failedOrLongRun;
+      const shortSteps = steps.slice(-12).map((s) => ({ kind: s.kind, summary: s.summary }));
+      const latestStep =
+        steps.length > 0
+          ? { kind: steps[steps.length - 1].kind, summary: steps[steps.length - 1].summary }
+          : null;
+      session.summary = { failedOrLongRun, resumable, totalSteps, shortSteps, latestStep };
+    } catch {
+      // Summary computation is best-effort only.
+    }
   }
 
   #ensureDir() {
@@ -1052,6 +1160,8 @@ export class SessionTracker {
           messages: session.messages || [],
           metadata: session.metadata || {},
           insights: session.insights || null,
+          trajectory: session.trajectory || null,
+          summary: session.summary || null,
         };
         writeFileSync(filePath, JSON.stringify(data, null, 2));
       } catch (err) {
@@ -1131,6 +1241,8 @@ export class SessionTracker {
           lastActivityAt: lastActive || Date.now(),
           metadata: data.metadata || {},
           insights: data.insights || buildSessionInsights({ messages: data.messages || [] }),
+          trajectory: data.trajectory || { version: 1, replayable: true, steps: [] },
+          summary: data.summary || null,
         });
         const restored = this.#sessions.get(id);
         if (restored && isTerminalSessionStatus(restored.status) && !restored.accumulatedAt) {