oh-pi 0.1.48 → 0.1.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-pi",
-  "version": "0.1.48",
+  "version": "0.1.49",
   "description": "One-click setup for pi-coding-agent. Like oh-my-zsh for pi.",
   "type": "module",
   "bin": {

package/pi-package/extensions/ant-colony/concurrency.ts

@@ -14,10 +14,10 @@ const CPU_CORES = os.cpus().length;
 
 export function defaultConcurrency(): ConcurrencyConfig {
   return {
-    current: 1,
+    current: 2,
     min: 1,
     max: Math.min(CPU_CORES, 8),
-    optimal: 2,
+    optimal: 3,
     history: [],
   };
 }
@@ -68,8 +68,8 @@ export function adapt(config: ConcurrencyConfig, pendingTasks: number): Concurre
   const taskCap = Math.min(pendingTasks, config.max);
 
   if (samples.length < 3) {
-    // 冷启动：保守起步
-    next.current = Math.min(2, taskCap);
+    // 冷启动：直接给一半 max，快速利用并发
+    next.current = Math.min(Math.ceil(config.max / 2), taskCap);
     return next;
   }
 

package/pi-package/extensions/ant-colony/index.ts

@@ -12,7 +12,7 @@
 import { readFileSync, appendFileSync, existsSync } from "node:fs";
 import { join } from "node:path";
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { Text, Container, Spacer } from "@mariozechner/pi-tui";
+import { Text, Container, Spacer, matchesKey } from "@mariozechner/pi-tui";
 import { Type } from "@sinclair/typebox";
 import { runColony, type QueenCallbacks } from "./queen.js";
 import type { ColonyState, ColonyMetrics, AntStreamEvent } from "./types.js";
@@ -46,30 +46,6 @@ function casteIcon(caste: string): string {
   return caste === "scout" ? "🔍" : caste === "soldier" ? "🛡️" : "⚒️";
 }
 
-function progressBar(done: number, total: number, width: number, theme: any): string {
-  if (total === 0) return "";
-  const pct = Math.min(done / total, 1);
-  const filled = Math.round(pct * width);
-  const empty = width - filled;
-  return theme.fg("success", "█".repeat(filled)) + theme.fg("muted", "░".repeat(empty)) + " " + theme.fg("accent", `${done}/${total}`);
-}
-
-function phasePipeline(status: string, theme: any): string {
-  const phases = [
-    { key: "scouting", icon: "🔍", label: "Scout" },
-    { key: "working", icon: "⚒️", label: "Work" },
-    { key: "reviewing", icon: "🛡️", label: "Review" },
-    { key: "done", icon: "✅", label: "Done" },
-  ];
-  const idx = phases.findIndex(p => p.key === status);
-  return phases.map((p, i) => {
-    const label = `${p.icon} ${p.label}`;
-    if (i < idx) return theme.fg("success", label);
-    if (i === idx) return theme.fg("accent", theme.bold(label));
-    return theme.fg("muted", label);
-  }).join(theme.fg("muted", " → "));
-}
-
 // ═══ Background colony state ═══
 
 interface AntStreamState {
@@ -94,64 +70,41 @@ export default function antColonyExtension(pi: ExtensionAPI) {
   // 当前运行中的后台蚁群（同时只允许一个）
   let activeColony: BackgroundColony | null = null;
 
-  // ─── Widget/Status 渲染 ───
+  // ─── Status 渲染 ───
 
   let lastRender = 0;
   const throttledRender = () => {
     const now = Date.now();
-    if (now - lastRender < 200) return;
+    if (now - lastRender < 500) return;
     lastRender = now;
-    renderWidget();
-    renderStatus();
+    pi.events.emit("ant-colony:render");
   };
 
-  const renderWidget = () => {
-    if (!activeColony) return;
-    const { state, phase, antStreams } = activeColony;
-    const streams = Array.from(antStreams.values());
-    const lines: string[] = [];
-
-    const elapsed = state ? formatDuration(Date.now() - state.createdAt) : "0s";
-    const cost = state ? formatCost(state.metrics.totalCost) : "$0";
-    lines.push(`🐜 Colony: ${phase} │ ${elapsed} │ ${cost}`);
-
-    if (state && state.metrics.tasksTotal > 0) {
-      const m = state.metrics;
-      const pct = Math.round((m.tasksDone / m.tasksTotal) * 100);
-      const filled = Math.round(pct / 5);
-      lines.push(`  ${"█".repeat(filled)}${"░".repeat(20 - filled)} ${m.tasksDone}/${m.tasksTotal} (${pct}%)`);
-    }
-
-    for (const s of streams.slice(-4)) {
-      const icon = casteIcon(s.caste);
-      const line = s.lastLine.length > 60 ? s.lastLine.slice(0, 57) + "..." : s.lastLine;
-      lines.push(`  ${icon} ${s.antId.slice(0, 15)} ▸ ${line || "..."}`);
-    }
-
-    pi.events.emit("ant-colony:widget", lines);
-  };
-
-  const renderStatus = () => {
-    if (!activeColony) return;
-    const { state, antStreams } = activeColony;
-    if (!state) return;
-    const m = state.metrics;
-    const active = antStreams.size;
-    pi.events.emit("ant-colony:status",
-      `🐜 ${statusIcon(state.status)} ${m.tasksDone}/${m.tasksTotal} tasks │ ${active} active │ ${formatCost(m.totalCost)}`
-    );
-  };
-
-  // 监听自己的事件来更新 UI（确保在有 ctx 的上下文中）
+  // 监听事件来更新 UI（确保在有 ctx 的上下文中）
   pi.on("session_start", async (_event, ctx) => {
-    pi.events.on("ant-colony:widget", (lines: string[]) => {
-      ctx.ui.setWidget("ant-colony", lines);
-    });
-    pi.events.on("ant-colony:status", (status: string) => {
-      ctx.ui.setStatus("ant-colony", status);
+    pi.events.on("ant-colony:render", () => {
+      if (!activeColony) return;
+      const { state, antStreams } = activeColony;
+      const active = antStreams.size;
+      const elapsed = state ? formatDuration(Date.now() - state.createdAt) : "0s";
+      const m = state?.metrics;
+      const colonyStatus = state?.status || "scouting";
+      const ants = state?.ants || [];
+      const turns = ants.reduce((s, a) => s + a.usage.turns, 0);
+      const outTok = ants.reduce((s, a) => s + a.usage.output, 0);
+
+      const parts = [`🐜 ${statusIcon(colonyStatus)}`];
+      if (m) parts.push(`${m.tasksDone}/${m.tasksTotal}`);
+      parts.push(`${active}⚡`);
+      parts.push(`${turns}↻`);
+      parts.push(formatTokens(outTok) + "↑");
+      if (m) parts.push(formatCost(m.totalCost));
+      parts.push(elapsed);
+
+      ctx.ui.setStatus("ant-colony", parts.join(" │ "));
     });
+
     pi.events.on("ant-colony:clear-ui", () => {
-      ctx.ui.setWidget("ant-colony", undefined);
       ctx.ui.setStatus("ant-colony", undefined);
     });
     pi.events.on("ant-colony:notify", (data: { msg: string; level: "info" | "success" | "warning" | "error" }) => {
@@ -361,7 +314,7 @@ export default function antColonyExtension(pi: ExtensionAPI) {
       // 注入结果到对话
       pi.sendMessage({
         customType: "ant-colony-report",
-        content: report,
+        content: `[COLONY_SIGNAL:COMPLETE]\n${report}`,
         display: true,
       }, { triggerTurn: true, deliverAs: "followUp" });
 
@@ -373,6 +326,11 @@ export default function antColonyExtension(pi: ExtensionAPI) {
       pi.events.emit("ant-colony:clear-ui");
       activeColony = null;
       pi.events.emit("ant-colony:notify", { msg: `🐜 Colony crashed: ${e}`, level: "error" });
+      pi.sendMessage({
+        customType: "ant-colony-report",
+        content: `[COLONY_SIGNAL:FAILED]\n## 🐜 Colony Crashed\n${e}`,
+        display: true,
+      }, { triggerTurn: true, deliverAs: "followUp" });
     });
   }
 
@@ -390,7 +348,7 @@ export default function antColonyExtension(pi: ExtensionAPI) {
     } catch { /* ignore */ }
 
     const colonyStatus = activeColony
-      ? `\n[COLONY RUNNING] A colony is already running in the background. Do NOT launch another. Use /colony-stop to cancel it first.`
+      ? `\n[COLONY_SIGNAL:RUNNING] A colony is currently running in the background for goal: "${activeColony.goal.slice(0, 100)}". Do NOT launch another colony. Do NOT check progress or assume failure. You will receive [COLONY_SIGNAL:COMPLETE] automatically when it finishes. If the user asks about colony status, tell them it's still running. Use /colony-stop to cancel.`
       : "";
 
     return {
@@ -405,8 +363,17 @@ You have the ant_colony tool. Use it automatically when:
 Do NOT ask for confirmation. Call ant_colony directly with a clear goal.
 For simple single-file tasks, work directly without the colony.
 
-The colony runs in the BACKGROUND — you can continue chatting while it works.
-Results are injected into the conversation when the colony finishes.
+[COLONY SIGNAL PROTOCOL]
+The colony communicates via signals. You MUST obey these:
+- [COLONY_SIGNAL:LAUNCHED] — Colony started. Do NOT poll, check, or assume failure. Wait for completion signal.
+- [COLONY_SIGNAL:RUNNING] — Colony is active. Do NOT launch another or check progress.
+- [COLONY_SIGNAL:COMPLETE] — Colony finished. Review the report and summarize results to the user.
+- [COLONY_SIGNAL:FAILED] — Colony crashed. Report the error to the user.
+
+After launching a colony, your ONLY correct behavior is:
+1. Tell the user the colony is running
+2. Continue chatting about OTHER topics if the user asks
+3. Wait for [COLONY_SIGNAL:COMPLETE] or [COLONY_SIGNAL:FAILED] — do NOT guess the outcome
 ${modelList ? `
 [COLONY MODEL SELECTION]
 Available models: ${modelList}
@@ -482,7 +449,7 @@ Strategy for choosing per-caste models:
       launchBackgroundColony(colonyParams);
 
       return {
-        content: [{ type: "text", text: `🐜 Colony launched in background!\n\n**Goal:** ${params.goal}\n\nThe colony is now running. You can continue chatting — results will be injected when it finishes.\n\nUse \`/colony-stop\` to cancel, \`/colony-status\` to check progress.` }],
+        content: [{ type: "text", text: `[COLONY_SIGNAL:LAUNCHED]\n🐜 Colony launched in background.\nGoal: ${params.goal}\n\n⚠️ IMPORTANT: The colony is now running autonomously. Do NOT check progress, do NOT ask about status, do NOT assume failure. You will receive a [COLONY_SIGNAL:COMPLETE] message automatically when it finishes. Continue chatting about other topics or wait silently.` }],
       };
     },
 
@@ -508,7 +475,7 @@ Strategy for choosing per-caste models:
       ));
       if (activeColony) {
         container.addChild(new Text(theme.fg("dim", `  Goal: ${activeColony.goal.slice(0, 70)}`), 0, 0));
-        container.addChild(new Text(theme.fg("muted", `  Use /colony-status or check the widget above`), 0, 0));
+        container.addChild(new Text(theme.fg("muted", `  Ctrl+Shift+A for details │ /colony-stop to cancel`), 0, 0));
       }
       return container;
     },
@@ -550,6 +517,99 @@ Strategy for choosing per-caste models:
     return container;
   });
 
+  // ═══ Shortcut: Ctrl+Shift+A 展开蚁群详情 ═══
+  pi.registerShortcut("ctrl+shift+a", {
+    description: "Show ant colony details",
+    async handler(ctx) {
+      if (!activeColony) {
+        ctx.ui.notify("No colony is currently running.", "info");
+        return;
+      }
+
+      await ctx.ui.custom<void>((tui, theme, _kb, done) => {
+        let cachedWidth: number | undefined;
+        let cachedLines: string[] | undefined;
+
+        const buildLines = (width: number): string[] => {
+          const c = activeColony;
+          if (!c) return [theme.fg("muted", "  No colony running.")];
+
+          const lines: string[] = [];
+          const w = width - 2; // padding
+
+          // ── Header ──
+          const elapsed = c.state ? formatDuration(Date.now() - c.state.createdAt) : "0s";
+          const cost = c.state ? formatCost(c.state.metrics.totalCost) : "$0";
+          lines.push(theme.fg("accent", theme.bold(`  🐜 Colony Details`)) + theme.fg("muted", ` │ ${elapsed} │ ${cost}`));
+          lines.push(theme.fg("dim", `  Goal: ${c.goal.slice(0, w - 8)}`));
+          lines.push("");
+
+          // ── Tasks ──
+          const tasks = c.state?.tasks || [];
+          if (tasks.length > 0) {
+            lines.push(theme.fg("accent", "  Tasks"));
+            for (const t of tasks.slice(0, 15)) {
+              const icon = t.status === "done" ? theme.fg("success", "✓")
+                : t.status === "failed" ? theme.fg("error", "✗")
+                : t.status === "active" ? theme.fg("warning", "●")
+                : theme.fg("dim", "○");
+              const dur = t.finishedAt && t.startedAt ? theme.fg("dim", ` ${formatDuration(t.finishedAt - t.startedAt)}`) : "";
+              lines.push(`  ${icon} ${casteIcon(t.caste)} ${theme.fg("text", t.title.slice(0, w - 12))}${dur}`);
+            }
+            if (tasks.length > 15) lines.push(theme.fg("muted", `  ⋯ +${tasks.length - 15} more`));
+            lines.push("");
+          }
+
+          // ── Active Ants ──
+          const streams = Array.from(c.antStreams.values());
+          if (streams.length > 0) {
+            lines.push(theme.fg("accent", "  Active Ants"));
+            for (const s of streams) {
+              const line = s.lastLine.length > w - 20 ? s.lastLine.slice(0, w - 23) + "..." : s.lastLine;
+              lines.push(`  ${casteIcon(s.caste)} ${theme.fg("accent", s.antId.slice(0, 14))} ${theme.fg("dim", `${s.tokens}tok`)} ${theme.fg("muted", "▸")} ${line}`);
+            }
+            lines.push("");
+          }
+
+          // ── Log (last 8) ──
+          if (c.log.length > 0) {
+            lines.push(theme.fg("accent", "  Log"));
+            for (const l of c.log.slice(-8)) {
+              lines.push(theme.fg("dim", `  ${l.slice(0, w - 2)}`));
+            }
+          }
+
+          lines.push("");
+          lines.push(theme.fg("muted", "  esc close"));
+          return lines;
+        };
+
+        // 定时刷新
+        const timer = setInterval(() => {
+          cachedWidth = undefined;
+          cachedLines = undefined;
+          tui.requestRender();
+        }, 1000);
+
+        return {
+          render(width: number): string[] {
+            if (cachedLines && cachedWidth === width) return cachedLines;
+            cachedLines = buildLines(width);
+            cachedWidth = width;
+            return cachedLines;
+          },
+          invalidate() { cachedWidth = undefined; cachedLines = undefined; },
+          handleInput(data: string) {
+            if (matchesKey(data, "escape")) {
+              clearInterval(timer);
+              done(undefined);
+            }
+          },
+        };
+      }, { overlay: true, overlayOptions: { anchor: "center", width: "80%", maxHeight: "80%" } });
+    },
+  });
+
   // ═══ Command: /colony-stop ═══
   pi.registerCommand("colony-stop", {
     description: "Stop the running background colony",

package/pi-package/extensions/ant-colony/nest.ts

@@ -21,6 +21,7 @@ export class Nest {
   private pheromoneCache: Pheromone[] = [];
   private pheromoneOffset: number = 0;
   private taskCache: Map<string, Task> = new Map();
+  private stateCache: ColonyState | null = null;
 
   constructor(private cwd: string, private colonyId: string) {
     this.dir = path.join(cwd, ".ant-colony", colonyId);
@@ -35,13 +36,16 @@ export class Nest {
 
   init(state: ColonyState): void {
     this.writeJson(this.stateFile, state);
+    this.stateCache = state;
     this.taskCache.clear();
     for (const t of state.tasks) this.writeTask(t);
   }
 
   getState(): ColonyState {
-    const base = this.readJson<ColonyState>(this.stateFile);
-    // 从 tasks/ 目录重建最新任务状态（原子性保证）
+    if (!this.stateCache) {
+      this.stateCache = this.readJson<ColonyState>(this.stateFile);
+    }
+    const base = { ...this.stateCache };
     base.tasks = this.getAllTasks();
     base.pheromones = this.getAllPheromones();
     return base;
@@ -49,9 +53,11 @@ export class Nest {
 
   updateState(patch: Partial<Pick<ColonyState, "status" | "concurrency" | "metrics" | "ants" | "finishedAt">>): void {
     this.withStateLock(() => {
-      const state = this.readJson<ColonyState>(this.stateFile);
-      Object.assign(state, patch);
-      this.writeJson(this.stateFile, state);
+      if (!this.stateCache) {
+        this.stateCache = this.readJson<ColonyState>(this.stateFile);
+      }
+      Object.assign(this.stateCache, patch);
+      this.writeJson(this.stateFile, this.stateCache);
     });
   }
 
@@ -186,11 +192,13 @@ export class Nest {
 
   updateAnt(ant: Ant): void {
     this.withStateLock(() => {
-      const state = this.readJson<ColonyState>(this.stateFile);
-      const idx = state.ants.findIndex(a => a.id === ant.id);
-      if (idx >= 0) state.ants[idx] = ant;
-      else state.ants.push(ant);
-      this.writeJson(this.stateFile, state);
+      if (!this.stateCache) {
+        this.stateCache = this.readJson<ColonyState>(this.stateFile);
+      }
+      const idx = this.stateCache.ants.findIndex(a => a.id === ant.id);
+      if (idx >= 0) this.stateCache.ants[idx] = ant;
+      else this.stateCache.ants.push(ant);
+      this.writeJson(this.stateFile, this.stateCache);
     });
   }
 
@@ -198,12 +206,14 @@ export class Nest {
 
   recordSample(sample: ConcurrencySample): void {
     this.withStateLock(() => {
-      const state = this.readJson<ColonyState>(this.stateFile);
-      state.concurrency.history.push(sample);
-      if (state.concurrency.history.length > 30) {
-        state.concurrency.history = state.concurrency.history.slice(-30);
+      if (!this.stateCache) {
+        this.stateCache = this.readJson<ColonyState>(this.stateFile);
+      }
+      this.stateCache.concurrency.history.push(sample);
+      if (this.stateCache.concurrency.history.length > 30) {
+        this.stateCache.concurrency.history = this.stateCache.concurrency.history.slice(-30);
       }
-      this.writeJson(this.stateFile, state);
+      this.writeJson(this.stateFile, this.stateCache);
     });
   }
 

package/pi-package/extensions/ant-colony/queen.ts

@@ -236,9 +236,9 @@ async function runAntWave(opts: WaveOptions): Promise<"ok"> {
       }
     }
 
-    // 自适应并发（每 5000ms 采样一次）
+    // 自适应并发（每 2000ms 采样一次）
     const now = Date.now();
-    if (now - lastSampleTime >= 5000) {
+    if (now - lastSampleTime >= 2000) {
       lastSampleTime = now;
       const completedRecently = state.tasks.filter(t =>
         t.status === "done" && t.finishedAt && t.finishedAt > now - 120000
@@ -260,7 +260,7 @@ async function runAntWave(opts: WaveOptions): Promise<"ok"> {
 
     if (slotsAvailable === 0) {
       // 等待一下再检查
-      await new Promise(r => setTimeout(r, 2000));
+      await new Promise(r => setTimeout(r, 500));
       continue;
     }
 
@@ -336,51 +336,39 @@ export async function runColony(opts: QueenOptions): Promise<ColonyState> {
   };
 
   try {
-    // ═══ Phase 1: 侦察（接力机制） ═══
-    let scoutAttempt = 0;
-    const MAX_SCOUT_RETRIES = 2;
-    let workerTasks: Task[] = [];
+    // ═══ Phase 1: 侦察（快速单次，不再多轮接力） ═══
+    callbacks.onPhase("scouting", "Dispatching scout ant to explore codebase...");
+    await runAntWave({ ...waveBase, caste: "scout" });
 
-    while (scoutAttempt <= MAX_SCOUT_RETRIES) {
-      callbacks.onPhase("scouting", scoutAttempt === 0
-        ? "Dispatching scout ants to explore codebase..."
-        : `Scout relay ${scoutAttempt}/${MAX_SCOUT_RETRIES} (building on previous discoveries)...`);
+    let workerTasks = nest.getAllTasks().filter(t => t.caste === "worker" && t.status === "pending");
 
+    // 只在完全没有 worker 任务时才重试一次
+    if (workerTasks.length === 0) {
+      const pheromones = nest.getAllPheromones();
+      const hasDiscoveries = pheromones.some(p => p.type === "discovery");
+      const relayTask: Task = {
+        id: makeTaskId(),
+        parentId: null,
+        title: "Scout relay: generate worker tasks",
+        description: hasDiscoveries
+          ? `Previous scout found information but didn't generate worker tasks. Generate concrete worker tasks based on discoveries.\n\nGoal:\n${opts.goal}`
+          : `Explore the codebase for this goal and generate worker tasks:\n\n${opts.goal}`,
+        caste: "scout",
+        status: "pending",
+        priority: 1,
+        files: [],
+        claimedBy: null,
+        result: null,
+        error: null,
+        spawnedTasks: [],
+        createdAt: Date.now(),
+        startedAt: null,
+        finishedAt: null,
+      };
+      nest.writeTask(relayTask);
+      callbacks.onPhase("scouting", "Scout relay: generating worker tasks...");
       await runAntWave({ ...waveBase, caste: "scout" });
-
       workerTasks = nest.getAllTasks().filter(t => t.caste === "worker" && t.status === "pending");
-      if (workerTasks.length > 0) break;
-
-      scoutAttempt++;
-      if (scoutAttempt <= MAX_SCOUT_RETRIES) {
-        // 接力：检查是否有信息素（前一只 scout 的部分发现）
-        const pheromones = nest.getAllPheromones();
-        const hasDiscoveries = pheromones.some(p => p.type === "discovery");
-
-        // 创建接力 scout 任务（而非重置旧任务）
-        const relayDescription = hasDiscoveries
-          ? `Continue exploring the codebase. Previous scouts made partial discoveries (see pheromone trail). Focus on areas NOT yet explored and generate worker tasks.\n\nOriginal goal:\n${opts.goal}`
-          : `Explore the codebase and identify all files, modules, and dependencies relevant to this goal:\n\n${opts.goal}\n\nBe thorough. The colony depends on your intelligence.`;
-
-        const relayTask: Task = {
-          id: makeTaskId(),
-          parentId: null,
-          title: hasDiscoveries ? "Scout relay: continue exploration" : "Scout: explore codebase for goal",
-          description: relayDescription,
-          caste: "scout",
-          status: "pending",
-          priority: 1,
-          files: [],
-          claimedBy: null,
-          result: null,
-          error: null,
-          spawnedTasks: [],
-          createdAt: Date.now(),
-          startedAt: null,
-          finishedAt: null,
-        };
-        nest.writeTask(relayTask);
-      }
     }
 
     if (workerTasks.length === 0) {