@phi-code-admin/phi-code 0.71.1 → 0.73.0

package/extensions/phi/orchestrator.ts

@@ -471,6 +471,10 @@ export default function orchestratorExtension(pi: ExtensionAPI) {
 	let activeAgentTools: string[] | null = null;
 	let savedTools: string[] | null = null;
 	let phasePending = false; // true while waiting for a phase to complete
+	let phaseTimeoutId: ReturnType<typeof setTimeout> | null = null;
+	const MAX_PHASE_DURATION_MS = 10 * 60 * 1000; // 10 minutes per phase
+	const MAX_TOOL_CALLS_PER_PHASE = 60; // Safety limit
+	let phaseStartTime: number | null = null;
 
 	/**
 	 * Parse agent .md file with YAML frontmatter
@@ -527,6 +531,8 @@ export default function orchestratorExtension(pi: ExtensionAPI) {
 		const review = getModel("review");
 
 		const ts = timestamp();
+		// Inject runtime info so agents can adapt to the host OS
+		const runtimeInfo = `\n\nRuntime: ${process.platform} (${process.arch})`;
 
 		return [
 			{
@@ -534,21 +540,29 @@ export default function orchestratorExtension(pi: ExtensionAPI) {
 				agent: loadAgentDef("explore"),
 				instruction: `You are the EXPLORE agent. Analyze the project requirements and existing codebase.
 
+**FIRST ACTION (MANDATORY):** Call \`memory_search\` with project-relevant keywords to check for prior context.
+
 **Project Request:** ${description}
 
 **Your tasks:**
-1. List all existing files and read key ones
-2. Identify tech stack, patterns, and constraints
-3. Create a STRUCTURED PROJECT BRIEF in \`.phi/plans/brief-${ts}.md\`:
+
+**Parallelization:** When making multiple tool calls that don't depend on each other (e.g., memory_search + ontology_query, or reading 2+ files), call them IN PARALLEL in the same response. This is faster.
+
+1. Call \`memory_search\` with project-relevant keywords (MANDATORY)
+2. List all existing files and read key ones
+3. Identify tech stack, patterns, and constraints
+4. Create a STRUCTURED PROJECT BRIEF in \`.phi/plans/brief-${ts}.md\`:
    - Context: what exists now
    - Objective: what needs to be built
    - Requirements: specific features needed
    - Tech decisions: frameworks, patterns to use
    - Constraints: what to NOT break
+5. Write your findings to \`.phi/plans/explore-${ts}.md\`
 
-**Step 4:** Write your findings to \`.phi/plans/explore-${ts}.md\`
+**LAST ACTION (MANDATORY):** Call \`memory_write\` to save your exploration findings for downstream agents.
 
 **Knowledge Graph:**
+// TODO: ontology_batch_add for reducing API calls (currently single-item only)
 After your analysis, use \`ontology_add\` to save key project entities AND their relations:
 - Add entities for: the project, each major library, each module/directory
 - Add relations between them: "uses", "contains", "depends_on", "implements"
@@ -576,7 +590,7 @@ After your analysis, use \`ontology_add\` to save key project entities AND their
 - Every function fully implemented
 - Follow existing patterns if codebase exists
 - [Any other specific constraints]
-\`\`\``,
+\`\`\`` + runtimeInfo,
 			},
 			{
 				key: "plan", label: "📐 Phase 2 — PLAN", model: plan.preferred, fallback: plan.fallback,
@@ -616,7 +630,7 @@ After your analysis, use \`ontology_add\` to save key project entities AND their
 - Dependencies: Task 1
 \`\`\`
 
-Before finishing, use \`memory_write\` to save your plan summary with relevant tags for future reference.`,
+Before finishing, use \`memory_write\` to save your plan summary with relevant tags for future reference.` + runtimeInfo,
 			},
 			{
 				key: "code", label: "💻 Phase 3 — CODE", model: code.preferred, fallback: code.fallback,
@@ -663,7 +677,7 @@ After implementation, use \`memory_write\` to save a summary of what was built,
 **CRITICAL RULES:**
 - Write ONE file per tool call — NEVER combine multiple files in a single response
 - Keep each file under 500 lines. If longer, split into modules
-- After writing each file, verify it exists with \`ls\` before proceeding`,
+- After writing ALL files, verify they exist with a single \`find . -name '*.ts' -o -name '*.js' -o -name '*.html' | sort\`` + runtimeInfo,
 			},
 			{
 				key: "test", label: "🧪 Phase 4 — TEST", model: test.preferred, fallback: test.fallback,
@@ -710,20 +724,25 @@ After implementation, use \`memory_write\` to save a summary of what was built,
 - NEVER put tool calls inside thinking blocks. Always use the proper JSON tool call format
 - NEVER modify source code permanently for testing. Use environment variables: \`PORT=3001 node server.js\` instead of editing files
 - NEVER create .env files with fake credentials. Use inline env vars: \`API_KEY=test node server.js\`
-- For port conflicts on Windows, use: \`netstat -ano | findstr :PORT\` and \`taskkill /PID <pid> /F\`
-- For port conflicts on Linux/Mac, use: \`lsof -ti:PORT | xargs kill -9\`
+- For port conflicts, prefer: \`npx kill-port PORT\` (cross-platform)
+- On Windows fallback: \`netstat -ano | findstr :PORT\` and \`taskkill /PID <pid> /F\`
+- On Linux/Mac fallback: \`lsof -ti:PORT | xargs kill -9\`
 - Always clean up after tests: kill background processes, remove temp files
 
-After testing, use \`memory_write\` to save test results, bugs found, and lessons learned.`,
+**Anti-loop rule:** If the SAME test fails 3 times in a row with the same error after your fixes, STOP trying to fix it. Write the failure in your test report as "UNRESOLVED" and move on. Do not waste more than 3 iterations on the same issue.
+
+After testing, use \`memory_write\` to save test results, bugs found, and lessons learned.` + runtimeInfo,
 			},
 			{
 				key: "review", label: "🔍 Phase 5 — REVIEW", model: review.preferred, fallback: review.fallback,
 				agent: loadAgentDef("review"),
 				instruction: `You are the REVIEW agent. Final quality review.
 
+**FIRST ACTIONS (MANDATORY — do these before anything else):**
+1. Call \`memory_search\` to find all notes from previous phases (explore, plan, code, test)
+2. Call \`ontology_query\` to understand the full project architecture and entity relationships
+
 **Context Retrieval:**
-1. Use \`memory_search\` to find all notes from previous phases (explore, plan, code, test)
-2. Use \`ontology_query\` to understand the full project architecture
 3. Review all \`.phi/plans/*.md\` files for complete context
 
 **Project Request:** ${description}
@@ -765,11 +784,18 @@ After testing, use \`memory_write\` to save test results, bugs found, and lesson
 ✅ Project ready for production / ❌ Issues need resolution
 \`\`\`
 
-After your review, use \`memory_write\` to save:
+After your review, use \`memory_write\` ONCE to save:
 - Key lessons learned about this project type
 - Patterns that worked well
 - Common mistakes to avoid in future projects
-Tag the note with relevant keywords for vector search.`,
+Tag the note with relevant keywords for vector search.
+
+**Important:** Write lessons-learned ONCE. Do not call memory_write twice with the same filename or duplicate content.
+
+**Ontology enrichment:** After your review, use \`ontology_add\` to save your key findings:
+- Add a "review-report" entity with type "Document"
+- Add relations to the project: "reviews" → project, quality score as entity property
+- Save any new architectural decisions or patterns discovered` + runtimeInfo,
 			},
 		];
 	}
@@ -837,10 +863,26 @@ Tag the note with relevant keywords for vector search.`,
 
 	function sendNextPhase(ctx: any) {
 		if (phaseQueue.length === 0) {
+			// All phases done — clean up and notify
 			setOrchestrationActive(false);
 			phasePending = false;
 			deactivateAgent();
-			ctx.ui.notify(`\n✅ **All 5 phases complete!**`, "info");
+			if (phaseTimeoutId) { clearTimeout(phaseTimeoutId); phaseTimeoutId = null; }
+			// Generate global final summary
+			const totalPhases = 5; // always 5
+			const elapsed = phaseStartTime ? Math.round((Date.now() - phaseStartTime) / 1000) : 0;
+			const minutes = Math.floor(elapsed / 60);
+			const seconds = elapsed % 60;
+			ctx.ui.notify(`\n📊 **Orchestration Summary**\n` +
+				`  Phases: ${totalPhases}/5 completed\n` +
+				`  Duration: ${minutes}m ${seconds}s\n` +
+				`  Check \`.phi/plans/\` for all reports`, "info");
+			try {
+				ctx.ui.notify(`\n✅ **All 5 phases complete!**`, "info");
+			} catch {
+				// Fallback: inject completion message into conversation stream
+				try { pi.sendUserMessage(`✅ All 5 phases complete! The project is ready for review.`); } catch { /* best effort */ }
+			}
 			return;
 		}
 
