oh-pi 0.1.29 → 0.1.31

package/dist/utils/install.js

@@ -1,10 +1,9 @@
 import { writeFileSync, mkdirSync, readFileSync, copyFileSync, existsSync, readdirSync, statSync, rmSync } from "node:fs";
-import { join, dirname } from "node:path";
-import { fileURLToPath } from "node:url";
+import { join } from "node:path";
 import { homedir } from "node:os";
 import { execSync } from "node:child_process";
 import { KEYBINDING_SCHEMES, MODEL_CAPABILITIES, PROVIDERS } from "../types.js";
-const PKG_ROOT = join(dirname(fileURLToPath(import.meta.url)), "..", "..");
+import { resources } from "./resources.js";
 /**
  * 确保目录存在，若不存在则递归创建
  * @param dir - 目标目录路径
@@ -123,7 +122,7 @@ export function applyConfig(config) {
         writeFileSync(join(agentDir, "keybindings.json"), JSON.stringify(kb, null, 2));
     }
     // 5. AGENTS.md
-    const agentsSrc = join(PKG_ROOT, "pi-package", "agents", `${config.agents}.md`);
+    const agentsSrc = resources.agent(config.agents);
     try {
         let content = readFileSync(agentsSrc, "utf8");
         if (config.locale && config.locale !== "en") {
@@ -138,8 +137,8 @@ export function applyConfig(config) {
     const extDir = join(agentDir, "extensions");
     cleanDir(extDir);
     for (const ext of config.extensions) {
-        const dirSrc = join(PKG_ROOT, "pi-package", "extensions", ext);
-        const fileSrc = join(PKG_ROOT, "pi-package", "extensions", `${ext}.ts`);
+        const dirSrc = resources.extension(ext);
+        const fileSrc = resources.extensionFile(ext);
         if (existsSync(dirSrc) && statSync(dirSrc).isDirectory()) {
             copyDir(dirSrc, join(extDir, ext));
         }
@@ -154,7 +153,7 @@ export function applyConfig(config) {
     const promptDir = join(agentDir, "prompts");
     cleanDir(promptDir);
     for (const p of config.prompts) {
-        const src = join(PKG_ROOT, "pi-package", "prompts", `${p}.md`);
+        const src = resources.prompt(p);
         try {
             copyFileSync(src, join(promptDir, `${p}.md`));
         }
@@ -164,7 +163,7 @@ export function applyConfig(config) {
     const skillDir = join(agentDir, "skills");
     cleanDir(skillDir);
     for (const s of config.skills) {
-        const srcDir = join(PKG_ROOT, "pi-package", "skills", s);
+        const srcDir = resources.skill(s);
         const destDir = join(skillDir, s);
         ensureDir(destDir);
         try {
@@ -175,7 +174,7 @@ export function applyConfig(config) {
     // 9. Copy themes (only custom ones)
     const themeDir = join(agentDir, "themes");
     cleanDir(themeDir);
-    const themeSrc = join(PKG_ROOT, "pi-package", "themes", `${config.theme}.json`);
+    const themeSrc = resources.theme(config.theme);
     try {
         copyFileSync(themeSrc, join(themeDir, `${config.theme}.json`));
     }

package/dist/utils/resources.d.ts

@@ -0,0 +1,8 @@
+export declare const resources: {
+    agent: (name: string) => string;
+    extension: (name: string) => string;
+    extensionFile: (name: string) => string;
+    prompt: (name: string) => string;
+    skill: (name: string) => string;
+    theme: (name: string) => string;
+};

package/dist/utils/resources.js

@@ -0,0 +1,15 @@
+/**
+ * 资源路径解析 — 解耦 install.ts 对 pi-package/ 目录的硬编码引用
+ */
+import { join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+const PKG_ROOT = join(dirname(fileURLToPath(import.meta.url)), "..", "..");
+const RESOURCES = join(PKG_ROOT, "pi-package");
+export const resources = {
+    agent: (name) => join(RESOURCES, "agents", `${name}.md`),
+    extension: (name) => join(RESOURCES, "extensions", name),
+    extensionFile: (name) => join(RESOURCES, "extensions", `${name}.ts`),
+    prompt: (name) => join(RESOURCES, "prompts", `${name}.md`),
+    skill: (name) => join(RESOURCES, "skills", name),
+    theme: (name) => join(RESOURCES, "themes", `${name}.json`),
+};

package/package.json

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

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

@@ -10,11 +10,10 @@
 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, Box } from "@mariozechner/pi-tui";
 import { Type } from "@sinclair/typebox";
 import { runColony, type QueenCallbacks } from "./queen.js";
