takomi 2.1.2 → 2.1.4

package/.pi/extensions/takomi-runtime/subagent-types.ts

@@ -1,83 +1,90 @@
-import type { TakomiThinkingLevel } from "../../../src/pi-takomi-core";
-import type { ChecklistInput } from "./shared";
-
-export type SubagentViewMode = "compact" | "expanded" | "fullscreen";
-export type SubagentFocusDirection = "next" | "prev";
-export type TakomiSubagentStatus = "running" | "completed" | "blocked";
-export type TakomiBoardTaskStatus = "pending" | "in-progress" | "completed" | "blocked";
-export type TakomiSubagentSource = "runtime-board" | "takomi-tool";
-export const TAKOMI_SUBAGENT_EVENT_CHANNEL = "takomi:subagent-runtime";
-
-export type TakomiSubagentRun = {
-  runKey: string;
-  conversationId?: string;
-  parentTaskId?: string;
-  parentRunKey?: string;
-  agent: string;
-  taskLabel: string;
-  status: TakomiSubagentStatus;
-  stage?: string;
-  workflow?: string;
-  model?: string;
-  fallbackModels?: string[];
-  thinking?: TakomiThinkingLevel;
-  checklist?: ChecklistInput;
-  boardTaskStatus?: TakomiBoardTaskStatus;
-  summary?: string;
-  outputText?: string;
-  logs: string[];
-  startedAt: number;
-  updatedAt: number;
-  source: TakomiSubagentSource;
-};
-
-export type TakomiSubagentRunInit = Omit<TakomiSubagentRun, "runKey" | "logs" | "startedAt" | "updatedAt" | "status"> & {
-  logs?: string[];
-  status?: TakomiSubagentStatus;
-};
-
-export type TakomiSubagentRunPatch = Partial<Omit<TakomiSubagentRun, "runKey" | "startedAt" | "source">> & {
-  source?: TakomiSubagentSource;
-};
-
-export type TakomiSubagentRenderEntry = {
-  run: TakomiSubagentRun;
-  depth: number;
-  relation: "focused" | "ancestor" | "peer";
-};
-
-export type TakomiSubagentRenderState = {
-  mode: SubagentViewMode;
-  activeCount: number;
-  focusPosition: number;
-  focusedRun?: TakomiSubagentRun;
-  activePath: TakomiSubagentRenderEntry[];
-  peerRuns: TakomiSubagentRenderEntry[];
-  compactRuns: TakomiSubagentRenderEntry[];
-};
-
-export interface TakomiSubagentController {
-  hasRuns(): boolean;
-  getStatusSummary(): string;
-  getViewMode(): SubagentViewMode;
-  start(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext, state: TakomiSubagentRunInit, runKey?: string): Promise<void>;
-  update(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext, patch: TakomiSubagentRunPatch, runKey?: string): Promise<void>;
-  appendLog(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext, chunk: string, runKey?: string): Promise<void>;
-  complete(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext, patch?: TakomiSubagentRunPatch, runKey?: string): Promise<void>;
-  block(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext, patch?: TakomiSubagentRunPatch, runKey?: string): Promise<void>;
-  reset(ctx?: import("@mariozechner/pi-coding-agent").ExtensionContext): void;
-  refresh(): void;
-  refreshWithContext(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext): void;
-  cycleFocus(direction: SubagentFocusDirection, ctx?: import("@mariozechner/pi-coding-agent").ExtensionContext): boolean;
-  setViewMode(mode: SubagentViewMode, ctx?: import("@mariozechner/pi-coding-agent").ExtensionContext): SubagentViewMode | undefined;
-  cycleViewMode(ctx?: import("@mariozechner/pi-coding-agent").ExtensionContext): SubagentViewMode | undefined;
-  closeFullscreen(ctx?: import("@mariozechner/pi-coding-agent").ExtensionContext): SubagentViewMode;
-  getKnownParentRunKey(parentTaskId: string): string | undefined;
-}
-
-export type TakomiSubagentRuntimeEvent =
-  | { type: "start"; runKey?: string; state: TakomiSubagentRunInit }
-  | { type: "update"; runKey?: string; patch: TakomiSubagentRunPatch }
-  | { type: "appendLog"; runKey?: string; chunk: string }
-  | { type: "complete"; runKey?: string; patch?: TakomiSubagentRunPatch }
-  | { type: "block"; runKey?: string; patch?: TakomiSubagentRunPatch };
+import type { TakomiThinkingLevel } from "../../../src/pi-takomi-core";
+import type { ChecklistInput } from "./shared";
+
+export type SubagentViewMode = "compact" | "expanded" | "fullscreen";
+export type SubagentFocusDirection = "next" | "prev";
+export type TakomiSubagentStatus = "running" | "completed" | "blocked";
+export type TakomiBoardTaskStatus = "pending" | "in-progress" | "completed" | "blocked";
+export type TakomiSubagentSource = "runtime-board" | "takomi-tool";
+export const TAKOMI_SUBAGENT_EVENT_CHANNEL = "takomi:subagent-runtime";
+
+export type TakomiSubagentRun = {
+  runKey: string;
+  conversationId?: string;
+  parentTaskId?: string;
+  parentRunKey?: string;
+  agent: string;
+  taskLabel: string;
+  status: TakomiSubagentStatus;
+  stage?: string;
+  workflow?: string;
+  model?: string;
+  fallbackModels?: string[];
+  thinking?: TakomiThinkingLevel;
+  checklist?: ChecklistInput;
+  boardTaskStatus?: TakomiBoardTaskStatus;
+  summary?: string;
+  outputText?: string;
+  currentTool?: string;
+  currentToolArgs?: string;
+  currentToolStartedAt?: number;
+  recentTools?: Array<{ tool: string; args: string; endMs: number }>;
+  recentOutput?: string[];
+  toolCount?: number;
+  sessionFile?: string;
+  logs: string[];
+  startedAt: number;
+  updatedAt: number;
+  source: TakomiSubagentSource;
+};
+
+export type TakomiSubagentRunInit = Omit<TakomiSubagentRun, "runKey" | "logs" | "startedAt" | "updatedAt" | "status"> & {
+  logs?: string[];
+  status?: TakomiSubagentStatus;
+};
+
+export type TakomiSubagentRunPatch = Partial<Omit<TakomiSubagentRun, "runKey" | "startedAt" | "source">> & {
+  source?: TakomiSubagentSource;
+};
+
+export type TakomiSubagentRenderEntry = {
+  run: TakomiSubagentRun;
+  depth: number;
+  relation: "focused" | "ancestor" | "peer";
+};
+
+export type TakomiSubagentRenderState = {
+  mode: SubagentViewMode;
+  activeCount: number;
+  focusPosition: number;
+  focusedRun?: TakomiSubagentRun;
+  activePath: TakomiSubagentRenderEntry[];
+  peerRuns: TakomiSubagentRenderEntry[];
+  compactRuns: TakomiSubagentRenderEntry[];
+};
+
+export interface TakomiSubagentController {
+  hasRuns(): boolean;
+  getStatusSummary(): string;
+  getViewMode(): SubagentViewMode;
+  start(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext, state: TakomiSubagentRunInit, runKey?: string): Promise<void>;
+  update(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext, patch: TakomiSubagentRunPatch, runKey?: string): Promise<void>;
+  appendLog(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext, chunk: string, runKey?: string): Promise<void>;
+  complete(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext, patch?: TakomiSubagentRunPatch, runKey?: string): Promise<void>;
+  block(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext, patch?: TakomiSubagentRunPatch, runKey?: string): Promise<void>;
+  reset(ctx?: import("@mariozechner/pi-coding-agent").ExtensionContext): void;
+  refresh(): void;
+  refreshWithContext(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext): void;
+  cycleFocus(direction: SubagentFocusDirection, ctx?: import("@mariozechner/pi-coding-agent").ExtensionContext): boolean;
+  setViewMode(mode: SubagentViewMode, ctx?: import("@mariozechner/pi-coding-agent").ExtensionContext): SubagentViewMode | undefined;
+  cycleViewMode(ctx?: import("@mariozechner/pi-coding-agent").ExtensionContext): SubagentViewMode | undefined;
+  closeFullscreen(ctx?: import("@mariozechner/pi-coding-agent").ExtensionContext): SubagentViewMode;
+  getKnownParentRunKey(parentTaskId: string): string | undefined;
+}
+
+export type TakomiSubagentRuntimeEvent =
+  | { type: "start"; runKey?: string; state: TakomiSubagentRunInit }
+  | { type: "update"; runKey?: string; patch: TakomiSubagentRunPatch }
+  | { type: "appendLog"; runKey?: string; chunk: string }
+  | { type: "complete"; runKey?: string; patch?: TakomiSubagentRunPatch }
+  | { type: "block"; runKey?: string; patch?: TakomiSubagentRunPatch };

