oh-pi 0.1.37 → 0.1.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-pi",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "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

@@ -110,6 +110,9 @@ For simple single-file tasks, work directly without the colony.`,
       goal: Type.String({ description: "What the colony should accomplish" }),
       maxAnts: Type.Optional(Type.Number({ description: "Max concurrent ants (default: auto-adapt)", minimum: 1, maximum: 8 })),
       maxCost: Type.Optional(Type.Number({ description: "Max cost budget in USD (default: unlimited)", minimum: 0.01 })),
+      scoutModel: Type.Optional(Type.String({ description: "Model for scout ants (default: current session model)" })),
+      workerModel: Type.Optional(Type.String({ description: "Model for worker ants (default: current session model)" })),
+      soldierModel: Type.Optional(Type.String({ description: "Model for soldier ants (default: current session model)" })),
     }),
 
     async execute(_toolCallId, params, signal, onUpdate, ctx) {
@@ -169,12 +172,18 @@ For simple single-file tasks, work directly without the colony.`,
           appendFileSync(gitignorePath, `${content.length && !content.endsWith("\n") ? "\n" : ""}.ant-colony/\n`);
         }
 
+        const modelOverrides: Record<string, string> = {};
+        if (params.scoutModel) modelOverrides.scout = params.scoutModel;
+        if (params.workerModel) modelOverrides.worker = params.workerModel;
+        if (params.soldierModel) modelOverrides.soldier = params.soldierModel;
+
         const state = await runColony({
           cwd: ctx.cwd,
           goal: params.goal,
           maxAnts: params.maxAnts,
           maxCost: params.maxCost,
           currentModel,
+          modelOverrides,
           signal: signal ?? undefined,
           callbacks,
         });
