@oh-my-pi/pi-coding-agent 7.0.0 → 8.0.1

package/src/{core/system-prompt.ts → system-prompt.ts}

@@ -7,14 +7,14 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import { $ } from "bun";
 import chalk from "chalk";
-import { contextFileCapability } from "../capability/context-file";
-import { systemPromptCapability } from "../capability/system-prompt";
-import { type ContextFile, loadCapability, type SystemPrompt as SystemPromptFile } from "../discovery/index";
-import customSystemPromptTemplate from "../prompts/system/custom-system-prompt.md" with { type: "text" };
-import systemPromptTemplate from "../prompts/system/system-prompt.md" with { type: "text" };
-import { renderPromptTemplate } from "./prompt-templates";
-import type { SkillsSettings } from "./settings-manager";
-import { loadSkills, type Skill } from "./skills";
+import { contextFileCapability } from "$c/capability/context-file";
+import { systemPromptCapability } from "$c/capability/system-prompt";
+import { renderPromptTemplate } from "$c/config/prompt-templates";
+import type { SkillsSettings } from "$c/config/settings-manager";
+import { type ContextFile, loadCapability, type SystemPrompt as SystemPromptFile } from "$c/discovery/index";
+import { loadSkills, type Skill } from "$c/extensibility/skills";
+import customSystemPromptTemplate from "$c/prompts/system/custom-system-prompt.md" with { type: "text" };
+import systemPromptTemplate from "$c/prompts/system/system-prompt.md" with { type: "text" };
 import type { ToolName } from "./tools/index";
 
 interface GitContext {
@@ -68,29 +68,6 @@ export async function loadGitContext(cwd: string): Promise<GitContext | null> {
 	};
 }
 
