@phi-code-admin/phi-code 0.60.8 → 0.61.0

package/extensions/phi/orchestrator.ts

@@ -129,13 +129,40 @@ export default function orchestratorExtension(pi: ExtensionAPI) {
 	}
 
 	function findPhiBinary(): string {
+		// Try the bundled CLI relative to extensions dir
 		const bundledCli = join(__dirname, "..", "..", "..", "dist", "cli.js");
 		if (existsSync(bundledCli)) return bundledCli;
+
+		// Try npm global install paths
+		const npmGlobalPaths = [
+			join(homedir(), "AppData", "Roaming", "npm", "node_modules", "@phi-code-admin", "phi-code", "dist", "cli.js"), // Windows
+			join(homedir(), ".npm-global", "lib", "node_modules", "@phi-code-admin", "phi-code", "dist", "cli.js"), // Linux custom
+			"/usr/local/lib/node_modules/@phi-code-admin/phi-code/dist/cli.js", // Linux/Mac default
+			"/usr/lib/node_modules/@phi-code-admin/phi-code/dist/cli.js", // Some Linux
+		];
+		for (const p of npmGlobalPaths) {
+			if (existsSync(p)) return p;
+		}
+
+		// Try `which phi` (Linux/Mac) or `where phi` (Windows)
 		try {
-			const which = require("child_process").execSync("which phi 2>/dev/null", { encoding: "utf-8" }).trim();
-			if (which) return which;
+			const isWin = process.platform === "win32";
+			const cmd = isWin ? "where" : "which";
+			const result = require("child_process").execSync(`${cmd} phi 2>${isWin ? "NUL" : "/dev/null"}`, { encoding: "utf-8" }).trim();
+			if (result) {
+				const firstLine = result.split("\n")[0].trim();
+				// On Windows, `where phi` returns the .cmd shim; we need the actual JS
+				if (isWin && firstLine.endsWith(".cmd")) {
+					const npmPrefix = require("child_process").execSync("npm prefix -g", { encoding: "utf-8" }).trim();
+					const jsPath = join(npmPrefix, "node_modules", "@phi-code-admin", "phi-code", "dist", "cli.js");
+					if (existsSync(jsPath)) return jsPath;
+				}
+				return firstLine;
+			}
 		} catch { /* not in PATH */ }
-		return "npx";
+
+		// Last resort: assume phi is in PATH (works with shell:true on Windows)
+		return "phi";
 	}
 
 	// ─── Sub-Agent Execution ─────────────────────────────────────────
@@ -197,7 +224,6 @@ export default function orchestratorExtension(pi: ExtensionAPI) {
 			taskPrompt += `- Report exactly what you did, what worked, and what didn't.\n`;
 
 			const args: string[] = [];
-			if (phiBin === "npx") args.push("@phi-code-admin/phi-code");
 
 			args.push("--print");
 			if (model && model !== "default") args.push("--model", model);
@@ -205,14 +231,26 @@ export default function orchestratorExtension(pi: ExtensionAPI) {
 			args.push("--no-session");
 			args.push(taskPrompt);
 
-			const cmd = phiBin === "npx" ? "npx" : "node";
-			const cmdArgs = phiBin === "npx" ? args : [phiBin, ...args];
+			// Determine command: use node + cli.js for JS paths, or phi directly on Windows
+			let cmd: string;
+			let cmdArgs: string[];
+			if (phiBin.endsWith(".js")) {
+				cmd = "node";
+				cmdArgs = [phiBin, ...args];
+			} else if (phiBin === "phi") {
+				cmd = "phi";
+				cmdArgs = args;
+			} else {
+				cmd = phiBin;
+				cmdArgs = args;
+			}
 
 			execFile(cmd, cmdArgs, {
 				cwd,
 				timeout: timeoutMs,
 				maxBuffer: 10 * 1024 * 1024,
 				env: { ...process.env },
+				shell: process.platform === "win32", // Windows needs shell for .cmd shims
 			}, (error, stdout, stderr) => {
 				const durationMs = Date.now() - startTime;
 				if (error) {
@@ -292,7 +330,9 @@ export default function orchestratorExtension(pi: ExtensionAPI) {
 		const totalTasks = tasks.length;
 		let wave = 1;
 
+		const phiBinPath = findPhiBinary();
 		notify(`🚀 Executing ${totalTasks} tasks with sub-agents (parallel mode)...`, "info");
+		notify(`📍 Phi binary: \`${phiBinPath}\``, "info");
 
 		// Execute in waves — each wave runs independent tasks in parallel
 		while (completed.size + failed.size < totalTasks) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@phi-code-admin/phi-code",
-	"version": "0.60.8",
+	"version": "0.61.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"piConfig": {