@@ -853,6 +895,15 @@ Tag the note with relevant keywords for vector search.`,
 			ctx.ui.notify(`\n${phase.label} → \`${modelId}\` (agent: ${agentName})`, "info");
 			// Small delay to let the model switch settle, then send instruction
 			setTimeout(() => pi.sendUserMessage(phase.instruction), 500);
+			// Set phase timeout — abort if phase takes too long
+			if (phaseTimeoutId) clearTimeout(phaseTimeoutId);
+			phaseTimeoutId = setTimeout(() => {
+				if (orchestrationActive && phasePending) {
+					ctx.ui.notify(`\n⏰ **Phase timed out** (${MAX_PHASE_DURATION_MS / 60000} min limit). Skipping to next phase.`, "warning");
+					phasePending = false;
+					sendNextPhase(ctx);
+				}
+			}, MAX_PHASE_DURATION_MS);
 		});
 	}
 
@@ -875,7 +926,18 @@ Tag the note with relevant keywords for vector search.`,
 	// That's why phases 2-5 never executed.
 
 	pi.on("agent_end", async (event, ctx) => {
-		if (!orchestrationActive || !phasePending) return;
+		if (!orchestrationActive) return;
+		// Allow completion even if phasePending was cleared by a duplicate event
+		if (!phasePending) {
+			// If queue is empty and orchestration is active, force completion
+			if (phaseQueue.length === 0) {
+				sendNextPhase(ctx);
+			}
+			return;
+		}
+
+		// Clear phase timeout on normal completion
+		if (phaseTimeoutId) { clearTimeout(phaseTimeoutId); phaseTimeoutId = null; }
 
 		// Build a structured summary of what happened in this phase
 		// Instead of raw LLM text, extract concrete actions: files created/modified,
@@ -888,12 +950,13 @@ Tag the note with relevant keywords for vector search.`,
 		let toolCallCount = 0;
 
 		for (const msg of messages) {
-			if (msg.role === 'tool' || msg.role === 'function') {
+			// Pi uses role: "toolResult" instead of "tool"
+			if (msg.role === 'tool' || msg.role === 'function' || msg.role === 'toolResult') {
 				toolCallCount++;
 				const content = Array.isArray(msg.content)
 					? msg.content.map((c: any) => c.text || '').join('')
 					: String(msg.content || '');
-				const name = (msg as any).name || '';
+				const name = (msg as any).name || (msg as any).toolName || '';
 				// Track writes
 				if (name === 'write' && content.includes('Successfully wrote')) {
 					const match = content.match(/wrote \d+ bytes to (.+)/);
@@ -904,8 +967,12 @@ Tag the note with relevant keywords for vector search.`,
 					const match = content.match(/edited (.+)/) || content.match(/in (.+)/);
 					if (match) filesEdited.push(match[1]);
 				}
-				// Track errors
-				if (content.includes('ERR:') || content.includes('Error:') || content.includes('FAIL')) {
+				// Track errors — but filter out edit retries (old_text mismatch = normal retry, not error)
+				if ((content.includes('ERR:') || content.includes('Error:') || content.includes('FAIL'))
+					&& !content.includes('old text must match')
+					&& !content.includes('The old text')
+					&& !content.includes('oldText not found')
+					&& !content.includes('old_text not found')) {
 					const preview = content.slice(0, 150).replace(/\n/g, ' ');
 					errorsHit.push(`${name}: ${preview}`);
 				}
@@ -917,13 +984,42 @@ Tag the note with relevant keywords for vector search.`,
 			}
 		}
 
+		// Detect API errors (401, auth failures) — abort workflow if found
+		const hasAuthError = messages.some((msg: any) => {
+			const content = typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content || '');
+			return content.includes('401') && (content.includes('invalid access token') || content.includes('token expired') || content.includes('Unauthorized'));
+		});
+		if (hasAuthError || (toolCallCount === 0 && messages.length > 0)) {
+			const errorMsg = hasAuthError ? 'API authentication error (401)' : 'Phase produced 0 tool calls — possible API or model error';
+			ctx.ui.notify(`\n❌ **Orchestrator aborted:** ${errorMsg}\nCheck your API key and model configuration.`, "error");
+			setOrchestrationActive(false);
+			phasePending = false;
+			deactivateAgent();
+			if (phaseTimeoutId) { clearTimeout(phaseTimeoutId); phaseTimeoutId = null; }
+			return;
+		}
+
 		// Build the summary
 		const summaryParts: string[] = [];
 		summaryParts.push(`Tool calls: ${toolCallCount}`);
+		// Anti-loop guard: warn if tool calls are excessive
+		if (toolCallCount > MAX_TOOL_CALLS_PER_PHASE) {
+			summaryParts.push(`⚠️ WARNING: Phase used ${toolCallCount} tool calls (limit: ${MAX_TOOL_CALLS_PER_PHASE}). Possible loop detected.`);
+		}
 		if (filesWritten.length > 0) summaryParts.push(`Files created/written: ${filesWritten.join(', ')}`);
 		if (filesEdited.length > 0) summaryParts.push(`Files edited: ${filesEdited.join(', ')}`);
 		if (testResults.length > 0) summaryParts.push(`Test results:\n${testResults.join('\n')}`);
 		if (errorsHit.length > 0) summaryParts.push(`Errors encountered: ${errorsHit.length}\n${errorsHit.slice(0, 5).join('\n')}`);
+
+		// Verify mandatory tool usage
+		const toolNames = messages
+			.filter((m: any) => m.role === 'tool' || m.role === 'function' || m.role === 'toolResult')
+			.map((m: any) => (m as any).name || (m as any).toolName || '');
+		const hasMemorySearch = toolNames.includes('memory_search');
+		const hasMemoryWrite = toolNames.includes('memory_write');
+		if (!hasMemorySearch) summaryParts.push(`⚠️ Phase did NOT call memory_search (mandatory)`);
+		if (!hasMemoryWrite) summaryParts.push(`⚠️ Phase did NOT call memory_write (mandatory)`);
+
 		const phaseSummary = summaryParts.join('\n');
 
 		// Inject structured summary into next phase
@@ -979,6 +1075,8 @@ Tag the note with relevant keywords for vector search.`,
 			}
 			ctx.ui.notify("", "info");
 
+			// Record orchestration start time for final summary
+			phaseStartTime = Date.now();
 			// Switch model and activate agent for first phase
 			const modelId = await switchModelForPhase(firstPhase, ctx);
 			activateAgent(firstPhase, ctx);

package/package.json

@@ -1,107 +1,107 @@
 {
-	"name": "@phi-code-admin/phi-code",
-	"version": "0.71.1",
-	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
-	"type": "module",
-	"piConfig": {
-		"name": "phi",
-		"configDir": ".phi"
-	},
-	"bin": {
-		"phi": "dist/cli.js"
-	},
-	"main": "./dist/index.js",
-	"types": "./dist/index.d.ts",
-	"exports": {
-		".": {
-			"types": "./dist/index.d.ts",
-			"import": "./dist/index.js"
-		},
-		"./hooks": {
-			"types": "./dist/core/hooks/index.d.ts",
-			"import": "./dist/core/hooks/index.js"
-		}
-	},
-	"files": [
-		"dist",
-		"skills",
-		"agents",
-		"extensions",
-		"README.md",
-		"LICENSE",
-		"CHANGELOG.md",
-		"scripts"
-	],
-	"scripts": {
-		"clean": "shx rm -rf dist",
-		"dev": "tsgo -p tsconfig.build.json --watch --preserveWatchOutput",
-		"build": "tsgo -p tsconfig.build.json && shx chmod +x dist/cli.js && npm run copy-assets",
-		"build:binary": "npm --prefix ../tui run build && npm --prefix ../ai run build && npm --prefix ../agent run build && npm run build && bun build --compile ./dist/cli.js --outfile dist/pi && npm run copy-binary-assets",
-		"copy-assets": "./scripts/copy-assets.sh",
-		"copy-binary-assets": "shx cp package.json dist/ && shx cp README.md dist/ && shx cp CHANGELOG.md dist/ && shx mkdir -p dist/theme && shx cp src/modes/interactive/theme/*.json dist/theme/ && shx mkdir -p dist/export-html/vendor && shx cp src/core/export-html/template.html dist/export-html/ && shx cp src/core/export-html/vendor/*.js dist/export-html/vendor/ && shx cp -r docs dist/ && shx cp -r examples dist/ && shx cp ../../node_modules/@silvia-odwyer/photon-node/photon_rs_bg.wasm dist/",
-		"test": "vitest --run",
-		"prepublishOnly": "npm run clean && npm run build",
-		"postinstall": "node scripts/postinstall.cjs"
-	},
-	"dependencies": {
-		"@mariozechner/jiti": "^2.6.2",
-		"@silvia-odwyer/photon-node": "^0.3.4",
-		"chalk": "^5.5.0",
-		"cli-highlight": "^2.1.11",
-		"diff": "^8.0.2",
-		"extract-zip": "^2.0.1",
-		"file-type": "^21.1.1",
-		"glob": "^13.0.1",
-		"hosted-git-info": "^9.0.2",
-		"ignore": "^7.0.5",
-		"marked": "^15.0.12",
-		"minimatch": "^10.2.3",
-		"phi-code-agent": "^0.56.3",
-		"phi-code-ai": "^0.56.3",
-		"phi-code-tui": "^0.56.3",
-		"proper-lockfile": "^4.1.2",
-		"sigma-agents": "^0.1.6",
-		"sigma-memory": "0.2.1",
-		"sigma-skills": "^0.1.2",
-		"strip-ansi": "^7.1.0",
-		"undici": "^7.19.1",
-		"yaml": "^2.8.2"
-	},
-	"overrides": {
-		"rimraf": "6.1.2",
-		"gaxios": {
-			"rimraf": "6.1.2"
-		}
-	},
-	"optionalDependencies": {
-		"@mariozechner/clipboard": "^0.3.2"
-	},
-	"devDependencies": {
-		"@types/diff": "^7.0.2",
-		"@types/hosted-git-info": "^3.0.5",
-		"@types/ms": "^2.1.0",
-		"@types/node": "^24.3.0",
-		"@types/proper-lockfile": "^4.1.4",
-		"shx": "^0.4.0",
-		"typescript": "^5.7.3",
-		"vitest": "^3.2.4"
-	},
-	"keywords": [
-		"ai",
-		"coding-agent",
-		"cli",
-		"typescript",
-		"sub-agents",
-		"memory"
-	],
-	"author": "Mario Zechner",
-	"license": "MIT",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/uglyswap/phi-code.git"
-	},
-	"homepage": "https://github.com/uglyswap/phi-code",
-	"engines": {
-		"node": ">=20.6.0"
-	}
+  "name": "@phi-code-admin/phi-code",
+  "version": "0.73.0",
+  "description": "Coding agent CLI with read, bash, edit, write tools and session management",
+  "type": "module",
+  "piConfig": {
+    "name": "phi",
+    "configDir": ".phi"
+  },
+  "bin": {
+    "phi": "dist/cli.js"
+  },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    },
+    "./hooks": {
+      "types": "./dist/core/hooks/index.d.ts",
+      "import": "./dist/core/hooks/index.js"
+    }
+  },
+  "files": [
+    "dist",
+    "skills",
+    "agents",
+    "extensions",
+    "README.md",
+    "LICENSE",
+    "CHANGELOG.md",
+    "scripts"
+  ],
+  "scripts": {
+    "clean": "shx rm -rf dist",
+    "dev": "tsgo -p tsconfig.build.json --watch --preserveWatchOutput",
+    "build": "tsgo -p tsconfig.build.json && shx chmod +x dist/cli.js && npm run copy-assets",
+    "build:binary": "npm --prefix ../tui run build && npm --prefix ../ai run build && npm --prefix ../agent run build && npm run build && bun build --compile ./dist/cli.js --outfile dist/pi && npm run copy-binary-assets",
+    "copy-assets": "./scripts/copy-assets.sh",
+    "copy-binary-assets": "shx cp package.json dist/ && shx cp README.md dist/ && shx cp CHANGELOG.md dist/ && shx mkdir -p dist/theme && shx cp src/modes/interactive/theme/*.json dist/theme/ && shx mkdir -p dist/export-html/vendor && shx cp src/core/export-html/template.html dist/export-html/ && shx cp src/core/export-html/vendor/*.js dist/export-html/vendor/ && shx cp -r docs dist/ && shx cp -r examples dist/ && shx cp ../../node_modules/@silvia-odwyer/photon-node/photon_rs_bg.wasm dist/",
+    "test": "vitest --run",
+    "prepublishOnly": "npm run clean && npm run build",
+    "postinstall": "node scripts/postinstall.cjs"
+  },
+  "dependencies": {
+    "@mariozechner/jiti": "^2.6.2",
+    "@silvia-odwyer/photon-node": "^0.3.4",
+    "chalk": "^5.5.0",
+    "cli-highlight": "^2.1.11",
+    "diff": "^8.0.2",
+    "extract-zip": "^2.0.1",
+    "file-type": "^21.1.1",
+    "glob": "^13.0.1",
+    "hosted-git-info": "^9.0.2",
+    "ignore": "^7.0.5",
+    "marked": "^15.0.12",
+    "minimatch": "^10.2.3",
+    "phi-code-agent": "^0.56.3",
+    "phi-code-ai": "^0.56.3",
+    "phi-code-tui": "^0.56.3",
+    "proper-lockfile": "^4.1.2",
+    "sigma-agents": "^0.1.6",
+    "sigma-memory": "0.2.1",
+    "sigma-skills": "^0.1.2",
+    "strip-ansi": "^7.1.0",
+    "undici": "^7.19.1",
+    "yaml": "^2.8.2"
+  },
+  "overrides": {
+    "rimraf": "6.1.2",
+    "gaxios": {
+      "rimraf": "6.1.2"
+    }
+  },
+  "optionalDependencies": {
+    "@mariozechner/clipboard": "^0.3.2"
+  },
+  "devDependencies": {
+    "@types/diff": "^7.0.2",
+    "@types/hosted-git-info": "^3.0.5",
+    "@types/ms": "^2.1.0",
+    "@types/node": "^24.3.0",
+    "@types/proper-lockfile": "^4.1.4",
+    "shx": "^0.4.0",
+    "typescript": "^5.7.3",
+    "vitest": "^3.2.4"
+  },
+  "keywords": [
+    "ai",
+    "coding-agent",
+    "cli",
+    "typescript",
+    "sub-agents",
+    "memory"
+  ],
+  "author": "Mario Zechner",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/uglyswap/phi-code.git"
+  },
+  "homepage": "https://github.com/uglyswap/phi-code",
+  "engines": {
+    "node": ">=20.6.0"
+  }
 }