-import type { ColonyState, ColonyMetrics, Ant, Task, AvailableModel } from "./types.js";
-import { resolveModelForCaste } from "./types.js";
+import type { ColonyState, ColonyMetrics, Ant, Task } from "./types.js";
 
 interface ColonyDetails {
   state: ColonyState | null;
@@ -49,20 +48,34 @@ 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;
+  const bar = theme.fg("success", "█".repeat(filled)) + theme.fg("muted", "░".repeat(empty));
+  return `${bar} ${theme.fg("accent", `${done}/${total}`)}`;
+}
 
-function resolveModels(ctx: { modelRegistry: { getAvailable(): AvailableModel[] }; model?: { id: string } | undefined }): { overrides: Record<string, string>; available: AvailableModel[]; currentModel?: string } {
-  const overrides: Record<string, string> = {};
-  const current = ctx.model?.id;
-  const available = ctx.modelRegistry.getAvailable();
-
-  for (const caste of ["scout", "worker", "soldier"] as const) {
-    const resolved = resolveModelForCaste(caste, available, current);
-    if (resolved) overrides[caste] = resolved;
-  }
-
-  return { overrides, available, currentModel: current };
+/** 渲染阶段流水线 scout → work → review → done */
+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", " → "));
 }
 
+
 export default function antColonyExtension(pi: ExtensionAPI) {
 
   // ═══ Auto-trigger: 注入蚁群意识，LLM 自动判断何时启动 ═══
@@ -102,8 +115,14 @@ For simple single-file tasks, work directly without the colony.`,
     async execute(_toolCallId, params, signal, onUpdate, ctx) {
       const details: ColonyDetails = { state: null, phase: "initializing", log: [] };
 
-      // Resolve models: smart discovery from registry
-      const { overrides: modelOverrides, available, currentModel } = resolveModels(ctx);
+      // 所有蚂蚁统一使用当前会话模型
+      const currentModel = ctx.model?.id;
+      if (!currentModel) {
+        return {
+          content: [{ type: "text", text: "Colony failed: no model available in current session" }],
+          isError: true,
+        };
+      }
 
       const emit = () => {
         const summary = details.state
@@ -155,8 +174,6 @@ For simple single-file tasks, work directly without the colony.`,
           goal: params.goal,
           maxAnts: params.maxAnts,
           maxCost: params.maxCost,
-          modelOverrides,
-          availableModels: available,
           currentModel,
           signal: signal ?? undefined,
           callbacks,
@@ -212,108 +229,136 @@ For simple single-file tasks, work directly without the colony.`,
     // ═══ TUI Rendering ═══
 
     renderCall(args, theme) {
-      let text = theme.fg("toolTitle", theme.bold("ant_colony "));
-      text += theme.fg("accent", "🐜");
-      const goal = args.goal?.length > 60 ? args.goal.slice(0, 57) + "..." : args.goal;
-      text += "\n  " + theme.fg("dim", goal || "...");
-      if (args.maxAnts) text += theme.fg("muted", ` (max: ${args.maxAnts})`);
-      if (args.maxCost) text += theme.fg("warning", ` (budget: $${args.maxCost})`);
+      const goal = args.goal?.length > 70 ? args.goal.slice(0, 67) + "..." : args.goal;
+      let text = theme.fg("toolTitle", theme.bold("🐜 ant_colony"));
+      if (args.maxAnts) text += theme.fg("muted", ` ×${args.maxAnts}`);
+      if (args.maxCost) text += theme.fg("warning", ` $${args.maxCost}`);
+      text += "\n" + theme.fg("dim", `  ${goal || "..."}`);
       return new Text(text, 0, 0);
     },
 
     renderResult(result, { expanded }, theme) {
       const details = result.details as ColonyDetails | undefined;
+
+      // ─── 运行中 ───
       if (!details?.state) {
-        // Still running or no state
         const log = details?.log ?? [];
-        let text = theme.fg("warning", "🐜 ") + theme.fg("toolTitle", details?.phase || "initializing...");
-        const recent = log.slice(expanded ? -30 : -8);
+        const container = new Container();
+        container.addChild(new Text(
+          theme.fg("warning", "🐜 ") + theme.fg("toolTitle", theme.bold("Colony ")) +
+          theme.fg("accent", details?.phase || "initializing..."),
+          0, 0,
+        ));
+        const recent = log.slice(expanded ? -20 : -5);
         if (recent.length > 0) {
-          text += "\n" + recent.map(l => theme.fg("dim", l)).join("\n");
+          container.addChild(new Text(recent.map(l => theme.fg("dim", `  ${l}`)).join("\n"), 0, 0));
         }
-        if (!expanded && log.length > 8) {
-          text += "\n" + theme.fg("muted", `... ${log.length - 8} more (Ctrl+O to expand)`);
+        if (!expanded && log.length > 5) {
+          container.addChild(new Text(theme.fg("muted", `  ⋯ ${log.length - 5} more`), 0, 0));
         }
-        return new Text(text, 0, 0);
+        return container;
       }
 
       const state = details.state;
       const m = state.metrics;
-      const icon = state.status === "done" ? theme.fg("success", "✓") : theme.fg("error", "✗");
       const elapsed = state.finishedAt ? formatDuration(state.finishedAt - state.createdAt) : "?";
+      const ok = state.status === "done";
 
+      // ─── 折叠视图 ───
       if (!expanded) {
-        let text = `${icon} ${theme.fg("toolTitle", theme.bold("ant colony "))}`;
-        text += theme.fg("accent", `${m.tasksDone}/${m.tasksTotal} tasks`);
-        text += theme.fg("muted", ` | ${m.antsSpawned} ants | ${elapsed} | ${formatCost(m.totalCost)}`);
-        text += theme.fg("muted", ` | peak ×${state.concurrency.optimal}`);
-
-        // Compact task list
-        for (const t of state.tasks.slice(0, 5)) {
-          const ti = t.status === "done" ? theme.fg("success", "✓") : t.status === "failed" ? theme.fg("error", "✗") : theme.fg("muted", "○");
-          text += `\n  ${ti} ${theme.fg("dim", `[${t.caste}]`)} ${t.title.slice(0, 60)}`;
+        const container = new Container();
+
+        // 标题行：状态 + 统计
+        const icon = ok ? theme.fg("success", "✓") : theme.fg("error", "✗");
+        container.addChild(new Text(
+          `${icon} ${theme.fg("toolTitle", theme.bold("ant colony "))}` +
+          theme.fg("muted", `${elapsed} │ `) +
+          theme.fg("accent", `${m.antsSpawned} ants`) +
+          theme.fg("muted", ` │ ${formatTokens(m.totalTokens)} │ ${formatCost(m.totalCost)}`),
+          0, 0,
+        ));
+
+        // 进度条
+        container.addChild(new Text(`  ${progressBar(m.tasksDone, m.tasksTotal, 20, theme)} ${theme.fg("muted", `(${m.tasksFailed} failed)`)}`, 0, 0));
+
+        // 任务列表（最多6条）
+        for (const t of state.tasks.slice(0, 6)) {
+          const ti = t.status === "done" ? theme.fg("success", "✓")
+            : t.status === "failed" ? theme.fg("error", "✗")
+            : theme.fg("muted", "○");
+          container.addChild(new Text(
+            `  ${ti} ${theme.fg("dim", `${casteIcon(t.caste)}`)} ${t.title.slice(0, 60)}`,
+            0, 0,
+          ));
         }
-        if (state.tasks.length > 5) text += `\n  ${theme.fg("muted", `... +${state.tasks.length - 5} more`)}`;
-        text += `\n${theme.fg("muted", "(Ctrl+O to expand)")}`;
-        return new Text(text, 0, 0);
+        if (state.tasks.length > 6) {
+          container.addChild(new Text(theme.fg("muted", `  ⋯ +${state.tasks.length - 6} more (Ctrl+O)`), 0, 0));
+        }
+
+        return container;
       }
 
-      // Expanded view
+      // ─── 展开视图 ───
       const container = new Container();
+
+      // 标题 + 阶段流水线
+      const icon = ok ? theme.fg("success", "✓") : theme.fg("error", "✗");
       container.addChild(new Text(
         `${icon} ${theme.fg("toolTitle", theme.bold("ant colony "))}` +
         theme.fg("accent", state.status) +
-        theme.fg("muted", ` | ${elapsed} | ${formatCost(m.totalCost)} | ${formatTokens(m.totalTokens)} tokens | peak ×${state.concurrency.optimal}`),
+        theme.fg("muted", ` │ ${elapsed} │ ${formatCost(m.totalCost)} │ ${formatTokens(m.totalTokens)} tokens`),
         0, 0,
       ));
-      container.addChild(new Text(theme.fg("dim", state.goal), 0, 0));
+      container.addChild(new Text(`  ${phasePipeline(state.status, theme)}`, 0, 0));
+      container.addChild(new Text(theme.fg("dim", `  ${state.goal}`), 0, 0));
+
+      // 进度条
       container.addChild(new Spacer(1));
+      container.addChild(new Text(`  ${progressBar(m.tasksDone, m.tasksTotal, 30, theme)}`, 0, 0));
 
-      // Tasks
-      container.addChild(new Text(theme.fg("muted", `─── Tasks (${m.tasksDone}/${m.tasksTotal}) ───`), 0, 0));
+      // 任务区
+      container.addChild(new Spacer(1));
+      container.addChild(new Text(theme.fg("muted", `  ─── Tasks (${m.tasksDone}/${m.tasksTotal}) ───`), 0, 0));
       for (const t of state.tasks) {
         const ti = t.status === "done" ? theme.fg("success", "✓")
           : t.status === "failed" ? theme.fg("error", "✗")
-          : t.status === "active" ? theme.fg("warning", "⏳")
+          : t.status === "active" ? theme.fg("warning", "◉")
           : theme.fg("muted", "○");
-        let line = `${ti} ${theme.fg("accent", `[${t.caste}]`)} ${t.title}`;
-        if (t.finishedAt && t.startedAt) line += theme.fg("dim", ` (${formatDuration(t.finishedAt - t.startedAt)})`);
-        container.addChild(new Text(line, 0, 0));
+        const dur = (t.finishedAt && t.startedAt) ? theme.fg("dim", ` ${formatDuration(t.finishedAt - t.startedAt)}`) : "";
+        container.addChild(new Text(`  ${ti} ${casteIcon(t.caste)} ${t.title}${dur}`, 0, 0));
         if (t.status === "done" && t.result) {
-          const preview = t.result.split("\n").slice(0, 2).join("\n").slice(0, 120);
-          container.addChild(new Text(theme.fg("dim", `  ${preview}`), 0, 0));
+          container.addChild(new Text(theme.fg("dim", `    ${t.result.split("\n")[0]?.slice(0, 100)}`), 0, 0));
         }
         if (t.status === "failed" && t.error) {
-          container.addChild(new Text(theme.fg("error", `  ${t.error.slice(0, 120)}`), 0, 0));
+          container.addChild(new Text(theme.fg("error", `    ${t.error.slice(0, 100)}`), 0, 0));
         }
       }
 
-      // Ants
+      // 蚂蚁区
       container.addChild(new Spacer(1));
-      container.addChild(new Text(theme.fg("muted", `─── Ants (${m.antsSpawned}) ───`), 0, 0));
+      container.addChild(new Text(theme.fg("muted", `  ─── Ants (${m.antsSpawned}) ───`), 0, 0));
       for (const a of state.ants) {
-        const ai = a.status === "done" ? theme.fg("success", "✓") : a.status === "failed" ? theme.fg("error", "✗") : theme.fg("warning", "⏳");
+        const ai = a.status === "done" ? theme.fg("success", "✓") : a.status === "failed" ? theme.fg("error", "✗") : theme.fg("warning", "◉");
         const dur = a.finishedAt ? formatDuration(a.finishedAt - a.startedAt) : "...";
         container.addChild(new Text(
-          `${ai} ${casteIcon(a.caste)} ${theme.fg("accent", a.id)} ${theme.fg("dim", `${dur} ${formatCost(a.usage.cost)} ${a.usage.turns}t`)}`,
+          `  ${ai} ${casteIcon(a.caste)} ${theme.fg("accent", a.id)} ${theme.fg("dim", `${dur} │ ${formatCost(a.usage.cost)} │ ${a.usage.turns}t`)}`,
           0, 0,
         ));
       }
 
-      // Concurrency
+      // 并发 + 日志
       container.addChild(new Spacer(1));
       const c = state.concurrency;
       container.addChild(new Text(
-        theme.fg("muted", `─── Concurrency ───`) + `\n` +
-        theme.fg("dim", `current: ${c.current} | optimal: ${c.optimal} | range: ${c.min}-${c.max} | samples: ${c.history.length}`),
+        theme.fg("muted", `  ─── Concurrency ───`) + "\n" +
+        theme.fg("dim", `  current: ${c.current} │ optimal: ${c.optimal} │ range: ${c.min}-${c.max}`),
         0, 0,
       ));
 
-      // Activity log
       container.addChild(new Spacer(1));
-      container.addChild(new Text(theme.fg("muted", "─── Log ───"), 0, 0));
-      for (const l of details.log.slice(-20)) {
-        container.addChild(new Text(theme.fg("dim", l), 0, 0));
+      container.addChild(new Text(theme.fg("muted", `  ─── Log ───`), 0, 0));
+      for (const l of details.log.slice(-15)) {
+        container.addChild(new Text(theme.fg("dim", `  ${l}`), 0, 0));
       }
 
       return container;

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

@@ -80,7 +80,7 @@ export class Nest {
         .map(f => this.readJson<Task>(path.join(this.tasksDir, f)));
       for (const t of tasks) this.taskCache.set(t.id, t);
       return tasks;
-    } catch { return []; }
+    } catch (e) { console.error("[nest] failed to read tasks dir:", e); return []; }
   }
 
   claimTask(taskId: string, antId: string): boolean {
@@ -217,7 +217,7 @@ export class Nest {
 
   private withStateLock<T>(fn: () => T): T {
     const MAX_WAIT = 5000;
-    const SPIN_MS = 10;
+    const SPIN_MS = 15;
     const start = Date.now();
     while (true) {
       try {
@@ -225,18 +225,22 @@ export class Nest {
         break;
       } catch {
         if (Date.now() - start > MAX_WAIT) {
-          // 超时强制清除死锁
-          try { fs.unlinkSync(this.lockFile); } catch { /* ignore */ }
+          // 超时：检查锁持有者是否存活
+          try {
+            const holder = parseInt(fs.readFileSync(this.lockFile, "utf-8"), 10);
+            try { process.kill(holder, 0); } catch { /* 进程已死，清除死锁 */ fs.unlinkSync(this.lockFile); continue; }
+          } catch { /* 读取失败，强制清除 */ try { fs.unlinkSync(this.lockFile); } catch {} }
           continue;
         }
-        const wait = SPIN_MS + Math.random() * SPIN_MS;
-        Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, wait);
+        // 简单 busy-wait，避免 SharedArrayBuffer 依赖
+        const until = Date.now() + SPIN_MS + Math.random() * SPIN_MS;
+        while (Date.now() < until) { /* spin */ }
       }
     }
     try {
       return fn();
     } finally {
-      try { fs.unlinkSync(this.lockFile); } catch { /* ignore */ }
+      try { fs.unlinkSync(this.lockFile); } catch { /* lock already removed */ }
     }
   }
 

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

@@ -16,9 +16,9 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import type {
   ColonyState, Task, Ant, AntCaste, ColonyMetrics,
-  ConcurrencyConfig, TaskPriority, ModelOverrides, AvailableModel,
+  ConcurrencyConfig, TaskPriority, ModelOverrides,
 } from "./types.js";
-import { DEFAULT_ANT_CONFIGS, resolveModelForCaste } from "./types.js";
+import { DEFAULT_ANT_CONFIGS } from "./types.js";
 import { Nest } from "./nest.js";
 import { spawnAnt, makeTaskId } from "./spawner.js";
 import { adapt, sampleSystem, defaultConcurrency } from "./concurrency.js";
@@ -36,9 +36,7 @@ export interface QueenOptions {
   goal: string;
   maxAnts?: number;
   maxCost?: number;
-  modelOverrides?: ModelOverrides;
-  availableModels?: AvailableModel[];
-  currentModel?: string;
+  currentModel: string;
   signal?: AbortSignal;
   callbacks: QueenCallbacks;
 }
@@ -139,25 +137,17 @@ interface WaveOptions {
   nest: Nest;
   cwd: string;
   caste: AntCaste;
+  currentModel: string;
   signal?: AbortSignal;
   callbacks: QueenCallbacks;
-  modelOverrides?: ModelOverrides;
-  maxCost?: number;
-  availableModels?: AvailableModel[];
-  currentModel?: string;
 }
 
 /**
  * 并发执行一批蚂蚁，自适应调节并发度
  */
-async function runAntWave(opts: WaveOptions): Promise<"ok" | "budget_exceeded"> {
-  const { nest, cwd, caste, signal, callbacks, modelOverrides, maxCost, availableModels, currentModel } = opts;
-  const config = { ...DEFAULT_ANT_CONFIGS[caste] };
-  if (modelOverrides?.[caste]) {
-    config.model = modelOverrides[caste];
-  } else if (!config.model && availableModels?.length) {
-    config.model = resolveModelForCaste(caste, availableModels, currentModel) ?? "";
-  }
+async function runAntWave(opts: WaveOptions): Promise<"ok"> {
+  const { nest, cwd, caste, signal, callbacks, currentModel } = opts;
+  const config = { ...DEFAULT_ANT_CONFIGS[caste], model: currentModel };
 
   let backoffMs = 0; // 429 退避时间
   let consecutiveRateLimits = 0; // 连续限流计数
@@ -217,26 +207,6 @@ async function runAntWave(opts: WaveOptions): Promise<"ok" | "budget_exceeded">
   // 调度循环：持续派蚂蚁直到没有待处理任务
   let lastSampleTime = 0;
   while (!signal?.aborted) {
-    // 预算检查：派蚂蚁前预估，基于已完成蚂蚁的平均 cost
-    if (maxCost != null) {
-      const ants = nest.getState().ants;
-      const currentCost = ants.reduce((s, a) => s + a.usage.cost, 0);
-      if (currentCost >= maxCost) {
-        callbacks.onPhase("working", `Budget exceeded ($${currentCost.toFixed(3)} >= $${maxCost.toFixed(2)}). Stopping.`);
-        return "budget_exceeded";
-      }
-      // 预估：如果剩余预算不够一只蚂蚁的平均花费，也停止
-      const doneAnts = ants.filter(a => a.status === "done" && a.usage.cost > 0);
-      if (doneAnts.length > 0) {
-        const avgCost = doneAnts.reduce((s, a) => s + a.usage.cost, 0) / doneAnts.length;
-        const remaining = maxCost - currentCost;
-        if (remaining < avgCost * 0.5) {
-          callbacks.onPhase("working", `Budget nearly exhausted ($${currentCost.toFixed(3)}, avg/ant: $${avgCost.toFixed(3)}). Stopping.`);
-          return "budget_exceeded";
-        }
-      }
-    }
-
     const state = nest.getState();
     const pending = state.tasks.filter(t => t.status === "pending" && t.caste === caste);
     if (pending.length === 0) break;
@@ -327,7 +297,7 @@ export async function runColony(opts: QueenOptions): Promise<ColonyState> {
       startTime: Date.now(), throughputHistory: [],
     },
     maxCost: opts.maxCost ?? null,
-    modelOverrides: opts.modelOverrides ?? {},
+    modelOverrides: {},
     createdAt: Date.now(),
     finishedAt: null,
   };
@@ -340,8 +310,7 @@ export async function runColony(opts: QueenOptions): Promise<ColonyState> {
   const { signal, callbacks } = opts;
   const waveBase: Omit<WaveOptions, "caste"> = {
     nest, cwd: opts.cwd, signal, callbacks,
-    modelOverrides: opts.modelOverrides, maxCost: opts.maxCost,
-    availableModels: opts.availableModels, currentModel: opts.currentModel,
+    currentModel: opts.currentModel,
   };
 
   const cleanup = () => {
@@ -353,26 +322,32 @@ export async function runColony(opts: QueenOptions): Promise<ColonyState> {
     } catch { /* ignore */ }
   };
 
-  const budgetStop = (phase: string) => {
-    nest.updateState({ status: "budget_exceeded", finishedAt: Date.now() });
-    callbacks.onPhase("budget_exceeded" as any, phase);
-    const s = nest.getState();
-    callbacks.onComplete(s);
-    cleanup();
-    return s;
-  };
-
   try {
-    // ═══ Phase 1: 侦察 ═══
-    callbacks.onPhase("scouting", "Dispatching scout ants to explore codebase...");
-    if (await runAntWave({ ...waveBase, caste: "scout" }) === "budget_exceeded")
-      return budgetStop("Budget exceeded during scouting");
-
-    // 检查侦察结果，如果没有产生工蚁任务，用侦察结果让女王自己拆
-    const postScout = nest.getAllTasks();
-    const workerTasks = postScout.filter(t => t.caste === "worker" && t.status === "pending");
+    // ═══ Phase 1: 侦察（最多重试2次） ═══
+    let scoutAttempt = 0;
+    const MAX_SCOUT_RETRIES = 2;
+    let workerTasks: Task[] = [];
+
+    while (scoutAttempt <= MAX_SCOUT_RETRIES) {
+      callbacks.onPhase("scouting", scoutAttempt === 0
+        ? "Dispatching scout ants to explore codebase..."
+        : `Scout retry ${scoutAttempt}/${MAX_SCOUT_RETRIES}...`);
+
+      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 任务为 pending 以便重试
+        for (const t of nest.getAllTasks().filter(t => t.caste === "scout" && (t.status === "done" || t.status === "failed"))) {
+          nest.updateTaskStatus(t.id, "pending");
+        }
+      }
+    }
+
     if (workerTasks.length === 0) {
-      // 侦察蚁没产生任务，标记失败
       nest.updateState({ status: "failed", finishedAt: Date.now() });
       const finalState = nest.getState();
       callbacks.onComplete(finalState);
@@ -383,8 +358,7 @@ export async function runColony(opts: QueenOptions): Promise<ColonyState> {
     // ═══ Phase 2: 工作 ═══
     nest.updateState({ status: "working" });
     callbacks.onPhase("working", `${workerTasks.length} tasks discovered. Dispatching worker ants...`);
-    if (await runAntWave({ ...waveBase, caste: "worker" }) === "budget_exceeded")
-      return budgetStop("Budget exceeded during working");
+    await runAntWave({ ...waveBase, caste: "worker" });
 
     // 处理工蚁产生的子任务（可能有多轮）
     let rounds = 0;
@@ -395,8 +369,7 @@ export async function runColony(opts: QueenOptions): Promise<ColonyState> {
       if (remaining.length === 0) break;
       rounds++;
       callbacks.onPhase("working", `Round ${rounds + 1}: ${remaining.length} sub-tasks from workers...`);
-      if (await runAntWave({ ...waveBase, caste: "worker" }) === "budget_exceeded")
-        return budgetStop("Budget exceeded during sub-tasks");
+      await runAntWave({ ...waveBase, caste: "worker" });
     }
 
     // ═══ Phase 3: 审查 ═══
@@ -406,8 +379,7 @@ export async function runColony(opts: QueenOptions): Promise<ColonyState> {
       callbacks.onPhase("reviewing", "Dispatching soldier ants to review changes...");
       const reviewTask = makeReviewTask(completedWorkerTasks);
       nest.writeTask(reviewTask);
-      if (await runAntWave({ ...waveBase, caste: "soldier" }) === "budget_exceeded")
-        return budgetStop("Budget exceeded during review");
+      await runAntWave({ ...waveBase, caste: "soldier" });
 
       // 兵蚁产生的修复任务
       const fixTasks = nest.getAllTasks().filter(t =>
@@ -416,8 +388,7 @@ export async function runColony(opts: QueenOptions): Promise<ColonyState> {
       if (fixTasks.length > 0) {
         nest.updateState({ status: "working" });
         callbacks.onPhase("working", `${fixTasks.length} fix tasks from review. Dispatching workers...`);
-        if (await runAntWave({ ...waveBase, caste: "worker" }) === "budget_exceeded")
-          return budgetStop("Budget exceeded during fixes");
+        await runAntWave({ ...waveBase, caste: "worker" });
       }
     }
 

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

@@ -114,8 +114,11 @@ Output format (MUST follow exactly):
 PASS or FAIL with summary.`,
 };
 
