pi-crew 0.1.30 → 0.1.32

package/src/agents/discover-agents.ts

@@ -1,102 +1,102 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
-import type { AgentConfig, ResourceSource } from "./agent-config.ts";
-import { loadConfig } from "../config/config.ts";
-import { parseCsv, parseFrontmatter } from "../utils/frontmatter.ts";
-import { packageRoot, projectPiRoot, userPiRoot } from "../utils/paths.ts";
-
-export interface AgentDiscoveryResult {
-	builtin: AgentConfig[];
-	user: AgentConfig[];
-	project: AgentConfig[];
-}
-
-function parseCost(value: string | undefined): "free" | "cheap" | "expensive" | undefined {
-	return value === "free" || value === "cheap" || value === "expensive" ? value : undefined;
-}
-
-function parseMemory(value: string | undefined): "user" | "project" | "local" | undefined {
-	return value === "user" || value === "project" || value === "local" ? value : undefined;
-}
-
-function parseAgentFile(filePath: string, source: ResourceSource): AgentConfig | undefined {
-	try {
-		const content = fs.readFileSync(filePath, "utf-8");
-		const { frontmatter, body } = parseFrontmatter(content);
-		const name = frontmatter.name?.trim() || path.basename(filePath, path.extname(filePath));
-		const description = frontmatter.description?.trim() || "No description provided.";
-		const triggers = parseCsv(frontmatter.triggers ?? frontmatter.trigger);
-		const useWhen = parseCsv(frontmatter.useWhen);
-		const avoidWhen = parseCsv(frontmatter.avoidWhen);
-		const cost = parseCost(frontmatter.cost);
-		const category = frontmatter.category?.trim() || undefined;
-		return {
-			name,
-			description,
-			source,
-			filePath,
-			systemPrompt: body.trim(),
-			model: frontmatter.model || undefined,
-			fallbackModels: parseCsv(frontmatter.fallbackModels),
-			thinking: frontmatter.thinking || undefined,
-			tools: parseCsv(frontmatter.tools),
-			extensions: frontmatter.extensions === "" ? [] : parseCsv(frontmatter.extensions),
-			skills: parseCsv(frontmatter.skills ?? frontmatter.skill),
-			systemPromptMode: frontmatter.systemPromptMode === "append" ? "append" : "replace",
-			inheritProjectContext: frontmatter.inheritProjectContext === "true",
-			inheritSkills: frontmatter.inheritSkills === "true",
-			memory: parseMemory(frontmatter.memory),
-			disabled: frontmatter.disabled === "true" || frontmatter.enabled === "false",
-			routing: triggers || useWhen || avoidWhen || cost || category ? { triggers, useWhen, avoidWhen, cost, category } : undefined,
-		};
-	} catch {
-		return undefined;
-	}
-}
-
-function readAgentDir(dir: string, source: ResourceSource): AgentConfig[] {
-	if (!fs.existsSync(dir)) return [];
-	return fs.readdirSync(dir)
-		.filter((entry) => entry.endsWith(".md") && !entry.endsWith(".team.md") && !entry.endsWith(".workflow.md"))
-		.map((entry) => parseAgentFile(path.join(dir, entry), source))
-		.filter((agent): agent is AgentConfig => agent !== undefined)
-		.sort((a, b) => a.name.localeCompare(b.name));
-}
-
-function applyAgentOverrides(agents: AgentConfig[], cwd: string): AgentConfig[] {
-	const loaded = loadConfig(cwd);
-	const config = loaded.config.agents;
-	const overrides = config?.overrides ?? {};
-	return agents
-		.filter((agent) => !(config?.disableBuiltins && agent.source === "builtin"))
-		.map((agent) => {
-			const overrideEntry = Object.entries(overrides).find(([name]) => name.toLowerCase() === agent.name.toLowerCase());
-			if (!overrideEntry) return agent;
-			const [, override] = overrideEntry;
-			return {
-				...agent,
-				disabled: override.disabled ?? agent.disabled,
-				model: override.model === false ? undefined : override.model ?? agent.model,
-				fallbackModels: override.fallbackModels === false ? undefined : override.fallbackModels ?? agent.fallbackModels,
-				thinking: override.thinking === false ? undefined : override.thinking ?? agent.thinking,
-				tools: override.tools === false ? undefined : override.tools ?? agent.tools,
-				override: { source: "config", path: loaded.path },
-			};
-		});
-}
-
-export function discoverAgents(cwd: string): AgentDiscoveryResult {
-	return {
-		builtin: applyAgentOverrides(readAgentDir(path.join(packageRoot(), "agents"), "builtin"), cwd),
-		user: applyAgentOverrides(readAgentDir(path.join(userPiRoot(), "agents"), "user"), cwd),
-		project: applyAgentOverrides(readAgentDir(path.join(projectPiRoot(cwd), "agents"), "project"), cwd),
-	};
-}
-
-export function allAgents(discovery: AgentDiscoveryResult): AgentConfig[] {
-	const byName = new Map<string, AgentConfig>();
-	for (const agent of [...discovery.builtin, ...discovery.user, ...discovery.project]) {
-		byName.set(agent.name.toLowerCase(), agent);
-	}
-	return [...byName.values()].filter((agent) => !agent.disabled).sort((a, b) => a.name.localeCompare(b.name));
-}
+import * as fs from "node:fs";
+import * as path from "node:path";
+import type { AgentConfig, ResourceSource } from "./agent-config.ts";
+import { loadConfig } from "../config/config.ts";
+import { parseCsv, parseFrontmatter } from "../utils/frontmatter.ts";
+import { packageRoot, projectCrewRoot, userPiRoot } from "../utils/paths.ts";
+
+export interface AgentDiscoveryResult {
+	builtin: AgentConfig[];
+	user: AgentConfig[];
+	project: AgentConfig[];
+}
+
+function parseCost(value: string | undefined): "free" | "cheap" | "expensive" | undefined {
+	return value === "free" || value === "cheap" || value === "expensive" ? value : undefined;
+}
+
+function parseMemory(value: string | undefined): "user" | "project" | "local" | undefined {
+	return value === "user" || value === "project" || value === "local" ? value : undefined;
+}
+
+function parseAgentFile(filePath: string, source: ResourceSource): AgentConfig | undefined {
+	try {
+		const content = fs.readFileSync(filePath, "utf-8");
+		const { frontmatter, body } = parseFrontmatter(content);
+		const name = frontmatter.name?.trim() || path.basename(filePath, path.extname(filePath));
+		const description = frontmatter.description?.trim() || "No description provided.";
+		const triggers = parseCsv(frontmatter.triggers ?? frontmatter.trigger);
+		const useWhen = parseCsv(frontmatter.useWhen);
+		const avoidWhen = parseCsv(frontmatter.avoidWhen);
+		const cost = parseCost(frontmatter.cost);
+		const category = frontmatter.category?.trim() || undefined;
+		return {
+			name,
+			description,
+			source,
+			filePath,
+			systemPrompt: body.trim(),
+			model: frontmatter.model || undefined,
+			fallbackModels: parseCsv(frontmatter.fallbackModels),
+			thinking: frontmatter.thinking || undefined,
+			tools: parseCsv(frontmatter.tools),
+			extensions: frontmatter.extensions === "" ? [] : parseCsv(frontmatter.extensions),
+			skills: parseCsv(frontmatter.skills ?? frontmatter.skill),
+			systemPromptMode: frontmatter.systemPromptMode === "append" ? "append" : "replace",
+			inheritProjectContext: frontmatter.inheritProjectContext === "true",
+			inheritSkills: frontmatter.inheritSkills === "true",
+			memory: parseMemory(frontmatter.memory),
+			disabled: frontmatter.disabled === "true" || frontmatter.enabled === "false",
+			routing: triggers || useWhen || avoidWhen || cost || category ? { triggers, useWhen, avoidWhen, cost, category } : undefined,
+		};
+	} catch {
+		return undefined;
+	}
+}
+
+function readAgentDir(dir: string, source: ResourceSource): AgentConfig[] {
+	if (!fs.existsSync(dir)) return [];
+	return fs.readdirSync(dir)
+		.filter((entry) => entry.endsWith(".md") && !entry.endsWith(".team.md") && !entry.endsWith(".workflow.md"))
+		.map((entry) => parseAgentFile(path.join(dir, entry), source))
+		.filter((agent): agent is AgentConfig => agent !== undefined)
+		.sort((a, b) => a.name.localeCompare(b.name));
+}
+
+function applyAgentOverrides(agents: AgentConfig[], cwd: string): AgentConfig[] {
+	const loaded = loadConfig(cwd);
+	const config = loaded.config.agents;
+	const overrides = config?.overrides ?? {};
+	return agents
+		.filter((agent) => !(config?.disableBuiltins && agent.source === "builtin"))
+		.map((agent) => {
+			const overrideEntry = Object.entries(overrides).find(([name]) => name.toLowerCase() === agent.name.toLowerCase());
+			if (!overrideEntry) return agent;
+			const [, override] = overrideEntry;
+			return {
+				...agent,
+				disabled: override.disabled ?? agent.disabled,
+				model: override.model === false ? undefined : override.model ?? agent.model,
+				fallbackModels: override.fallbackModels === false ? undefined : override.fallbackModels ?? agent.fallbackModels,
+				thinking: override.thinking === false ? undefined : override.thinking ?? agent.thinking,
+				tools: override.tools === false ? undefined : override.tools ?? agent.tools,
+				override: { source: "config", path: loaded.path },
+			};
+		});
+}
+
+export function discoverAgents(cwd: string): AgentDiscoveryResult {
+	return {
+		builtin: applyAgentOverrides(readAgentDir(path.join(packageRoot(), "agents"), "builtin"), cwd),
+		user: applyAgentOverrides(readAgentDir(path.join(userPiRoot(), "agents"), "user"), cwd),
+		project: applyAgentOverrides(readAgentDir(path.join(projectCrewRoot(cwd), "agents"), "project"), cwd),
+	};
+}
+
+export function allAgents(discovery: AgentDiscoveryResult): AgentConfig[] {
+	const byName = new Map<string, AgentConfig>();
+	for (const agent of [...discovery.builtin, ...discovery.user, ...discovery.project]) {
+		byName.set(agent.name.toLowerCase(), agent);
+	}
+	return [...byName.values()].filter((agent) => !agent.disabled).sort((a, b) => a.name.localeCompare(b.name));
+}

