pum-agent 0.1.0-beta.3

package/src/subagents/types.ts

@@ -0,0 +1,86 @@
+import type { ImageContent } from "@earendil-works/pi-ai";
+import type { Line, PendingLine } from "../transcript";
+import type { WorktreeRecord } from "../worktree";
+import type { AgentUsage } from "../agent-usage";
+
+export const SUBAGENT_CUSTOM_TYPE = "pum.subagent";
+export const AGENT_MESSAGE_CUSTOM_TYPE = "pum.agent_message";
+export const AGENT_MESSAGE_DISPLAY_TYPE = "pum.agent_message_display";
+export const TOOL_EVENT_CUSTOM_TYPE = "pum.tool_event";
+/** Hidden user-message prefix used only to guarantee that the main loop wakes. */
+export const SUBAGENT_WAKE_PREFIX = "[PUM internal subagent wake]";
+
+export type SubagentStatus =
+  | "starting"
+  | "running"
+  | "idle"
+  | "completed"
+  | "failed"
+  | "stopped"
+  | "interrupted";
+
+export type AgentStream = { kind: "assistant" | "thinking"; text: string } | null;
+
+export type AgentTranscript = {
+  lines: Line[];
+  stream: AgentStream;
+  pending: PendingLine[];
+};
+
+export type SubagentSnapshot = {
+  id: string;
+  name: string;
+  task: string;
+  status: SubagentStatus;
+  worktree: WorktreeRecord;
+  sessionFile?: string;
+  /** The retained agent that spawned this agent. Missing legacy values mean main. */
+  parentAgentId: string | null;
+  modelId: string;
+  thinkingLevel: string;
+  transcript: AgentTranscript;
+  summary?: string;
+  startedAt: number;
+  updatedAt: number;
+  runStartedAt?: number;
+  usage: AgentUsage;
+};
+
+export type SubagentRegistryEvent = {
+  event: "spawned" | "status" | "usage" | "removed";
+  id: string;
+  at: number;
+  snapshot?: Omit<SubagentSnapshot, "transcript">;
+  status?: SubagentStatus;
+  summary?: string;
+  usage?: AgentUsage;
+};
+
+export type AgentMessageData = {
+  id: string;
+  sender: string;
+  recipient: string;
+  text: string;
+  at: number;
+};
+
+export type SubagentManagerEvent =
+  | { type: "changed" }
+  | { type: "main-line"; line: Line }
+  | { type: "main-pending-add"; pending: PendingLine }
+  | { type: "main-pending-resolve"; id: string }
+  | { type: "main-pending-drop"; id: string };
+
+export type SpawnSubagentOptions = {
+  task: string;
+  name?: string;
+  modelId: string;
+  thinkingLevel: string;
+  createWorktree?: boolean;
+  parentAgentId?: string | null;
+};
+
+export type RoutedPrompt = {
+  text: string;
+  images?: ImageContent[];
+};

package/src/syntax.ts

