@henryqw/pi-codegraph 0.2.2 → 0.3.0

package/README.md

@@ -1,24 +1,22 @@
 # `@henryqw/pi-codegraph`
 
-Get a separate [CodeGraph](https://github.com/colbymchenry/codegraph) index when you start Pi in a new Git worktree. Use CodeGraph's explore tool through pi-mcp-adapter from Pi.
+Get a separate [CodeGraph](https://github.com/colbymchenry/codegraph) index when you start Pi in a new Git worktree, and let agents explore the indexed code with the `codegraph_explore` tool.
 
 ## Install
 
 ```bash
 npm install -g @colbymchenry/codegraph
-pi install npm:pi-mcp-adapter
 pi install npm:@henryqw/pi-codegraph
 ```
 
-Requires the `codegraph` CLI on `PATH` and [pi-mcp-adapter](https://github.com/nicobailon/pi-mcp-adapter).
+Requires only the `codegraph` executable on Pi's `PATH`. No MCP server or MCP configuration is needed.
 
 ## Works with
 
 | Package | Relationship | Purpose |
 | --- | --- | --- |
-| [`@colbymchenry/codegraph`](https://github.com/colbymchenry/codegraph) | Required | Builds the indexes and serves CodeGraph tools over MCP. |
-| [`@henryqw/pi-footer`](https://pi.henry.wang/extensions/pi-footer) | Improves | Shows a compact CodeGraph index badge and direct tool activity when loaded. |
-| [`pi-mcp-adapter`](https://github.com/nicobailon/pi-mcp-adapter) | Required | Connects the MCP server to Pi. |
+| [`@colbymchenry/codegraph`](https://github.com/colbymchenry/codegraph) | Required | Builds the indexes and answers `codegraph explore` queries. |
+| [`@henryqw/pi-footer`](https://pi.henry.wang/extensions/pi-footer) | Improves | Shows a compact CodeGraph index badge and tool activity when loaded. |
 
 ## Use
 
@@ -28,15 +26,14 @@ From the primary checkout, initialize CodeGraph once:
 codegraph init --yes
 ```
 
-Then launch `pi` in a linked worktree. When the primary checkout has an index, pi-codegraph initializes a separate worktree index and exposes CodeGraph tools through pi-mcp-adapter.
+Then launch `pi` in a linked worktree. When the primary checkout has an index, pi-codegraph initializes a separate worktree index.
 
 | Surface | Type | Purpose |
 | --- | --- | --- |
-| `codegraph_explore` | tool | Lets agents explore the indexed code through CodeGraph. |
-| `mcp` | tool | Lets agents call other CodeGraph tools through the `henryqw_pi-codegraph__codegraph` adapter server. |
+| `codegraph_explore` | tool | Lets agents explore the indexed code. It returns the source of the relevant symbols grouped by file, plus the call path between them. |
 | CodeGraph setup status | ui | Shows users setup progress and errors, and confirms a new worktree index is ready. |
 
-The adapter discovers tools lazily.
+`codegraph_explore` takes a `query`, an optional `maxFiles` (default 12), and an optional `projectPath` (defaults to Pi's working directory). It runs `codegraph explore --path <projectPath> --max-files <maxFiles> <query>` and returns the output as-is. If the command exits with an error or runs longer than 120 seconds, the tool call fails and shows the end of CodeGraph's error output.
 
 ## Flow
 
@@ -45,15 +42,15 @@ The adapter discovers tools lazily.
 - Each linked worktree keeps its own `.codegraph`; databases are never copied or shared between branches.
 - Non-Git directories and repositories without a primary index are not initialized.
 - The extension reports `checking index…` and `indexing…` during setup, `indexed` when a database file exists, `missing` when no index was built, `prerequisites missing` when setup was skipped, and `setup failed` on an error. `indexed` does not guarantee database health.
-- If `pi-footer` is also loaded, it places a compact `CG` badge first on its third line: `✓ CG` indexed, `○ CG` missing, `◐ CG` checking or indexing, `! CG` setup problem, or `? CG` unknown state. It temporarily shows `● CG` only during direct `codegraph_explore` calls or `codegraph_*` calls through this package's MCP server, not for every MCP call.
+- If `pi-footer` is also loaded, it places a compact `CG` badge first on its third line: `✓ CG` indexed, `○ CG` missing, `◐ CG` checking or indexing, `! CG` setup problem, or `? CG` unknown state. It temporarily shows `● CG` only during `codegraph_explore` calls.
 
 ## State and storage
 
-The extension relies on CodeGraph's own state — each worktree maintains its own `.codegraph/codegraph.db`. The extension never copies or shares the database and does not write it directly: it delegates creation to `codegraph init --yes <worktree-root>`. Existing indexes are left alone; CodeGraph owns synchronization when its MCP server runs.
+The extension relies on CodeGraph's own state — each worktree maintains its own `.codegraph/codegraph.db`. The extension never copies or shares the database and does not write it directly: it delegates creation to `codegraph init --yes <worktree-root>`. Existing indexes are left alone.
 
 ## Limits and recovery
 
-At startup, the extension checks for a loaded adapter and runs `codegraph --version`. If either prerequisite is unavailable, Pi warns, reports `prerequisites missing`, and skips setup. Restart Pi or run `/reload` after fixing prerequisites.
+At startup, the extension runs `codegraph --version`. If that fails, Pi warns, reports `prerequisites missing`, and skips setup. Restart Pi or run `/reload` after fixing prerequisites.
 
 Initialization uses an exclusive `pi-codegraph-init.lock` in the worktree's Git metadata. Failed or interrupted initialization keeps the lock so a partial database is not accepted. To recover, first confirm no initializer is running, then run `codegraph index` **from the affected worktree root** (not the primary checkout or a nested directory). Only after it succeeds, remove the lock directory with `rmdir` using the path in the error message, then run `/reload`:
 
@@ -61,10 +58,8 @@ Initialization uses an exclusive `pi-codegraph-init.lock` in the worktree's Git
 cd /path/to/affected-worktree-root && codegraph index && rmdir /path/to/pi-codegraph-init.lock
 ```
 
-The package never installs prerequisites automatically. The `codegraph` executable must be available to both Pi and its MCP child process. Only Git worktree-root indexes using the default `.codegraph` directory are supported; nested monorepo indexes are not initialized automatically. The primary checkout must remain indexed for automatic opt-in detection.
+The package never installs prerequisites automatically. Only Git worktree-root indexes using the default `.codegraph` directory are supported; nested monorepo indexes are not initialized automatically. The primary checkout must remain indexed for automatic opt-in detection.
 
 Do not remove an active lock. Existing indexes without an extension-owned lock are not health-checked. The lock coordinates this extension's sessions, not manual `codegraph init` commands; avoid running those during initialization.
 
 The extension does not add ignore rules, delete indexes, or prune worktrees — add `.codegraph/` to your own ignore rules if needed. Pi Subagent conservatively treats ignored files as retained work: an indexed worker worktree may require manual cleanup.
-
-If you already configured a `codegraph` server manually, remove that entry after confirming the package server works. Keeping both can expose duplicate servers/tools. The extension does not change your MCP configuration.

package/extensions/codegraph.ts

@@ -2,9 +2,11 @@ import { mkdir, rmdir, stat } from "node:fs/promises";
 import { join } from "node:path";
 import { setTimeout as delay } from "node:timers/promises";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { Type } from "typebox";
 
 const LOCK_WAIT_MS = 5 * 60_000;
 const INIT_TIMEOUT_MS = 10 * 60_000;
+const EXPLORE_TIMEOUT_MS = 120_000;
 const WIDGET_KEY = "pi-codegraph";
 const SUCCESS_TTL_MS = 5000;
 
@@ -26,17 +28,10 @@ async function git(pi: ExtensionAPI, cwd: string, args: string[]): Promise<strin
 }
 
 async function initialize(pi: ExtensionAPI, ctx: ExtensionContext): Promise<void> {
-	const prerequisites: string[] = [];
-	if (!pi.getAllTools().some((tool) => tool.name === "mcp")) {
-		prerequisites.push("Install and enable pi-mcp-adapter >=2.36.0: pi install npm:pi-mcp-adapter");
-	}
 	const version = await pi.exec("codegraph", ["--version"], { cwd: ctx.cwd, timeout: 10_000 });
 	if (version.code !== 0 || version.killed) {
 		const detail = version.killed ? "timed out or killed" : version.stderr.trim().slice(-1000) || `exit ${version.code}`;
-		prerequisites.push(`codegraph --version failed (${detail}). Install CodeGraph: npm install -g @colbymchenry/codegraph. If already installed, check that codegraph runs on Pi's PATH.`);
-	}
-	if (prerequisites.length) {
-		const message = `pi-codegraph: setup skipped.\n${prerequisites.join("\n")}\nThen restart Pi or /reload.`;
+		const message = `pi-codegraph: setup skipped.\ncodegraph --version failed (${detail}). Install CodeGraph: npm install -g @colbymchenry/codegraph. If already installed, check that codegraph runs on Pi's PATH.\nThen restart Pi or /reload.`;
 		ctx.ui.setStatus("pi-codegraph", "pi-codegraph: prerequisites missing");
 		if (ctx.hasUI) ctx.ui.notify(message, "warning");
 		else console.warn(message);
@@ -110,6 +105,25 @@ async function initialize(pi: ExtensionAPI, ctx: ExtensionContext): Promise<void
 }
 
 export default function codegraphExtension(pi: ExtensionAPI): void {
+	pi.registerTool({
+		name: "codegraph_explore",
+		label: "CodeGraph explore",
+		description: "Primary code exploration tool. Call it first for how-does-X-work, architecture, bug, or where-is-X questions, and before editing. Returns the verbatim source of the relevant symbols grouped by file, plus the call path among them, in one capped call. Treat the shown source as already read.",
+		parameters: Type.Object({
+			query: Type.String({ description: "Symbol names, file names, short code terms, or a natural-language question." }),
+			maxFiles: Type.Optional(Type.Number({ description: "Maximum files to include (default 12)." })),
+			projectPath: Type.Optional(Type.String({ description: "Absolute path to the project or any directory inside it. Defaults to the session cwd." })),
+		}),
+		annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+		async execute(_toolCallId, { query, maxFiles, projectPath }, signal, _onUpdate, ctx) {
+			const path = projectPath ?? ctx.cwd;
+			const result = await pi.exec("codegraph", ["explore", "--path", path, "--max-files", String(maxFiles ?? 12), query], { cwd: path, signal, timeout: EXPLORE_TIMEOUT_MS });
+			if (result.code !== 0 || result.killed) {
+				throw new Error(`codegraph explore failed (${result.killed ? "timed out or killed" : `exit ${result.code}`}): ${result.stderr.trim().slice(-2000)}`);
+			}
+			return { content: [{ type: "text", text: result.stdout }], details: undefined };
+		},
+	});
 	pi.on("session_start", async (_event, ctx) => {
 		try {
 			await initialize(pi, ctx);

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@henryqw/pi-codegraph",
-  "version": "0.2.2",
-  "description": "Initialize CodeGraph indexes in opted-in Git worktrees and expose CodeGraph through pi-mcp-adapter.",
+  "version": "0.3.0",
+  "description": "Initialize CodeGraph indexes in opted-in Git worktrees and expose codegraph_explore as a Pi tool.",
   "keywords": [
     "pi-package",
     "pi",
     "codegraph",
-    "mcp",
     "worktree"
   ],
   "type": "module",
@@ -17,7 +16,6 @@
   "files": [
     "LICENSE",
     "extensions",
-    "mcp.json",
     "README.md"
   ],
   "scripts": {
@@ -26,11 +24,11 @@
     "pack:check": "npm pack --dry-run"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": ">=0.87.0 <0.88.0",
-    "pi-mcp-adapter": ">=2.36.0 <3.0.0"
+    "@earendil-works/pi-coding-agent": ">=0.87.0 <0.100.0",
+    "typebox": "^1.3.15"
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "0.87.0"
+    "@earendil-works/pi-coding-agent": "0.99.1"
   },
   "repository": {
     "type": "git",
@@ -46,7 +44,6 @@
   "pi": {
     "extensions": [
       "./extensions/codegraph.ts"
-    ],
-    "mcp": "./mcp.json"
+    ]
   }
 }

package/mcp.json

@@ -1,11 +0,0 @@
-{
-  "mcpServers": {
-    "codegraph": {
-      "command": "codegraph",
-      "args": ["serve", "--mcp"],
-      "lifecycle": "lazy",
-      "toolPrefix": "none",
-      "directTools": ["codegraph_explore"]
-    }
-  }
-}