pum-agent 0.2.11-beta.1 → 0.2.13-beta.1

package/README.md

@@ -152,6 +152,8 @@ Set `PUM_DIR` to override PUM's complete configuration and data directory. Run `
 
 Useful commands include `/login`, `/history`, `/news`, `/triggers`, `/check-path`, `/clear`, `/compress`, and `/worktree`.
 
+For automated benchmarks, add `--statsFile <path>` to a headless `-p` run. PUM writes a versioned JSON artifact with run metadata and all `/stats` data. PUM creates missing parent directories. PUM rejects an existing file before startup unless `--override` is present. The alias `--stats-file` is also accepted.
+
 ### Copy transcript text
 
 Drag across transcript text with the left mouse button. PUM copies the completed selection when you release the button.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pum-agent",
-  "version": "0.2.11-beta.1",
+  "version": "0.2.13-beta.1",
   "description": "A compact terminal coding agent powered by pi and OpenTUI.",
   "license": "MIT",
   "type": "module",

package/src/app.tsx

@@ -47,7 +47,7 @@ import {
   type PendingLine,
   type Role,
 } from "./transcript";
-import { editCounts, toolArg, type ToolCall } from "./tool-line";
+import { bashOutput, bashResultDisplay, editCounts, toolArg, type ToolCall } from "./tool-line";
 import { readBranch, watchBranch } from "./git-branch";
 import { HelpPopup, maxHelpScrollOffset } from "./help-popup";
 import { appendHistory, loadHistory, removeHistory } from "./history";
@@ -135,6 +135,8 @@ import {
   type NewsItem,
   type NewsPrompt,
 } from "./news";
+import { statsFromEntries, type SessionStatsManager } from "./session-stats";
+import { maxStatsScrollOffset, StatsPopup } from "./stats-popup";
 
 type Stream = { kind: "assistant" | "thinking"; text: string } | null;
 type Transcript = { lines: Line[]; stream: Stream; pending: PendingLine[] };