@@ -0,0 +1,60 @@
+import { SyntaxStyle } from "@opentui/core";
+import type { Theme } from "./theme";
+
+/**
+ * OpenTUI's <markdown> and <code> need a SyntaxStyle and ship no default. The
+ * keys are tree-sitter capture names from the bundled highlight queries;
+ * lookup falls back along the dots, so "markup.heading" covers
+ * "markup.heading.1" and friends.
+ */
+export function buildSyntaxStyle(t: Theme): SyntaxStyle {
+  return SyntaxStyle.fromStyles({
+    default: { fg: t.assistant },
+    conceal: { fg: t.dim },
+
+    // markdown. Headings are only ever captured numbered (markup.heading.1…6)
+    // and the tree-sitter path does not fall back along the dots, so each
+    // level has to be registered.
+    "markup.heading": { fg: t.accent, bold: true },
+    "markup.heading.1": { fg: t.accent, bold: true },
+    "markup.heading.2": { fg: t.accent, bold: true },
+    "markup.heading.3": { fg: t.accent, bold: true },
+    "markup.heading.4": { fg: t.accent },
+    "markup.heading.5": { fg: t.accent },
+    "markup.heading.6": { fg: t.accent },
+    "markup.list": { fg: t.tool },
+    "markup.list.checked": { fg: t.success },
+    "markup.list.unchecked": { fg: t.dim },
+    "markup.quote": { fg: t.dim, italic: true },
+    "markup.raw": { fg: t.toolArg },
+    "markup.raw.block": { fg: t.toolArg },
+    "markup.strong": { fg: t.fg, bold: true },
+    "markup.italic": { fg: t.fg, italic: true },
+    "markup.strikethrough": { fg: t.dim, dim: true },
+    "markup.link": { fg: t.accent, underline: true },
+    "markup.link.label": { fg: t.accent },
+    "markup.link.url": { fg: t.dim, underline: true },
+    label: { fg: t.accent },
+    "character.special": { fg: t.tool },
+
+    // code
+    keyword: { fg: t.codeKeyword },
+    operator: { fg: t.codeKeyword },
+    string: { fg: t.codeString },
+    "string.escape": { fg: t.codeNumber },
+    number: { fg: t.codeNumber },
+    boolean: { fg: t.codeNumber },
+    constant: { fg: t.codeNumber },
+    comment: { fg: t.codeComment, italic: true },
+    function: { fg: t.codeFunction },
+    constructor: { fg: t.codeFunction },
+    type: { fg: t.codeType },
+    attribute: { fg: t.codeType },
+    module: { fg: t.codeType },
+    variable: { fg: t.fg },
+    property: { fg: t.fg },
+    "punctuation.delimiter": { fg: t.dim },
+    "punctuation.bracket": { fg: t.dim },
+    "punctuation.special": { fg: t.dim },
+  });
+}

package/src/theme.ts

