@mammothb/pi-eval 1.0.0 → 2.0.0

package/README.md

@@ -11,19 +11,33 @@ between calls.
 
 ### Tool parameters
 
-| Parameter          | Type   | Default    | Description |
-| ------------------ | ------ | ---------- | ----------- |
-| `language`         | string | _(required)_ | Programming language: `"javascript"` or `"python"` |
-| `code`             | string | _(required)_ | Code to execute |
-| `nodeModulesPath`  | string | —          | Path to node_modules for `require()` resolution |
-| `pythonPath`       | string | —          | Path to python3 binary (e.g., `.venv/bin/python3`) |
+| Parameter  | Type   | Default     | Description |
+| ---------- | ------ | ----------- | ----------- |
+| `language` | string | _(required)_ | Programming language: `"javascript"` or `"python"` |
+| `code`     | string | _(required)_ | Code to execute |
+
+### Runtime configuration
+
+Python binary and Node.js module paths are configured via JSON files, not per-call parameters:
+
+- **Global**: `~/.pi/agent/pi-eval.json`
+- **Project**: `.pi/pi-eval.json` (overrides global)
+
+```json
+{
+  "pythonPath": ".venv/bin/python3",
+  "nodeModulesPath": "./node_modules"
+}
+```
+
+Relative paths in project configs are resolved relative to the project root.
 
 ### Features
 
 - **JavaScript**: Writes code to a temp file, spawns `node` as a subprocess.
   Console output is captured as labeled `STDOUT:` / `STDERR:` sections.
+  Set `nodeModulesPath` in config to make project packages available via `require()`.
 - **Python**: Spawns `python3` with `-c`, capturing stdout/stderr identically.
-  Supports virtual environments via the `pythonPath` parameter.
-- **Safety**: 30-second timeout, 1 MB output cap, abort-on-Escape support.
-- **Dependency isolation**: Use `nodeModulesPath` to resolve packages from a
-  project's `node_modules/`. Use `pythonPath` to target a venv.
+  By default, searches `PATH` for `python3` (falling back to `/usr/bin/python3`,
+  `/usr/local/bin/python3`). Set `pythonPath` in config to target a venv or custom binary.
+- **Safety**: 30-second timeout, 1 MB output cap, Escape to cancel a running evaluation.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mammothb/pi-eval",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "A pi extension that adds an eval tool for executing JavaScript and Python code in isolated subprocesses",
   "keywords": [
     "pi-package"
@@ -15,6 +15,9 @@
       "./index.ts"
     ]
   },
+  "dependencies": {
+    "@mammothb/pi-shared": "1.0.0"
+  },
   "devDependencies": {
     "typebox": "^1.2.0"
   },

package/src/config.ts

@@ -0,0 +1,67 @@
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
+import { expandTilde } from "@mammothb/pi-shared";
+
+export interface EvalConfig {
+  /**
+   * Path to a python3 binary (e.g., '.venv/bin/python3' for venvs).
+   * When set, this binary is used for all Python evaluations instead of
+   * searching PATH for 'python3'.
+   */
+  pythonPath?: string;
+  /**
+   * Path to a node_modules directory. When set, NODE_PATH is passed
+   * to the Node.js subprocess so require() resolves from this directory.
+   * Use './node_modules' for project-local packages.
+   */
+  nodeModulesPath?: string;
+}
+
+export const DEFAULT_CONFIG: EvalConfig = {};
+
+/**
+ * Load config from JSON files. Project config (`.pi/pi-eval.json`)
+ * overrides global config (`~/.pi/agent/pi-eval.json`).
+ *
+ * Returns the default config if no config files exist.
+ */
+export function loadConfig(cwd: string): EvalConfig {
+  const globalPath = join(getAgentDir(), "pi-eval.json");
+  const projectPath = join(cwd, ".pi", "pi-eval.json");
+
+  let global: Partial<EvalConfig> | undefined;
+  let project: Partial<EvalConfig> | undefined;
+
+  if (existsSync(globalPath)) {
+    try {
+      global = JSON.parse(readFileSync(globalPath, "utf-8"));
+    } catch (err) {
+      console.error(`Failed to load global config from ${globalPath}: ${err}`);
+    }
+  }
+
+  if (existsSync(projectPath)) {
+    try {
+      project = JSON.parse(readFileSync(projectPath, "utf-8"));
+    } catch (err) {
+      console.error(
+        `Failed to load project config from ${projectPath}: ${err}`,
+      );
+    }
+  }
+
+  const merged = {
+    ...DEFAULT_CONFIG,
+    ...global,
+    ...project,
+  };
+
+  return {
+    ...merged,
+    pythonPath: merged.pythonPath ? expandTilde(merged.pythonPath) : undefined,
+    nodeModulesPath: merged.nodeModulesPath
+      ? expandTilde(merged.nodeModulesPath)
+      : undefined,
+  };
+}

package/src/eval.ts

@@ -1,5 +1,6 @@
 import type { ToolDefinition } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
+import { loadConfig } from "./config.js";
 import { executeJavaScript } from "./javascript.js";
 import { executePython } from "./python.js";
 import {
@@ -13,21 +14,6 @@ export const TIMEOUT_MS = 30_000;
 const Parameters = Type.Object({
   language: Type.Union([Type.Literal("javascript"), Type.Literal("python")]),
   code: Type.String({ description: "Code to execute" }),
-  pythonPath: Type.Optional(
-    Type.String({
-      description:
-        "Path to python3 binary (e.g., '.venv/bin/python3' for venvs). " +
-        "Defaults to 'python3'.",
-    }),
-  ),
-  nodeModulesPath: Type.Optional(
-    Type.String({
-      description:
-        "Path to a node_modules directory. When set, NODE_PATH is passed " +
-        "to the subprocess so require() resolves from this directory. " +
-        "Use './node_modules' for project-local packages.",
-    }),
-  ),
 });
 
 export function createEvalTool(): ToolDefinition<
@@ -42,13 +28,13 @@ export function createEvalTool(): ToolDefinition<
 - Each call is a fresh subprocess — no state persists between calls
 - 30-second timeout; press Escape to cancel a running evaluation
 - Working directory is the agent's current working directory (like bash)
-- Use nodeModulesPath to resolve require() from a project directory
-- Use pythonPath to target a virtual environment`,
+- Set pythonPath or nodeModulesPath in ~/.pi/agent/pi-eval.json (global) or .pi/pi-eval.json (project) to configure the runtime for all eval calls`,
     promptSnippet:
       "Execute JavaScript or Python code in an isolated subprocess",
     parameters: Parameters,
     async execute(_toolCallId, params, signal, _onUpdate, ctx) {
-      const { language, code, pythonPath, nodeModulesPath } = params;
+      const { language, code } = params;
+      const config = loadConfig(ctx.cwd);
 
       // Validate language (belt-and-suspenders: TypeBox schema already constrains it,
       // but a raw API call could bypass validation)
@@ -69,13 +55,19 @@ export function createEvalTool(): ToolDefinition<
       }
 
       if (language === "python") {
-        return executePython(code, pythonPath, signal, timeoutSignal, ctx.cwd);
+        return executePython(
+          code,
+          config.pythonPath,
+          signal,
+          timeoutSignal,
+          ctx.cwd,
+        );
       }
 
       // ── JavaScript execution via temp file + node subprocess ──
       return executeJavaScript(
         code,
-        nodeModulesPath,
+        config.nodeModulesPath,
         signal,
         timeoutSignal,
         ctx.cwd,