package/.pi/extensions/takomi-runtime/ui.ts

@@ -1,133 +1,133 @@
-import type { AssistantMessage } from "@mariozechner/pi-ai";
-import type { ExtensionContext, ReadonlyFooterDataProvider, Theme } from "@mariozechner/pi-coding-agent";
-import {
-  ellipsizeMiddle,
-  formatFooterNumber,
-  truncateToWidth,
-  visibleWidth,
-} from "./shared";
-
-interface Component {
-  render(width: number): string[];
-  invalidate(): void;
-  dispose?(): void;
-}
-
-interface RenderTui {
-  requestRender(force?: boolean): void;
-}
-
-export type RuntimeHudState = {
-  enabled: boolean;
-  autoOrch: boolean;
-  planMode: boolean;
-  role: string;
-  stage?: string;
-  workflow?: string;
-  activeSessionId?: string;
-  launchMode?: string;
-  subagentsEnabled?: boolean;
-};
-
-type Tone = "accent" | "warning" | "success" | "error" | "muted" | "dim" | "thinkingMinimal";
-
-function stageTone(stage?: string): Tone {
-  switch (stage) {
-    case "genesis":
-      return "thinkingMinimal";
-    case "design":
-      return "accent";
-    case "build":
-      return "warning";
-    default:
-      return "muted";
-  }
-}
-
-function badge(theme: Theme, label: string, tone: Tone): string {
-  return theme.fg(tone, `<${label.toUpperCase()}>`);
-}
-
-export function renderRuntimeStatus(theme: Theme, state: RuntimeHudState): string {
-  const primary = state.stage ?? state.role;
-  const stageBadge = badge(theme, primary, stageTone(state.stage));
-  const auto = state.autoOrch ? theme.fg("accent", "auto") : theme.fg("dim", "manual");
-  const gate = state.launchMode === "manual" ? theme.fg("warning", "review-gate") : theme.fg("accent", "auto-gate");
-  const plan = state.planMode ? theme.fg("warning", "plan") : theme.fg("dim", "direct");
-  const subagents = state.subagentsEnabled === false ? theme.fg("error", "subagents:off") : theme.fg("dim", "subagents:on");
-  return [theme.fg("accent", "Takomi"), stageBadge, theme.fg("dim", `role:${state.role}`), auto, gate, plan, subagents].join(" ");
-}
-
-export function renderRuntimeWidget(theme: Theme, state: RuntimeHudState): string[] {
-  if (!state.enabled) return [];
-  const primary = state.stage ?? state.role;
-  const parts = [
-    theme.fg("accent", "Takomi"),
-    badge(theme, primary, stageTone(state.stage)),
-    theme.fg("dim", `role:${state.role}`),
-    state.autoOrch ? theme.fg("accent", "auto") : theme.fg("dim", "manual"),
-    state.launchMode === "manual" ? theme.fg("warning", "review-gate") : theme.fg("accent", "auto-gate"),
-    state.planMode ? theme.fg("warning", "plan") : theme.fg("dim", "direct"),
-    state.subagentsEnabled === false ? theme.fg("error", "subagents:off") : theme.fg("dim", "subagents:on"),
-    state.workflow ? theme.fg("dim", `wf:${state.workflow}`) : "",
-    state.activeSessionId ? theme.fg("dim", `session:${ellipsizeMiddle(state.activeSessionId, 12)}`) : "",
-  ].filter(Boolean);
-  return [parts.join("  ")];
-}
-
-export class TakomiFooterComponent implements Component {
-  private readonly unsubscribeBranchChange: () => void;
-
-  constructor(
-    private readonly tui: RenderTui,
-    private readonly theme: Theme,
-    private readonly footerData: ReadonlyFooterDataProvider,
-    private readonly ctx: ExtensionContext,
-    private readonly getState: () => RuntimeHudState,
-  ) {
-    this.unsubscribeBranchChange = footerData.onBranchChange(() => {
-      this.tui.requestRender();
-    });
-  }
-
-  dispose(): void {
-    this.unsubscribeBranchChange();
-  }
-
-  invalidate(): void {}
-
-  render(width: number): string[] {
-    const state = this.getState();
-    let input = 0;
-    let output = 0;
-    let cost = 0;
-
-    for (const entry of this.ctx.sessionManager.getBranch()) {
-      if (entry.type === "message" && entry.message.role === "assistant") {
-        const message = entry.message as AssistantMessage;
-        input += message.usage.input;
-        output += message.usage.output;
-        cost += message.usage.cost.total;
-      }
-    }
-
-    const cwd = this.theme.fg("dim", this.ctx.cwd);
-    const stats = this.theme.fg("dim", `up:${formatFooterNumber(input)} down:${formatFooterNumber(output)} $${cost.toFixed(3)}`);
-    const leftPad = " ".repeat(Math.max(1, width - visibleWidth(cwd) - visibleWidth(stats)));
-    const topLine = truncateToWidth(`${cwd}${leftPad}${stats}`, width);
-
-    const extensionStatuses = [...this.footerData.getExtensionStatuses().entries()]
-      .filter(([key]) => key !== "takomi-runtime")
-      .map(([, value]) => value)
-      .filter(Boolean);
-    const runtimeStatus = renderRuntimeStatus(this.theme, state);
-    const left = [runtimeStatus, ...extensionStatuses].join(this.theme.fg("dim", "  |  "));
-    const branch = this.footerData.getGitBranch();
-    const rightText = [this.ctx.model?.id || "no-model", branch ? `git:${branch}` : ""].filter(Boolean).join(" | ");
-    const right = this.theme.fg("dim", rightText);
-    const rightPad = " ".repeat(Math.max(1, width - visibleWidth(left) - visibleWidth(right)));
-    const bottomLine = truncateToWidth(`${left}${rightPad}${right}`, width);
-
-    return [topLine, bottomLine];
-  }
-}
+import type { AssistantMessage } from "@mariozechner/pi-ai";
+import type { ExtensionContext, ReadonlyFooterDataProvider, Theme } from "@mariozechner/pi-coding-agent";
+import {
+  ellipsizeMiddle,
+  formatFooterNumber,
+  truncateToWidth,
+  visibleWidth,
+} from "./shared";
+
+interface Component {
+  render(width: number): string[];
+  invalidate(): void;
+  dispose?(): void;
+}
+
+interface RenderTui {
+  requestRender(force?: boolean): void;
+}
+
+export type RuntimeHudState = {
+  enabled: boolean;
+  autoOrch: boolean;
+  planMode: boolean;
+  role: string;
+  stage?: string;
+  workflow?: string;
+  activeSessionId?: string;
+  launchMode?: string;
+  subagentsEnabled?: boolean;
+};
+
+type Tone = "accent" | "warning" | "success" | "error" | "muted" | "dim" | "thinkingMinimal";
+
+function stageTone(stage?: string): Tone {
+  switch (stage) {
+    case "genesis":
+      return "thinkingMinimal";
+    case "design":
+      return "accent";
+    case "build":
+      return "warning";
+    default:
+      return "muted";
+  }
+}
+
+function badge(theme: Theme, label: string, tone: Tone): string {
+  return theme.fg(tone, `<${label.toUpperCase()}>`);
+}
+
+export function renderRuntimeStatus(theme: Theme, state: RuntimeHudState): string {
+  const primary = state.stage ?? state.role;
+  const stageBadge = badge(theme, primary, stageTone(state.stage));
+  const auto = state.autoOrch ? theme.fg("accent", "auto") : theme.fg("dim", "manual");
+  const gate = state.launchMode === "manual" ? theme.fg("warning", "review-gate") : theme.fg("accent", "auto-gate");
+  const plan = state.planMode ? theme.fg("warning", "plan") : theme.fg("dim", "direct");
+  const subagents = state.subagentsEnabled === false ? theme.fg("error", "subagents:off") : theme.fg("dim", "subagents:on");
+  return [theme.fg("accent", "Takomi"), stageBadge, theme.fg("dim", `role:${state.role}`), auto, gate, plan, subagents].join(" ");
+}
+
+export function renderRuntimeWidget(theme: Theme, state: RuntimeHudState): string[] {
+  if (!state.enabled) return [];
+  const primary = state.stage ?? state.role;
+  const parts = [
+    theme.fg("accent", "Takomi"),
+    badge(theme, primary, stageTone(state.stage)),
+    theme.fg("dim", `role:${state.role}`),
+    state.autoOrch ? theme.fg("accent", "auto") : theme.fg("dim", "manual"),
+    state.launchMode === "manual" ? theme.fg("warning", "review-gate") : theme.fg("accent", "auto-gate"),
+    state.planMode ? theme.fg("warning", "plan") : theme.fg("dim", "direct"),
+    state.subagentsEnabled === false ? theme.fg("error", "subagents:off") : theme.fg("dim", "subagents:on"),
+    state.workflow ? theme.fg("dim", `wf:${state.workflow}`) : "",
+    state.activeSessionId ? theme.fg("dim", `session:${ellipsizeMiddle(state.activeSessionId, 12)}`) : "",
+  ].filter(Boolean);
+  return [parts.join("  ")];
+}
+
+export class TakomiFooterComponent implements Component {
+  private readonly unsubscribeBranchChange: () => void;
+
+  constructor(
+    private readonly tui: RenderTui,
+    private readonly theme: Theme,
+    private readonly footerData: ReadonlyFooterDataProvider,
+    private readonly ctx: ExtensionContext,
+    private readonly getState: () => RuntimeHudState,
+  ) {
+    this.unsubscribeBranchChange = footerData.onBranchChange(() => {
+      this.tui.requestRender();
+    });
+  }
+
+  dispose(): void {
+    this.unsubscribeBranchChange();
+  }
+
+  invalidate(): void {}
+
+  render(width: number): string[] {
+    const state = this.getState();
+    let input = 0;
+    let output = 0;
+    let cost = 0;
+
+    for (const entry of this.ctx.sessionManager.getBranch()) {
+      if (entry.type === "message" && entry.message.role === "assistant") {
+        const message = entry.message as AssistantMessage;
+        input += message.usage.input;
+        output += message.usage.output;
+        cost += message.usage.cost.total;
+      }
+    }
+
+    const cwd = this.theme.fg("dim", this.ctx.cwd);
+    const stats = this.theme.fg("dim", `up:${formatFooterNumber(input)} down:${formatFooterNumber(output)} $${cost.toFixed(3)}`);
+    const leftPad = " ".repeat(Math.max(1, width - visibleWidth(cwd) - visibleWidth(stats)));
+    const topLine = truncateToWidth(`${cwd}${leftPad}${stats}`, width);
+
+    const extensionStatuses = [...this.footerData.getExtensionStatuses().entries()]
+      .filter(([key]) => key !== "takomi-runtime")
+      .map(([, value]) => value)
+      .filter(Boolean);
+    const runtimeStatus = renderRuntimeStatus(this.theme, state);
+    const left = [runtimeStatus, ...extensionStatuses].join(this.theme.fg("dim", "  |  "));
+    const branch = this.footerData.getGitBranch();
+    const rightText = [this.ctx.model?.id || "no-model", branch ? `git:${branch}` : ""].filter(Boolean).join(" | ");
+    const right = this.theme.fg("dim", rightText);
+    const rightPad = " ".repeat(Math.max(1, width - visibleWidth(left) - visibleWidth(right)));
+    const bottomLine = truncateToWidth(`${left}${rightPad}${right}`, width);
+
+    return [topLine, bottomLine];
+  }
+}

