oh-pi 0.1.62 → 0.1.64

package/package.json

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

@@ -14,7 +14,8 @@ import { join } from "node:path";
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
 import { Text, Container, Spacer, matchesKey } from "@mariozechner/pi-tui";
 import { Type } from "@sinclair/typebox";
-import { runColony, type QueenCallbacks } from "./queen.js";
+import { runColony, resumeColony, type QueenCallbacks } from "./queen.js";
+import { Nest } from "./nest.js";
 import type { ColonyState, ColonyMetrics, AntStreamEvent } from "./types.js";
 
 // ═══ Helpers ═══
@@ -174,7 +175,7 @@ export default function antColonyExtension(pi: ExtensionAPI) {
     modelOverrides: Record<string, string>;
     cwd: string;
     modelRegistry?: any;
-  }) {
+  }, resume = false) {
     if (activeColony) {
       pi.events.emit("ant-colony:notify", { msg: "A colony is already running. Use /colony-stop first.", level: "warning" });
       return;
@@ -190,9 +191,21 @@ export default function antColonyExtension(pi: ExtensionAPI) {
       promise: null as any, // set below
     };
 
+    let lastPhase = "";
+
     const callbacks: QueenCallbacks = {
       onSignal(signal) {
         colony.phase = signal.message;
+        // 阶段切换时注入消息到主进程对话流
+        if (signal.phase !== lastPhase) {
+          lastPhase = signal.phase;
+          const pct = Math.round(signal.progress * 100);
+          pi.sendMessage({
+            customType: "ant-colony-progress",
+            content: `[COLONY_SIGNAL:${signal.phase.toUpperCase()}] 🐜 ${signal.message} (${pct}%, ${formatCost(signal.cost)})`,
+            display: false,
+          }, { triggerTurn: false, deliverAs: "followUp" });
+        }
         throttledRender();
       },
       onPhase(phase, detail) {
@@ -236,7 +249,7 @@ export default function antColonyExtension(pi: ExtensionAPI) {
       appendFileSync(gitignorePath, `${gitContent.length && !gitContent.endsWith("\n") ? "\n" : ""}.ant-colony/\n`);
     }
 
-    colony.promise = runColony({
+    const colonyOpts = {
       cwd: params.cwd,
       goal: params.goal,
       maxAnts: params.maxAnts,
@@ -247,7 +260,8 @@ export default function antColonyExtension(pi: ExtensionAPI) {
       callbacks,
       authStorage: undefined,
       modelRegistry: params.modelRegistry,
-    });
+    };
+    colony.promise = resume ? resumeColony(colonyOpts) : runColony(colonyOpts);
 
     activeColony = colony;
     throttledRender();
@@ -569,6 +583,30 @@ export default function antColonyExtension(pi: ExtensionAPI) {
     },
   });
 
+  pi.registerCommand("colony-resume", {
+    description: "Resume a colony from its last checkpoint",
+    async handler(_args, ctx) {
+      if (activeColony) {
+        ctx.ui.notify("A colony is already running.", "warning");
+        return;
+      }
+      const found = Nest.findResumable(ctx.cwd);
+      if (!found) {
+        ctx.ui.notify("No resumable colony found.", "info");
+        return;
+      }
+      ctx.ui.notify(`🐜 Resuming colony: ${found.state.goal.slice(0, 60)}...`, "info");
+      launchBackgroundColony({
+        cwd: ctx.cwd,
+        goal: found.state.goal,
+        maxCost: found.state.maxCost ?? undefined,
+        currentModel: ctx.currentModel,
+        modelOverrides: {},
+        modelRegistry: ctx.modelRegistry,
+      }, true);
+    },
+  });
+
   // ═══ Cleanup on shutdown ═══
   pi.on("session_shutdown", async () => {
     if (activeColony) {

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

@@ -263,4 +263,33 @@ export class Nest {
   private readJson<T>(file: string): T {
     return JSON.parse(fs.readFileSync(file, "utf-8")) as T;
   }
+
+  /** 查找可恢复的蚁群（状态为 working/scouting/reviewing 且未完成） */
+  static findResumable(cwd: string): { colonyId: string; state: ColonyState } | null {
+    const parentDir = path.join(cwd, ".ant-colony");
+    try {
+      for (const dir of fs.readdirSync(parentDir)) {
+        const stateFile = path.join(parentDir, dir, "state.json");
+        if (!fs.existsSync(stateFile)) continue;
+        const state = JSON.parse(fs.readFileSync(stateFile, "utf-8")) as ColonyState;
+        if (!state.finishedAt && state.status !== "done" && state.status !== "failed" && state.status !== "budget_exceeded") {
+          return { colonyId: dir, state };
+        }
+      }
+    } catch { /* no .ant-colony dir */ }
+    return null;
+  }
+
+  /** 从已有文件恢复，不调用 init */
+  restore(): void {
+    this.stateCache = this.readJson<ColonyState>(this.stateFile);
+    // 将 claimed/active 任务重置为 pending（蚂蚁已死）
+    for (const task of this.getAllTasks()) {
+      if (task.status === "claimed" || task.status === "active") {
+        task.status = "pending";
+        task.claimedBy = undefined;
+        this.writeTask(task);
+      }
+    }
+  }
 }

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

@@ -542,3 +542,76 @@ export async function runColony(opts: QueenOptions): Promise<ColonyState> {
     cleanup();
   }
 }
+
+/**
+ * 从检查点恢复蚁群 — 跳过已完成的阶段，继续执行未完成的任务
+ */
+export async function resumeColony(opts: QueenOptions): Promise<ColonyState> {
+  const found = Nest.findResumable(opts.cwd);
+  if (!found) return runColony(opts); // 无可恢复状态，正常启动
+
+  const nest = new Nest(opts.cwd, found.colonyId);
+  nest.restore();
+
+  const { signal, callbacks } = opts;
+  const waveBase: Omit<WaveOptions, "caste"> = {
+    nest, cwd: opts.cwd, signal, callbacks,
+    currentModel: opts.currentModel,
+    modelOverrides: opts.modelOverrides,
+    authStorage: opts.authStorage,
+    modelRegistry: opts.modelRegistry,
+  };
+
+  const emitSignal = (phase: ColonyState["status"], message: string) => {
+    const m = nest.getState().metrics;
+    const active = nest.getState().ants.filter(a => a.status === "working").length;
+    const progress = m.tasksTotal > 0 ? m.tasksDone / m.tasksTotal : 0;
+    callbacks.onSignal?.({ phase, progress, active, cost: m.totalCost, message });
+  };
+
+  const cleanup = () => {
+    nest.destroy();
+    const parentDir = path.join(opts.cwd, ".ant-colony");
+    try {
+      const entries = fs.readdirSync(parentDir);
+      if (entries.length === 0) fs.rmdirSync(parentDir);
+    } catch { /* ignore */ }
+  };
+
+  callbacks.onPhase?.("working", "Resuming colony from checkpoint...");
+  emitSignal("working", "Resuming...");
+
+  try {
+    // 执行所有 pending 任务
+    const pendingDrones = nest.getAllTasks().filter(t => t.caste === "drone" && t.status === "pending");
+    if (pendingDrones.length > 0) await runAntWave({ ...waveBase, caste: "drone" });
+
+    const pendingWorkers = nest.getAllTasks().filter(t => t.caste === "worker" && t.status === "pending");
+    if (pendingWorkers.length > 0) {
+      const result = await runAntWave({ ...waveBase, caste: "worker" });
+      if (result === "budget") {
+        nest.updateState({ status: "budget_exceeded", finishedAt: Date.now() });
+        emitSignal("budget_exceeded", "Budget exhausted");
+        const s = nest.getState();
+        callbacks.onComplete?.(s);
+        return s;
+      }
+    }
+
+    const finalMetrics = updateMetrics(nest);
+    nest.updateState({ status: "done", finishedAt: Date.now(), metrics: finalMetrics });
+    const finalState = nest.getState();
+    callbacks.onComplete?.(finalState);
+    emitSignal("done", `Resumed: ${finalMetrics.tasksDone}/${finalMetrics.tasksTotal} tasks done`);
+    return finalState;
+
+  } catch (e) {
+    nest.updateState({ status: "failed", finishedAt: Date.now() });
+    const failState = nest.getState();
+    callbacks.onComplete?.(failState);
+    emitSignal("failed", String(e).slice(0, 100));
+    return failState;
+  } finally {
+    cleanup();
+  }
+}