oh-pi 0.1.55 → 0.1.56

package/package.json

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

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

@@ -0,0 +1,94 @@
+/**
+ * 轻量 import graph — 静态分析 ts/js 文件的依赖关系
+ */
+import * as fs from "node:fs";
+import * as path from "node:path";
+
+export interface ImportGraph {
+  /** file → files it imports */
+  imports: Map<string, Set<string>>;
+  /** file → files that import it */
+  importedBy: Map<string, Set<string>>;
+}
+
+/** 从 import/require 语句中提取相对路径 */
+const IMPORT_RE = /(?:import|export)\s+.*?from\s+['"](\.[^'"]+)['"]/g;
+const REQUIRE_RE = /require\s*\(\s*['"](\.[^'"]+)['"]\s*\)/g;
+
+function resolveImport(from: string, specifier: string, cwd: string): string | null {
+  const dir = path.dirname(path.resolve(cwd, from));
+  const base = path.resolve(dir, specifier);
+  const exts = ["", ".ts", ".tsx", ".js", ".jsx", "/index.ts", "/index.js"];
+  for (const ext of exts) {
+    const full = base + ext;
+    if (fs.existsSync(full)) return path.relative(cwd, full);
+  }
+  return null;
+}
+
+/**
+ * 构建项目的 import graph
+ * @param files - 相对于 cwd 的文件路径列表
+ * @param cwd - 项目根目录
+ */
+export function buildImportGraph(files: string[], cwd: string): ImportGraph {
+  const imports = new Map<string, Set<string>>();
+  const importedBy = new Map<string, Set<string>>();
+
+  for (const file of files) {
+    const abs = path.resolve(cwd, file);
+    if (!fs.existsSync(abs)) continue;
+    let content: string;
+    try { content = fs.readFileSync(abs, "utf-8"); } catch { continue; }
+
+    const deps = new Set<string>();
+    for (const re of [IMPORT_RE, REQUIRE_RE]) {
+      re.lastIndex = 0;
+      for (const m of content.matchAll(re)) {
+        const resolved = resolveImport(file, m[1], cwd);
+        if (resolved) deps.add(resolved);
+      }
+    }
+
+    imports.set(file, deps);
+    for (const dep of deps) {
+      if (!importedBy.has(dep)) importedBy.set(dep, new Set());
+      importedBy.get(dep)!.add(file);
+    }
+  }
+
+  return { imports, importedBy };
+}
+
+/**
+ * 计算文件的依赖深度（被多少文件直接或间接依赖）
+ * 深度越高 = 越底层 = 应优先处理
+ */
+export function dependencyDepth(file: string, graph: ImportGraph): number {
+  const visited = new Set<string>();
+  const queue = [file];
+  while (queue.length > 0) {
+    const f = queue.pop()!;
+    if (visited.has(f)) continue;
+    visited.add(f);
+    const dependents = graph.importedBy.get(f);
+    if (dependents) for (const d of dependents) queue.push(d);
+  }
+  return visited.size - 1; // 不算自己
+}
+
+/**
+ * 检查 taskA 的文件是否依赖 taskB 的文件
+ * 即 taskA 的某个文件 import 了 taskB 的某个文件
+ */
+export function taskDependsOn(taskAFiles: string[], taskBFiles: string[], graph: ImportGraph): boolean {
+  for (const a of taskAFiles) {
+    const deps = graph.imports.get(a);
+    if (deps) {
+      for (const b of taskBFiles) {
+        if (deps.has(b)) return true;
+      }
+    }
+  }
+  return false;
+}

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

@@ -22,6 +22,7 @@ import { DEFAULT_ANT_CONFIGS } from "./types.js";
 import { Nest } from "./nest.js";
 import { spawnAnt, runDrone, makeTaskId } from "./spawner.js";
 import { adapt, sampleSystem, defaultConcurrency } from "./concurrency.js";
