@oh-my-pi/pi-coding-agent 6.9.69 → 8.0.0

package/src/{core → extensibility}/hooks/runner.ts

@@ -4,9 +4,9 @@
 
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { Model } from "@oh-my-pi/pi-ai";
-import { theme } from "../../modes/interactive/theme/theme";
-import type { ModelRegistry } from "../model-registry";
-import type { SessionManager } from "../session-manager";
+import type { ModelRegistry } from "$c/config/model-registry";
+import { theme } from "$c/modes/theme/theme";
+import type { SessionManager } from "$c/session/session-manager";
 import type {
 	AppendEntryHandler,
 	BranchHandler,
@@ -40,7 +40,7 @@ import type {
 export type HookErrorListener = (error: HookError) => void;
 
 // Re-export execCommand for backward compatibility
-export { execCommand } from "../exec";
+export { execCommand } from "$c/exec/exec";
 
 /** No-op UI context used when no UI is available */
 const noOpUIContext: HookUIContext = {

package/src/{core → extensibility}/hooks/types.ts

@@ -8,23 +8,23 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, Message, Model, TextContent, ToolResultMessage } from "@oh-my-pi/pi-ai";
 import type { Component, TUI } from "@oh-my-pi/pi-tui";
-import type { Theme } from "../../modes/interactive/theme/theme";
-import type { CompactionPreparation, CompactionResult } from "../compaction/index";
-import type { ExecOptions, ExecResult } from "../exec";
-import type { HookMessage } from "../messages";
-import type { ModelRegistry } from "../model-registry";
+import type { ModelRegistry } from "$c/config/model-registry";
+import type { ExecOptions, ExecResult } from "$c/exec/exec";
+import type { Theme } from "$c/modes/theme/theme";
+import type { EditToolDetails } from "$c/patch";
+import type { CompactionPreparation, CompactionResult } from "$c/session/compaction/index";
+import type { HookMessage } from "$c/session/messages";
 import type {
 	BranchSummaryEntry,
 	CompactionEntry,
 	ReadonlySessionManager,
 	SessionEntry,
 	SessionManager,
-} from "../session-manager";
-import type { BashToolDetails, FindToolDetails, GrepToolDetails, LsToolDetails, ReadToolDetails } from "../tools/index";
-import type { EditToolDetails } from "../tools/patch";
+} from "$c/session/session-manager";
+import type { BashToolDetails, FindToolDetails, GrepToolDetails, LsToolDetails, ReadToolDetails } from "$c/tools/index";
 
 // Re-export for backward compatibility
-export type { ExecOptions, ExecResult } from "../exec";
+export type { ExecOptions, ExecResult } from "$c/exec/exec";
 
 /**
  * UI context for hooks to request interactive UI from the harness.

package/src/{core → extensibility}/plugins/doctor.ts

@@ -1,4 +1,4 @@
-import { theme } from "../../modes/interactive/theme/theme";
+import { theme } from "$c/modes/theme/theme";
 import type { DoctorCheck } from "./types";
 
 export async function runDoctorChecks(): Promise<DoctorCheck[]> {

package/src/{core → extensibility}/plugins/installer.ts

@@ -1,6 +1,7 @@
+import { lstatSync, symlinkSync, unlinkSync } from "node:fs";
 import { mkdir } from "node:fs/promises";
 import { join, resolve } from "node:path";
-import { getAgentDir } from "../../config";
+import { getAgentDir } from "$c/config";
 import type { InstalledPlugin } from "./types";
 
 const PLUGINS_DIR = join(getAgentDir(), "plugins");
@@ -176,7 +177,6 @@ export async function linkPlugin(localPath: string): Promise<void> {
 
 	// Remove existing if present
 	try {
-		const { unlinkSync, lstatSync } = await import("fs");
 		const stat = lstatSync(linkPath);
 		if (stat.isSymbolicLink() || stat.isDirectory()) {
 			unlinkSync(linkPath);
@@ -186,6 +186,5 @@ export async function linkPlugin(localPath: string): Promise<void> {
 	}
 
 	// Create symlink using fs instead of shell command
-	const { symlinkSync } = await import("fs");
 	symlinkSync(absolutePath, linkPath);
 }

package/src/{core → extensibility}/plugins/paths.ts

@@ -1,6 +1,6 @@
 import { homedir } from "node:os";
 import { join } from "node:path";
-import { CONFIG_DIR_NAME, getConfigDirPaths } from "../../config";
+import { CONFIG_DIR_NAME, getConfigDirPaths } from "$c/config";
 
 // =============================================================================
 // Plugin Directory Paths

package/src/{core → extensibility}/skills.ts

@@ -2,13 +2,12 @@ import { readdirSync, readFileSync, statSync } from "node:fs";
 import { realpath } from "node:fs/promises";
 import { basename, join } from "node:path";
 import { logger } from "@oh-my-pi/pi-utils";
-import { minimatch } from "minimatch";
-import { skillCapability } from "../capability/skill";
-import type { SourceMeta } from "../capability/types";
-import type { Skill as CapabilitySkill, SkillFrontmatter as ImportedSkillFrontmatter } from "../discovery";
-import { loadCapability } from "../discovery";
-import { parseFrontmatter } from "./frontmatter";
-import type { SkillsSettings } from "./settings-manager";
+import { skillCapability } from "$c/capability/skill";
+import type { SourceMeta } from "$c/capability/types";
+import type { SkillsSettings } from "$c/config/settings-manager";
+import type { Skill as CapabilitySkill, SkillFrontmatter as ImportedSkillFrontmatter } from "$c/discovery";
+import { loadCapability } from "$c/discovery";
+import { parseFrontmatter } from "$c/utils/frontmatter";
 
 // Re-export SkillFrontmatter for backward compatibility
 export type { ImportedSkillFrontmatter as SkillFrontmatter };
@@ -169,45 +168,6 @@ function scanDirectoryForSkills(dir: string): LoadSkillsResult {
 	return { skills, warnings };
 }
 
-/**
- * Format skills for inclusion in a system prompt.
- * Uses XML format per Agent Skills standard.
- * See: https://agentskills.io/integrate-skills
- */
-export function formatSkillsForPrompt(skills: Skill[]): string {
-	if (skills.length === 0) {
-		return "";
-	}
-
-	const lines = [
-		"\n\nThe following skills provide specialized instructions for specific tasks.",
-		"Use the read tool to load a skill's file when the task matches its description.",
-		"",
-		"<available_skills>",
-	];
-
-	for (const skill of skills) {
-		lines.push("  <skill>");
-		lines.push(`    <name>${escapeXml(skill.name)}</name>`);
-		lines.push(`    <description>${escapeXml(skill.description)}</description>`);
-		lines.push(`    <location>${escapeXml(skill.filePath)}</location>`);
-		lines.push("  </skill>");
-	}
-
-	lines.push("</available_skills>");
-
-	return lines.join("\n");
-}
-
-function escapeXml(str: string): string {
-	return str
-		.replace(/&/g, "&amp;")
-		.replace(/</g, "&lt;")
-		.replace(/>/g, "&gt;")
-		.replace(/"/g, "&quot;")
-		.replace(/'/g, "&apos;");
-}
-
 export interface LoadSkillsOptions extends SkillsSettings {
 	/** Working directory for project-local skills. Default: process.cwd() */
 	cwd?: string;
@@ -258,13 +218,13 @@ export async function loadSkills(options: LoadSkillsOptions = {}): Promise<LoadS
 	// Check if skill name matches any of the include patterns
 	function matchesIncludePatterns(name: string): boolean {
 		if (includeSkills.length === 0) return true;
-		return includeSkills.some((pattern) => minimatch(name, pattern));
+		return includeSkills.some((pattern) => new Bun.Glob(pattern).match(name));
 	}
 
 	// Check if skill name matches any of the ignore patterns
 	function matchesIgnorePatterns(name: string): boolean {
 		if (ignoredSkills.length === 0) return false;
-		return ignoredSkills.some((pattern) => minimatch(name, pattern));
+		return ignoredSkills.some((pattern) => new Bun.Glob(pattern).match(name));
 	}
 
 	// Filter skills by source and patterns first

package/src/{core → extensibility}/slash-commands.ts

@@ -1,9 +1,9 @@
-import { slashCommandCapability } from "../capability/slash-command";
-import type { SlashCommand } from "../discovery";
-import { loadCapability } from "../discovery";
-import { parseFrontmatter } from "./frontmatter";
-import { renderPromptTemplate } from "./prompt-templates";
-import { EMBEDDED_COMMAND_TEMPLATES } from "./tools/task/commands";
+import { slashCommandCapability } from "$c/capability/slash-command";
+import { renderPromptTemplate } from "$c/config/prompt-templates";
+import type { SlashCommand } from "$c/discovery";
+import { loadCapability } from "$c/discovery";
+import { EMBEDDED_COMMAND_TEMPLATES } from "$c/task/commands";
+import { parseFrontmatter } from "$c/utils/frontmatter";
 
 /**
  * Represents a custom slash command loaded from a file

package/src/index.ts

@@ -7,41 +7,66 @@ export { StringEnum } from "@oh-my-pi/pi-ai";
 export { Container, Markdown, Spacer, Text } from "@oh-my-pi/pi-tui";
 // Logging
 export { logger } from "@oh-my-pi/pi-utils";
-export { getAgentDir, VERSION } from "./config";
+export type { FileDiagnosticsResult } from "$c/lsp/index";
+// UI components for extensions
 export {
-	AgentSession,
-	type AgentSessionConfig,
-	type AgentSessionEvent,
-	type AgentSessionEventListener,
-	type ModelCycleResult,
-	type PromptOptions,
-	type SessionStats,
-} from "./core/agent-session";
-// Auth and model registry
-export { type ApiKeyCredential, type AuthCredential, AuthStorage, type OAuthCredential } from "./core/auth-storage";
-// Compaction
+	ArminComponent,
+	AssistantMessageComponent,
+	BashExecutionComponent,
+	BorderedLoader,
+	BranchSummaryMessageComponent,
+	CompactionSummaryMessageComponent,
+	CustomEditor,
+	CustomMessageComponent,
+	DynamicBorder,
+	FooterComponent,
+	HookEditorComponent as ExtensionEditorComponent,
+	HookInputComponent as ExtensionInputComponent,
+	HookSelectorComponent as ExtensionSelectorComponent,
+	LoginDialogComponent,
+	ModelSelectorComponent,
+	OAuthSelectorComponent,
+	type RenderDiffOptions,
+	renderDiff,
+	SessionSelectorComponent,
+	type SettingsCallbacks,
+	SettingsSelectorComponent,
+	ShowImagesSelectorComponent,
+	ThemeSelectorComponent,
+	ThinkingSelectorComponent,
+	ToolExecutionComponent,
+	type ToolExecutionOptions,
+	TreeSelectorComponent,
+	truncateToVisualLines,
+	UserMessageComponent,
+	UserMessageSelectorComponent,
+	type VisualTruncateResult,
+} from "$c/modes/components/index";
+// Theme utilities for custom tools
 export {
-	type BranchPreparation,
-	type BranchSummaryResult,
-	type CollectEntriesResult,
-	type CompactionResult,
-	type CutPointResult,
-	calculateContextTokens,
-	collectEntriesForBranchSummary,
-	compact,
-	DEFAULT_COMPACTION_SETTINGS,
-	estimateTokens,
-	type FileOperations,
-	findCutPoint,
-	findTurnStartIndex,
-	type GenerateBranchSummaryOptions,
-	generateBranchSummary,
-	generateSummary,
-	getLastAssistantUsage,
-	prepareBranchEntries,
-	serializeConversation,
-	shouldCompact,
-} from "./core/compaction/index";
+	getLanguageFromPath,
+	getMarkdownTheme,
+	getSelectListTheme,
+	getSettingsListTheme,
+	highlightCode,
+	initTheme,
+	Theme,
+	type ThemeColor,
+} from "$c/modes/theme/theme";
+export { getAgentDir, VERSION } from "./config";
+export { formatKeyHint, formatKeyHints } from "./config/keybindings";
+export { ModelRegistry } from "./config/model-registry";
+// Prompt templates
+export type { PromptTemplate } from "./config/prompt-templates";
+export {
+	type CompactionSettings,
+	type ImageSettings,
+	type LspSettings,
+	type RetrySettings,
+	type Settings,
+	SettingsManager,
+	type SkillsSettings,
+} from "./config/settings-manager";
 // Custom commands
 export type {
 	CustomCommand,
@@ -50,7 +75,7 @@ export type {
 	CustomCommandSource,
 	CustomCommandsLoadResult,
 	LoadedCustomCommand,
-} from "./core/custom-commands/types";
+} from "./extensibility/custom-commands/types";
 export type {
 	AgentToolUpdateCallback,
 	CustomTool,
@@ -63,9 +88,9 @@ export type {
 	ExecResult,
 	LoadedCustomTool,
 	RenderResultOptions,
-} from "./core/custom-tools/index";
+} from "./extensibility/custom-tools/index";
 // Custom tools
-export { CustomToolLoader, discoverAndLoadCustomTools, loadCustomTools } from "./core/custom-tools/index";
+export { CustomToolLoader, discoverAndLoadCustomTools, loadCustomTools } from "./extensibility/custom-tools/index";
 export type {
 	AppAction,
 	Extension,
@@ -97,7 +122,7 @@ export type {
 	UserBashEventResult,
 	UserPythonEvent,
 	UserPythonEventResult,
-} from "./core/extensions/index";
+} from "./extensibility/extensions/index";
 // Extension types and utilities
 export {
 	discoverAndLoadExtensions,
@@ -110,14 +135,34 @@ export {
 	isLsToolResult,
 	isReadToolResult,
 	isWriteToolResult,
-} from "./core/extensions/index";
+} from "./extensibility/extensions/index";
 // Hook system types (legacy re-export)
-export type * from "./core/hooks/index";
-export { formatKeyHint, formatKeyHints } from "./core/keybindings";
-export { convertToLlm } from "./core/messages";
-export { ModelRegistry } from "./core/model-registry";
-// Prompt templates
-export type { PromptTemplate } from "./core/prompt-templates";
+export type * from "./extensibility/hooks/index";
+// Skills
+export {
+	type LoadSkillsFromDirOptions,
+	type LoadSkillsResult,
+	loadSkills,
+	loadSkillsFromDir,
+	type Skill,
+	type SkillFrontmatter,
+	type SkillWarning,
+} from "./extensibility/skills";
+// Slash commands
+export { type FileSlashCommand, loadSlashCommands as discoverSlashCommands } from "./extensibility/slash-commands";
+// Main entry point
+export { main } from "./main";
+// Run modes for programmatic SDK usage
+export {
+	InteractiveMode,
+	type InteractiveModeOptions,
+	type PrintModeOptions,
+	RpcClient,
+	type RpcClientOptions,
+	type RpcEventListener,
+	runPrintMode,
+	runRpcMode,
+} from "./modes/index";
 // SDK for programmatic usage
 export {
 	// Factory
@@ -149,7 +194,42 @@ export {
 	ReadTool,
 	type ToolSession,
 	WriteTool,
-} from "./core/sdk";
+} from "./sdk";
+export {
+	AgentSession,
+	type AgentSessionConfig,
+	type AgentSessionEvent,
+	type AgentSessionEventListener,
+	type ModelCycleResult,
+	type PromptOptions,
+	type SessionStats,
+} from "./session/agent-session";
+// Auth and model registry
+export { type ApiKeyCredential, type AuthCredential, AuthStorage, type OAuthCredential } from "./session/auth-storage";
+// Compaction
+export {
+	type BranchPreparation,
+	type BranchSummaryResult,
+	type CollectEntriesResult,
+	type CompactionResult,
+	type CutPointResult,
+	calculateContextTokens,
+	collectEntriesForBranchSummary,
+	compact,
+	DEFAULT_COMPACTION_SETTINGS,
+	estimateTokens,
+	type FileOperations,
+	findCutPoint,
+	findTurnStartIndex,
+	type GenerateBranchSummaryOptions,
+	generateBranchSummary,
+	generateSummary,
+	getLastAssistantUsage,
+	prepareBranchEntries,
+	serializeConversation,
+	shouldCompact,
+} from "./session/compaction/index";
+export { convertToLlm } from "./session/messages";
 export {
 	type BranchSummaryEntry,
 	buildSessionContext,
@@ -171,29 +251,7 @@ export {
 	SessionManager,
 	type SessionMessageEntry,
 	type ThinkingLevelChangeEntry,
-} from "./core/session-manager";
-export {
-	type CompactionSettings,
-	type ImageSettings,
-	type LspSettings,
-	type RetrySettings,
-	type Settings,
-	SettingsManager,
-	type SkillsSettings,
-} from "./core/settings-manager";
-// Skills
-export {
-	formatSkillsForPrompt,
-	type LoadSkillsFromDirOptions,
-	type LoadSkillsResult,
-	loadSkills,
-	loadSkillsFromDir,
-	type Skill,
-	type SkillFrontmatter,
-	type SkillWarning,
-} from "./core/skills";
-// Slash commands
-export { type FileSlashCommand, loadSlashCommands as discoverSlashCommands } from "./core/slash-commands";
+} from "./session/session-manager";
 // Tools (detail types and utilities)
 export {
 	type BashToolDetails,
@@ -217,64 +275,5 @@ export {
 	truncateLine,
 	truncateTail,
 	type WriteToolDetails,
-} from "./core/tools/index";
-export type { FileDiagnosticsResult } from "./core/tools/lsp/index";
-// Main entry point
-export { main } from "./main";
-// Run modes for programmatic SDK usage
-export {
-	InteractiveMode,
-	type InteractiveModeOptions,
-	type PrintModeOptions,
-	RpcClient,
-	type RpcClientOptions,
-	type RpcEventListener,
-	runPrintMode,
-	runRpcMode,
-} from "./modes/index";
-// UI components for extensions
-export {
-	ArminComponent,
-	AssistantMessageComponent,
-	BashExecutionComponent,
-	BorderedLoader,
-	BranchSummaryMessageComponent,
-	CompactionSummaryMessageComponent,
-	CustomEditor,
-	CustomMessageComponent,
-	DynamicBorder,
-	FooterComponent,
-	HookEditorComponent as ExtensionEditorComponent,
-	HookInputComponent as ExtensionInputComponent,
-	HookSelectorComponent as ExtensionSelectorComponent,
-	LoginDialogComponent,
-	ModelSelectorComponent,
-	OAuthSelectorComponent,
-	type RenderDiffOptions,
-	renderDiff,
-	SessionSelectorComponent,
-	type SettingsCallbacks,
-	SettingsSelectorComponent,
-	ShowImagesSelectorComponent,
-	ThemeSelectorComponent,
-	ThinkingSelectorComponent,
-	ToolExecutionComponent,
-	type ToolExecutionOptions,
-	TreeSelectorComponent,
-	truncateToVisualLines,
-	UserMessageComponent,
-	UserMessageSelectorComponent,
-	type VisualTruncateResult,
-} from "./modes/interactive/components/index";
-// Theme utilities for custom tools
-export {
-	getLanguageFromPath,
-	getMarkdownTheme,
-	getSelectListTheme,
-	getSettingsListTheme,
-	highlightCode,
-	initTheme,
-	Theme,
-	type ThemeColor,
-} from "./modes/interactive/theme/theme";
+} from "./tools/index";
 export { getShellConfig } from "./utils/shell";

package/src/internal-urls/agent-protocol.ts

@@ -0,0 +1,126 @@
+/**
+ * Protocol handler for agent:// URLs.
+ *
+ * Resolves agent output IDs to artifact files in the session directory.
+ *
+ * URL forms:
+ * - agent://<id> - Full output content
+ * - agent://<id>/<path> - JSON extraction via path form
+ * - agent://<id>?q=<query> - JSON extraction via query form
+ */
+
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { applyQuery, pathToQuery } from "./json-query";
+import type { InternalResource, InternalUrl, ProtocolHandler } from "./types";
+
+export interface AgentProtocolOptions {
+	/**
+	 * Returns the artifacts directory path, or null if no session.
+	 * Artifacts directory is the session file path without .jsonl extension.
+	 */
+	getArtifactsDir: () => string | null;
+}
+
+/**
+ * List available output IDs in artifacts directory.
+ */
+function listAvailableOutputs(artifactsDir: string): string[] {
+	try {
+		const files = fs.readdirSync(artifactsDir);
+		return files.filter((f) => f.endsWith(".md")).map((f) => f.replace(".md", ""));
+	} catch {
+		return [];
+	}
+}
+
+/**
+ * Handler for agent:// URLs.
+ *
+ * Resolves output IDs like "reviewer_0" to their artifact files,
+ * with optional JSON extraction.
+ */
+export class AgentProtocolHandler implements ProtocolHandler {
+	readonly scheme = "agent";
+
+	constructor(private readonly options: AgentProtocolOptions) {}
+
+	async resolve(url: InternalUrl): Promise<InternalResource> {
+		const artifactsDir = this.options.getArtifactsDir();
+		if (!artifactsDir) {
+			throw new Error("No session - agent outputs unavailable");
+		}
+
+		if (!fs.existsSync(artifactsDir)) {
+			throw new Error("No artifacts directory found");
+		}
+
+		// Extract output ID from host
+		const outputId = url.rawHost || url.hostname;
+		if (!outputId) {
+			throw new Error("agent:// URL requires an output ID: agent://<id>");
+		}
+
+		// Check for conflicting extraction methods
+		const urlPath = url.pathname;
+		const queryParam = url.searchParams.get("q");
+		const hasPathExtraction = urlPath && urlPath !== "/" && urlPath !== "";
+		const hasQueryExtraction = queryParam !== null && queryParam !== "";
+
+		if (hasPathExtraction && hasQueryExtraction) {
+			throw new Error("agent:// URL cannot combine path extraction with ?q=");
+		}
+
+		// Load the output file
+		const outputPath = path.join(artifactsDir, `${outputId}.md`);
+		if (!fs.existsSync(outputPath)) {
+			const available = listAvailableOutputs(artifactsDir);
+			const availableStr = available.length > 0 ? available.join(", ") : "none";
+			throw new Error(`Not found: ${outputId}\nAvailable: ${availableStr}`);
+		}
+
+		const rawContent = await Bun.file(outputPath).text();
+		const notes: string[] = [];
+
+		// Handle extraction
+		let content = rawContent;
+		let contentType: InternalResource["contentType"] = "text/markdown";
+
+		if (hasPathExtraction || hasQueryExtraction) {
+			// Parse JSON
+			let jsonValue: unknown;
+			try {
+				jsonValue = JSON.parse(rawContent);
+			} catch (err) {
+				const message = err instanceof Error ? err.message : String(err);
+				throw new Error(`Output ${outputId} is not valid JSON: ${message}`);
+			}
+
+			// Convert path to query if needed
+			const query = hasPathExtraction ? pathToQuery(urlPath) : queryParam!;
+
+			if (query) {
+				const extracted = applyQuery(jsonValue, query);
+				try {
+					content = JSON.stringify(extracted, null, 2) ?? "null";
+				} catch {
+					content = String(extracted);
+				}
+				notes.push(`Extracted: ${query}`);
+			} else {
+				// Empty path/query means return full JSON
+				content = JSON.stringify(jsonValue, null, 2);
+			}
+			contentType = "application/json";
+		}
+
+		return {
+			url: url.href,
+			content,
+			contentType,
+			size: Buffer.byteLength(content, "utf-8"),
+			sourcePath: outputPath,
+			notes,
+		};
+	}
+}