@@ -391,6 +393,7 @@ export function App({
   settings: initial,
   searchProviders,
   subagentManager,
+  statsManager,
   questionnaireManager,
   spawnPreviewManager,
   loginRequired = false,
@@ -417,6 +420,7 @@ export function App({
   /** Provider ids that carry the hosted web-search tool; empty means none. */
   searchProviders: string[];
   subagentManager: SubagentManager;
+  statsManager?: SessionStatsManager;
   questionnaireManager?: QuestionnaireManager;
   spawnPreviewManager?: SpawnPreviewManager;
   loginRequired?: boolean;
@@ -476,6 +480,9 @@ export function App({
   const [helpOpen, setHelpOpen] = useState(false);
   const [helpScrollOffset, setHelpScrollOffset] = useState(0);
   const [historyOpen, setHistoryOpen] = useState(false);
+  const [statsOpen, setStatsOpen] = useState(false);
+  const [statsScrollOffset, setStatsScrollOffset] = useState(0);
+  const [statsRevision, setStatsRevision] = useState(0);
   const [historySessions, setHistorySessions] = useState<SessionHistoryItem[]>([]);
   const [page, setPage] = useState<"main" | "models" | "checkModels">("main");
   const [settingsQuery, setSettingsQuery] = useState("");
@@ -528,6 +535,7 @@ export function App({
   const newsOpenRef = useRef(false);
   const [newsCursor, setNewsCursor] = useState(0);
   const newsCursorRef = useRef(0);
+  const statsOpenRef = useRef(false);
 
   const theme = useMemo(() => loadTheme(settings.theme), [settings.theme]);
   const { width, height } = useTerminalDimensions();
@@ -555,6 +563,10 @@ export function App({
   const visibleUsage = activeAgent?.usage ?? usage;
   const agentTreeRows = buildAgentTree(agents);
   const triggers = sortTriggers(triggerManager?.getTriggers() ?? []);
+  const statsSnapshot = useMemo(() => statsManager?.snapshot() ?? statsFromEntries(
+    (session.sessionManager as any).getEntries?.() ?? session.sessionManager.buildContextEntries(),
+    `${session.agent.state.model.provider}/${session.agent.state.model.id}`,
+  ), [statsManager, session, statsRevision]);
   const inputHint = cancelArmed
     ? " esc again to cancel "
     : quitArmed
@@ -663,6 +675,8 @@ export function App({
     setAgentSelectorOpen(false);
     setNewsOpen(false);
     newsOpenRef.current = false;
+    setStatsOpen(false);
+    statsOpenRef.current = false;
     setStashMode(false);
     const nextCursor = Math.min(triggerCursorRef.current, Math.max(0, triggers.length - 1));
     triggerCursorRef.current = nextCursor;
@@ -967,6 +981,7 @@ export function App({
       helpOpen ||
       historyOpen ||
       newsOpenRef.current ||
+      statsOpenRef.current ||
       settingsOpenRef.current
     ) return;
     const input = inputRef.current;
@@ -1022,6 +1037,11 @@ export function App({
     append({ kind: "text", role: "system", text: warning });
   }), [sandboxWarningSource]);
 
+  useEffect(() => {
+    setStatsRevision((revision) => revision + 1);
+    return statsManager?.subscribe(() => setStatsRevision((revision) => revision + 1));
+  }, [statsManager, session]);
+
 
   useEffect(() => triggerManager?.subscribe(() => {
     setTriggerRevision((revision) => revision + 1);
@@ -1037,9 +1057,15 @@ export function App({
       else if (event.type === "main-pending-add") addPending(event.pending);
       else if (event.type === "main-pending-resolve") resolvePending(event.id);
       else if (event.type === "main-pending-drop") dropPending(event.id);
+      else if (event.type === "news-changed") {
+        const loaded = loadNewsItems(session.sessionFile);
+        newsRef.current = loaded;
+        setNews(loaded);
+        setTx((value) => ({ ...value, lines: tagNewsLines(value.lines, loaded) }));
+      }
       setAgentRevision((revision) => revision + 1);
     }),
-    [subagentManager],
+    [subagentManager, session],
   );
 
   useEffect(() => {
@@ -1066,6 +1092,8 @@ export function App({
         setLoginOpen(false);
         setNewsOpen(false);
         newsOpenRef.current = false;
+        setStatsOpen(false);
+        statsOpenRef.current = false;
       }
       setQuestionnaireRevision((revision) => revision + 1);
     });
@@ -1155,10 +1183,17 @@ export function App({
               name: event.toolName,
               arg: toolArg(event.toolName, event.args, cwd),
               state: "running",
+              startedAt: Date.now(),
             },
           });
           break;
-        case "tool_execution_end":
+        case "tool_execution_update":
+          if (event.toolName === "bash") {
+            patchTool(event.toolCallId, { output: bashOutput(event.partialResult) });
+          }
+          break;
+        case "tool_execution_end": {
+          const bashResult = event.toolName === "bash" ? bashResultDisplay(event.result) : {};
           patchTool(event.toolCallId, {
             state: isRejectedToolResult(event.result, event.toolCallId)
               ? "rejected"
@@ -1174,8 +1209,11 @@ export function App({
                   : event.toolName.startsWith("message_cache_")
                     ? messageCacheDetail(event.result)
                     : undefined,
+            output: undefined,
+            exitCode: bashResult.exitCode,
           });
           break;
+        }
         case "agent_start":
           setWorking(true);
           break;
@@ -1407,6 +1445,8 @@ export function App({
     setTriggerPopup(false, false);
     setNewsOpen(false);
     newsOpenRef.current = false;
+    setStatsOpen(false);
+    statsOpenRef.current = false;
     setLoginOpen(true);
     loginControllerRef.current?.open();
   };
@@ -1461,6 +1501,8 @@ export function App({
     setTriggerPopup(false, false);
     setNewsOpen(false);
     newsOpenRef.current = false;
+    setStatsOpen(false);
+    statsOpenRef.current = false;
     loadSessions()
       .then((sessions) => {
         setHistorySessions(sessions);
@@ -1483,6 +1525,8 @@ export function App({
     setAgentSelectorOpen(false);
     setTriggerPopup(false, false);
     setLoginOpen(false);
+    setStatsOpen(false);
+    statsOpenRef.current = false;
     newsCursorRef.current = 0;
     setNewsCursor(0);
     newsOpenRef.current = true;
@@ -1495,6 +1539,27 @@ export function App({
     queueMicrotask(() => inputRef.current?.focus());
   };
 
+  const openStats = () => {
+    settingsOpenRef.current = false;
+    setSettingsOpen(false);
+    setHelpOpen(false);
+    setHistoryOpen(false);
+    setAgentSelectorOpen(false);
+    setTriggerPopup(false, false);
+    setLoginOpen(false);
+    setNewsOpen(false);
+    newsOpenRef.current = false;
+    setStatsScrollOffset(0);
+    statsOpenRef.current = true;
+    setStatsOpen(true);
+  };
+
+  const closeStats = () => {
+    statsOpenRef.current = false;
+    setStatsOpen(false);
+    queueMicrotask(() => inputRef.current?.focus());
+  };
+
   const moveNewsCursor = (direction: number) => {
     const count = newsRef.current.length;
     if (count === 0) return;
@@ -1506,29 +1571,47 @@ export function App({
   const jumpFromNews = (target: "answer" | "prompt") => {
     const item = newsRef.current[newsCursorRef.current];
     if (!item) return;
-    const lines = txRef.current.lines;
-    const answerIndex = lines.findIndex((line) =>
-      line.kind === "text" && line.role === "assistant" && line.newsId === item.id,
-    );
+    const requesterAgentId = item.completion?.requesterAgentId ?? null;
+    const lines = requesterAgentId === null
+      ? txRef.current.lines
+      : subagentManager.getAgent(requesterAgentId)?.transcript.lines;
+    if (!lines) return;
+    const completionPromptIndex = item.completion
+      ? lines.findIndex((line) =>
+        line.kind === "agent-message" && line.messageId === item.completion?.messageId,
+      )
+      : -1;
+    const answerIndex = item.completion
+      ? lines.findIndex((line, index) =>
+        index > completionPromptIndex
+          && line.kind === "text"
+          && line.role === "assistant"
+          && line.text === item.text,
+      )
+      : lines.findIndex((line) =>
+        line.kind === "text" && line.role === "assistant" && line.newsId === item.id,
+      );
     let targetIndex = answerIndex;
     if (target === "prompt") {
-      const promptText = item.prompts?.find((prompt) => !prompt.steer)?.text
-        ?? item.prompts?.[0]?.text;
-      targetIndex = -1;
-      if (promptText) {
-        const end = answerIndex >= 0 ? answerIndex : lines.length;
-        for (let index = end - 1; index >= 0; index--) {
-          const line = lines[index];
-          if (line?.kind === "text" && line.role === "user" && line.text === promptText) {
-            targetIndex = index;
-            break;
+      targetIndex = completionPromptIndex;
+      if (!item.completion) {
+        const promptText = item.prompts?.find((prompt) => !prompt.steer)?.text
+          ?? item.prompts?.[0]?.text;
+        if (promptText) {
+          const end = answerIndex >= 0 ? answerIndex : lines.length;
+          for (let index = end - 1; index >= 0; index--) {
+            const line = lines[index];
+            if (line?.kind === "text" && line.role === "user" && line.text === promptText) {
+              targetIndex = index;
+              break;
+            }
           }
         }
       }
     }
     if (targetIndex < 0) return;
 
-    if (activeAgentIdRef.current !== null && !selectAgentView(null)) return;
+    if (activeAgentIdRef.current !== requesterAgentId && !selectAgentView(requesterAgentId)) return;
     newsOpenRef.current = false;
     setNewsOpen(false);
     const scrollToTarget = () => {
@@ -1590,8 +1673,12 @@ export function App({
     const firstLine = item.text.split("\n")[0] ?? item.text;
     const preview = firstLine.length > 240 ? `${firstLine.slice(0, 240)} …` : firstLine;
     const quote = `> ${preview}\n\n`;
-    viewDrafts.current.set("main", quote);
-    if (activeAgentIdRef.current !== null) selectAgentView(null);
+    const requesterAgentId = item.completion?.requesterAgentId ?? null;
+    const targetAgentId = requesterAgentId && subagentManager.getAgent(requesterAgentId)
+      ? requesterAgentId
+      : null;
+    viewDrafts.current.set(targetAgentId ?? "main", quote);
+    if (activeAgentIdRef.current !== targetAgentId) selectAgentView(targetAgentId);
     else setEditorText(quote);
     queueMicrotask(() => {
       inputRef.current?.focus();
@@ -1732,8 +1819,9 @@ export function App({
     const checkPathCommand = /^\/check-path(?:\s|$)/.test(trimmed);
     const triggersCommand = trimmed === "/triggers";
     const newsCommand = trimmed === "/news";
+    const statsCommand = trimmed === "/stats";
     const worktreeCommand = /^\/worktree(?:\s+([a-zA-Z0-9_-]+))?$/.exec(trimmed);
-    if (!compress && !clear && !historyCommand && !loginCommand && !checkPathCommand && !triggersCommand && !newsCommand && !worktreeCommand) return false;
+    if (!compress && !clear && !historyCommand && !loginCommand && !checkPathCommand && !triggersCommand && !newsCommand && !statsCommand && !worktreeCommand) return false;
     editingStashIndex.current = null;
 
     if (historyCommand) {
@@ -1756,6 +1844,11 @@ export function App({
       openNews();
       return true;
     }
+    if (statsCommand) {
+      setEditorText("");
+      openStats();
+      return true;
+    }
 
     setEditorText("");
     histCursor.current = null;
@@ -2202,6 +2295,7 @@ export function App({
         !agentSelectorOpen &&
         !helpOpen &&
         !historyOpen &&
+        !statsOpenRef.current &&
         !settingsOpenRef.current;
       const inputValue = inputRef.current?.plainText ?? "";
       if (promptOwnsInput && (inputValue.length > 0 || pendingImages.current.length > 0)) {
@@ -2277,6 +2371,20 @@ export function App({
       return;
     }
 
+    if (statsOpenRef.current || statsOpen) {
+      key.stopPropagation();
+      const maxOffset = maxStatsScrollOffset(statsSnapshot, width, height);
+      if (key.name === "escape") closeStats();
+      else if (key.name === "home") setStatsScrollOffset(0);
+      else if (key.name === "end") setStatsScrollOffset(maxOffset);
+      else if (key.name === "up" || key.name === "down" || key.name === "pageup" || key.name === "pagedown") {
+        const amount = key.name === "pageup" || key.name === "pagedown" ? 5 : 1;
+        const direction = key.name === "up" || key.name === "pageup" ? -1 : 1;
+        setStatsScrollOffset((offset) => Math.max(0, Math.min(maxOffset, offset + direction * amount)));
+      }
+      return;
+    }
+
     if (key.ctrl && key.name === "t") {
       key.stopPropagation();
       if (triggersOpenRef.current) setTriggerPopup(false);
@@ -2961,7 +3069,7 @@ export function App({
             selectionBg={theme.selectionBg}
             wrapMode="word"
             scrollMargin={1}
-            focused={!settingsOpen && !helpOpen && !historyOpen && !agentSelectorOpen && !triggersOpen && !loginOpen && !questionnaire && !spawnPreview && !newsOpen}
+            focused={!settingsOpen && !helpOpen && !historyOpen && !statsOpen && !agentSelectorOpen && !triggersOpen && !loginOpen && !questionnaire && !spawnPreview && !newsOpen}
             onContentChange={handleTextareaChange}
             onCursorChange={scheduleInputMetrics}
             onSubmit={() => submitPrompt()}
@@ -3051,6 +3159,15 @@ export function App({
             terminalHeight={height}
           />
         ) : null}
+        {statsOpen ? (
+          <StatsPopup
+            theme={theme}
+            snapshot={statsSnapshot}
+            terminalWidth={width}
+            terminalHeight={height}
+            scrollOffset={statsScrollOffset}
+          />
+        ) : null}
         {settingsOpen ? (
           <SettingsPopup
             theme={theme}