@@ -0,0 +1,346 @@
+import { RGBA, parseColor } from "@opentui/core";
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+import { AGENT_DIR } from "./config";
+
+export type Theme = {
+  name: string;
+  bg: string;
+  fg: string;
+  dim: string;
+  accent: string;
+  border: string;
+  /** Foreground and background of a user turn's full-width bar. */
+  user: string;
+  userBg: string;
+  /** Foreground and background for inter-agent communication rows. */
+  agentMessage: string;
+  agentMessageBg: string;
+  assistant: string;
+  thinking: string;
+  tool: string;
+  toolArg: string;
+  success: string;
+  error: string;
+  warn: string;
+  selectionBg: string;
+  popupBg: string;
+  /** The bright colour a shimmer sweeps toward. */
+  highlight: string;
+  /** Syntax colours for markdown code blocks. */
+  codeKeyword: string;
+  codeString: string;
+  codeNumber: string;
+  codeComment: string;
+  codeFunction: string;
+  codeType: string;
+};
+
+const tokyonight: Theme = {
+  name: "tokyonight",
+  bg: "#1a1b26",
+  fg: "#c0caf5",
+  dim: "#565f89",
+  accent: "#7aa2f7",
+  border: "#292e42",
+  user: "#c0caf5",
+  userBg: "#283457",
+  agentMessage: "#bb9af7",
+  agentMessageBg: "#2b234a",
+  assistant: "#c0caf5",
+  thinking: "#565f89",
+  tool: "#e0af68",
+  toolArg: "#9ece6a",
+  success: "#9ece6a",
+  error: "#f7768e",
+  warn: "#ff9e64",
+  selectionBg: "#33467c",
+  popupBg: "#1f2335",
+  highlight: "#ffffff",
+  codeKeyword: "#bb9af7",
+  codeString: "#9ece6a",
+  codeNumber: "#ff9e64",
+  codeComment: "#565f89",
+  codeFunction: "#7aa2f7",
+  codeType: "#2ac3de",
+};
+
+const gruvbox: Theme = {
+  name: "gruvbox",
+  bg: "#282828",
+  fg: "#ebdbb2",
+  dim: "#928374",
+  accent: "#83a598",
+  border: "#3c3836",
+  user: "#ebdbb2",
+  userBg: "#3c3836",
+  agentMessage: "#d3869b",
+  agentMessageBg: "#4a3346",
+  assistant: "#ebdbb2",
+  thinking: "#928374",
+  tool: "#fabd2f",
+  toolArg: "#b8bb26",
+  success: "#b8bb26",
+  error: "#fb4934",
+  warn: "#fe8019",
+  selectionBg: "#504945",
+  popupBg: "#32302f",
+  highlight: "#fbf1c7",
+  codeKeyword: "#fb4934",
+  codeString: "#b8bb26",
+  codeNumber: "#d3869b",
+  codeComment: "#928374",
+  codeFunction: "#fabd2f",
+  codeType: "#8ec07c",
+};
+
+const catppuccin: Theme = {
+  name: "catppuccin",
+  bg: "#1e1e2e",
+  fg: "#cdd6f4",
+  dim: "#6c7086",
+  accent: "#89b4fa",
+  border: "#313244",
+  user: "#cdd6f4",
+  userBg: "#313244",
+  agentMessage: "#cba6f7",
+  agentMessageBg: "#3b3156",
+  assistant: "#cdd6f4",
+  thinking: "#6c7086",
+  tool: "#f9e2af",
+  toolArg: "#a6e3a1",
+  success: "#a6e3a1",
+  error: "#f38ba8",
+  warn: "#fab387",
+  selectionBg: "#45475a",
+  popupBg: "#181825",
+  highlight: "#f5e0dc",
+  codeKeyword: "#cba6f7",
+  codeString: "#a6e3a1",
+  codeNumber: "#fab387",
+  codeComment: "#6c7086",
+  codeFunction: "#89b4fa",
+  codeType: "#f9e2af",
+};
+
+const nord: Theme = {
+  name: "nord",
+  bg: "#2e3440",
+  fg: "#d8dee9",
+  dim: "#7b88a1",
+  accent: "#88c0d0",
+  border: "#3b4252",
+  user: "#eceff4",
+  userBg: "#434c5e",
+  agentMessage: "#b48ead",
+  agentMessageBg: "#453b53",
+  assistant: "#d8dee9",
+  thinking: "#7b88a1",
+  tool: "#ebcb8b",
+  toolArg: "#a3be8c",
+  success: "#a3be8c",
+  error: "#bf616a",
+  warn: "#d08770",
+  selectionBg: "#4c566a",
+  popupBg: "#3b4252",
+  highlight: "#eceff4",
+  codeKeyword: "#b48ead",
+  codeString: "#a3be8c",
+  codeNumber: "#d08770",
+  codeComment: "#616e88",
+  codeFunction: "#88c0d0",
+  codeType: "#8fbcbb",
+};
+
+const dracula: Theme = {
+  name: "dracula",
+  bg: "#282a36",
+  fg: "#f8f8f2",
+  dim: "#6272a4",
+  accent: "#bd93f9",
+  border: "#44475a",
+  user: "#f8f8f2",
+  userBg: "#44475a",
+  agentMessage: "#ff79c6",
+  agentMessageBg: "#4a304d",
+  assistant: "#f8f8f2",
+  thinking: "#6272a4",
+  tool: "#f1fa8c",
+  toolArg: "#50fa7b",
+  success: "#50fa7b",
+  error: "#ff5555",
+  warn: "#ffb86c",
+  selectionBg: "#44475a",
+  popupBg: "#21222c",
+  highlight: "#ffffff",
+  codeKeyword: "#ff79c6",
+  codeString: "#f1fa8c",
+  codeNumber: "#bd93f9",
+  codeComment: "#6272a4",
+  codeFunction: "#50fa7b",
+  codeType: "#8be9fd",
+};
+
+const rosepine: Theme = {
+  name: "rosepine",
+  bg: "#191724",
+  fg: "#e0def4",
+  dim: "#6e6a86",
+  accent: "#c4a7e7",
+  border: "#26233a",
+  user: "#e0def4",
+  userBg: "#26233a",
+  agentMessage: "#c4a7e7",
+  agentMessageBg: "#302940",
+  assistant: "#e0def4",
+  thinking: "#6e6a86",
+  tool: "#f6c177",
+  toolArg: "#9ccfd8",
+  success: "#31748f",
+  error: "#eb6f92",
+  warn: "#f6c177",
+  selectionBg: "#403d52",
+  popupBg: "#1f1d2e",
+  highlight: "#fffaf3",
+  codeKeyword: "#c4a7e7",
+  codeString: "#9ccfd8",
+  codeNumber: "#ebbcba",
+  codeComment: "#6e6a86",
+  codeFunction: "#31748f",
+  codeType: "#f6c177",
+};
+
+const solarized: Theme = {
+  name: "solarized",
+  bg: "#002b36",
+  fg: "#839496",
+  dim: "#586e75",
+  accent: "#268bd2",
+  border: "#073642",
+  user: "#93a1a1",
+  userBg: "#073642",
+  agentMessage: "#6c71c4",
+  agentMessageBg: "#173b4a",
+  assistant: "#93a1a1",
+  thinking: "#586e75",
+  tool: "#b58900",
+  toolArg: "#859900",
+  success: "#859900",
+  error: "#dc322f",
+  warn: "#cb4b16",
+  selectionBg: "#0b4b59",
+  popupBg: "#073642",
+  highlight: "#fdf6e3",
+  codeKeyword: "#6c71c4",
+  codeString: "#859900",
+  codeNumber: "#d33682",
+  codeComment: "#586e75",
+  codeFunction: "#268bd2",
+  codeType: "#2aa198",
+};
+
+const kanagawa: Theme = {
+  name: "kanagawa",
+  bg: "#1f1f28",
+  fg: "#dcd7ba",
+  dim: "#727169",
+  accent: "#7e9cd8",
+  border: "#2a2a37",
+  user: "#dcd7ba",
+  userBg: "#2d4f67",
+  agentMessage: "#957fb8",
+  agentMessageBg: "#3a3048",
+  assistant: "#dcd7ba",
+  thinking: "#727169",
+  tool: "#e6c384",
+  toolArg: "#98bb6c",
+  success: "#98bb6c",
+  error: "#e46876",
+  warn: "#ffa066",
+  selectionBg: "#2d4f67",
+  popupBg: "#16161d",
+  highlight: "#c8c093",
+  codeKeyword: "#957fb8",
+  codeString: "#98bb6c",
+  codeNumber: "#d27e99",
+  codeComment: "#727169",
+  codeFunction: "#7e9cd8",
+  codeType: "#7fb4ca",
+};
+
+const githubLight: Theme = {
+  name: "github-light",
+  bg: "#ffffff",
+  fg: "#24292f",
+  dim: "#6e7781",
+  accent: "#0969da",
+  border: "#d0d7de",
+  user: "#24292f",
+  userBg: "#ddf4ff",
+  agentMessage: "#8250df",
+  agentMessageBg: "#f3e8ff",
+  assistant: "#24292f",
+  thinking: "#6e7781",
+  tool: "#9a6700",
+  toolArg: "#1a7f37",
+  success: "#1a7f37",
+  error: "#cf222e",
+  warn: "#bc4c00",
+  selectionBg: "#b6d7ff",
+  popupBg: "#f6f8fa",
+  highlight: "#000000",
+  codeKeyword: "#cf222e",
+  codeString: "#0a3069",
+  codeNumber: "#0550ae",
+  codeComment: "#6e7781",
+  codeFunction: "#8250df",
+  codeType: "#953800",
+};
+
+export const PRESETS: Record<string, Theme> = {
+  tokyonight,
+  gruvbox,
+  catppuccin,
+  nord,
+  dracula,
+  rosepine,
+  solarized,
+  kanagawa,
+  "github-light": githubLight,
+};
+export const PRESET_NAMES = Object.keys(PRESETS);
+
+const THEME_PATH = join(AGENT_DIR, "theme.json");
+
+/**
+ * A preset, with <AGENT_DIR>/theme.json merged over it. The file may set any
+ * subset of tokens; unknown keys are ignored and a bad file is ignored whole.
+ */
+export function loadTheme(name: string): Theme {
+  const base = PRESETS[name] ?? tokyonight;
+  let override: Partial<Theme> = {};
+  try {
+    override = JSON.parse(readFileSync(THEME_PATH, "utf8"));
+  } catch {
+    // no file, or unreadable — the preset stands on its own
+  }
+  const merged = { ...base };
+  for (const key of Object.keys(base) as (keyof Theme)[]) {
+    const value = override[key];
+    if (typeof value === "string") merged[key] = value;
+  }
+  merged.name = base.name;
+  return merged;
+}
+
+/** @opentui/core exports RGBA and parseColor but no interpolation helper. */
+export function mix(a: RGBA, b: RGBA, t: number): RGBA {
+  return RGBA.fromValues(
+    a.r + (b.r - a.r) * t,
+    a.g + (b.g - a.g) * t,
+    a.b + (b.b - a.b) * t,
+    1,
+  );
+}
+
+export const rgba = (color: string): RGBA => parseColor(color);