package/.pi/extensions/takomi-subagents/agent-aliases.ts

@@ -1,18 +1,18 @@
-import type { TakomiAgentConfig } from "./agents";
-
-const AGENT_ALIASES: Record<string, string[]> = {
-  general: ["orchestrator", "coder", "architect"],
-  code: ["coder"],
-  build: ["coder", "orchestrator"],
-  design: ["designer"],
-  review: ["reviewer"],
-  architecture: ["architect"],
-};
-
-export function resolveAgentName(name: string, agents: Map<string, TakomiAgentConfig>): string {
-  if (agents.has(name)) return name;
-  const lower = name.toLowerCase();
-  const exactCase = [...agents.keys()].find((agentName) => agentName.toLowerCase() === lower);
-  if (exactCase) return exactCase;
-  return AGENT_ALIASES[lower]?.find((candidate) => agents.has(candidate)) ?? name;
-}
+import type { TakomiAgentConfig } from "./agents";
+
+const AGENT_ALIASES: Record<string, string[]> = {
+  general: ["orchestrator", "coder", "architect"],
+  code: ["coder"],
+  build: ["coder", "orchestrator"],
+  design: ["designer"],
+  review: ["reviewer"],
+  architecture: ["architect"],
+};
+
+export function resolveAgentName(name: string, agents: Map<string, TakomiAgentConfig>): string {
+  if (agents.has(name)) return name;
+  const lower = name.toLowerCase();
+  const exactCase = [...agents.keys()].find((agentName) => agentName.toLowerCase() === lower);
+  if (exactCase) return exactCase;
+  return AGENT_ALIASES[lower]?.find((candidate) => agents.has(candidate)) ?? name;
+}