oh-pi 0.1.53 → 0.1.55

package/package.json

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

@@ -43,7 +43,7 @@ function statusIcon(status: string): string {
 }
 
 function casteIcon(caste: string): string {
-  return caste === "scout" ? "🔍" : caste === "soldier" ? "🛡️" : "⚒️";
+  return caste === "scout" ? "🔍" : caste === "soldier" ? "🛡️" : caste === "drone" ? "⚙️" : "⚒️";
 }
 
 // ═══ Background colony state ═══

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

@@ -20,7 +20,7 @@ import type {
 } from "./types.js";
 import { DEFAULT_ANT_CONFIGS } from "./types.js";
 import { Nest } from "./nest.js";
-import { spawnAnt, makeTaskId } from "./spawner.js";
+import { spawnAnt, runDrone, makeTaskId } from "./spawner.js";
 import { adapt, sampleSystem, defaultConcurrency } from "./concurrency.js";
 import type { AuthStorage, ModelRegistry } from "@mariozechner/pi-coding-agent";
 
@@ -72,7 +72,7 @@ function makeInitialScoutTask(goal: string): Task {
 
 function childTaskFromParsed(
   parentId: string,
-  parsed: { title: string; description: string; files: string[]; caste: AntCaste; priority: TaskPriority },
+  parsed: { title: string; description: string; files: string[]; caste: AntCaste; priority: TaskPriority; context?: string },
 ): Task {
   return {
     id: makeTaskId(),
@@ -83,6 +83,7 @@ function childTaskFromParsed(
     status: "pending",
     priority: parsed.priority,
     files: parsed.files,
+    context: parsed.context || undefined,
     claimedBy: null,
     result: null,
     error: null,
@@ -176,7 +177,9 @@ async function runAntWave(opts: WaveOptions): Promise<"ok"> {
     callbacks.onAntSpawn(ant, task);
 
     try {
-      const result = await spawnAnt(cwd, nest, task, config, signal, callbacks.onAntStream, opts.authStorage, opts.modelRegistry);
+      const result = caste === "drone"
+        ? await runDrone(cwd, nest, task)
+        : await spawnAnt(cwd, nest, task, config, signal, callbacks.onAntStream, opts.authStorage, opts.modelRegistry);
       callbacks.onAntDone(result.ant, task, result.output);
 
       if (result.rateLimited) {
@@ -343,7 +346,7 @@ export async function runColony(opts: QueenOptions): Promise<ColonyState> {
     callbacks.onPhase("scouting", "Dispatching scout ant to explore codebase...");
     await runAntWave({ ...waveBase, caste: "scout" });
 
-    let workerTasks = nest.getAllTasks().filter(t => t.caste === "worker" && t.status === "pending");
+    let workerTasks = nest.getAllTasks().filter(t => (t.caste === "worker" || t.caste === "drone") && t.status === "pending");
 
     // 只在完全没有 worker 任务时才重试一次
     if (workerTasks.length === 0) {
@@ -371,7 +374,7 @@ export async function runColony(opts: QueenOptions): Promise<ColonyState> {
       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");
+      workerTasks = nest.getAllTasks().filter(t => (t.caste === "worker" || t.caste === "drone") && t.status === "pending");
     }
 
     if (workerTasks.length === 0) {
@@ -383,12 +386,24 @@ export async function runColony(opts: QueenOptions): Promise<ColonyState> {
 
     // ═══ Phase 2: 工作 ═══
     nest.updateState({ status: "working" });
+
+    // 先执行 drone 任务（零 LLM 成本）
+    const droneTasks = nest.getAllTasks().filter(t => t.caste === "drone" && t.status === "pending");
+    if (droneTasks.length > 0) {
+      callbacks.onPhase("working", `${droneTasks.length} drone tasks. Executing rules...`);
+      await runAntWave({ ...waveBase, caste: "drone" });
+    }
+
     callbacks.onPhase("working", `${workerTasks.length} tasks discovered. Dispatching worker ants...`);
     await runAntWave({ ...waveBase, caste: "worker" });
 
     // 处理工蚁产生的子任务（可能有多轮）
     let rounds = 0;
     while (rounds < 3) {
+      // 先跑 drone 子任务
+      const pendingDrones = nest.getAllTasks().filter(t => t.caste === "drone" && t.status === "pending");
+      if (pendingDrones.length > 0) await runAntWave({ ...waveBase, caste: "drone" });
+
       const remaining = nest.getAllTasks().filter(t =>
         t.caste === "worker" && (t.status === "pending" || t.status === "blocked")
       );
@@ -398,9 +413,18 @@ export async function runColony(opts: QueenOptions): Promise<ColonyState> {
       await runAntWave({ ...waveBase, caste: "worker" });
     }
 
+    // ═══ Auto-check: run tsc before soldier review ═══
+    let tscPassed = true;
+    try {
+      const { execSync } = await import("node:child_process");
+      execSync("npx tsc --noEmit", { cwd: opts.cwd, timeout: 30000, stdio: "pipe" });
+    } catch {
+      tscPassed = false;
+    }
+
     // ═══ Phase 3: 审查 ═══
     const completedWorkerTasks = nest.getAllTasks().filter(t => t.caste === "worker" && t.status === "done");
-    if (completedWorkerTasks.length > 0) {
+    if (completedWorkerTasks.length > 0 && (!tscPassed || completedWorkerTasks.length > 3)) {
       nest.updateState({ status: "reviewing" });
       callbacks.onPhase("reviewing", "Dispatching soldier ants to review changes...");
       const reviewTask = makeReviewTask(completedWorkerTasks);

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

@@ -57,6 +57,7 @@ export interface ParsedSubTask {
   files: string[];
   caste: AntCaste;
   priority: 1 | 2 | 3 | 4 | 5;
+  context?: string;
 }
 
 const CASTE_PROMPTS: Record<AntCaste, string> = {
@@ -67,6 +68,7 @@ Behavior:
 - Identify files, functions, dependencies related to the goal
 - IMPORTANT: After EACH tool call, summarize what you found so far. Do NOT wait until the end.
 - Report findings as structured intelligence for Worker Ants
+- For each recommended task, include the KEY code snippets (with file:line) the worker will need — this saves workers from re-reading files
 
 Output format (MUST follow exactly):
 ## Discoveries
@@ -79,6 +81,9 @@ For each task the colony should do next:
 - files: <comma-separated file paths>
 - caste: worker
 - priority: <1-5, 1=highest>
+- context: <relevant code snippets that the worker will need, with file:line references>
+
+Use caste "drone" instead of "worker" for simple tasks that can be done with a single bash command (file copy, find-replace, formatting, running tests). Drone description should be the exact bash command to execute.
 
 ## Warnings
 Any risks, blockers, or conflicts detected.`,
@@ -142,6 +147,9 @@ function buildPrompt(task: Task, pheromoneContext: string, castePrompt: string,
   if (task.files.length > 0) {
     prompt += `**Files scope:** ${task.files.join(", ")}\n`;
   }
+  if (task.context) {
+    prompt += `\n## Pre-loaded Context (from scout)\n${task.context}\n`;
+  }
   if (/[\u4e00-\u9fff]/.test(task.description)) {
     prompt += '\nIMPORTANT: Follow the language requirements specified in the task description. If the task says to write in Chinese, write in Chinese.\n';
   }
@@ -152,13 +160,18 @@ function buildPrompt(task: Task, pheromoneContext: string, castePrompt: string,
 function parseSubTasks(output: string): ParsedSubTask[] {
   const tasks: ParsedSubTask[] = [];
   const regex = /### TASK:\s*(.+)\n(?:- description:\s*(.+)\n)?(?:- files:\s*(.+)\n)?(?:- caste:\s*(\w+)\n)?(?:- priority:\s*(\d))?/g;
+  const taskBlocks = output.split(/(?=### TASK:)/);
   for (const m of output.matchAll(regex)) {
+    const block = taskBlocks.find(b => b.includes(`### TASK: ${m[1]?.trim()}`)) || "";
+    const ctxMatch = block.match(/- context:\s*([\s\S]*?)(?=### TASK:|## |\n\n|$)/);
+    const context = ctxMatch?.[1]?.trim() || undefined;
     tasks.push({
       title: m[1]?.trim() || "Untitled",
       description: m[2]?.trim() || m[1]?.trim() || "",
       files: (m[3]?.trim() || "").split(",").map(f => f.trim()).filter(Boolean),
       caste: (m[4]?.trim() as AntCaste) || "worker",
       priority: (parseInt(m[5] || "3") as 1 | 2 | 3 | 4 | 5) || 3,
+      context,
     });
   }
   return tasks;
@@ -239,6 +252,49 @@ function makeMinimalResourceLoader(systemPrompt: string): ResourceLoader {
   };
 }
 
+/**
+ * 运行 Drone — 纯规则执行，零 LLM 成本
+ * 任务描述即为要执行的 bash 命令
+ */
+export async function runDrone(
+  cwd: string,
+  nest: Nest,
+  task: Task,
+): Promise<AntResult> {
+  const antId = makeAntId("drone");
+  const ant: Ant = {
+    id: antId, caste: "drone", status: "working", taskId: task.id,
+    pid: null, model: "none",
+    usage: { input: 0, output: 0, cost: 0, turns: 1 },
+    startedAt: Date.now(), finishedAt: null,
+  };
+  nest.updateAnt(ant);
+  nest.updateTaskStatus(task.id, "active");
+
+  try {
+    const { execSync } = await import("node:child_process");
+    const cmd = task.description;
+    const output = execSync(cmd, { cwd, encoding: "utf-8", timeout: 30000, stdio: "pipe" }).trim();
+
+    ant.status = "done";
+    ant.finishedAt = Date.now();
+    nest.updateAnt(ant);
+    nest.updateTaskStatus(task.id, "done", `## Completed\n${output || "(no output)"}`);
+    nest.dropPheromone({
+      id: makePheromoneId(), type: "completion", antId, antCaste: "drone",
+      taskId: task.id, content: `Drone executed: ${cmd.slice(0, 100)}`, files: task.files, strength: 1, createdAt: Date.now(),
+    });
+    return { ant, output, newTasks: [], pheromones: [], rateLimited: false };
+  } catch (e: any) {
+    const errStr = e.stderr?.toString() || String(e);
+    ant.status = "failed";
+    ant.finishedAt = Date.now();
+    nest.updateAnt(ant);
+    nest.updateTaskStatus(task.id, "failed", undefined, errStr.slice(0, 500));
+    return { ant, output: errStr, newTasks: [], pheromones: [], rateLimited: false };
+  }
+}
+
 /**
  * 孵化并运行一只蚂蚁 — SDK 内嵌版
  */

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

@@ -3,7 +3,7 @@
  */
 
 // ═══ 蚂蚁角色 ═══
-export type AntCaste = "scout" | "worker" | "soldier";
+export type AntCaste = "scout" | "worker" | "soldier" | "drone";
 
 export interface AntConfig {
   caste: AntCaste;
@@ -17,6 +17,7 @@ export const DEFAULT_ANT_CONFIGS: Record<AntCaste, Omit<AntConfig, "systemPrompt
   scout:   { caste: "scout",   model: "",  tools: ["read", "bash", "grep", "find", "ls"], maxTurns: 8 },
   worker:  { caste: "worker",  model: "",  tools: ["read", "bash", "edit", "write", "grep", "find", "ls"], maxTurns: 15 },
   soldier: { caste: "soldier", model: "",  tools: ["read", "bash", "grep", "find", "ls"], maxTurns: 8 },
+  drone:   { caste: "drone",   model: "",  tools: ["bash"], maxTurns: 1 },
 };
 
 /** Per-caste model overrides from user config */
@@ -35,6 +36,7 @@ export interface Task {
   status: TaskStatus;
   priority: TaskPriority;
   files: string[];           // 锁定的文件
+  context?: string;          // Scout 预加载的代码片段
   claimedBy: string | null;  // ant id
   result: string | null;
   error: string | null;