package/src/config/config.ts

@@ -4,6 +4,7 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { PiTeamsAutonomyProfileSchema, PiTeamsConfigSchema } from "../schema/config-schema.ts";
+import { projectCrewRoot } from "../utils/paths.ts";
 
 export type PiTeamsAutonomyProfile = "manual" | "suggested" | "assisted" | "aggressive";
 
@@ -80,6 +81,16 @@ export interface CrewAgentsConfig {
 	overrides?: Record<string, AgentOverrideConfig>;
 }
 
+export interface CrewToolsConfig {
+	enableClaudeStyleAliases?: boolean;
+	enableSteer?: boolean;
+	terminateOnForeground?: boolean;
+}
+
+export interface CrewTelemetryConfig {
+	enabled?: boolean;
+}
+
 export interface PiTeamsConfig {
 	asyncByDefault?: boolean;
 	executeWorkers?: boolean;
@@ -91,6 +102,8 @@ export interface PiTeamsConfig {
 	control?: CrewControlConfig;
 	worktree?: CrewWorktreeConfig;
 	agents?: CrewAgentsConfig;
+	tools?: CrewToolsConfig;
+	telemetry?: CrewTelemetryConfig;
 	ui?: CrewUiConfig;
 }
 
@@ -124,7 +137,7 @@ export function configPath(): string {
 }
 
 export function projectConfigPath(cwd: string): string {
-	return path.join(cwd, ".pi", "teams", "config.json");
+	return path.join(projectCrewRoot(cwd), "config.json");
 }
 
 function withoutUndefined<T extends Record<string, unknown>>(value: T): Partial<T> {

package/src/config/defaults.ts

@@ -38,10 +38,11 @@ export const DEFAULT_ARTIFACT_CLEANUP = {
 
 export const DEFAULT_PATHS = {
 	state: {
-		projectBase: "teams",
-		userBase: "runs",
 		runsSubdir: "state/runs",
 		artifactsSubdir: "artifacts",
+		subagentsSubdir: "state/subagents",
+		importsSubdir: "imports",
+		worktreesSubdir: "worktrees",
 		manifestFile: "manifest.json",
 		tasksFile: "tasks.json",
 		eventsFile: "events.jsonl",

package/src/extension/cross-extension-rpc.ts

@@ -1,82 +1,82 @@
-import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
-import type { TeamToolParamsValue } from "../schema/team-tool-schema.ts";
-import { handleTeamTool } from "./team-tool.ts";
-import { parseLiveControlRealtimeMessage, publishLiveControlRealtime } from "../runtime/live-control-realtime.ts";
-
-export interface EventBusLike {
-	on(event: string, handler: (data: unknown) => void): (() => void) | void;
-	emit(event: string, data: unknown): void;
-}
-
-export type RpcReply<T = unknown> = { success: true; data?: T } | { success: false; error: string };
-export const PI_CREW_RPC_VERSION = 1;
-
-export interface PiCrewRpcHandle {
-	unsubscribe(): void;
-}
-
-function requestId(raw: unknown): string | undefined {
-	return raw && typeof raw === "object" && !Array.isArray(raw) && typeof (raw as { requestId?: unknown }).requestId === "string" ? (raw as { requestId: string }).requestId : undefined;
-}
-
-function reply(events: EventBusLike, channel: string, id: string | undefined, payload: RpcReply): void {
-	if (!id) return;
-	events.emit(`${channel}:reply:${id}`, payload);
-}
-
-function textOf(result: Awaited<ReturnType<typeof handleTeamTool>>): string {
-	return result.content?.map((item) => item.type === "text" ? item.text : "").join("\n") ?? "";
-}
-
-function on(events: EventBusLike, channel: string, handler: (raw: unknown) => void): () => void {
-	const unsub = events.on(channel, handler);
-	return typeof unsub === "function" ? unsub : () => {};
-}
-
-export function registerPiCrewRpc(events: EventBusLike | undefined, getCtx: () => ExtensionContext | undefined): PiCrewRpcHandle | undefined {
-	if (!events) return undefined;
-	const unsubs = [
-		on(events, "pi-crew:rpc:ping", (raw) => reply(events, "pi-crew:rpc:ping", requestId(raw), { success: true, data: { version: PI_CREW_RPC_VERSION } })),
-		on(events, "pi-crew:rpc:run", async (raw) => {
-			const id = requestId(raw);
-			try {
-				const ctx = getCtx();
-				if (!ctx) throw new Error("No active pi-crew session context.");
-				const params: TeamToolParamsValue = raw && typeof raw === "object" && !Array.isArray(raw) ? { ...(raw as object), action: "run" } as TeamToolParamsValue : { action: "run" };
-				const result = await handleTeamTool(params, ctx);
-				reply(events, "pi-crew:rpc:run", id, result.isError ? { success: false, error: textOf(result) } : { success: true, data: result.details });
-			} catch (error) {
-				reply(events, "pi-crew:rpc:run", id, { success: false, error: error instanceof Error ? error.message : String(error) });
-			}
-		}),
-		on(events, "pi-crew:rpc:status", async (raw) => {
-			const id = requestId(raw);
-			try {
-				const ctx = getCtx();
-				if (!ctx) throw new Error("No active pi-crew session context.");
-				const runId = raw && typeof raw === "object" && !Array.isArray(raw) ? (raw as { runId?: string }).runId : undefined;
-				const result = await handleTeamTool({ action: "status", runId }, ctx);
-				reply(events, "pi-crew:rpc:status", id, result.isError ? { success: false, error: textOf(result) } : { success: true, data: { text: textOf(result), details: result.details } });
-			} catch (error) {
-				reply(events, "pi-crew:rpc:status", id, { success: false, error: error instanceof Error ? error.message : String(error) });
-			}
-		}),
-		on(events, "pi-crew:live-control", (raw) => {
-			const request = parseLiveControlRealtimeMessage(raw);
-			if (request) publishLiveControlRealtime(request);
-		}),
-		on(events, "pi-crew:rpc:live-control", async (raw) => {
-			const id = requestId(raw);
-			try {
-				const ctx = getCtx();
-				if (!ctx) throw new Error("No active pi-crew session context.");
-				const obj = raw && typeof raw === "object" && !Array.isArray(raw) ? raw as Record<string, unknown> : {};
-				const result = await handleTeamTool({ action: "api", runId: typeof obj.runId === "string" ? obj.runId : undefined, config: { operation: typeof obj.operation === "string" ? obj.operation : "steer-agent", agentId: obj.agentId, message: obj.message, prompt: obj.prompt } }, ctx);
-				reply(events, "pi-crew:rpc:live-control", id, result.isError ? { success: false, error: textOf(result) } : { success: true, data: { text: textOf(result), details: result.details } });
-			} catch (error) {
-				reply(events, "pi-crew:rpc:live-control", id, { success: false, error: error instanceof Error ? error.message : String(error) });
-			}
-		}),
-	];
-	return { unsubscribe: () => unsubs.forEach((unsub) => unsub()) };
-}
+import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { TeamToolParamsValue } from "../schema/team-tool-schema.ts";
+import { handleTeamTool } from "./team-tool.ts";
+import { parseLiveControlRealtimeMessage, publishLiveControlRealtime } from "../runtime/live-control-realtime.ts";
+
+export interface EventBusLike {
+	on(event: string, handler: (data: unknown) => void): (() => void) | void;
+	emit(event: string, data: unknown): void;
+}
+
+export type RpcReply<T = unknown> = { success: true; data?: T } | { success: false; error: string };
+export const PI_CREW_RPC_VERSION = 1;
+
+export interface PiCrewRpcHandle {
+	unsubscribe(): void;
+}
+
+function requestId(raw: unknown): string | undefined {
+	return raw && typeof raw === "object" && !Array.isArray(raw) && typeof (raw as { requestId?: unknown }).requestId === "string" ? (raw as { requestId: string }).requestId : undefined;
+}
+
+function reply(events: EventBusLike, channel: string, id: string | undefined, payload: RpcReply): void {
+	if (!id) return;
+	events.emit(`${channel}:reply:${id}`, payload);
+}
+
+function textOf(result: Awaited<ReturnType<typeof handleTeamTool>>): string {
+	return result.content?.map((item) => item.type === "text" ? item.text : "").join("\n") ?? "";
+}
+
+function on(events: EventBusLike, channel: string, handler: (raw: unknown) => void): () => void {
+	const unsub = events.on(channel, handler);
+	return typeof unsub === "function" ? unsub : () => {};
+}
+
+export function registerPiCrewRpc(events: EventBusLike | undefined, getCtx: () => ExtensionContext | undefined): PiCrewRpcHandle | undefined {
+	if (!events) return undefined;
+	const unsubs = [
+		on(events, "pi-crew:rpc:ping", (raw) => reply(events, "pi-crew:rpc:ping", requestId(raw), { success: true, data: { version: PI_CREW_RPC_VERSION } })),
+		on(events, "pi-crew:rpc:run", async (raw) => {
+			const id = requestId(raw);
+			try {
+				const ctx = getCtx();
+				if (!ctx) throw new Error("No active pi-crew session context.");
+				const params: TeamToolParamsValue = raw && typeof raw === "object" && !Array.isArray(raw) ? { ...(raw as object), action: "run" } as TeamToolParamsValue : { action: "run" };
+				const result = await handleTeamTool(params, ctx);
+				reply(events, "pi-crew:rpc:run", id, result.isError ? { success: false, error: textOf(result) } : { success: true, data: result.details });
+			} catch (error) {
+				reply(events, "pi-crew:rpc:run", id, { success: false, error: error instanceof Error ? error.message : String(error) });
+			}
+		}),
+		on(events, "pi-crew:rpc:status", async (raw) => {
+			const id = requestId(raw);
+			try {
+				const ctx = getCtx();
+				if (!ctx) throw new Error("No active pi-crew session context.");
+				const runId = raw && typeof raw === "object" && !Array.isArray(raw) ? (raw as { runId?: string }).runId : undefined;
+				const result = await handleTeamTool({ action: "status", runId }, ctx);
+				reply(events, "pi-crew:rpc:status", id, result.isError ? { success: false, error: textOf(result) } : { success: true, data: { text: textOf(result), details: result.details } });
+			} catch (error) {
+				reply(events, "pi-crew:rpc:status", id, { success: false, error: error instanceof Error ? error.message : String(error) });
+			}
+		}),
+		on(events, "pi-crew:live-control", (raw) => {
+			const request = parseLiveControlRealtimeMessage(raw);
+			if (request) publishLiveControlRealtime(request);
+		}),
+		on(events, "pi-crew:rpc:live-control", async (raw) => {
+			const id = requestId(raw);
+			try {
+				const ctx = getCtx();
+				if (!ctx) throw new Error("No active pi-crew session context.");
+				const obj = raw && typeof raw === "object" && !Array.isArray(raw) ? raw as Record<string, unknown> : {};
+				const result = await handleTeamTool({ action: "api", runId: typeof obj.runId === "string" ? obj.runId : undefined, config: { operation: typeof obj.operation === "string" ? obj.operation : "steer-agent", agentId: obj.agentId, message: obj.message, prompt: obj.prompt } }, ctx);
+				reply(events, "pi-crew:rpc:live-control", id, result.isError ? { success: false, error: textOf(result) } : { success: true, data: { text: textOf(result), details: result.details } });
+			} catch (error) {
+				reply(events, "pi-crew:rpc:live-control", id, { success: false, error: error instanceof Error ? error.message : String(error) });
+			}
+		}),
+	];
+	return { unsubscribe: () => unsubs.forEach((unsub) => unsub()) };
+}

package/src/extension/import-index.ts

@@ -1,6 +1,7 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { projectPiRoot, userPiRoot } from "../utils/paths.ts";
+import { projectCrewRoot, userCrewRoot } from "../utils/paths.ts";
+import { DEFAULT_PATHS } from "../config/defaults.ts";
 
 export interface ImportedRunIndexEntry {
 	runId: string;
@@ -45,8 +46,8 @@ function collect(root: string, scope: "project" | "user"): ImportedRunIndexEntry
 }
 
 export function listImportedRuns(cwd: string): ImportedRunIndexEntry[] {
-	const projectRoot = path.join(projectPiRoot(cwd), "teams", "imports");
-	const userRoot = path.join(userPiRoot(), "extensions", "pi-crew", "imports");
+	const projectRoot = path.join(projectCrewRoot(cwd), DEFAULT_PATHS.state.importsSubdir);
+	const userRoot = path.join(userCrewRoot(), DEFAULT_PATHS.state.importsSubdir);
 	return [...collect(userRoot, "user"), ...collect(projectRoot, "project")]
 		.sort((a, b) => (b.importedAt ?? "").localeCompare(a.importedAt ?? ""));
 }

package/src/extension/management.ts

@@ -12,7 +12,7 @@ import { allTeams, discoverTeams } from "../teams/discover-teams.ts";
 import type { WorkflowConfig, WorkflowStep } from "../workflows/workflow-config.ts";
 import { serializeWorkflow } from "../workflows/workflow-serializer.ts";
 import { allWorkflows, discoverWorkflows } from "../workflows/discover-workflows.ts";
-import { projectPiRoot, userPiRoot } from "../utils/paths.ts";
+import { projectCrewRoot, userPiRoot } from "../utils/paths.ts";
 import { hasOwn, parseConfigObject, requireString, sanitizeName } from "../utils/names.ts";
 
 interface ManagementContext {
@@ -28,7 +28,7 @@ function result(text: string, status: TeamToolDetails["status"] = "ok", isError
 }
 
 function scopeDir(ctx: ManagementContext, resource: "agent" | "team" | "workflow", scope: MutableSource): string {
-	const base = scope === "user" ? userPiRoot() : projectPiRoot(ctx.cwd);
+	const base = scope === "user" ? userPiRoot() : projectCrewRoot(ctx.cwd);
 	if (resource === "agent") return path.join(base, "agents");
 	if (resource === "team") return path.join(base, "teams");
 	return path.join(base, "workflows");

package/src/extension/project-init.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { packageRoot } from "../utils/paths.ts";
+import { packageRoot, projectCrewRoot } from "../utils/paths.ts";
 
 export interface ProjectInitOptions {
 	copyBuiltins?: boolean;
@@ -44,14 +44,16 @@ export function initializeProject(cwd: string, options: ProjectInitOptions = {})
 	const createdDirs: string[] = [];
 	const copiedFiles: string[] = [];
 	const skippedFiles: string[] = [];
-	const piRoot = path.join(cwd, ".pi");
-	const agentsDir = path.join(piRoot, "agents");
-	const teamsDir = path.join(piRoot, "teams");
-	const workflowsDir = path.join(piRoot, "workflows");
+	const crewRoot = projectCrewRoot(cwd);
+	const usingLegacyPi = path.basename(crewRoot) === "teams" && path.basename(path.dirname(crewRoot)) === ".pi";
+	const ignorePrefix = usingLegacyPi ? ".pi/teams" : ".crew";
+	const agentsDir = path.join(crewRoot, "agents");
+	const teamsDir = path.join(crewRoot, "teams");
+	const workflowsDir = path.join(crewRoot, "workflows");
 	ensureDir(agentsDir, createdDirs);
 	ensureDir(teamsDir, createdDirs);
 	ensureDir(workflowsDir, createdDirs);
-	ensureDir(path.join(piRoot, "teams", "imports"), createdDirs);
+	ensureDir(path.join(crewRoot, "imports"), createdDirs);
 
 	if (options.copyBuiltins) {
 		copyBuiltinDir("agents", agentsDir, options.overwrite === true, copiedFiles, skippedFiles);
@@ -60,7 +62,7 @@ export function initializeProject(cwd: string, options: ProjectInitOptions = {})
 	}
 
 	const gitignorePath = path.join(cwd, ".gitignore");
-	const desired = [".pi/teams/state/", ".pi/teams/artifacts/", ".pi/teams/worktrees/", ".pi/teams/imports/"];
+	const desired = [`${ignorePrefix}/state/`, `${ignorePrefix}/artifacts/`, `${ignorePrefix}/worktrees/`, `${ignorePrefix}/imports/`];
 	const existing = fs.existsSync(gitignorePath) ? fs.readFileSync(gitignorePath, "utf-8") : "";
 	const missing = desired.filter((entry) => !existing.split(/\r?\n/).includes(entry));
 	let gitignoreUpdated = false;

package/src/extension/register.ts

@@ -19,6 +19,7 @@ import { registerTeamCommands } from "./registration/commands.ts";
 import { registerSubagentTools } from "./registration/subagent-tools.ts";
 import { runArtifactCleanup } from "./registration/artifact-cleanup.ts";
 import { registerTeamTool } from "./registration/team-tool.ts";
+import { registerCompactionGuard } from "./registration/compaction-guard.ts";
 
 export { __test__subagentSpawnParams };
 
@@ -47,10 +48,24 @@ export function registerPiTeams(pi: ExtensionAPI): void {
 		manifestCache = createManifestCache(cwd);
 		return manifestCache;
 	};
+	const telemetryEnabled = (): boolean => loadConfig(currentCtx?.cwd ?? process.cwd()).config.telemetry?.enabled !== false;
 	const widgetState: CrewWidgetState = { frame: 0 };
 	const subagentManager = new SubagentManager(
 		4,
 		(record) => {
+			// Phase 1.3 + 1.6: Emit public crew.subagent.completed event with telemetry.
+			// Users can opt out with config.telemetry.enabled=false.
+			if (telemetryEnabled()) {
+				pi.events?.emit?.("crew.subagent.completed", {
+					id: record.id,
+					runId: record.runId,
+					type: record.type,
+					status: record.status,
+					turnCount: record.turnCount,
+					terminated: record.terminated ?? false,
+					durationMs: record.durationMs,
+				});
+			}
 			if (!record.background || record.resultConsumed) return;
 			if (record.status === "completed" || record.status === "failed" || record.status === "cancelled" || record.status === "blocked" || record.status === "error") {
 				sendFollowUp(pi, [`pi-crew subagent ${record.id} ${record.status}.`, record.runId ? `Run: ${record.runId}` : undefined, `Use get_subagent_result with agent_id=${record.id} for output.`].filter((line): line is string => Boolean(line)).join("\n"));
@@ -108,6 +123,10 @@ export function registerPiTeams(pi: ExtensionAPI): void {
 	const startForegroundRun = (ctx: ExtensionContext, runner: (signal?: AbortSignal) => Promise<void>, runId?: string): void => {
 		const controller = new AbortController();
 		foregroundControllers.add(controller);
+		if (ctx.hasUI) {
+			(ctx.ui as { setWorkingIndicator?: (options?: { frames?: string[]; intervalMs?: number }) => void }).setWorkingIndicator?.({ frames: ["⣾", "⣽", "⣻", "⢿", "⡿", "⣟", "⣯", "⣷"], intervalMs: 80 });
+			ctx.ui.setWorkingMessage(runId ? `pi-crew foreground run ${runId}...` : "pi-crew foreground run...");
+		}
 		setImmediate(() => {
 			void runner(controller.signal)
 				.catch((error) => {
@@ -124,11 +143,37 @@ export function registerPiTeams(pi: ExtensionAPI): void {
 				})
 				.finally(() => {
 					foregroundControllers.delete(controller);
+					if (ctx.hasUI) {
+						(ctx.ui as { setWorkingIndicator?: (options?: { frames?: string[]; intervalMs?: number }) => void }).setWorkingIndicator?.();
+						ctx.ui.setWorkingMessage();
+					}
 					if (runId) {
 						const loaded = loadRunManifestById(ctx.cwd, runId);
 						const status = loaded?.manifest.status ?? "finished";
 						const level = status === "failed" || status === "blocked" ? "error" : status === "cancelled" ? "warning" : "info";
 						ctx.ui.notify(`pi-crew run ${runId} ${status}. Use /team-summary ${runId} or /team-status ${runId}.`, level as "info" | "warning" | "error");
+						// Phase 2.3: Persist run completion reference into the Pi session.
+						pi.appendEntry("crew:run-completed", {
+							runId,
+							team: loaded?.manifest.team,
+							workflow: loaded?.manifest.workflow,
+							goal: loaded?.manifest.goal,
+							status,
+							taskCount: loaded?.tasks.length,
+							timestamp: Date.now(),
+						});
+						// Phase 1.3: Emit public crew.run.* events
+						const eventType = status === "completed" ? "crew.run.completed" : status === "failed" || status === "blocked" ? "crew.run.failed" : status === "cancelled" ? "crew.run.cancelled" : undefined;
+						if (eventType) {
+							pi.events?.emit?.(eventType, {
+								runId,
+								team: loaded?.manifest.team,
+								workflow: loaded?.manifest.workflow,
+								status,
+								taskCount: loaded?.tasks.length,
+								goal: loaded?.manifest.goal,
+							});
+						}
 					}
 					if (currentCtx) {
 						const config = loadConfig(currentCtx.cwd).config.ui;
@@ -189,6 +234,24 @@ export function registerPiTeams(pi: ExtensionAPI): void {
 	pi.on("session_before_switch", () => stopSessionBoundSubagents());
 	pi.on("session_shutdown", () => cleanupRuntime());
 
+	registerCompactionGuard(pi, { foregroundControllers });
+
+	// Phase 1.4: Permission gate for destructive team actions.
+	// AGENTS.md requires confirm=true for management deletes.
+	pi.on("tool_call", async (event, ctx) => {
+		if (event.toolName !== "team") return;
+		const input = (event as { input?: Record<string, unknown> }).input;
+		if (!input) return;
+		const action = typeof input.action === "string" ? input.action : undefined;
+		const destructiveActions = new Set(["delete", "forget", "prune", "cleanup"]);
+		if (!action || !destructiveActions.has(action)) return;
+		if (input.confirm === true || input.force === true) return;
+		return {
+			block: true,
+			reason: `Destructive action '${action}' requires confirm=true (or force=true to bypass reference checks).`,
+		};
+	});
+
 	registerTeamTool(pi, { foregroundControllers, startForegroundRun, openLiveSidebar, getManifestCache, widgetState });
 	registerSubagentTools(pi, subagentManager);
 	time("register.tools");

package/src/extension/registration/artifact-cleanup.ts

@@ -1,14 +1,15 @@
-import * as path from "node:path";
-import { DEFAULT_ARTIFACT_CLEANUP } from "../../config/defaults.ts";
-import { CLEANUP_MARKER_FILE, cleanupOldArtifacts } from "../../state/artifact-store.ts";
-import { logInternalError } from "../../utils/internal-error.ts";
-import { projectPiRoot, userPiRoot } from "../../utils/paths.ts";
-
-export function runArtifactCleanup(cwd: string): void {
-	try {
-		cleanupOldArtifacts(path.join(userPiRoot(), "extensions", "pi-crew", "artifacts"), { maxAgeDays: DEFAULT_ARTIFACT_CLEANUP.maxAgeDays, markerFile: CLEANUP_MARKER_FILE });
-		cleanupOldArtifacts(path.join(projectPiRoot(cwd), "artifacts"), { maxAgeDays: DEFAULT_ARTIFACT_CLEANUP.maxAgeDays, markerFile: CLEANUP_MARKER_FILE });
-	} catch (error) {
-		logInternalError("register.artifact-cleanup", error, `cwd=${cwd}`);
-	}
-}
+import * as path from "node:path";
+import { DEFAULT_ARTIFACT_CLEANUP } from "../../config/defaults.ts";
+import { CLEANUP_MARKER_FILE, cleanupOldArtifacts } from "../../state/artifact-store.ts";
+import { logInternalError } from "../../utils/internal-error.ts";
+import { projectCrewRoot, userCrewRoot } from "../../utils/paths.ts";
+import { DEFAULT_PATHS } from "../../config/defaults.ts";
+
+export function runArtifactCleanup(cwd: string): void {
+	try {
+		cleanupOldArtifacts(path.join(userCrewRoot(), DEFAULT_PATHS.state.artifactsSubdir), { maxAgeDays: DEFAULT_ARTIFACT_CLEANUP.maxAgeDays, markerFile: CLEANUP_MARKER_FILE });
+		cleanupOldArtifacts(path.join(projectCrewRoot(cwd), DEFAULT_PATHS.state.artifactsSubdir), { maxAgeDays: DEFAULT_ARTIFACT_CLEANUP.maxAgeDays, markerFile: CLEANUP_MARKER_FILE });
+	} catch (error) {
+		logInternalError("register.artifact-cleanup", error, `cwd=${cwd}`);
+	}
+}