@oh-my-pi/pi-coding-agent 8.1.0 → 8.2.0

package/src/utils/shell-snapshot.ts

@@ -5,11 +5,9 @@
  * .bashrc/.zshrc, which can be sourced before each command to provide a familiar
  * shell experience.
  */
-
-import { unlinkSync } from "node:fs";
-import { mkdir } from "node:fs/promises";
-import { homedir, tmpdir } from "node:os";
-import { join } from "node:path";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
 import { postmortem } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
 
@@ -19,10 +17,10 @@ let cachedSnapshotPath: string | null = null;
  * Get the user's shell config file path.
  */
 function getShellConfigFile(shell: string): string {
-	const home = homedir();
-	if (shell.includes("zsh")) return join(home, ".zshrc");
-	if (shell.includes("bash")) return join(home, ".bashrc");
-	return join(home, ".profile");
+	const home = os.homedir();
+	if (shell.includes("zsh")) return path.join(home, ".zshrc");
+	if (shell.includes("bash")) return path.join(home, ".bashrc");
+	return path.join(home, ".profile");
 }
 
 /**
@@ -131,12 +129,12 @@ export async function getOrCreateSnapshot(
 	const rcFile = getShellConfigFile(shell);
 
 	// Create snapshot directory
-	const snapshotDir = join(tmpdir(), "omp-shell-snapshots");
-	await mkdir(snapshotDir, { recursive: true });
+	const snapshotDir = path.join(os.tmpdir(), "omp-shell-snapshots");
+	await fs.promises.mkdir(snapshotDir, { recursive: true });
 
 	// Generate unique snapshot path
 	const shellName = shell.includes("zsh") ? "zsh" : shell.includes("bash") ? "bash" : "sh";
-	const snapshotPath = join(snapshotDir, `snapshot-${shellName}-${crypto.randomUUID()}.sh`);
+	const snapshotPath = path.join(snapshotDir, `snapshot-${shellName}-${crypto.randomUUID()}.sh`);
 
 	// Generate and execute snapshot script
 	const script = await generateSnapshotScript(shell, snapshotPath, rcFile);
@@ -167,6 +165,6 @@ export function getSnapshotSourceCommand(snapshotPath: string | null): string {
 
 postmortem.register("shell-snapshot", () => {
 	if (cachedSnapshotPath) {
-		unlinkSync(cachedSnapshotPath);
+		fs.unlinkSync(cachedSnapshotPath);
 	}
 });

package/src/utils/shell.ts

@@ -1,7 +1,6 @@
-import { constants } from "node:fs";
-import { access } from "node:fs/promises";
-import { SettingsManager } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
+import * as fs from "node:fs";
 import { $ } from "bun";
+import { SettingsManager } from "../config/settings-manager";
 
 export interface ShellConfig {
 	shell: string;
@@ -17,7 +16,7 @@ let cachedShellConfig: ShellConfig | null = null;
  */
 async function isExecutable(path: string): Promise<boolean> {
 	try {
-		await access(path, constants.X_OK);
+		await fs.promises.access(path, fs.constants.X_OK);
 		return true;
 	} catch {
 		return false;
@@ -138,7 +137,7 @@ export async function getShellConfig(): Promise<ShellConfig> {
 				`  1. Install Git for Windows: https://git-scm.com/download/win\n` +
 				`  2. Add your bash to PATH (Cygwin, MSYS2, etc.)\n` +
 				`  3. Set shellPath in ~/.omp/agent/settings.json\n\n` +
-				`Searched Git Bash in:\n${paths.map((p) => `  ${p}`).join("\n")}`,
+				`Searched Git Bash in:\n${paths.map(p => `  ${p}`).join("\n")}`,
 		);
 	}
 

package/src/utils/title-generator.ts

@@ -1,14 +1,13 @@
 /**
  * Generate session titles using a smol, fast model.
  */
-
 import type { Api, Model } from "@oh-my-pi/pi-ai";
 import { completeSimple } from "@oh-my-pi/pi-ai";
-import type { ModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-registry";
-import { parseModelString, SMOL_MODEL_PRIORITY } from "@oh-my-pi/pi-coding-agent/config/model-resolver";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import titleSystemPrompt from "@oh-my-pi/pi-coding-agent/prompts/system/title-system.md" with { type: "text" };
 import { logger } from "@oh-my-pi/pi-utils";
+import type { ModelRegistry } from "../config/model-registry";
+import { parseModelString, SMOL_MODEL_PRIORITY } from "../config/model-resolver";
+import { renderPromptTemplate } from "../config/prompt-templates";
+import titleSystemPrompt from "../prompts/system/title-system.md" with { type: "text" };
 
 const TITLE_SYSTEM_PROMPT = renderPromptTemplate(titleSystemPrompt);
 
@@ -21,7 +20,7 @@ function getTitleModelCandidates(registry: ModelRegistry, savedSmolModel?: strin
 	const candidates: Model<Api>[] = [];
 	const addCandidate = (model?: Model<Api>): void => {
 		if (!model) return;
-		const exists = candidates.some((candidate) => candidate.provider === model.provider && candidate.id === model.id);
+		const exists = candidates.some(candidate => candidate.provider === model.provider && candidate.id === model.id);
 		if (!exists) {
 			candidates.push(model);
 		}
@@ -30,17 +29,17 @@ function getTitleModelCandidates(registry: ModelRegistry, savedSmolModel?: strin
 	if (savedSmolModel) {
 		const parsed = parseModelString(savedSmolModel);
 		if (parsed) {
-			const match = availableModels.find((model) => model.provider === parsed.provider && model.id === parsed.id);
+			const match = availableModels.find(model => model.provider === parsed.provider && model.id === parsed.id);
 			addCandidate(match);
 		}
 	}
 
 	for (const pattern of SMOL_MODEL_PRIORITY) {
 		const needle = pattern.toLowerCase();
-		const exactMatch = availableModels.find((model) => model.id.toLowerCase() === needle);
+		const exactMatch = availableModels.find(model => model.id.toLowerCase() === needle);
 		addCandidate(exactMatch);
 
-		const fuzzyMatch = availableModels.find((model) => model.id.toLowerCase().includes(needle));
+		const fuzzyMatch = availableModels.find(model => model.id.toLowerCase().includes(needle));
 		addCandidate(fuzzyMatch);
 	}
 

package/src/utils/tools-manager.ts

@@ -1,9 +1,9 @@
-import { chmod, mkdir, rename, rm } from "node:fs/promises";
-import { arch, platform } from "node:os";
-import { join } from "node:path";
-import { APP_NAME, getBinDir } from "@oh-my-pi/pi-coding-agent/config";
-import { createTempDir, logger } from "@oh-my-pi/pi-utils";
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { logger, TempDir } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
+import { APP_NAME, getBinDir } from "../config";
 
 const TOOLS_DIR = getBinDir();
 
@@ -148,7 +148,7 @@ export async function getToolPath(tool: ToolName): Promise<string | null> {
 	if (!config) return null;
 
 	// Check our tools directory first
-	const localPath = join(TOOLS_DIR, config.binaryName + (platform() === "win32" ? ".exe" : ""));
+	const localPath = path.join(TOOLS_DIR, config.binaryName + (os.platform() === "win32" ? ".exe" : ""));
 	if (await Bun.file(localPath).exists()) {
 		return localPath;
 	}
@@ -187,8 +187,8 @@ async function downloadTool(tool: ToolName): Promise<string> {
 	const config = TOOLS[tool];
 	if (!config) throw new Error(`Unknown tool: ${tool}`);
 
-	const plat = platform();
-	const architecture = arch();
+	const plat = os.platform();
+	const architecture = os.arch();
 
 	// Get latest version
 	const version = await getLatestVersion(config.repo);
@@ -200,64 +200,64 @@ async function downloadTool(tool: ToolName): Promise<string> {
 	}
 
 	// Create tools directory
-	await mkdir(TOOLS_DIR, { recursive: true });
+	await fs.mkdir(TOOLS_DIR, { recursive: true });
 
 	const downloadUrl = `https://github.com/${config.repo}/releases/download/${config.tagPrefix}${version}/${assetName}`;
 	const binaryExt = plat === "win32" ? ".exe" : "";
-	const binaryPath = join(TOOLS_DIR, config.binaryName + binaryExt);
+	const binaryPath = path.join(TOOLS_DIR, config.binaryName + binaryExt);
 
 	// Handle direct binary downloads (no archive extraction needed)
 	if (config.isDirectBinary) {
 		await downloadFile(downloadUrl, binaryPath);
 		if (plat !== "win32") {
-			await chmod(binaryPath, 0o755);
+			await fs.chmod(binaryPath, 0o755);
 		}
 		return binaryPath;
 	}
 
 	// Download archive
-	const archivePath = join(TOOLS_DIR, assetName);
+	const archivePath = path.join(TOOLS_DIR, assetName);
 	await downloadFile(downloadUrl, archivePath);
 
 	// Extract
-	const tmp = await createTempDir("@omp-tools-extract-");
+	const tmp = await TempDir.create("@omp-tools-extract-");
 
 	try {
 		if (assetName.endsWith(".tar.gz")) {
 			const archive = new Bun.Archive(await Bun.file(archivePath).arrayBuffer());
 			const files = await archive.files();
-			for (const [path, file] of files) {
-				await Bun.write(join(tmp.path, path), file);
+			for (const [filePath, file] of files) {
+				await Bun.write(path.join(tmp.path(), filePath), file);
 			}
 		} else if (assetName.endsWith(".zip")) {
-			await mkdir(tmp.path, { recursive: true });
-			await $`unzip -o ${archivePath} -d ${tmp.path}`.quiet().nothrow();
+			await fs.mkdir(tmp.path(), { recursive: true });
+			await $`unzip -o ${archivePath} -d ${tmp.path()}`.quiet().nothrow();
 		}
 
 		// Find the binary in extracted files
 		// ast-grep releases the binary directly in the zip, not in a subdirectory
 		let extractedBinary: string;
 		if (tool === "sg") {
-			extractedBinary = join(tmp.path, config.binaryName + binaryExt);
+			extractedBinary = path.join(tmp.path(), config.binaryName + binaryExt);
 		} else {
-			const extractedDir = join(tmp.path, assetName.replace(/\.(tar\.gz|zip)$/, ""));
-			extractedBinary = join(extractedDir, config.binaryName + binaryExt);
+			const extractedDir = path.join(tmp.path(), assetName.replace(/\.(tar\.gz|zip)$/, ""));
+			extractedBinary = path.join(extractedDir, config.binaryName + binaryExt);
 		}
 
 		if (await Bun.file(extractedBinary).exists()) {
-			await rename(extractedBinary, binaryPath);
+			await fs.rename(extractedBinary, binaryPath);
 		} else {
 			throw new Error(`Binary not found in archive: ${extractedBinary}`);
 		}
 
 		// Make executable (Unix only)
 		if (plat !== "win32") {
-			await chmod(binaryPath, 0o755);
+			await fs.chmod(binaryPath, 0o755);
 		}
 	} finally {
 		// Cleanup
 		await tmp.remove();
-		await rm(archivePath, { force: true });
+		await fs.rm(archivePath, { force: true });
 	}
 
 	return binaryPath;