-/** Tool descriptions for system prompt */
-const toolDescriptions: Record<ToolName, string> = {
-	ask: "Ask user for input or clarification",
-	read: "Read file contents",
-	bash: "Execute bash commands (npm, docker, etc.)",
-	python: "Execute Python code via a session-backed IPython kernel",
-	calc: "{ calculations: array of { expression: string, prefix: string, suffix: string } } Basic calculations.",
-	ssh: "Execute commands on remote hosts via SSH",
-	edit: "Make surgical edits to files (find exact text and replace)",
-	write: "Create or overwrite files",
-	grep: "Search file contents for patterns (respects .gitignore)",
-	find: "Find files by glob pattern (respects .gitignore)",
-	git: "Structured Git operations with safety guards (status, diff, log, commit, push, pr, etc.)",
-	ls: "List directory contents",
-	lsp: "PREFERRED for semantic code queries: go-to-definition, find-all-references, hover (type info), call hierarchy. Returns precise, deterministic results. Use BEFORE grep for symbol lookups.",
-	notebook: "Edit Jupyter notebook cells",
-	output: "Output structured data to the user (bypasses tool result formatting)",
-	task: "Spawn a sub-agent to handle complex tasks",
-	web_fetch: "Fetch and render URLs into clean text for LLM consumption",
-	web_search: "Search the web for information",
-	report_finding: "Report a finding during code review",
-};
-
 function firstNonEmpty(values: Array<string | undefined | null>): string | null {
 	for (const value of values) {
 		const trimmed = value?.trim();
@@ -726,10 +703,6 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		// Use defaults
 		toolNamesArray = defaultToolNames;
 	}
-	const toolDescriptionsArray = toolNamesArray.map((name) => ({
-		name,
-		description: toolDescriptions[name as ToolName] ?? "",
-	}));
 
 	// Resolve skills: use provided or discover
 	const skills =
@@ -750,7 +723,6 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 			appendPrompt: resolvedAppendPrompt ?? "",
 			contextFiles,
 			agentsMdSearch,
-			toolDescriptions: toolDescriptionsArray,
 			git,
 			skills: filteredSkills,
 			rules: rules ?? [],
@@ -761,7 +733,6 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 
 	return renderPromptTemplate(systemPromptTemplate, {
 		tools: toolNamesArray,
-		toolDescriptions: toolDescriptionsArray,
 		environment: await getEnvironmentInfo(),
 		systemPromptCustomization: systemPromptCustomization ?? "",
 		contextFiles,

package/src/{core/tools/task → task}/agents.ts

@@ -4,15 +4,15 @@
  * Agents are embedded at build time via Bun's import with { type: "text" }.
  */
 
-import { parseFrontmatter } from "../../../core/frontmatter";
-import { parseAgentFields } from "../../../discovery/helpers";
-import exploreMd from "../../../prompts/agents/explore.md" with { type: "text" };
+import { renderPromptTemplate } from "$c/config/prompt-templates";
+import { parseAgentFields } from "$c/discovery/helpers";
+import exploreMd from "$c/prompts/agents/explore.md" with { type: "text" };
 // Embed agent markdown files at build time
-import agentFrontmatterTemplate from "../../../prompts/agents/frontmatter.md" with { type: "text" };
-import planMd from "../../../prompts/agents/plan.md" with { type: "text" };
-import reviewerMd from "../../../prompts/agents/reviewer.md" with { type: "text" };
-import taskMd from "../../../prompts/agents/task.md" with { type: "text" };
-import { renderPromptTemplate } from "../../prompt-templates";
+import agentFrontmatterTemplate from "$c/prompts/agents/frontmatter.md" with { type: "text" };
+import planMd from "$c/prompts/agents/plan.md" with { type: "text" };
+import reviewerMd from "$c/prompts/agents/reviewer.md" with { type: "text" };
+import taskMd from "$c/prompts/agents/task.md" with { type: "text" };
+import { parseFrontmatter } from "$c/utils/frontmatter";
 import type { AgentDefinition, AgentSource } from "./types";
 
 interface AgentFrontmatter {

package/src/{core/tools/task → task}/commands.ts

@@ -5,13 +5,12 @@
  */
 
 import * as path from "node:path";
-import { type SlashCommand, slashCommandCapability } from "../../../capability/slash-command";
-import { parseFrontmatter } from "../../../core/frontmatter";
-import { loadCapability } from "../../../discovery";
-
+import { type SlashCommand, slashCommandCapability } from "$c/capability/slash-command";
+import { renderPromptTemplate } from "$c/config/prompt-templates";
+import { loadCapability } from "$c/discovery";
 // Embed command markdown files at build time
-import initMd from "../../../prompts/agents/init.md" with { type: "text" };
-import { renderPromptTemplate } from "../../prompt-templates";
+import initMd from "$c/prompts/agents/init.md" with { type: "text" };
+import { parseFrontmatter } from "$c/utils/frontmatter";
 
 const EMBEDDED_COMMANDS: { name: string; content: string }[] = [
 	{ name: "init.md", content: renderPromptTemplate(initMd) },

package/src/{core/tools/task → task}/discovery.ts

@@ -14,9 +14,9 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { findAllNearestProjectConfigDirs, getConfigDirs } from "../../../config";
-import { parseFrontmatter } from "../../../core/frontmatter";
-import { parseAgentFields } from "../../../discovery/helpers";
+import { findAllNearestProjectConfigDirs, getConfigDirs } from "$c/config";
+import { parseAgentFields } from "$c/discovery/helpers";
+import { parseFrontmatter } from "$c/utils/frontmatter";
 import { loadBundledAgents } from "./agents";
 import type { AgentDefinition, AgentSource } from "./types";
 

package/src/{core/tools/task → task}/executor.ts

@@ -6,17 +6,17 @@
 
 import path from "node:path";
 import type { AgentEvent, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import type { AuthStorage } from "../../auth-storage";
-import type { EventBus } from "../../event-bus";
-import { callTool } from "../../mcp/client";
-import type { MCPManager } from "../../mcp/manager";
-import type { ModelRegistry } from "../../model-registry";
-import { formatModelString, parseModelPattern } from "../../model-resolver";
-import { checkPythonKernelAvailability } from "../../python-kernel";
+import type { ModelRegistry } from "$c/config/model-registry";
+import { formatModelString, parseModelPattern } from "$c/config/model-resolver";
+import { checkPythonKernelAvailability } from "$c/ipy/kernel";
+import { LspTool } from "$c/lsp/index";
+import type { LspParams } from "$c/lsp/types";
+import { callTool } from "$c/mcp/client";
+import type { MCPManager } from "$c/mcp/manager";
+import type { AuthStorage } from "$c/session/auth-storage";
+import { PythonTool, type PythonToolParams } from "$c/tools/python";
+import type { EventBus } from "$c/utils/event-bus";
 import type { ToolSession } from "..";
-import { LspTool } from "../lsp/index";
-import type { LspParams } from "../lsp/types";
-import { PythonTool, type PythonToolParams } from "../python";
 import { subprocessToolRegistry } from "./subprocess-tool-registry";
 import {
 	type AgentDefinition,
@@ -41,11 +41,12 @@ import type {
 /** Options for worker execution */
 export interface ExecutorOptions {
 	cwd: string;
+	worktree?: string;
 	agent: AgentDefinition;
 	task: string;
 	description?: string;
 	index: number;
-	taskId: string;
+	id: string;
 	context?: string;
 	modelOverride?: string;
 	thinkingLevel?: ThinkingLevel;
@@ -61,7 +62,7 @@ export interface ExecutorOptions {
 	authStorage?: AuthStorage;
 	modelRegistry?: ModelRegistry;
 	settingsManager?: {
-		serialize: () => import("../../settings-manager").Settings;
+		serialize: () => import("$c/config/settings-manager").Settings;
 		getPythonToolMode?: () => "ipy-only" | "bash-only" | "both";
 		getPythonKernelMode?: () => "session" | "per-call";
 		getPythonSharedGateway?: () => boolean;
@@ -162,35 +163,24 @@ function getUsageTokens(usage: unknown): number {
 	return input + output + cacheRead + cacheWrite;
 }
 
-/**
- * Parse MCP tool name to extract server and tool names.
- * Format: mcp_<serverName>_<toolName>
- * Note: Uses lastIndexOf to handle server names with underscores.
- */
-function parseMCPToolName(fullName: string): { serverName: string; toolName: string } | undefined {
-	if (!fullName.startsWith("mcp_")) return undefined;
-	const rest = fullName.slice(4);
-	const underscoreIndex = rest.lastIndexOf("_");
-	if (underscoreIndex === -1) return undefined;
-	return {
-		serverName: rest.slice(0, underscoreIndex),
-		toolName: rest.slice(underscoreIndex + 1),
-	};
-}
-
 /**
  * Extract MCP tool metadata from MCPManager for passing to worker.
+ *
+ * MCPTool and DeferredMCPTool expose mcpToolName (original MCP tool name)
+ * and mcpServerName properties. We use these directly when available,
+ * falling back to empty strings if not.
  */
 function extractMCPToolMetadata(mcpManager: MCPManager): MCPToolMetadata[] {
 	return mcpManager.getTools().map((tool) => {
-		const parsed = parseMCPToolName(tool.name);
+		// MCPTool and DeferredMCPTool have these properties
+		const mcpTool = tool as { mcpToolName?: string; mcpServerName?: string };
 		return {
 			name: tool.name,
 			label: tool.label ?? tool.name,
 			description: tool.description ?? "",
 			parameters: tool.parameters,
-			serverName: parsed?.serverName ?? "",
-			mcpToolName: parsed?.toolName ?? "",
+			serverName: mcpTool.mcpServerName ?? "",
+			mcpToolName: mcpTool.mcpToolName ?? "",
 		};
 	});
 }
@@ -204,7 +194,8 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 		agent,
 		task,
 		index,
-		taskId,
+		id,
+		worktree,
 		context,
 		modelOverride,
 		thinkingLevel,
@@ -218,7 +209,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 	// Initialize progress
 	const progress: AgentProgress = {
 		index,
-		taskId,
+		id,
 		agent: agent.name,
 		agentSource: agent.source,
 		status: "running",
@@ -236,7 +227,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 	if (signal?.aborted) {
 		return {
 			index,
-			taskId,
+			id,
 			agent: agent.name,
 			agentSource: agent.source,
 			task,
@@ -258,7 +249,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 	// Set up artifact paths and write input file upfront if artifacts dir provided
 	let subtaskSessionFile: string | undefined;
 	if (options.artifactsDir) {
-		subtaskSessionFile = path.join(options.artifactsDir, `${taskId}.jsonl`);
+		subtaskSessionFile = path.join(options.artifactsDir, `${id}.jsonl`);
 	}
 
 	// Add tools if specified
@@ -324,7 +315,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 	} catch (err) {
 		return {
 			index,
-			taskId,
+			id,
 			agent: agent.name,
 			agentSource: agent.source,
 			task,
@@ -385,7 +376,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 		return AbortSignal.timeout(timeoutMs);
 	};
 
-	const pythonSessionFile = sessionFile ?? `subtask:${taskId}`;
+	const pythonSessionFile = sessionFile ?? `subtask:${id}`;
 	const pythonToolSession: ToolSession = {
 		cwd,
 		hasUI: false,
@@ -689,6 +680,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 		type: "start",
 		payload: {
 			cwd,
+			worktree,
 			task: fullTask,
 			systemPrompt: agent.systemPrompt,
 			model: resolvedModel,
@@ -743,12 +735,10 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 				return;
 			}
 			try {
-				const parsed = parseMCPToolName(request.toolName);
-				if (!parsed) throw new Error(`Invalid MCP tool name: ${request.toolName}`);
 				const result = await withTimeout(
 					(async () => {
-						const connection = await mcpManager.waitForConnection(parsed.serverName);
-						return callTool(connection, parsed.toolName, request.params);
+						const connection = await mcpManager.waitForConnection(request.serverName);
+						return callTool(connection, request.mcpToolName, request.params);
 					})(),
 					request.timeoutMs,
 				);
@@ -1025,11 +1015,11 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 	const { text: truncatedOutput, truncated } = truncateOutput(rawOutput);
 
 	// Write output artifact (input and jsonl already written in real-time)
-	// Compute output metadata for Output tool integration
+	// Compute output metadata for agent:// URL integration
 	let outputMeta: { lineCount: number; charCount: number } | undefined;
 	let outputPath: string | undefined;
 	if (options.artifactsDir) {
-		outputPath = path.join(options.artifactsDir, `${taskId}.md`);
+		outputPath = path.join(options.artifactsDir, `${id}.md`);
 		try {
 			await Bun.write(outputPath, rawOutput);
 			outputMeta = {
@@ -1048,7 +1038,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 
 	return {
 		index,
-		taskId,
+		id,
 		agent: agent.name,
 		agentSource: agent.source,
 		task,