@oh-my-pi/pi-coding-agent 14.5.8 → 14.5.9

package/src/tools/{run-command → recipe}/runners/pkg.ts

@@ -9,9 +9,23 @@ interface PackageJsonInfo {
 	workspaces: string[];
 }
 
-interface PackageCommandInfo {
-	rootCommandPrefix: string;
-	workspaceCommandPrefix: (relativeDir: string) => string;
+async function resolvePackageRunner(cwd: string): Promise<string> {
+	if ((await isFile(path.join(cwd, "bun.lock"))) || (await isFile(path.join(cwd, "bun.lockb")))) {
+		return "bun run";
+	}
+	if (await isFile(path.join(cwd, "pnpm-lock.yaml"))) {
+		return "pnpm run";
+	}
+	if (await isFile(path.join(cwd, "yarn.lock"))) {
+		return "yarn";
+	}
+	if ((await isFile(path.join(cwd, "package-lock.json"))) || (await isFile(path.join(cwd, "npm-shrinkwrap.json")))) {
+		return "npm run";
+	}
+	if ($which("bun")) {
+		return "bun run";
+	}
+	return "npm run";
 }
 
 function isRecord(value: unknown): value is Record<string, unknown> {
@@ -32,43 +46,6 @@ async function isFile(filePath: string): Promise<boolean> {
 	}
 }
 
-async function resolvePackageRunner(cwd: string): Promise<PackageCommandInfo> {
-	if ((await isFile(path.join(cwd, "bun.lock"))) || (await isFile(path.join(cwd, "bun.lockb")))) {
-		return {
-			rootCommandPrefix: "bun run",
-			workspaceCommandPrefix: relativeDir => `bun --cwd ${shellQuote(relativeDir)} run`,
-		};
-	}
-	if (await isFile(path.join(cwd, "pnpm-lock.yaml"))) {
-		return {
-			rootCommandPrefix: "pnpm run",
-			workspaceCommandPrefix: relativeDir => `pnpm --dir ${shellQuote(relativeDir)} run`,
-		};
-	}
-	if (await isFile(path.join(cwd, "yarn.lock"))) {
-		return {
-			rootCommandPrefix: "yarn",
-			workspaceCommandPrefix: relativeDir => `yarn --cwd ${shellQuote(relativeDir)}`,
-		};
-	}
-	if ((await isFile(path.join(cwd, "package-lock.json"))) || (await isFile(path.join(cwd, "npm-shrinkwrap.json")))) {
-		return {
-			rootCommandPrefix: "npm run",
-			workspaceCommandPrefix: relativeDir => `npm --prefix ${shellQuote(relativeDir)} run`,
-		};
-	}
-	if ($which("bun")) {
-		return {
-			rootCommandPrefix: "bun run",
-			workspaceCommandPrefix: relativeDir => `bun --cwd ${shellQuote(relativeDir)} run`,
-		};
-	}
-	return {
-		rootCommandPrefix: "npm run",
-		workspaceCommandPrefix: relativeDir => `npm --prefix ${shellQuote(relativeDir)} run`,
-	};
-}
-
 function parseWorkspacePatterns(pkg: Record<string, unknown>): string[] {
 	const { workspaces } = pkg;
 	if (Array.isArray(workspaces)) return workspaces.filter((entry): entry is string => typeof entry === "string");
@@ -129,22 +106,17 @@ function packageTaskName(packageName: string | undefined, packageDir: string, sc
 	return `${packageName ?? packageDir}/${scriptName}`;
 }
 
-function tasksForPackage(options: {
-	pkg: PackageJsonInfo;
-	packageDir: string;
-	commandPrefix: string;
-	namespaced: boolean;
-}): RunnerTask[] {
+function tasksForPackage(options: { pkg: PackageJsonInfo; packageDir: string; namespaced: boolean }): RunnerTask[] {
 	return options.pkg.scripts.map(scriptName => ({
 		name: options.namespaced ? packageTaskName(options.pkg.name, options.packageDir, scriptName) : scriptName,
 		doc: options.namespaced ? options.packageDir : undefined,
 		parameters: [],
-		commandPrefix: options.commandPrefix,
+		cwd: options.namespaced ? options.packageDir : undefined,
 		commandName: shellQuote(scriptName),
 	}));
 }
 
-async function readPackageTasks(cwd: string, commandInfo: PackageCommandInfo): Promise<RunnerTask[] | null> {
+async function readPackageTasks(cwd: string): Promise<RunnerTask[] | null> {
 	const rootPkg = await readPackageJson(path.join(cwd, "package.json"));
 	if (!rootPkg) return null;
 	const workspacePackageJsons = await findWorkspacePackageJsons(cwd, rootPkg.workspaces);
@@ -155,7 +127,6 @@ async function readPackageTasks(cwd: string, commandInfo: PackageCommandInfo): P
 			...tasksForPackage({
 				pkg: rootPkg,
 				packageDir: ".",
-				commandPrefix: commandInfo.rootCommandPrefix,
 				namespaced: false,
 			}),
 		);
@@ -169,7 +140,6 @@ async function readPackageTasks(cwd: string, commandInfo: PackageCommandInfo): P
 			...tasksForPackage({
 				pkg,
 				packageDir,
-				commandPrefix: commandInfo.workspaceCommandPrefix(packageDir),
 				namespaced: true,
 			}),
 		);
@@ -183,10 +153,10 @@ export const pkgRunner: TaskRunner = {
 	label: "Pkg",
 	async detect(cwd: string): Promise<DetectedRunner | null> {
 		try {
-			const commandInfo = await resolvePackageRunner(cwd);
-			const tasks = await readPackageTasks(cwd, commandInfo);
+			const commandPrefix = await resolvePackageRunner(cwd);
+			const tasks = await readPackageTasks(cwd);
 			if (!tasks || tasks.length === 0) return null;
-			return { id: "pkg", label: "Pkg", commandPrefix: commandInfo.rootCommandPrefix, tasks };
+			return { id: "pkg", label: "Pkg", commandPrefix, tasks };
 		} catch (err) {
 			logger.debug("package runner probe failed", { error: err instanceof Error ? err.message : String(err) });
 			return null;

package/src/tools/renderers.ts

@@ -23,8 +23,8 @@ import { jobToolRenderer } from "./job";
 import { notebookToolRenderer } from "./notebook";
 import { pythonToolRenderer } from "./python";
 import { readToolRenderer } from "./read";
+import { recipeToolRenderer } from "./recipe/render";
 import { resolveToolRenderer } from "./resolve";
-import { runCommandToolRenderer } from "./run-command/render";
 import { searchToolRenderer } from "./search";
 import { searchToolBm25Renderer } from "./search-tool-bm25";
 import { sshToolRenderer } from "./ssh";
@@ -49,7 +49,7 @@ export const toolRenderers: Record<string, ToolRenderer> = {
 	ast_grep: astGrepToolRenderer as ToolRenderer,
 	ast_edit: astEditToolRenderer as ToolRenderer,
 	bash: bashToolRenderer as ToolRenderer,
-	run_command: runCommandToolRenderer as ToolRenderer,
+	recipe: recipeToolRenderer as ToolRenderer,
 	debug: debugToolRenderer as ToolRenderer,
 	python: pythonToolRenderer as ToolRenderer,
 	calc: calculatorToolRenderer as ToolRenderer,

package/src/tools/run-command/render.ts

@@ -1,18 +0,0 @@
-import { createShellRenderer } from "../bash";
-import type { DetectedRunner } from "./runner";
-import { commandFromOp, titleFromOp } from "./runner";
-
-export interface RunCommandRenderArgs {
-	op?: string;
-	__partialJson?: string;
-	[key: string]: unknown;
-}
-
-export function createRunCommandToolRenderer(runners: DetectedRunner[]) {
-	return createShellRenderer<RunCommandRenderArgs>({
-		resolveTitle: args => titleFromOp(args?.op, runners),
-		resolveCommand: args => commandFromOp(args?.op, runners),
-	});
-}
-
-export const runCommandToolRenderer = createRunCommandToolRenderer([]);