package/src/tool-line.ts

@@ -0,0 +1,72 @@
+import { relative } from "node:path";
+
+export type ToolCall = {
+  id: string;
+  name: string;
+  /** The one argument worth showing for this tool. */
+  arg: string;
+  state: "running" | "ok" | "error" | "rejected";
+  /** "+3 −1" for edits, or an error note. */
+  detail?: string;
+};
+
+/** Tool args are typed `any`, so every access here is defensive. */
+export function toolArg(name: string, args: any, cwd: string): string {
+  if (!args || typeof args !== "object") return "";
+
+  if (name === "bash" && typeof args.command === "string") {
+    return args.command.split("\n")[0]!.trim();
+  }
+  if (name === "apply_patch" && typeof args.patch === "string") {
+    const paths: string[] = [];
+    let updateIndex = -1;
+    for (const line of args.patch.replace(/\r\n/g, "\n").split("\n")) {
+      const file = line.match(/^\*\*\* (Add|Update|Delete) File: (.+)$/);
+      if (file) {
+        paths.push(file[2]!.trim().replaceAll("\\", "/"));
+        updateIndex = file[1] === "Update" ? paths.length - 1 : -1;
+        continue;
+      }
+      const move = line.match(/^\*\*\* Move to: (.+)$/);
+      if (move && updateIndex >= 0) {
+        paths[updateIndex] = `${paths[updateIndex]} → ${move[1]!.trim().replaceAll("\\", "/")}`;
+      }
+    }
+    if (paths.length === 1) return paths[0]!;
+    if (paths.length > 1) return `${paths.length} files · ${paths[0]}`;
+  }
+  if (name === "spawn_subagent" && typeof args.task === "string") {
+    return typeof args.name === "string" ? `${args.name} · ${args.task}` : args.task;
+  }
+  if (name === "message_agent" && typeof args.target === "string") {
+    return typeof args.message === "string" ? `${args.target} · ${args.message}` : args.target;
+  }
+  if (name === "stop_subagent" && typeof args.target === "string") return args.target;
+  if (name === "finish_subagent" && typeof args.summary === "string") return args.summary;
+  if (name === "worktree" && typeof args.action === "string") {
+    const target = args.target ?? args.name;
+    return target ? `${args.action} ${target}` : args.action;
+  }
+  if (typeof args.path === "string") {
+    const rel = relative(cwd, args.path);
+    return rel && !rel.startsWith("..") ? rel : args.path;
+  }
+  const first = Object.values(args).find((v) => typeof v === "string");
+  return typeof first === "string" ? first.split("\n")[0]! : "";
+}
+
+/** Count changed lines from a tool result's unified patch details. */
+export function editCounts(result: any): string | undefined {
+  const patch = result?.details?.patch;
+  if (typeof patch !== "string") return undefined;
+
+  let added = 0;
+  let removed = 0;
+  for (const line of patch.split("\n")) {
+    if (line.startsWith("+++") || line.startsWith("---")) continue;
+    if (line.startsWith("+")) added++;
+    else if (line.startsWith("-")) removed++;
+  }
+  if (!added && !removed) return undefined;
+  return `+${added} −${removed}`;
+}