-function buildPrompt(task: Task, pheromoneContext: string, castePrompt: string): string {
+function buildPrompt(task: Task, pheromoneContext: string, castePrompt: string, maxTurns?: number): string {
   let prompt = castePrompt + "\n\n";
+  if (maxTurns) {
+    prompt += `## ⚠️ Turn Limit\nYou have a MAXIMUM of ${maxTurns} turns. Plan accordingly — reserve your LAST turn to output the structured result format above. Do NOT waste turns on unnecessary exploration.\n\n`;
+  }
   if (pheromoneContext) {
     prompt += `## Colony Pheromone Trail (intelligence from other ants)\n${pheromoneContext}\n\n`;
   }
@@ -223,7 +226,7 @@ export async function spawnAnt(
   // 构建 prompt
   const pheromoneCtx = nest.getPheromoneContext(task.files);
   const castePrompt = CASTE_PROMPTS[antConfig.caste];
-  const fullPrompt = buildPrompt(task, pheromoneCtx, castePrompt);
+  const fullPrompt = buildPrompt(task, pheromoneCtx, castePrompt, antConfig.maxTurns);
   const tmpFile = writePromptFile(nest.dir, antId, fullPrompt);
 
   const args = [
@@ -246,6 +249,7 @@ export async function spawnAnt(
       nest.updateAnt(ant);
 
       let buffer = "";
+      let turnCount = 0;
 
       proc.stdout.on("data", (data) => {
         buffer += data.toString();
@@ -255,6 +259,15 @@ export async function spawnAnt(
           if (!line.trim()) continue;
           try {
             const event = JSON.parse(line);
+            if (event.type === "turn_end") {
+              turnCount++;
+              if (antConfig.maxTurns && turnCount === antConfig.maxTurns) {
+                stderr += `[ant-colony] Warning: ant reached maxTurns (${antConfig.maxTurns}), 1 grace turn remaining\n`;
+              } else if (antConfig.maxTurns && turnCount > antConfig.maxTurns) {
+                proc.kill("SIGTERM");
+                setTimeout(() => { if (!proc.killed) proc.kill("SIGKILL"); }, 3000);
+              }
+            }
             if (event.type === "message_end" && event.message) {
               messages.push(event.message);
               if (event.message.role === "assistant") {
@@ -288,6 +301,7 @@ export async function spawnAnt(
 
       if (signal) {
         const kill = () => {
+          try { fs.unlinkSync(tmpFile); } catch { /* already cleaned */ }
           proc.kill("SIGTERM");
           setTimeout(() => { if (!proc.killed) proc.kill("SIGKILL"); }, 3000);
         };

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

@@ -19,79 +19,9 @@ export const DEFAULT_ANT_CONFIGS: Record<AntCaste, Omit<AntConfig, "systemPrompt
   soldier: { caste: "soldier", model: "",  tools: ["read", "bash", "grep", "find", "ls"], maxTurns: 8 },
 };
 
-// ═══ 模型层级 ═══
-export type ModelTier = "fast" | "balanced" | "powerful";
-
-export const CASTE_MODEL_TIER: Record<AntCaste, ModelTier> = {
-  scout: "fast",
-  worker: "powerful",
-  soldier: "balanced",
-};
-
-export const MODEL_TIER_KEYWORDS: Record<ModelTier, string[]> = {
-  fast:     ["haiku", "mini", "flash", "nano", "small"],
-  balanced: ["sonnet", "gpt-4o", "pro"],
-  powerful: ["opus", "o1", "o3", "deepthink"],
-};
-
 /** Per-caste model overrides from user config */
 export type ModelOverrides = Partial<Record<AntCaste, string>>;
 
-export interface AvailableModel {
-  id: string;
-  cost?: { input: number };
-}
-
-/** Extract version score from model name: "claude-sonnet-4-0" → 4.0, "claude-3-5-haiku" → 3.5 */
-function modelVersionScore(id: string): number {
-  // Match patterns like "4-0", "3-5", "4.5", "4o" etc.
-  const nums = id.match(/(\d+)[-.](\d+)/g);
-  if (!nums) {
-    const single = id.match(/(\d+)/g);
-    return single ? Math.max(...single.map(Number)) : 0;
-  }
-  // Take the highest version-like number pair
-  return Math.max(...nums.map(n => {
-    const [a, b] = n.split(/[-.]/).map(Number);
-    return a + (b ?? 0) / 10;
-  }));
-}
-
-/**
- * 根据 caste 的 ModelTier 从可用模型中匹配最合适的模型
- *
- * 策略：从模型名提取版本号排序
- * - fast（侦察蚁）：选版本号最低的（轻量便宜）
- * - powerful（工蚁）：选版本号最高的（最强）
- * - balanced（兵蚁）：优先当前会话模型
- * - 所有 tier 最终 fallback 到 currentModel
- */
-export function resolveModelForCaste(
-  caste: AntCaste,
-  available: AvailableModel[],
-  currentModel?: string,
-): string | undefined {
-  if (available.length === 0) return currentModel;
-  const tier = CASTE_MODEL_TIER[caste];
-
-  // 工蚁/兵蚁优先使用当前会话模型
-  if (tier !== "fast" && currentModel) return currentModel;
-
-  // 按版本号排序
-  const scored = available.map(m => ({ id: m.id, score: modelVersionScore(m.id) }));
-  scored.sort((a, b) => a.score - b.score);
-
-  // 优先同 provider
-  const provider = currentModel?.split("/")[0] ?? currentModel?.split("-")[0];
-  const sameProvider = provider ? scored.filter(m => m.id.toLowerCase().includes(provider.toLowerCase())) : [];
-  const pool = sameProvider.length > 0 ? sameProvider : scored;
-
-  if (tier === "fast") return pool[pool.length - 1]?.id ?? currentModel;
-  if (tier === "powerful") return pool[pool.length - 1]?.id ?? currentModel;
-  // balanced: middle
-  return pool[Math.floor(pool.length / 2)]?.id ?? currentModel;
-}
-
 // ═══ 任务 (Food Source) ═══
 export type TaskStatus = "pending" | "claimed" | "active" | "done" | "failed" | "blocked";
 export type TaskPriority = 1 | 2 | 3 | 4 | 5; // 1=highest