@melihmucuk/pi-crew 1.0.21 → 1.0.22

package/README.md

@@ -115,15 +115,15 @@ Read-only bundled subagents still keep `bash` for inspection workflows like `git
 
 Subagent definitions are discovered from three locations, in priority order:
 
-1. **Project**: `<cwd>/.pi/agents/*.md`
-2. **User global**: `~/.pi/agent/agents/*.md`
+1. **Project**: `<cwd>/<CONFIG_DIR_NAME>/agents/*.md` (default: `<cwd>/.pi/agents/*.md`)
+2. **User global**: `<agentDir>/agents/*.md` (default: `~/.pi/agent/agents/*.md`)
 3. **Bundled**: shipped with this package
 
 When multiple sources define a subagent with the same `name`, the higher-priority source wins. This lets you override any bundled subagent by placing a file with the same name in your project or user directory.
 
 ## Custom Subagents
 
-Create `.md` files in `<cwd>/.pi/agents/` (project-level) or `~/.pi/agent/agents/` (global) with YAML frontmatter:
+Create `.md` files in Pi's project config agents directory (default `<cwd>/.pi/agents/`) or global agent directory (default `~/.pi/agent/agents/`) with YAML frontmatter:
 
 ```markdown
 ---
@@ -159,8 +159,8 @@ You can override selected frontmatter fields without editing the `.md` definitio
 
 Config locations:
 
-- Global: `~/.pi/agent/pi-crew.json`
-- Project: `<cwd>/.pi/pi-crew.json`
+- Global: `<agentDir>/pi-crew.json` (default `~/.pi/agent/pi-crew.json`)
+- Project: `<cwd>/<CONFIG_DIR_NAME>/pi-crew.json` (default `<cwd>/.pi/pi-crew.json`)
 
 Project config overrides global config. Only these fields are overridable:
 

package/extension/catalog.ts

@@ -2,7 +2,9 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 import type { ThinkingLevel } from "@earendil-works/pi-agent-core";
-import { getAgentDir, parseFrontmatter } from "@earendil-works/pi-coding-agent";
+import * as piCodingAgent from "@earendil-works/pi-coding-agent";
+
+const PROJECT_CONFIG_DIR_NAME = piCodingAgent.CONFIG_DIR_NAME ?? ".pi";
 
 const SUPPORTED_TOOL_NAMES_LITERAL = [
 	"read",
@@ -304,7 +306,7 @@ function parseAgentDefinition(content: string, filePath: string): ParseResult {
 	let frontmatter: Record<string, unknown>;
 	let body: string;
 	try {
-		const parsed = parseFrontmatter<Record<string, unknown>>(content);
+		const parsed = piCodingAgent.parseFrontmatter<Record<string, unknown>>(content);
 		frontmatter = parsed.frontmatter;
 		body = parsed.body;
 	} catch (error) {
@@ -526,13 +528,13 @@ const bundledAgentsDir = path.resolve(path.dirname(fileURLToPath(import.meta.url
 
 class FilesystemAgentCatalogSource implements AgentCatalogSource {
 	loadAgentDefinitionGroups(cwd: string): AgentDefinitionSourceGroup[] {
-		return [path.join(cwd, ".pi", "agents"), path.join(getAgentDir(), "agents"), bundledAgentsDir]
+		return [path.join(cwd, PROJECT_CONFIG_DIR_NAME, "agents"), path.join(piCodingAgent.getAgentDir(), "agents"), bundledAgentsDir]
 			.map(loadAgentDefinitionGroup)
 			.filter((group): group is AgentDefinitionSourceGroup => group !== null);
 	}
 
 	loadConfigFiles(cwd: string): AgentConfigFile[] {
-		return [path.join(getAgentDir(), "pi-crew.json"), path.join(cwd, ".pi", "pi-crew.json")]
+		return [path.join(piCodingAgent.getAgentDir(), "pi-crew.json"), path.join(cwd, PROJECT_CONFIG_DIR_NAME, "pi-crew.json")]
 			.map(loadConfigFile)
 			.filter((file): file is AgentConfigFile => file !== null);
 	}

package/extension/subagent-session.ts

@@ -203,15 +203,22 @@ export class SubagentSessionRunner implements SubagentRunner {
 
 	private attachSessionListeners(state: SubagentState, session: AgentSession): void {
 		state.unsubscribe = session.subscribe((event) => {
-			if (event.type !== "turn_end") return;
-			state.turns++;
-			const msg = event.message;
-			if (msg.role === "assistant") {
-				const assistantMsg = msg as AssistantMessage;
-				state.contextTokens = assistantMsg.usage.totalTokens;
-				state.model = assistantMsg.model;
+			if (event.type === "turn_end") {
+				state.turns++;
+				const msg = event.message;
+				if (msg.role === "assistant") {
+					const assistantMsg = msg as AssistantMessage;
+					state.contextTokens = assistantMsg.usage.totalTokens;
+					state.model = assistantMsg.model;
+				}
+				this.callbacks.onProgress(state.ownerSessionId);
+				return;
+			}
+
+			if (event.type === "compaction_end" && event.result?.estimatedTokensAfter !== undefined) {
+				state.contextTokens = event.result.estimatedTokensAfter;
+				this.callbacks.onProgress(state.ownerSessionId);
 			}
-			this.callbacks.onProgress(state.ownerSessionId);
 		});
 	}
 

package/extension/tools.ts

@@ -1,5 +1,6 @@
 import type { AgentToolResult } from "@earendil-works/pi-agent-core";
-import { getAgentDir, type ExtensionAPI, type ExtensionContext } from "@earendil-works/pi-coding-agent";
+import * as piCodingAgent from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 import {
@@ -15,6 +16,8 @@ export type CrewToolResult = AgentToolResult<unknown> & {
 	terminate?: boolean;
 };
 
+const PROJECT_CONFIG_DIR_NAME = piCodingAgent.CONFIG_DIR_NAME ?? ".pi";
+
 type RegisteredTool = Parameters<ExtensionAPI["registerTool"]>[0];
 type ToolRenderCall = Exclude<RegisteredTool["renderCall"], undefined>;
 
@@ -52,7 +55,7 @@ function toolSuccess(
 
 function formatAvailableAgents(agents: AgentConfig[]): string[] {
 	if (agents.length === 0) {
-		return ["No valid subagent definitions found. Add `.md` files to `<cwd>/.pi/agents/` or `~/.pi/agent/agents/`."];
+		return [`No valid subagent definitions found. Add \`.md\` files to \`<cwd>/${PROJECT_CONFIG_DIR_NAME}/agents/\` or \`${piCodingAgent.getAgentDir()}/agents/\`.`];
 	}
 
 	return agents.flatMap((agent) => {
@@ -216,7 +219,7 @@ export function registerCrewTools(pi: ExtensionAPI, crew: CrewRuntime, extension
 					brief,
 					model: ctx.model,
 					modelRegistry: ctx.modelRegistry,
-					agentDir: getAgentDir(),
+					agentDir: piCodingAgent.getAgentDir(),
 					parentSessionFile: ctx.sessionManager.getSessionFile(),
 					onWarning: (msg) => ctx.ui.notify(msg, "warning"),
 				},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@melihmucuk/pi-crew",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "type": "module",
   "description": "Non-blocking subagent orchestration for pi coding agent",
   "files": [
@@ -43,13 +43,13 @@
     "typebox": "*"
   },
   "devDependencies": {
-    "@earendil-works/pi-agent-core": "^0.79.6",
-    "@earendil-works/pi-ai": "^0.79.6",
-    "@earendil-works/pi-coding-agent": "^0.79.6",
-    "@earendil-works/pi-tui": "^0.79.6",
+    "@earendil-works/pi-agent-core": "^0.80.2",
+    "@earendil-works/pi-ai": "^0.80.2",
+    "@earendil-works/pi-coding-agent": "^0.80.2",
+    "@earendil-works/pi-tui": "^0.80.2",
     "@types/node": "^25.9.3",
     "tsx": "^4.22.4",
-    "typebox": "^1.2.16",
+    "typebox": "^1.3.0",
     "typescript": "^6.0.3"
   }
 }