@@ -241,21 +250,81 @@ For simple single-file tasks, work directly without the colony.`,
       const details = result.details as ColonyDetails | undefined;
 
       // ─── 运行中 ───
-      if (!details?.state) {
+      if (!details?.state || (details.state.status !== "done" && details.state.status !== "failed")) {
+        const state = details?.state;
         const log = details?.log ?? [];
         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) {
-          container.addChild(new Text(recent.map(l => theme.fg("dim", `  ${l}`)).join("\n"), 0, 0));
+
+        if (state) {
+          const m = state.metrics;
+          const elapsed = formatDuration(Date.now() - state.createdAt);
+
+          // 标题行：● N ants launched (phase)
+          const activeAnts = state.ants.filter(a => a.status === "working");
+          const totalAnts = state.ants.length;
+          container.addChild(new Text(
+            theme.fg("warning", "● ") +
+            theme.fg("toolTitle", theme.bold(`${totalAnts} ant${totalAnts !== 1 ? "s" : ""} launched `)) +
+            theme.fg("muted", `(${state.status}) `) +
+            theme.fg("dim", `${elapsed} │ ${formatCost(m.totalCost)}`),
+            0, 0,
+          ));
+
+          // 进度条
+          if (m.tasksTotal > 0) {
+            container.addChild(new Text(`  ${progressBar(m.tasksDone, m.tasksTotal, 20, theme)}`, 0, 0));
+          }
+
+          // 蚂蚁树
+          const ants = expanded ? state.ants : state.ants.slice(-8);
+          for (let i = 0; i < ants.length; i++) {
+            const a = ants[i];
+            const isLast = i === ants.length - 1;
+            const branch = isLast ? "└─" : "├─";
+            const pipe = isLast ? "   " : "│  ";
+
+            const statusDot = a.status === "working" ? theme.fg("warning", "◉")
+              : a.status === "done" ? theme.fg("success", "✓")
+              : theme.fg("error", "✗");
+
+            const task = state.tasks.find(t => t.id === a.taskId);
+            const taskTitle = task?.title?.slice(0, 55) || "...";
+            const dur = a.finishedAt ? formatDuration(a.finishedAt - a.startedAt) : formatDuration(Date.now() - a.startedAt);
+            const turns = a.usage.turns > 0 ? `${a.usage.turns}t` : "";
+            const model = a.model ? a.model.split("/").pop()! : "";
+
+            container.addChild(new Text(
+              theme.fg("muted", `  ${branch} `) + statusDot + " " +
+              theme.fg("accent", `@${a.id.slice(0, 20)} `) +
+              theme.fg("dim", `(${a.caste}) ${dur}${turns ? " │ " + turns : ""}`) +
+              (model ? " " + theme.fg("muted", model) : ""),
+              0, 0,
+            ));
+            container.addChild(new Text(
+              theme.fg("muted", `  ${pipe}`) + theme.fg("dim", `⎿  ${taskTitle}`),
+              0, 0,
+            ));
+          }
+          if (!expanded && state.ants.length > 8) {
+            container.addChild(new Text(theme.fg("muted", `  ⋯ +${state.ants.length - 8} more (expand to see all)`), 0, 0));
+          }
+        } else {
+          container.addChild(new Text(
+            theme.fg("warning", "● ") + theme.fg("toolTitle", theme.bold("Colony ")) +
+            theme.fg("accent", details?.phase || "initializing..."),
+            0, 0,
+          ));
         }
-        if (!expanded && log.length > 5) {
-          container.addChild(new Text(theme.fg("muted", `  ⋯ ${log.length - 5} more`), 0, 0));
+
+        // 最近日志（仅展开时）
+        if (expanded && log.length > 0) {
+          container.addChild(new Spacer(1));
+          const recent = log.slice(-10);
+          for (const l of recent) {
+            container.addChild(new Text(theme.fg("dim", `  ${l}`), 0, 0));
+          }
         }
+
         return container;
       }
 

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

@@ -37,6 +37,7 @@ export interface QueenOptions {
   maxAnts?: number;
   maxCost?: number;
   currentModel: string;
+  modelOverrides?: ModelOverrides;
   signal?: AbortSignal;
   callbacks: QueenCallbacks;
 }
@@ -138,6 +139,7 @@ interface WaveOptions {
   cwd: string;
   caste: AntCaste;
   currentModel: string;
+  modelOverrides?: ModelOverrides;
   signal?: AbortSignal;
   callbacks: QueenCallbacks;
 }
@@ -147,7 +149,8 @@ interface WaveOptions {
  */
 async function runAntWave(opts: WaveOptions): Promise<"ok"> {
   const { nest, cwd, caste, signal, callbacks, currentModel } = opts;
-  const config = { ...DEFAULT_ANT_CONFIGS[caste], model: currentModel };
+  const casteModel = opts.modelOverrides?.[caste] || currentModel;
+  const config = { ...DEFAULT_ANT_CONFIGS[caste], model: casteModel };
 
   let backoffMs = 0; // 429 退避时间
   let consecutiveRateLimits = 0; // 连续限流计数
@@ -160,7 +163,8 @@ async function runAntWave(opts: WaveOptions): Promise<"ok"> {
 
     const ant: Ant = {
       id: "", caste, status: "idle", taskId: task.id,
-      pid: null, usage: { input: 0, output: 0, cost: 0, turns: 0 },
+      pid: null, model: casteModel,
+      usage: { input: 0, output: 0, cost: 0, turns: 0 },
       startedAt: Date.now(), finishedAt: null,
     };
     callbacks.onAntSpawn(ant, task);
@@ -311,6 +315,7 @@ export async function runColony(opts: QueenOptions): Promise<ColonyState> {
   const waveBase: Omit<WaveOptions, "caste"> = {
     nest, cwd: opts.cwd, signal, callbacks,
     currentModel: opts.currentModel,
+    modelOverrides: opts.modelOverrides,
   };
 
   const cleanup = () => {

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

@@ -216,6 +216,7 @@ export async function spawnAnt(
     status: "working",
     taskId: task.id,
     pid: null,
+    model: antConfig.model,
     usage: { input: 0, output: 0, cost: 0, turns: 0 },
     startedAt: Date.now(),
     finishedAt: null,

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

@@ -73,6 +73,7 @@ export interface Ant {
   status: AntStatus;
   taskId: string | null;
   pid: number | null;
+  model: string;
   usage: { input: number; output: number; cost: number; turns: number };
   startedAt: number;
   finishedAt: number | null;