+import { buildImportGraph, taskDependsOn, type ImportGraph } from "./deps.js";
 import type { AuthStorage, ModelRegistry } from "@mariozechner/pi-coding-agent";
 
 export interface QueenCallbacks {
@@ -149,6 +150,7 @@ interface WaveOptions {
   callbacks: QueenCallbacks;
   authStorage?: AuthStorage;
   modelRegistry?: ModelRegistry;
+  importGraph?: ImportGraph;
 }
 
 /**
@@ -188,11 +190,13 @@ async function runAntWave(opts: WaveOptions): Promise<"ok"> {
 
       // 蚂蚁产生的子任务加入巢穴
       for (const sub of result.newTasks) {
-        // 检查文件锁冲突
+        // 检查文件锁冲突和依赖冲突
         const allTasks = nest.getAllTasks();
         const conflicting = allTasks.find(t =>
-          t.status === "active" &&
-          t.files.some(f => sub.files.includes(f))
+          t.status === "active" && (
+            t.files.some(f => sub.files.includes(f)) ||
+            (opts.importGraph && taskDependsOn(sub.files, t.files, opts.importGraph))
+          )
         );
         const child = childTaskFromParsed(task.id, sub);
         if (conflicting) {
@@ -230,11 +234,15 @@ async function runAntWave(opts: WaveOptions): Promise<"ok"> {
       await new Promise(r => setTimeout(r, backoffMs));
     }
 
-    // 解除 blocked 任务（如果锁定文件已释放）
+    // 解除 blocked 任务（如果锁定文件和依赖文件都已释放）
     const activeTasks = state.tasks.filter(t => t.status === "active");
     const activeFiles = new Set(activeTasks.flatMap(t => t.files));
     for (const t of state.tasks.filter(t => t.status === "blocked" && t.caste === caste)) {
-      if (!t.files.some(f => activeFiles.has(f))) {
+      const fileConflict = t.files.some(f => activeFiles.has(f));
+      const depConflict = opts.importGraph && activeTasks.some(at =>
+        taskDependsOn(t.files, at.files, opts.importGraph!)
+      );
+      if (!fileConflict && !depConflict) {
         nest.updateTaskStatus(t.id, "pending");
       }
     }
@@ -324,7 +332,7 @@ export async function runColony(opts: QueenOptions): Promise<ColonyState> {
 
   nest.init(initialState);
   const { signal, callbacks } = opts;
-  const waveBase: Omit<WaveOptions, "caste"> = {
+  const waveBase: Omit<WaveOptions, "caste"> & { importGraph?: ImportGraph } = {
     nest, cwd: opts.cwd, signal, callbacks,
     currentModel: opts.currentModel,
     modelOverrides: opts.modelOverrides,
@@ -387,6 +395,16 @@ export async function runColony(opts: QueenOptions): Promise<ColonyState> {
     // ═══ Phase 2: 工作 ═══
     nest.updateState({ status: "working" });
 
+    // 构建 import graph 用于依赖感知调度
+    let importGraph: ImportGraph | undefined;
+    try {
+      const allFiles = nest.getAllTasks().flatMap(t => t.files).filter(f => /\.[tj]sx?$/.test(f));
+      if (allFiles.length > 0) {
+        importGraph = buildImportGraph([...new Set(allFiles)], opts.cwd);
+        waveBase.importGraph = importGraph;
+      }
+    } catch { /* graph build failed, proceed without */ }
+
     // 先执行 drone 任务（零 LLM 成本）
     const droneTasks = nest.getAllTasks().filter(t => t.caste === "drone" && t.status === "pending");
     if (droneTasks.length > 0) {

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

@@ -168,7 +168,7 @@ function parseSubTasks(output: string): ParsedSubTask[] {
     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),
+      files: (m[3]?.trim() || "").split(",").map((f: string) => f.trim()).filter(Boolean),
       caste: (m[4]?.trim() as AntCaste) || "worker",
       priority: (parseInt(m[5] || "3") as 1 | 2 | 3 | 4 | 5) || 3,
       context,
@@ -361,7 +361,7 @@ export async function spawnAnt(
     });
 
     // 订阅实时事件
-    session.subscribe((event) => {
+    session.subscribe((event: any) => {
       if (event.type === "message_update" && event.assistantMessageEvent.type === "text_delta") {
         const delta = event.assistantMessageEvent.delta;
         accumulatedText += delta;