supipowers 1.1.0 → 1.2.2

package/src/orchestrator/progress-renderer.ts

@@ -1,281 +0,0 @@
-// src/orchestrator/progress-renderer.ts
-import type { TaskStatus } from "./agent-grid.js";
-import { activeRuns, type TaskProgress, type RunProgressState } from "./run-progress.js";
-
-// ── ANSI-aware width helpers ─────────────────────────────────────
-
-// eslint-disable-next-line no-control-regex
-const ANSI_RE = /\x1b\[[0-9;]*m/g;
-
-/** Visible character count (ignoring ANSI escape sequences). */
-function visibleWidth(s: string): number {
-  return s.replace(ANSI_RE, "").length;
-}
-
-/** Truncate a string with ANSI codes so its visible width ≤ max, appending '…' if cut. */
-function truncateToWidth(s: string, max: number): string {
-  if (max <= 0) return "";
-  if (visibleWidth(s) <= max) return s;
-
-  let vis = 0;
-  let i = 0;
-  const ellipsis = "…";
-  const target = max - 1; // reserve 1 char for ellipsis
-
-  while (i < s.length && vis < target) {
-    // Skip ANSI sequences without counting them
-    if (s[i] === "\x1b" && s[i + 1] === "[") {
-      const end = s.indexOf("m", i);
-      if (end !== -1) { i = end + 1; continue; }
-    }
-    vis++;
-    i++;
-  }
-
-  // Grab any trailing ANSI reset sequences so colors don't leak
-  let tail = "";
-  let j = i;
-  while (j < s.length && s[j] === "\x1b") {
-    const end = s.indexOf("m", j);
-    if (end === -1) break;
-    tail += s.slice(j, end + 1);
-    j = end + 1;
-  }
-
-  return s.slice(0, i) + tail + ellipsis;
-}
-
-// ── Types ──────────────────────────────────────────────────────────
-
-interface Theme {
-  fg(color: string, text: string): string;
-  bold(text: string): string;
-  sep: { dot: string };
-  tree: {
-    branch: string;
-    last: string;
-    vertical: string;
-    hook: string;
-  };
-}
-
-interface Component {
-  render(width: number): string[];
-  invalidate(): void;
-}
-
-interface CustomMessage<T> {
-  details: T;
-}
-
-interface RunProgressDetails {
-  runId: string;
-}
-
-import type { Platform } from "../platform/types.js";
-
-// ── Constants ──────────────────────────────────────────────────────
-
-const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
-
-interface StatusConfig {
-  color: string;
-  icon: (frame: number) => string;
-}
-
-const STATUS_CONFIG: Record<TaskStatus, StatusConfig> = {
-  pending:            { color: "dim",     icon: () => "○" },
-  running:            { color: "accent",  icon: (f) => SPINNER_FRAMES[f % SPINNER_FRAMES.length] },
-  reviewing:          { color: "warning", icon: () => "◎" },
-  done:               { color: "success", icon: () => "✓" },
-  done_with_concerns: { color: "warning", icon: () => "⚠" },
-  blocked:            { color: "error",   icon: () => "✗" },
-};
-
-// ── Helper: format elapsed time ────────────────────────────────────
-
-function formatElapsed(startedAt: number, completedAt?: number): string {
-  const ms = (completedAt ?? Date.now()) - startedAt;
-  const s = Math.floor(ms / 1000);
-  if (s < 60) return `${s}s`;
-  const m = Math.floor(s / 60);
-  const rem = s % 60;
-  return rem > 0 ? `${m}m${rem}s` : `${m}m`;
-}
-
-// ── Inline Progress Component ──────────────────────────────────────
-
-export class InlineProgressComponent implements Component {
-  #runId: string;
-  #theme: Theme;
-  #spinnerFrame = 0;
-
-  constructor(runId: string, theme: Theme) {
-    this.#runId = runId;
-    this.#theme = theme;
-  }
-
-  render(width: number): string[] {
-    // Advance spinner on every render call (called each repaint)
-    this.#spinnerFrame = (this.#spinnerFrame + 1) % SPINNER_FRAMES.length;
-
-    const state = activeRuns.get(this.#runId);
-    if (!state || state.tasks.size === 0) return [];
-
-    const tasks = [...state.tasks.values()];
-    const lines: string[] = [];
-    const tree = this.#theme.tree;
-    const sep = this.#theme.sep.dot;
-
-    tasks.forEach((task, idx) => {
-      const isLast = idx === tasks.length - 1;
-      const prefix = isLast ? tree.last : tree.branch;
-      const cfg = STATUS_CONFIG[task.status];
-      const icon = this.#theme.fg(cfg.color, cfg.icon(this.#spinnerFrame));
-      const taskLabel = this.#theme.fg(cfg.color, `T${task.taskId}`);
-      const name = this.#theme.bold(task.name);
-
-      const parts: string[] = [`${prefix} ${icon} ${taskLabel} ${sep} ${name}`];
-      this.#appendTaskMeta(task, parts, sep);
-
-      // Show dependencies for pending tasks
-      if (task.status === "pending" && task.dependsOn.length > 0) {
-        const depLabels = task.dependsOn.map((d) => `T${d}`).join(", ");
-        parts.push(` ${sep} `);
-        parts.push(this.#theme.fg("dim", `Depends on ${depLabels}`));
-      }
-
-      lines.push(width > 0 ? truncateToWidth(parts.join(""), width) : parts.join(""));
-    });
-
-    // Summary line
-    const summary = state.summary;
-    const summaryParts: string[] = [];
-    if (state.batchLabel) summaryParts.push(this.#theme.fg("muted", state.batchLabel));
-    if (summary.done > 0)    summaryParts.push(this.#theme.fg("success", `${summary.done} done`));
-    if (summary.running > 0) summaryParts.push(this.#theme.fg("accent",  `${summary.running} running`));
-    if (summary.pending > 0) summaryParts.push(this.#theme.fg("dim",     `${summary.pending} pending`));
-    if (summary.blocked > 0) summaryParts.push(this.#theme.fg("error",   `${summary.blocked} blocked`));
-
-    if (summaryParts.length > 0) {
-      const indent = `  `; // align under tree
-      const summaryLine = `${indent}${summaryParts.join(` ${sep} `)}`;
-      lines.push(width > 0 ? truncateToWidth(summaryLine, width) : summaryLine);
-    }
-
-    return lines;
-  }
-
-  invalidate(): void {
-    // No cache to bust — we render fresh each time
-  }
-
-  handleInput(data: string): void {
-    // ESC key (\x1b not followed by [ which would be an ANSI sequence)
-    if (data === "\x1b" || data === "\x1b\x1b") {
-      const state = activeRuns.get(this.#runId);
-      if (state && !state.aborted) {
-        state.abort();
-      }
-    }
-  }
-
-  // ── Private ────────────────────────────────────────────────────
-
-  #appendTaskMeta(task: TaskProgress, parts: string[], sep: string): void {
-    const isActive = task.status === "running" || task.status === "reviewing";
-    const isDone =
-      task.status === "done" ||
-      task.status === "done_with_concerns" ||
-      task.status === "blocked";
-
-    if (task.toolCount > 0) {
-      parts.push(` ${sep} `);
-      parts.push(this.#theme.fg("muted", `${task.toolCount} tools`));
-    }
-
-    if (isDone && task.filesChanged > 0) {
-      parts.push(` ${sep} `);
-      parts.push(this.#theme.fg("muted", `${task.filesChanged} files`));
-    }
-
-    if (isDone) {
-      const elapsed = formatElapsed(task.startedAt, task.completedAt);
-      parts.push(` ${sep} `);
-      parts.push(this.#theme.fg("muted", elapsed));
-    }
-
-    if (isActive && task.currentActivity) {
-      parts.push(` ${sep} `);
-      parts.push(this.#theme.fg("dim", task.currentActivity));
-    }
-  }
-}
-
-// ── Widget (string[] for ctx.ui.setWidget) ──────────────────────
-
-const WIDGET_ICONS: Record<TaskStatus, string> = {
-  pending:            "○",
-  running:            "◉",
-  reviewing:          "◎",
-  done:               "✓",
-  done_with_concerns: "⚠",
-  blocked:            "✗",
-};
-
-function widgetTaskMeta(task: TaskProgress): string {
-  const parts: string[] = [];
-  const isActive = task.status === "running" || task.status === "reviewing";
-  const isDone = task.status === "done" || task.status === "done_with_concerns" || task.status === "blocked";
-  if (task.toolCount > 0) parts.push(`${task.toolCount} tools`);
-  if (isDone && task.filesChanged > 0) parts.push(`${task.filesChanged} files`);
-  if (isDone) parts.push(formatElapsed(task.startedAt, task.completedAt));
-  if (isActive && task.currentActivity) parts.push(task.currentActivity);
-  return parts.length > 0 ? ` · ${parts.join(" · ")}` : "";
-}
-
-/** Render progress as plain string[] for use with ctx.ui.setWidget. */
-export function renderWidgetLines(state: RunProgressState): string[] {
-  if (state.tasks.size === 0) return [];
-  const tasks = [...state.tasks.values()];
-  const lines: string[] = [];
-
-  for (let i = 0; i < tasks.length; i++) {
-    const task = tasks[i];
-    const prefix = i === tasks.length - 1 ? "└" : "├";
-    const icon = WIDGET_ICONS[task.status];
-    let line = `${prefix} ${icon} T${task.taskId} · ${task.name}`;
-    line += widgetTaskMeta(task);
-    if (task.status === "pending" && task.dependsOn.length > 0) {
-      line += ` · depends on ${task.dependsOn.map((d) => `T${d}`).join(", ")}`
-    }
-    lines.push(line);
-  }
-
-  // Summary
-  const s = state.summary;
-  const summaryParts: string[] = [];
-  if (state.batchLabel) summaryParts.push(state.batchLabel);
-  if (s.done > 0) summaryParts.push(`${s.done} done`);
-  if (s.running > 0) summaryParts.push(`${s.running} running`);
-  if (s.pending > 0) summaryParts.push(`${s.pending} pending`);
-  if (s.blocked > 0) summaryParts.push(`${s.blocked} blocked`);
-  if (summaryParts.length > 0) {
-    lines.push(`  ${summaryParts.join(" · ")}`);
-  }
-
-  return lines;
-}
-
-// ── Registration ───────────────────────────────────────────────────
-
-export function registerProgressRenderer(platform: Platform): void {
-  platform.registerMessageRenderer<RunProgressDetails>(
-    "supi-run-progress",
-    (message: CustomMessage<RunProgressDetails>, _options: any, theme: Theme) => {
-      const { runId } = message.details;
-      if (!runId) return undefined;
-      return new InlineProgressComponent(runId, theme);
-    },
-  );
-}

package/src/orchestrator/prompts.ts

@@ -1,149 +0,0 @@
-// src/orchestrator/prompts.ts
-import type { PlanTask, SupipowersConfig } from "../types.js";
-import { buildLspValidationPrompt } from "../lsp/bridge.js";
-import { buildImplementerPrompt } from "./agent-prompts.js";
-import { buildReceivingReviewInstructions } from "../discipline/receiving-review.js";
-
-/** Build the system prompt for a sub-agent executing a task */
-export function buildTaskPrompt(
-  task: PlanTask,
-  planContext: string,
-  config: SupipowersConfig,
-  lspAvailable: boolean,
-  contextModeAvailable = false,
-  workDir?: string,
-): string {
-  let result = buildImplementerPrompt({
-    task,
-    planContext,
-    workDir: workDir ?? process.cwd(),
-  });
-
-  if (lspAvailable) {
-    result = [
-      result,
-      "",
-      "## LSP Available",
-      "You have access to the LSP tool. Use it to:",
-      "- Check diagnostics after making changes",
-      "- Find references before renaming symbols",
-      "- Validate your work has no type errors",
-      "",
-      buildLspValidationPrompt(task.files),
-    ].join("\n");
-  }
-
-  if (contextModeAvailable) {
-    result = [
-      result,
-      "",
-      "## Context Mode Available",
-      "You have access to context-mode sandbox tools. Prefer them for large operations:",
-      "- Use `ctx_batch_execute` for multi-step operations",
-      "- Use `ctx_search` for querying indexed knowledge",
-      "- Use `ctx_execute` for single commands with large output",
-      "- Do NOT use `curl`/`wget` \u2014 use `ctx_fetch_and_index`",
-      "- Do NOT use Read for analyzing large files \u2014 use `ctx_execute_file`",
-      "- Keep output under 500 words; write large artifacts to files",
-    ].join("\n");
-  }
-
-  return result;
-}
-
-/** Build prompt for a fix agent */
-export function buildFixPrompt(
-  task: PlanTask,
-  previousOutput: string,
-  failureReason: string,
-  lspAvailable: boolean,
-  contextModeAvailable = false,
-): string {
-  const sections: string[] = [
-    "# Fix Assignment",
-    "",
-    `## Original Task: ${task.name}`,
-    "",
-    "## What Went Wrong",
-    failureReason,
-    "",
-    "## Previous Agent Output",
-    previousOutput,
-    "",
-    "## Target Files",
-    ...task.files.map((f) => `- ${f}`),
-    "",
-    "## Acceptance Criteria",
-    task.criteria,
-    "",
-    "## Instructions",
-    "1. Understand what the previous agent attempted",
-    "2. Identify and fix the issue",
-    "3. Verify the acceptance criteria are now met",
-    "4. Report your status",
-    "",
-    "---",
-    "",
-    buildReceivingReviewInstructions(),
-  ];
-
-  if (lspAvailable) {
-    sections.push("", buildLspValidationPrompt(task.files));
-  }
-
-  if (contextModeAvailable) {
-    sections.push(
-      "",
-      "## Context Mode Available",
-      "You have access to context-mode sandbox tools. Prefer them for large operations:",
-      "- Use `ctx_batch_execute` for multi-step operations",
-      "- Use `ctx_search` for querying indexed knowledge",
-      "- Use `ctx_execute` for single commands with large output",
-      "- Do NOT use `curl`/`wget` \u2014 use `ctx_fetch_and_index`",
-      "- Do NOT use Read for analyzing large files \u2014 use `ctx_execute_file`",
-      "- Keep output under 500 words; write large artifacts to files",
-    );
-  }
-
-  return sections.join("\n");
-}
-
-/** Build prompt for a merge/conflict resolution agent */
-export function buildMergePrompt(
-  conflictingFiles: string[],
-  agentOutputs: { taskName: string; output: string }[],
-  contextModeAvailable = false,
-): string {
-  const sections: string[] = [
-    "# Merge Assignment",
-    "",
-    "Multiple agents edited the same files. Resolve the conflicts.",
-    "",
-    "## Conflicting Files",
-    ...conflictingFiles.map((f) => `- ${f}`),
-    "",
-    "## Agent Outputs",
-  ];
-
-  for (const { taskName, output } of agentOutputs) {
-    sections.push(`### ${taskName}`, output, "");
-  }
-
-  sections.push(
-    "## Instructions",
-    "1. Read each conflicting file",
-    "2. Understand what each agent intended",
-    "3. Merge the changes so both intents are preserved",
-    "4. If changes are incompatible, report BLOCKED with explanation"
-  );
-
-  if (contextModeAvailable) {
-    sections.push(
-      "",
-      "## Context Mode Available",
-      "Prefer context-mode sandbox tools for large operations.",
-    );
-  }
-
-  return sections.join("\n");
-}

package/src/orchestrator/result-collector.ts

@@ -1,72 +0,0 @@
-import type { AgentResult, RunBatch } from "../types.js";
-
-export interface BatchSummary {
-  batchIndex: number;
-  total: number;
-  done: number;
-  doneWithConcerns: number;
-  blocked: number;
-  allPassed: boolean;
-  concerns: string[];
-  blockers: string[];
-  filesChanged: string[];
-}
-
-export function summarizeBatch(
-  batch: RunBatch,
-  results: AgentResult[]
-): BatchSummary {
-  const batchResults = results.filter((r) => batch.taskIds.includes(r.taskId));
-
-  const done = batchResults.filter((r) => r.status === "done").length;
-  const doneWithConcerns = batchResults.filter(
-    (r) => r.status === "done_with_concerns"
-  ).length;
-  const blocked = batchResults.filter((r) => r.status === "blocked").length;
-
-  return {
-    batchIndex: batch.index,
-    total: batch.taskIds.length,
-    done,
-    doneWithConcerns,
-    blocked,
-    allPassed: blocked === 0,
-    concerns: batchResults
-      .filter((r) => r.concerns)
-      .map((r) => r.concerns!),
-    blockers: batchResults
-      .filter((r) => r.status === "blocked")
-      .map((r) => r.output),
-    filesChanged: batchResults.flatMap((r) => r.filesChanged),
-  };
-}
-
-export function detectConflicts(results: AgentResult[]): string[] {
-  const fileCounts = new Map<string, number>();
-  for (const result of results) {
-    for (const file of result.filesChanged) {
-      fileCounts.set(file, (fileCounts.get(file) ?? 0) + 1);
-    }
-  }
-  return [...fileCounts.entries()]
-    .filter(([, count]) => count > 1)
-    .map(([file]) => file);
-}
-
-export function buildRunSummary(allResults: AgentResult[]): {
-  totalTasks: number;
-  done: number;
-  doneWithConcerns: number;
-  blocked: number;
-  totalFilesChanged: number;
-  totalDuration: number;
-} {
-  return {
-    totalTasks: allResults.length,
-    done: allResults.filter((r) => r.status === "done").length,
-    doneWithConcerns: allResults.filter((r) => r.status === "done_with_concerns").length,
-    blocked: allResults.filter((r) => r.status === "blocked").length,
-    totalFilesChanged: new Set(allResults.flatMap((r) => r.filesChanged)).size,
-    totalDuration: allResults.reduce((sum, r) => sum + r.duration, 0),
-  };
-}

package/src/orchestrator/run-progress.ts

@@ -1,95 +0,0 @@
-// src/orchestrator/run-progress.ts
-import type { TaskStatus } from "./agent-grid.js";
-
-export interface TaskProgress {
-  taskId: number;
-  name: string;
-  status: TaskStatus;
-  currentActivity: string;
-  toolCount: number;
-  filesChanged: number;
-  startedAt: number;
-  completedAt?: number;
-  errorReason?: string;
-  concerns?: string;
-  dependsOn: number[];
-}
-
-/** Shared state store for a single run — written by dispatcher, read by renderer */
-export class RunProgressState {
-  readonly tasks = new Map<number, TaskProgress>();
-  #batchLabel = "";
-  onChange?: () => void;
-
-  get batchLabel(): string { return this.#batchLabel; }
-  set batchLabel(value: string) {
-    this.#batchLabel = value;
-    this.onChange?.();
-  }
-
-  // Abort support — wired to ESC in the progress renderer
-  readonly #controller = new AbortController();
-  get signal(): AbortSignal { return this.#controller.signal; }
-  get aborted(): boolean { return this.#controller.signal.aborted; }
-  abort(): void { this.#controller.abort(); }
-  addTask(taskId: number, name: string, dependsOn: number[] = []): void {
-    this.tasks.set(taskId, {
-      taskId,
-      name,
-      status: "pending",
-      currentActivity: "",
-      toolCount: 0,
-      filesChanged: 0,
-      startedAt: Date.now(),
-      dependsOn,
-    });
-    this.onChange?.();
-  }
-
-  setStatus(taskId: number, status: TaskStatus, reason?: string): void {
-    const task = this.tasks.get(taskId);
-    if (!task) return;
-    task.status = status;
-    if (status === "blocked") task.errorReason = reason;
-    if (status === "done_with_concerns") task.concerns = reason;
-    if (status === "done" || status === "done_with_concerns" || status === "blocked") {
-      task.completedAt = Date.now();
-    }
-    this.onChange?.();
-  }
-
-  setActivity(taskId: number, activity: string): void {
-    const task = this.tasks.get(taskId);
-    if (!task) return;
-    task.currentActivity = activity;
-    this.onChange?.();
-  }
-
-  incrementTools(taskId: number): void {
-    const task = this.tasks.get(taskId);
-    if (!task) return;
-    task.toolCount++;
-    this.onChange?.();
-  }
-
-  incrementFiles(taskId: number): void {
-    const task = this.tasks.get(taskId);
-    if (!task) return;
-    task.filesChanged++;
-    this.onChange?.();
-  }
-
-  get summary() {
-    const all = [...this.tasks.values()];
-    return {
-      total: all.length,
-      done: all.filter((t) => t.status === "done" || t.status === "done_with_concerns").length,
-      running: all.filter((t) => t.status === "running" || t.status === "reviewing").length,
-      blocked: all.filter((t) => t.status === "blocked").length,
-      pending: all.filter((t) => t.status === "pending").length,
-    };
-  }
-}
-
-/** Module-level store: runId → state. Renderer reads from here. */
-export const activeRuns = new Map<string, RunProgressState>();

package/src/platform/pi.ts

@@ -1,61 +0,0 @@
-import type { Platform, AgentSession, AgentSessionOptions } from "./types.js";
-import { createPaths } from "./types.js";
-
-export function createPiAdapter(pi: any): Platform {
-  return {
-    name: "pi",
-    registerCommand: (name, opts) => pi.registerCommand(name, opts),
-    getCommands: () => pi.getCommands(),
-    getActiveTools: () => pi.getActiveTools(),
-    registerTool: (definition) => pi.registerTool(definition),
-    setActiveTools: (names) => pi.setActiveTools(names),
-    exec: (cmd, args, opts) => pi.exec(cmd, args, opts),
-    sendMessage: (content, opts) => {
-      pi.sendMessage(content, {
-        deliverAs: opts?.deliverAs ?? "steer",
-        triggerTurn: opts?.triggerTurn ?? true,
-      });
-    },
-    registerMessageRenderer: (type, fn) => pi.registerMessageRenderer(type, fn),
-
-    setModel(_model: string): void {
-      // Pi doesn't support runtime model switching
-    },
-    getCurrentModel(): string {
-      return "unknown";
-    },
-    getModelForRole(_role: string): string | null {
-      return null;
-    },
-
-    on: (event, handler) => pi.on(event, handler),
-
-    createAgentSession: async (opts: AgentSessionOptions): Promise<AgentSession> => {
-      const mod = await import("@mariozechner/pi-coding-agent");
-      const createFn = (mod as any).createAgentSession;
-      // Same fix as OMP adapter: model is a string ID, not a Model object.
-      // Use modelPattern for string-based model resolution.
-      const { model, ...restOpts } = opts;
-      const { session } = await createFn({
-        cwd: restOpts.cwd ?? process.cwd(),
-        hasUI: false,
-        ...restOpts,
-        ...(model ? { modelPattern: model } : {}),
-      });
-      return {
-        subscribe: (handler: any) => session.subscribe(handler),
-        prompt: (text: string, promptOpts?: any) => session.prompt(text, promptOpts),
-        state: session.state,
-        dispose: () => session.dispose(),
-      };
-    },
-
-    paths: createPaths(".pi"),
-    capabilities: {
-      agentSessions: true,
-      compactionHooks: true,
-      customWidgets: true,
-      registerTool: true,
-    },
-  };
-}