@oh-my-pi/pi-coding-agent 1.340.0 → 2.0.1337

package/src/core/session-manager.ts

@@ -1,5 +1,3 @@
-import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
-import type { ImageContent, Message, TextContent } from "@oh-my-pi/pi-ai";
 import {
 	appendFileSync,
 	closeSync,
@@ -11,16 +9,18 @@ import {
 	readSync,
 	statSync,
 	writeFileSync,
-} from "fs";
-import { join, resolve } from "path";
-import { getAgentDir as getDefaultAgentDir } from "../config.js";
+} from "node:fs";
+import { join, resolve } from "node:path";
+import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
+import type { ImageContent, Message, TextContent } from "@oh-my-pi/pi-ai";
+import { getAgentDir as getDefaultAgentDir } from "../config";
 import {
 	type BashExecutionMessage,
 	createBranchSummaryMessage,
 	createCompactionSummaryMessage,
 	createHookMessage,
 	type HookMessage,
-} from "./messages.js";
+} from "./messages";
 
 export const CURRENT_SESSION_VERSION = 2;
 
@@ -28,6 +28,7 @@ export interface SessionHeader {
 	type: "session";
 	version?: number; // v1 sessions don't have this
 	id: string;
+	title?: string; // Auto-generated title from first message
 	timestamp: string;
 	cwd: string;
 	parentSession?: string;
@@ -56,8 +57,10 @@ export interface ThinkingLevelChangeEntry extends SessionEntryBase {
 
 export interface ModelChangeEntry extends SessionEntryBase {
 	type: "model_change";
-	provider: string;
-	modelId: string;
+	/** Model in "provider/modelId" format */
+	model: string;
+	/** Role: "default", "smol", "slow", etc. Undefined treated as "default" */
+	role?: string;
 }
 
 export interface CompactionEntry<T = unknown> extends SessionEntryBase {
@@ -149,12 +152,14 @@ export interface SessionTreeNode {
 export interface SessionContext {
 	messages: AgentMessage[];
 	thinkingLevel: string;
-	model: { provider: string; modelId: string } | null;
+	/** Model roles: { default: "provider/modelId", small: "provider/modelId", ... } */
+	models: Record<string, string>;
 }
 
 export interface SessionInfo {
 	path: string;
 	id: string;
+	title?: string;
 	created: Date;
 	modified: Date;
 	messageCount: number;
@@ -290,7 +295,7 @@ export function buildSessionContext(
 	let leaf: SessionEntry | undefined;
 	if (leafId === null) {
 		// Explicitly null - return no messages (navigated to before first entry)
-		return { messages: [], thinkingLevel: "off", model: null };
+		return { messages: [], thinkingLevel: "off", models: {} };
 	}
 	if (leafId) {
 		leaf = byId.get(leafId);
@@ -301,7 +306,7 @@ export function buildSessionContext(
 	}
 
 	if (!leaf) {
-		return { messages: [], thinkingLevel: "off", model: null };
+		return { messages: [], thinkingLevel: "off", models: {} };
 	}
 
 	// Walk from leaf to root, collecting path
@@ -314,16 +319,21 @@ export function buildSessionContext(
 
 	// Extract settings and find compaction
 	let thinkingLevel = "off";
-	let model: { provider: string; modelId: string } | null = null;
+	const models: Record<string, string> = {};
 	let compaction: CompactionEntry | null = null;
 
 	for (const entry of path) {
 		if (entry.type === "thinking_level_change") {
 			thinkingLevel = entry.thinkingLevel;
 		} else if (entry.type === "model_change") {
-			model = { provider: entry.provider, modelId: entry.modelId };
+			// New format: { model: "provider/id", role?: string }
+			if (entry.model) {
+				const role = entry.role ?? "default";
+				models[role] = entry.model;
+			}
 		} else if (entry.type === "message" && entry.message.role === "assistant") {
-			model = { provider: entry.message.provider, modelId: entry.message.model };
+			// Infer default model from assistant messages
+			models.default = `${entry.message.provider}/${entry.message.model}`;
 		} else if (entry.type === "compaction") {
 			compaction = entry;
 		}
@@ -379,7 +389,7 @@ export function buildSessionContext(
 		}
 	}
 
-	return { messages, thinkingLevel, model };
+	return { messages, thinkingLevel, models };
 }
 
 /**
@@ -454,6 +464,67 @@ export function findMostRecentSession(sessionDir: string): string | null {
 	}
 }
 
+/** Recent session info for display */
+export interface RecentSessionInfo {
+	name: string;
+	path: string;
+	timeAgo: string;
+}
+
+/** Format a time difference as a human-readable string */
+function formatTimeAgo(date: Date): string {
+	const now = Date.now();
+	const diffMs = now - date.getTime();
+	const diffMins = Math.floor(diffMs / 60000);
+	const diffHours = Math.floor(diffMs / 3600000);
+	const diffDays = Math.floor(diffMs / 86400000);
+
+	if (diffMins < 1) return "just now";
+	if (diffMins < 60) return `${diffMins}m ago`;
+	if (diffHours < 24) return `${diffHours}h ago`;
+	if (diffDays < 7) return `${diffDays}d ago`;
+	return date.toLocaleDateString();
+}
+
+/** Get recent sessions for display in welcome screen */
+export function getRecentSessions(sessionDir: string, limit = 3): RecentSessionInfo[] {
+	try {
+		const files = readdirSync(sessionDir)
+			.filter((f) => f.endsWith(".jsonl"))
+			.map((f) => join(sessionDir, f))
+			.filter(isValidSessionFile)
+			.map((path) => {
+				const stat = statSync(path);
+				// Try to get session title or id from first line
+				let name = path.split("/").pop()?.replace(".jsonl", "") ?? "Unknown";
+				try {
+					const content = readFileSync(path, "utf-8");
+					const firstLine = content.split("\n")[0];
+					if (firstLine) {
+						const header = JSON.parse(firstLine) as SessionHeader;
+						if (header.type === "session") {
+							// Prefer title over id
+							name = header.title ?? header.id ?? name;
+						}
+					}
+				} catch {
+					// Use filename as fallback
+				}
+				return { path, name, mtime: stat.mtime };
+			})
+			.sort((a, b) => b.mtime.getTime() - a.mtime.getTime())
+			.slice(0, limit);
+
+		return files.map((f) => ({
+			name: f.name.length > 40 ? `${f.name.slice(0, 37)}...` : f.name,
+			path: f.path,
+			timeAgo: formatTimeAgo(f.mtime),
+		}));
+	} catch {
+		return [];
+	}
+}
+
 /**
  * Manages conversation sessions as append-only trees stored in JSONL files.
  *
@@ -467,6 +538,7 @@ export function findMostRecentSession(sessionDir: string): string | null {
  */
 export class SessionManager {
 	private sessionId: string = "";
+	private sessionTitle: string | undefined;
 	private sessionFile: string | undefined;
 	private sessionDir: string;
 	private cwd: string;
@@ -499,6 +571,7 @@ export class SessionManager {
 			this.fileEntries = loadEntriesFromFile(this.sessionFile);
 			const header = this.fileEntries.find((e) => e.type === "session") as SessionHeader | undefined;
 			this.sessionId = header?.id ?? crypto.randomUUID();
+			this.sessionTitle = header?.title;
 
 			if (migrateToCurrentVersion(this.fileEntries)) {
 				this._rewriteFile();
@@ -579,6 +652,31 @@ export class SessionManager {
 		return this.sessionFile;
 	}
 
+	getSessionTitle(): string | undefined {
+		return this.sessionTitle;
+	}
+
+	setSessionTitle(title: string): void {
+		this.sessionTitle = title;
+		// Update the session file header with the title
+		if (this.persist && this.sessionFile && existsSync(this.sessionFile)) {
+			try {
+				const content = readFileSync(this.sessionFile, "utf-8");
+				const lines = content.split("\n");
+				if (lines.length > 0) {
+					const header = JSON.parse(lines[0]) as SessionHeader;
+					if (header.type === "session") {
+						header.title = title;
+						lines[0] = JSON.stringify(header);
+						writeFileSync(this.sessionFile, lines.join("\n"));
+					}
+				}
+			} catch {
+				// Ignore errors updating title
+			}
+		}
+	}
+
 	_persist(entry: SessionEntry): void {
 		if (!this.persist || !this.sessionFile) return;
 
@@ -633,15 +731,19 @@ export class SessionManager {
 		return entry.id;
 	}
 
-	/** Append a model change as child of current leaf, then advance leaf. Returns entry id. */
-	appendModelChange(provider: string, modelId: string): string {
+	/**
+	 * Append a model change as child of current leaf, then advance leaf. Returns entry id.
+	 * @param model Model in "provider/modelId" format
+	 * @param role Optional role (default: "default")
+	 */
+	appendModelChange(model: string, role?: string): string {
 		const entry: ModelChangeEntry = {
 			type: "model_change",
 			id: generateId(this.byId),
 			parentId: this.leafId,
 			timestamp: new Date().toISOString(),
-			provider,
-			modelId,
+			model,
+			role,
 		};
 		this._appendEntry(entry);
 		return entry.id;
@@ -1061,7 +1163,7 @@ export class SessionManager {
 					if (lines.length === 0) continue;
 
 					// Check first line for valid session header
-					let header: { type: string; id: string; timestamp: string } | null = null;
+					let header: { type: string; id: string; title?: string; timestamp: string } | null = null;
 					try {
 						const first = JSON.parse(lines[0]);
 						if (first.type === "session" && first.id) {
@@ -1107,6 +1209,7 @@ export class SessionManager {
 					sessions.push({
 						path: file,
 						id: header.id,
+						title: header.title,
 						created: new Date(header.timestamp),
 						modified: stats.mtime,
 						messageCount,

package/src/core/settings-manager.ts

@@ -1,6 +1,6 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
-import { dirname, join } from "path";
-import { CONFIG_DIR_NAME, getAgentDir } from "../config.js";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { CONFIG_DIR_NAME, getAgentDir } from "../config";
 
 export interface CompactionSettings {
 	enabled?: boolean; // default: true
@@ -30,6 +30,11 @@ export interface SkillsSettings {
 	includeSkills?: string[]; // default: [] (empty = include all; glob patterns to filter)
 }
 
+export interface CommandsSettings {
+	enableClaudeUser?: boolean; // default: true (load from ~/.claude/commands/)
+	enableClaudeProject?: boolean; // default: true (load from .claude/commands/)
+}
+
 export interface TerminalSettings {
 	showImages?: boolean; // default: true (only relevant if terminal supports images)
 }
@@ -51,12 +56,23 @@ export interface MCPSettings {
 	enableProjectConfig?: boolean; // default: true (load .mcp.json from project root)
 }
 
+export interface LspSettings {
+	formatOnWrite?: boolean; // default: true (format files using LSP after write tool writes code files)
+	diagnosticsOnWrite?: boolean; // default: true (return LSP diagnostics after write tool writes code files)
+	diagnosticsOnEdit?: boolean; // default: false (return LSP diagnostics after edit tool edits code files)
+}
+
+export interface EditSettings {
+	fuzzyMatch?: boolean; // default: true (accept high-confidence fuzzy matches for whitespace/indentation)
+}
+
 export interface Settings {
 	lastChangelogVersion?: string;
-	defaultProvider?: string;
-	defaultModel?: string;
+	/** Model roles map: { default: "provider/modelId", small: "provider/modelId", ... } */
+	modelRoles?: Record<string, string>;
 	defaultThinkingLevel?: "off" | "minimal" | "low" | "medium" | "high" | "xhigh";
 	queueMode?: "all" | "one-at-a-time";
+	interruptMode?: "immediate" | "wait";
 	theme?: string;
 	compaction?: CompactionSettings;
 	branchSummary?: BranchSummarySettings;
@@ -67,11 +83,14 @@ export interface Settings {
 	hooks?: string[]; // Array of hook file paths
 	customTools?: string[]; // Array of custom tool file paths
 	skills?: SkillsSettings;
+	commands?: CommandsSettings;
 	terminal?: TerminalSettings;
 	enabledModels?: string[]; // Model patterns for cycling (same format as --models CLI flag)
 	exa?: ExaSettings;
 	bashInterceptor?: BashInterceptorSettings;
 	mcp?: MCPSettings;
+	lsp?: LspSettings;
+	edit?: EditSettings;
 }
 
 /** Deep merge settings: project/overrides take precedence, nested objects merge recursively */
@@ -200,28 +219,29 @@ export class SettingsManager {
 		this.save();
 	}
 
-	getDefaultProvider(): string | undefined {
-		return this.settings.defaultProvider;
+	/**
+	 * Get model for a role. Returns "provider/modelId" string or undefined.
+	 */
+	getModelRole(role: string): string | undefined {
+		return this.settings.modelRoles?.[role];
 	}
 
-	getDefaultModel(): string | undefined {
-		return this.settings.defaultModel;
-	}
-
-	setDefaultProvider(provider: string): void {
-		this.globalSettings.defaultProvider = provider;
+	/**
+	 * Set model for a role. Model should be "provider/modelId" format.
+	 */
+	setModelRole(role: string, model: string): void {
+		if (!this.globalSettings.modelRoles) {
+			this.globalSettings.modelRoles = {};
+		}
+		this.globalSettings.modelRoles[role] = model;
 		this.save();
 	}
 
-	setDefaultModel(modelId: string): void {
-		this.globalSettings.defaultModel = modelId;
-		this.save();
-	}
-
-	setDefaultModelAndProvider(provider: string, modelId: string): void {
-		this.globalSettings.defaultProvider = provider;
-		this.globalSettings.defaultModel = modelId;
-		this.save();
+	/**
+	 * Get all model roles.
+	 */
+	getModelRoles(): Record<string, string> {
+		return { ...this.settings.modelRoles };
 	}
 
 	getQueueMode(): "all" | "one-at-a-time" {
@@ -233,6 +253,15 @@ export class SettingsManager {
 		this.save();
 	}
 
+	getInterruptMode(): "immediate" | "wait" {
+		return this.settings.interruptMode || "immediate";
+	}
+
+	setInterruptMode(mode: "immediate" | "wait"): void {
+		this.globalSettings.interruptMode = mode;
+		this.save();
+	}
+
 	getTheme(): string | undefined {
 		return this.settings.theme;
 	}
@@ -376,6 +405,13 @@ export class SettingsManager {
 		};
 	}
 
+	getCommandsSettings(): Required<CommandsSettings> {
+		return {
+			enableClaudeUser: this.settings.commands?.enableClaudeUser ?? true,
+			enableClaudeProject: this.settings.commands?.enableClaudeProject ?? true,
+		};
+	}
+
 	getShowImages(): boolean {
 		return this.settings.terminal?.showImages ?? true;
 	}
@@ -474,4 +510,52 @@ export class SettingsManager {
 		this.globalSettings.mcp.enableProjectConfig = enabled;
 		this.save();
 	}
+
+	getLspFormatOnWrite(): boolean {
+		return this.settings.lsp?.formatOnWrite ?? true;
+	}
+
+	setLspFormatOnWrite(enabled: boolean): void {
+		if (!this.globalSettings.lsp) {
+			this.globalSettings.lsp = {};
+		}
+		this.globalSettings.lsp.formatOnWrite = enabled;
+		this.save();
+	}
+
+	getLspDiagnosticsOnWrite(): boolean {
+		return this.settings.lsp?.diagnosticsOnWrite ?? true;
+	}
+
+	setLspDiagnosticsOnWrite(enabled: boolean): void {
+		if (!this.globalSettings.lsp) {
+			this.globalSettings.lsp = {};
+		}
+		this.globalSettings.lsp.diagnosticsOnWrite = enabled;
+		this.save();
+	}
+
+	getLspDiagnosticsOnEdit(): boolean {
+		return this.settings.lsp?.diagnosticsOnEdit ?? false;
+	}
+
+	setLspDiagnosticsOnEdit(enabled: boolean): void {
+		if (!this.globalSettings.lsp) {
+			this.globalSettings.lsp = {};
+		}
+		this.globalSettings.lsp.diagnosticsOnEdit = enabled;
+		this.save();
+	}
+
+	getEditFuzzyMatch(): boolean {
+		return this.settings.edit?.fuzzyMatch ?? true;
+	}
+
+	setEditFuzzyMatch(enabled: boolean): void {
+		if (!this.globalSettings.edit) {
+			this.globalSettings.edit = {};
+		}
+		this.globalSettings.edit.fuzzyMatch = enabled;
+		this.save();
+	}
 }

package/src/core/skills.ts

@@ -1,9 +1,9 @@
-import { existsSync, readdirSync, readFileSync, realpathSync, statSync } from "fs";
+import { existsSync, readdirSync, readFileSync, realpathSync, statSync } from "node:fs";
+import { homedir } from "node:os";
+import { basename, dirname, join, resolve } from "node:path";
 import { minimatch } from "minimatch";
-import { homedir } from "os";
-import { basename, dirname, join, resolve } from "path";
-import { CONFIG_DIR_NAME, getAgentDir } from "../config.js";
-import type { SkillsSettings } from "./settings-manager.js";
+import { CONFIG_DIR_NAME, getAgentDir } from "../config";
+import type { SkillsSettings } from "./settings-manager";
 
 /**
  * Standard frontmatter fields per Agent Skills spec.

package/src/core/slash-commands.ts

@@ -1,6 +1,8 @@
-import { existsSync, readdirSync, readFileSync } from "fs";
-import { join, resolve } from "path";
-import { CONFIG_DIR_NAME, getCommandsDir } from "../config.js";
+import { existsSync, readdirSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join, resolve } from "node:path";
+import { CONFIG_DIR_NAME, getCommandsDir } from "../config";
+import { logger } from "./logger";
 
 /**
  * Represents a custom slash command loaded from a file
@@ -98,14 +100,12 @@ export function substituteArgs(content: string, args: string[]): string {
 	return result;
 }
 
+type CommandSource = "builtin" | "claude-user" | "claude-project" | "user" | "project";
+
 /**
  * Recursively scan a directory for .md files (and symlinks to .md files) and load them as slash commands
  */
-function loadCommandsFromDir(
-	dir: string,
-	source: "builtin" | "user" | "project",
-	subdir: string = "",
-): FileSlashCommand[] {
+function loadCommandsFromDir(dir: string, source: CommandSource, subdir: string = ""): FileSlashCommand[] {
 	const commands: FileSlashCommand[] = [];
 
 	if (!existsSync(dir)) {
@@ -129,15 +129,18 @@ function loadCommandsFromDir(
 
 					const name = entry.name.slice(0, -3); // Remove .md extension
 
-					// Build source string
-					let sourceStr: string;
-					if (source === "builtin") {
-						sourceStr = subdir ? `(builtin:${subdir})` : "(builtin)";
-					} else if (source === "user") {
-						sourceStr = subdir ? `(user:${subdir})` : "(user)";
-					} else {
-						sourceStr = subdir ? `(project:${subdir})` : "(project)";
-					}
+					// Build source string based on source type
+					const sourceLabel =
+						source === "builtin"
+							? "builtin"
+							: source === "claude-user"
+								? "claude-user"
+								: source === "claude-project"
+									? "claude-project"
+									: source === "user"
+										? "user"
+										: "project";
+					const sourceStr = subdir ? `(${sourceLabel}:${subdir})` : `(${sourceLabel})`;
 
 					// Get description from frontmatter or first non-empty line
 					let description = frontmatter.description || "";
@@ -159,13 +162,13 @@ function loadCommandsFromDir(
 						content,
 						source: sourceStr,
 					});
-				} catch (_error) {
-					// Silently skip files that can't be read
+				} catch (err) {
+					logger.debug("Failed to read slash command file", { error: String(err) });
 				}
 			}
 		}
-	} catch (_error) {
-		// Silently skip directories that can't be read
+	} catch (err) {
+		logger.debug("Failed to read slash command directory", { error: String(err) });
 	}
 
 	return commands;
@@ -176,54 +179,66 @@ export interface LoadSlashCommandsOptions {
 	cwd?: string;
 	/** Agent config directory for global commands. Default: from getCommandsDir() */
 	agentDir?: string;
+	/** Enable loading from ~/.claude/commands/. Default: true */
+	enableClaudeUser?: boolean;
+	/** Enable loading from .claude/commands/. Default: true */
+	enableClaudeProject?: boolean;
 }
 
 /**
  * Load all custom slash commands from:
  * 1. Builtin: package commands/
- * 2. Global: agentDir/commands/
- * 3. Project: cwd/{CONFIG_DIR_NAME}/commands/
+ * 2. Claude user: ~/.claude/commands/
+ * 3. Claude project: .claude/commands/
+ * 4. Pi user: agentDir/commands/
+ * 5. Pi project: cwd/{CONFIG_DIR_NAME}/commands/
+ *
+ * First occurrence wins (earlier sources have priority).
  */
 export function loadSlashCommands(options: LoadSlashCommandsOptions = {}): FileSlashCommand[] {
 	const resolvedCwd = options.cwd ?? process.cwd();
 	const resolvedAgentDir = options.agentDir ?? getCommandsDir();
+	const enableClaudeUser = options.enableClaudeUser ?? true;
+	const enableClaudeProject = options.enableClaudeProject ?? true;
 
 	const commands: FileSlashCommand[] = [];
 	const seenNames = new Set<string>();
 
-	// 1. Builtin commands (from package)
-	const builtinDir = join(import.meta.dir, "../commands");
-	if (existsSync(builtinDir)) {
-		const builtinCommands = loadCommandsFromDir(builtinDir, "builtin");
-		for (const cmd of builtinCommands) {
+	const addCommands = (newCommands: FileSlashCommand[]) => {
+		for (const cmd of newCommands) {
 			if (!seenNames.has(cmd.name)) {
 				commands.push(cmd);
 				seenNames.add(cmd.name);
 			}
 		}
+	};
+
+	// 1. Builtin commands (from package)
+	const builtinDir = join(import.meta.dir, "../commands");
+	if (existsSync(builtinDir)) {
+		addCommands(loadCommandsFromDir(builtinDir, "builtin"));
 	}
 
-	// 2. Load global commands from agentDir/commands/
-	// Note: if agentDir is provided, it should be the agent dir, not the commands dir
-	const globalCommandsDir = options.agentDir ? join(options.agentDir, "commands") : resolvedAgentDir;
-	const globalCommands = loadCommandsFromDir(globalCommandsDir, "user");
-	for (const cmd of globalCommands) {
-		if (!seenNames.has(cmd.name)) {
-			commands.push(cmd);
-			seenNames.add(cmd.name);
-		}
+	// 2. Claude user commands (~/.claude/commands/)
+	if (enableClaudeUser) {
+		const claudeUserDir = join(homedir(), ".claude", "commands");
+		addCommands(loadCommandsFromDir(claudeUserDir, "claude-user"));
 	}
 
-	// 3. Load project commands from cwd/{CONFIG_DIR_NAME}/commands/
-	const projectCommandsDir = resolve(resolvedCwd, CONFIG_DIR_NAME, "commands");
-	const projectCommands = loadCommandsFromDir(projectCommandsDir, "project");
-	for (const cmd of projectCommands) {
-		if (!seenNames.has(cmd.name)) {
-			commands.push(cmd);
-			seenNames.add(cmd.name);
-		}
+	// 3. Claude project commands (.claude/commands/)
+	if (enableClaudeProject) {
+		const claudeProjectDir = resolve(resolvedCwd, ".claude", "commands");
+		addCommands(loadCommandsFromDir(claudeProjectDir, "claude-project"));
 	}
 
+	// 4. Pi user commands (agentDir/commands/)
+	const globalCommandsDir = options.agentDir ? join(options.agentDir, "commands") : resolvedAgentDir;
+	addCommands(loadCommandsFromDir(globalCommandsDir, "user"));
+
+	// 5. Pi project commands (cwd/{CONFIG_DIR_NAME}/commands/)
+	const projectCommandsDir = resolve(resolvedCwd, CONFIG_DIR_NAME, "commands");
+	addCommands(loadCommandsFromDir(projectCommandsDir, "project"));
+
 	return commands;
 }
 

package/src/core/system-prompt.ts

@@ -2,13 +2,13 @@
  * System prompt construction and project context loading
  */
 
+import { existsSync, readFileSync } from "node:fs";
+import { join, resolve } from "node:path";
 import chalk from "chalk";
-import { existsSync, readFileSync } from "fs";
-import { join, resolve } from "path";
-import { getAgentDir, getDocsPath, getExamplesPath, getReadmePath } from "../config.js";
-import type { SkillsSettings } from "./settings-manager.js";
-import { formatSkillsForPrompt, loadSkills, type Skill } from "./skills.js";
-import type { ToolName } from "./tools/index.js";
+import { getAgentDir, getDocsPath, getExamplesPath, getReadmePath } from "../config";
+import type { SkillsSettings } from "./settings-manager";
+import { formatSkillsForPrompt, loadSkills, type Skill } from "./skills";
+import type { ToolName } from "./tools/index";
 
 /**
  * Execute a git command synchronously and return stdout or null on failure.