@oh-my-pi/pi-coding-agent 3.20.1 → 3.24.0

package/docs/hooks.md

@@ -72,7 +72,7 @@ Additional paths via `settings.json`:
 | --------------------------------- | --------------------------------------------- |
 | `@oh-my-pi/pi-coding-agent/hooks` | Hook types (`HookAPI`, `HookContext`, events) |
 | `@oh-my-pi/pi-coding-agent`       | Additional types if needed                    |
-| `@oh-my-pi/pi-ai`                 | AI utilities                                  |
+| `@mariozechner/pi-ai`             | AI utilities                                  |
 | `@oh-my-pi/pi-tui`                | TUI components                                |
 
 Node.js built-ins (`node:fs`, `node:path`, etc.) are also available.
@@ -548,7 +548,7 @@ Current model, or `undefined` if none selected yet. Use for LLM calls in hooks:
 ```typescript
 if (ctx.model) {
 	const apiKey = await ctx.modelRegistry.getApiKey(ctx.model);
-	// Use with @oh-my-pi/pi-ai complete()
+	// Use with @mariozechner/pi-ai complete()
 }
 ```
 

package/docs/sdk.md

@@ -248,7 +248,7 @@ const { session } = await createAgentSession({
 ### Model
 
 ```typescript
-import { getModel } from "@oh-my-pi/pi-ai";
+import { getModel } from "@mariozechner/pi-ai";
 import { discoverAuthStorage, discoverModels } from "@oh-my-pi/pi-coding-agent";
 
 const authStorage = discoverAuthStorage();
@@ -347,60 +347,60 @@ const { session } = await createAgentSession({
 
 ### Tools
 
-```typescript
-import {
-	codingTools, // read, bash, edit, write (default)
-	readOnlyTools, // read, grep, find, ls
-	readTool,
-	bashTool,
-	editTool,
-	writeTool,
-	grepTool,
-	findTool,
-	lsTool,
-} from "@oh-my-pi/pi-coding-agent";
+By default, `createAgentSession` creates all built-in tools automatically. You can filter which tools are available using `toolNames`:
 
-// Use built-in tool set
-const { session } = await createAgentSession({
-	tools: readOnlyTools,
-});
+```typescript
+// Use all built-in tools (default)
+const { session } = await createAgentSession();
 
-// Pick specific tools
+// Filter to specific tools
 const { session } = await createAgentSession({
-	tools: [readTool, bashTool, grepTool],
+	toolNames: ["read", "grep", "find", "ls"], // Read-only tools
 });
 ```
 
-#### Tools with Custom cwd
+#### Available Built-in Tools
+
+All tools are defined in `BUILTIN_TOOLS`:
 
-**Important:** The pre-built tool instances (`readTool`, `bashTool`, etc.) use `process.cwd()` for path resolution. When you specify a custom `cwd` AND provide explicit `tools`, you must use the tool factory functions to ensure paths resolve correctly:
+- `ask` - Interactive user prompts (requires UI)
+- `bash` - Shell command execution
+- `edit` - Surgical file editing
+- `find` - File search by glob patterns
+- `git` - Git operations (can be disabled via settings)
+- `grep` - Content search with regex
+- `ls` - Directory listing
+- `lsp` - Language server protocol integration
+- `notebook` - Jupyter notebook editing
+- `output` - Task output retrieval
+- `read` - File reading (text and images)
+- `rulebook` - Rule reference (requires rules)
+- `task` - Subagent spawning
+- `web_fetch` - Web page fetching
+- `web_search` - Web search
+- `write` - File writing
+
+#### Creating Tools Manually
+
+For advanced use cases, you can create tools directly using `createTools`:
 
 ```typescript
 import {
-	createCodingTools, // Creates [read, bash, edit, write] for specific cwd
-	createReadOnlyTools, // Creates [read, grep, find, ls] for specific cwd
-	createReadTool,
-	createBashTool,
-	createEditTool,
-	createWriteTool,
-	createGrepTool,
-	createFindTool,
-	createLsTool,
+	BUILTIN_TOOLS,
+	createTools,
+	type ToolSession,
 } from "@oh-my-pi/pi-coding-agent";
 
-const cwd = "/path/to/project";
-
-// Use factory for tool sets
-const { session } = await createAgentSession({
-	cwd,
-	tools: createCodingTools(cwd), // Tools resolve paths relative to cwd
-});
+const session: ToolSession = {
+	cwd: "/path/to/project",
+	hasUI: false,
+	rulebookRules: [],
+	getSessionFile: () => null,
+	getSessionSpawns: () => "*",
+	getAvailableTools: () => Object.keys(BUILTIN_TOOLS),
+};
 
-// Or pick specific tools
-const { session } = await createAgentSession({
-	cwd,
-	tools: [createReadTool(cwd), createBashTool(cwd), createGrepTool(cwd)],
-});
+const tools = await createTools(session);
 ```
 
 **When you don't need factories:**
@@ -733,7 +733,7 @@ Project overrides global. Nested objects merge keys. Setters only modify global
 All discovery functions accept optional `cwd` and `agentDir` parameters.
 
 ```typescript
-import { getModel } from "@oh-my-pi/pi-ai";
+import { getModel } from "@mariozechner/pi-ai";
 import {
 	AuthStorage,
 	ModelRegistry,
@@ -806,7 +806,7 @@ interface CreateAgentSessionResult {
 ## Complete Example
 
 ```typescript
-import { getModel } from "@oh-my-pi/pi-ai";
+import { getModel } from "@mariozechner/pi-ai";
 import { Type } from "@sinclair/typebox";
 import {
 	AuthStorage,
@@ -943,17 +943,14 @@ buildSystemPrompt
 SessionManager
 SettingsManager
 
-// Built-in tools (use process.cwd())
-codingTools
-readOnlyTools
-readTool, bashTool, editTool, writeTool
-grepTool, findTool, lsTool
+// Tool registry and factory
+BUILTIN_TOOLS              // Map of tool name to factory
+createTools                // Create all tools from ToolSession
+type ToolSession           // Session context for tool creation
 
-// Tool factories (for custom cwd)
-createCodingTools
-createReadOnlyTools
+// Individual tool factories
 createReadTool, createBashTool, createEditTool, createWriteTool
-createGrepTool, createFindTool, createLsTool
+createGrepTool, createFindTool, createLsTool, createGitTool
 
 // Types
 type CreateAgentSessionOptions

package/examples/custom-tools/README.md

@@ -10,10 +10,6 @@ Each example uses the `subdirectory/index.ts` structure required for tool discov
 
 Minimal example showing the basic structure of a custom tool.
 
-### question/
-
-Demonstrates `pi.ui.select()` for asking the user questions with options.
-
 ### todo/
 
 Full-featured example demonstrating:
@@ -23,17 +19,6 @@ Full-featured example demonstrating:
 - Proper branching support via details storage
 - State management without external files
 
-### subagent/
-
-Delegate tasks to specialized subagents with isolated context windows. Includes:
-
-- `index.ts` - The custom tool (single, parallel, and chain modes)
-- `agents.ts` - Agent discovery helper
-- `agents/` - Sample agent definitions (scout, planner, reviewer, worker)
-- `commands/` - Workflow presets (/implement, /scout-and-plan, /implement-and-review)
-
-See [subagent/README.md](subagent/README.md) for full documentation.
-
 ## Usage
 
 ```bash
@@ -63,7 +48,7 @@ See [docs/custom-tools.md](../../docs/custom-tools.md) for full documentation.
 
 ```typescript
 import { Type } from "@sinclair/typebox";
-import { StringEnum } from "@oh-my-pi/pi-ai";
+import { StringEnum } from "@mariozechner/pi-ai";
 import { Text } from "@oh-my-pi/pi-tui";
 import type { CustomToolFactory } from "@oh-my-pi/pi-coding-agent";
 
@@ -114,7 +99,7 @@ renderResult(result, { expanded, isPartial }, theme) {
 **Use StringEnum for string parameters** (required for Google API compatibility):
 
 ```typescript
-import { StringEnum } from "@oh-my-pi/pi-ai";
+import { StringEnum } from "@mariozechner/pi-ai";
 
 // Good
 action: StringEnum(["list", "add"] as const);

package/examples/extensions/README.md

@@ -16,54 +16,54 @@ cp permission-gate.ts ~/.omp/agent/extensions/
 
 ### Lifecycle & Safety
 
-| Extension | Description |
-|-----------|-------------|
-| `permission-gate.ts` | Prompts for confirmation before dangerous bash commands (rm -rf, sudo, etc.) |
-| `protected-paths.ts` | Blocks writes to protected paths (.env, .git/, node_modules/) |
-| `confirm-destructive.ts` | Confirms before destructive session actions (clear, switch, branch) |
-| `dirty-repo-guard.ts` | Prevents session changes with uncommitted git changes |
+| Extension                | Description                                                                  |
+| ------------------------ | ---------------------------------------------------------------------------- |
+| `permission-gate.ts`     | Prompts for confirmation before dangerous bash commands (rm -rf, sudo, etc.) |
+| `protected-paths.ts`     | Blocks writes to protected paths (.env, .git/, node_modules/)                |
+| `confirm-destructive.ts` | Confirms before destructive session actions (clear, switch, branch)          |
+| `dirty-repo-guard.ts`    | Prevents session changes with uncommitted git changes                        |
 
 ### Custom Tools
 
-| Extension | Description |
-|-----------|-------------|
-| `todo.ts` | Todo list tool + `/todos` command with custom rendering and state persistence |
-| `hello.ts` | Minimal custom tool example |
-| `question.ts` | Demonstrates `ctx.ui.select()` for asking the user questions |
-| `subagent/` | Delegate tasks to specialized subagents with isolated context windows |
+| Extension     | Description                                                                   |
+| ------------- | ----------------------------------------------------------------------------- |
+| `todo.ts`     | Todo list tool + `/todos` command with custom rendering and state persistence |
+| `hello.ts`    | Minimal custom tool example                                                   |
+| `question.ts` | Demonstrates `ctx.ui.select()` for asking the user questions                  |
+| `subagent/`   | Delegate tasks to specialized subagents with isolated context windows         |
 
 ### Commands & UI
 
-| Extension | Description |
-|-----------|-------------|
-| `plan-mode.ts` | Claude Code-style plan mode for read-only exploration with `/plan` command |
-| `tools.ts` | Interactive `/tools` command to enable/disable tools with session persistence |
-| `handoff.ts` | Transfer context to a new focused session via `/handoff <goal>` |
-| `qna.ts` | Extracts questions from last response into editor via `ctx.ui.setEditorText()` |
-| `status-line.ts` | Shows turn progress in footer via `ctx.ui.setStatus()` with themed colors |
-| `snake.ts` | Snake game with custom UI, keyboard handling, and session persistence |
+| Extension        | Description                                                                    |
+| ---------------- | ------------------------------------------------------------------------------ |
+| `plan-mode.ts`   | Claude Code-style plan mode for read-only exploration with `/plan` command     |
+| `tools.ts`       | Interactive `/tools` command to enable/disable tools with session persistence  |
+| `handoff.ts`     | Transfer context to a new focused session via `/handoff <goal>`                |
+| `qna.ts`         | Extracts questions from last response into editor via `ctx.ui.setEditorText()` |
+| `status-line.ts` | Shows turn progress in footer via `ctx.ui.setStatus()` with themed colors      |
+| `snake.ts`       | Snake game with custom UI, keyboard handling, and session persistence          |
 
 ### Git Integration
 
-| Extension | Description |
-|-----------|-------------|
-| `git-checkpoint.ts` | Creates git stash checkpoints at each turn for code restoration on branch |
-| `auto-commit-on-exit.ts` | Auto-commits on exit using last assistant message for commit message |
+| Extension                | Description                                                               |
+| ------------------------ | ------------------------------------------------------------------------- |
+| `git-checkpoint.ts`      | Creates git stash checkpoints at each turn for code restoration on branch |
+| `auto-commit-on-exit.ts` | Auto-commits on exit using last assistant message for commit message      |
 
 ### System Prompt & Compaction
 
-| Extension | Description |
-|-----------|-------------|
-| `pirate.ts` | Demonstrates `systemPromptAppend` to dynamically modify system prompt |
-| `custom-compaction.ts` | Custom compaction that summarizes entire conversation |
+| Extension              | Description                                                           |
+| ---------------------- | --------------------------------------------------------------------- |
+| `pirate.ts`            | Demonstrates `systemPromptAppend` to dynamically modify system prompt |
+| `custom-compaction.ts` | Custom compaction that summarizes entire conversation                 |
 
 ### External Dependencies
 
-| Extension | Description |
-|-----------|-------------|
+| Extension         | Description                                                               |
+| ----------------- | ------------------------------------------------------------------------- |
 | `chalk-logger.ts` | Uses chalk from parent node_modules (demonstrates jiti module resolution) |
-| `with-deps/` | Extension with its own package.json and dependencies |
-| `file-trigger.ts` | Watches a trigger file and injects contents into conversation |
+| `with-deps/`      | Extension with its own package.json and dependencies                      |
+| `file-trigger.ts` | Watches a trigger file and injects contents into conversation             |
 
 ## Writing Extensions
 
@@ -74,68 +74,70 @@ import type { ExtensionAPI } from "@oh-my-pi/pi-coding-agent";
 import { Type } from "@sinclair/typebox";
 
 export default function (pi: ExtensionAPI) {
-  // Subscribe to lifecycle events
-  pi.on("tool_call", async (event, ctx) => {
-    if (event.toolName === "bash" && event.input.command?.includes("rm -rf")) {
-      const ok = await ctx.ui.confirm("Dangerous!", "Allow rm -rf?");
-      if (!ok) return { block: true, reason: "Blocked by user" };
-    }
-  });
-
-  // Register custom tools
-  pi.registerTool({
-    name: "greet",
-    label: "Greeting",
-    description: "Generate a greeting",
-    parameters: Type.Object({
-      name: Type.String({ description: "Name to greet" }),
-    }),
-    async execute(toolCallId, params, onUpdate, ctx, signal) {
-      return {
-        content: [{ type: "text", text: `Hello, ${params.name}!` }],
-        details: {},
-      };
-    },
-  });
-
-  // Register commands
-  pi.registerCommand("hello", {
-    description: "Say hello",
-    handler: async (args, ctx) => {
-      ctx.ui.notify("Hello!", "info");
-    },
-  });
+	// Subscribe to lifecycle events
+	pi.on("tool_call", async (event, ctx) => {
+		if (event.toolName === "bash" && event.input.command?.includes("rm -rf")) {
+			const ok = await ctx.ui.confirm("Dangerous!", "Allow rm -rf?");
+			if (!ok) return { block: true, reason: "Blocked by user" };
+		}
+	});
+
+	// Register custom tools
+	pi.registerTool({
+		name: "greet",
+		label: "Greeting",
+		description: "Generate a greeting",
+		parameters: Type.Object({
+			name: Type.String({ description: "Name to greet" }),
+		}),
+		async execute(toolCallId, params, onUpdate, ctx, signal) {
+			return {
+				content: [{ type: "text", text: `Hello, ${params.name}!` }],
+				details: {},
+			};
+		},
+	});
+
+	// Register commands
+	pi.registerCommand("hello", {
+		description: "Say hello",
+		handler: async (args, ctx) => {
+			ctx.ui.notify("Hello!", "info");
+		},
+	});
 }
 ```
 
 ## Key Patterns
 
 **Use StringEnum for string parameters** (required for Google API compatibility):
+
 ```typescript
-import { StringEnum } from "@oh-my-pi/pi-ai";
+import { StringEnum } from "@mariozechner/pi-ai";
 
 // Good
-action: StringEnum(["list", "add"] as const)
+action: StringEnum(["list", "add"] as const);
 
 // Bad - doesn't work with Google
-action: Type.Union([Type.Literal("list"), Type.Literal("add")])
+action: Type.Union([Type.Literal("list"), Type.Literal("add")]);
 ```
 
 **State persistence via details:**
+
 ```typescript
 // Store state in tool result details for proper branching support
 return {
-  content: [{ type: "text", text: "Done" }],
-  details: { todos: [...todos], nextId },  // Persisted in session
+	content: [{ type: "text", text: "Done" }],
+	details: { todos: [...todos], nextId }, // Persisted in session
 };
 
 // Reconstruct on session events
 pi.on("session_start", async (_event, ctx) => {
-  for (const entry of ctx.sessionManager.getBranch()) {
-    if (entry.type === "message" && entry.message.toolName === "my_tool") {
-      const details = entry.message.details;
-      // Reconstruct state from details
-    }
-  }
+	for (const entry of ctx.sessionManager.getBranch()) {
+		if (entry.type === "message" && entry.message.toolName === "my_tool") {
+			const details = entry.message.details;
+			// Reconstruct state from details
+		}
+	}
 });
 ```

package/examples/extensions/todo.ts

@@ -10,7 +10,7 @@
  * correct for that point in history.
  */
 
-import { StringEnum } from "@oh-my-pi/pi-ai";
+import { StringEnum } from "@mariozechner/pi-ai";
 import type { ExtensionAPI, ExtensionContext, Theme } from "@oh-my-pi/pi-coding-agent";
 import { matchesKey, Text, truncateToWidth } from "@oh-my-pi/pi-tui";
 import { Type } from "@sinclair/typebox";
@@ -261,10 +261,7 @@ export default function (pi: ExtensionAPI) {
 				case "add": {
 					const added = todoList[todoList.length - 1];
 					return new Text(
-						theme.fg("success", "✓ Added ") +
-							theme.fg("accent", `#${added.id}`) +
-							" " +
-							theme.fg("muted", added.text),
+						`${theme.fg("success", "✓ Added ") + theme.fg("accent", `#${added.id}`)} ${theme.fg("muted", added.text)}`,
 						0,
 						0,
 					);

package/examples/hooks/custom-compaction.ts

@@ -13,7 +13,7 @@
  *   omp --hook examples/hooks/custom-compaction.ts
  */
 
-import { complete, getModel } from "@oh-my-pi/pi-ai";
+import { complete, getModel } from "@mariozechner/pi-ai";
 import type { HookAPI } from "@oh-my-pi/pi-coding-agent";
 import { convertToLlm, serializeConversation } from "@oh-my-pi/pi-coding-agent";
 
@@ -42,9 +42,7 @@ export default function (pi: HookAPI) {
 		const allMessages = [...messagesToSummarize, ...turnPrefixMessages];
 
 		ctx.ui.notify(
-			`Custom compaction: summarizing ${allMessages.length} messages (${tokensBefore.toLocaleString()} tokens) with ${
-				model.id
-			}...`,
+			`Custom compaction: summarizing ${allMessages.length} messages (${tokensBefore.toLocaleString()} tokens) with ${model.id}...`,
 			"info",
 		);
 

package/examples/hooks/handoff.ts

@@ -12,7 +12,7 @@
  * The generated prompt appears as a draft in the editor for review/editing.
  */
 
-import { complete, type Message } from "@oh-my-pi/pi-ai";
+import { complete, type Message } from "@mariozechner/pi-ai";
 import type { HookAPI, SessionEntry } from "@oh-my-pi/pi-coding-agent";
 import { BorderedLoader, convertToLlm, serializeConversation } from "@oh-my-pi/pi-coding-agent";
 

package/examples/hooks/qna.ts

@@ -7,7 +7,7 @@
  * 3. Loads the result into the editor for user to fill in answers
  */
 
-import { complete, type UserMessage } from "@oh-my-pi/pi-ai";
+import { complete, type UserMessage } from "@mariozechner/pi-ai";
 import type { HookAPI } from "@oh-my-pi/pi-coding-agent";
 import { BorderedLoader } from "@oh-my-pi/pi-coding-agent";
 

package/examples/sdk/02-custom-model.ts

@@ -4,7 +4,7 @@
  * Shows how to select a specific model and thinking level.
  */
 
-import { getModel } from "@oh-my-pi/pi-ai";
+import { getModel } from "@mariozechner/pi-ai";
 import { createAgentSession, discoverAuthStorage, discoverModels } from "@oh-my-pi/pi-coding-agent";
 
 // Set up auth storage and model registry

package/examples/sdk/README.md

@@ -29,7 +29,7 @@ npx tsx examples/sdk/01-minimal.ts
 ## Quick Reference
 
 ```typescript
-import { getModel } from "@oh-my-pi/pi-ai";
+import { getModel } from "@mariozechner/pi-ai";
 import {
 	AuthStorage,
 	createAgentSession,
@@ -44,12 +44,8 @@ import {
 	buildSystemPrompt,
 	ModelRegistry,
 	SessionManager,
-	codingTools,
-	readOnlyTools,
-	readTool,
-	bashTool,
-	editTool,
-	writeTool,
+	BUILTIN_TOOLS,
+	createTools,
 } from "@oh-my-pi/pi-coding-agent";
 
 // Auth and models setup
@@ -70,8 +66,8 @@ const { session } = await createAgentSession({
 	modelRegistry,
 });
 
-// Read-only
-const { session } = await createAgentSession({ tools: readOnlyTools, authStorage, modelRegistry });
+// Read-only tools
+const { session } = await createAgentSession({ toolNames: ["read", "grep", "find", "ls"], authStorage, modelRegistry });
 
 // In-memory
 const { session } = await createAgentSession({
@@ -90,7 +86,7 @@ const { session } = await createAgentSession({
 	authStorage: customAuth,
 	modelRegistry: customRegistry,
 	systemPrompt: "You are helpful.",
-	tools: [readTool, bashTool],
+	toolNames: ["read", "bash"],
 	customTools: [{ tool: myTool }],
 	hooks: [{ factory: myHook }],
 	skills: [],
@@ -119,7 +115,7 @@ await session.prompt("Hello");
 | `model`                     | From settings/first available | Model to use                      |
 | `thinkingLevel`             | From settings/"off"           | off, low, medium, high            |
 | `systemPrompt`              | Discovered                    | String or `(default) => modified` |
-| `tools`                     | `codingTools`                 | Built-in tools                    |
+| `toolNames`                 | All built-in tools            | Filter which tools to include     |
 | `customTools`               | Discovered                    | Replaces discovery                |
 | `additionalCustomToolPaths` | `[]`                          | Merge with discovery              |
 | `hooks`                     | Discovered                    | Replaces discovery                |

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "3.20.1",
+	"version": "3.24.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"ompConfig": {
@@ -29,7 +29,7 @@
 		"CHANGELOG.md"
 	],
 	"scripts": {
-		"check": "tsgo --noEmit",
+		"check": "tsgo -p tsconfig.check.json",
 		"clean": "rm -rf dist",
 		"build": "tsgo -p tsconfig.build.json && chmod +x dist/cli.js",
 		"build:binary": "bun build --compile ./src/cli.ts --outfile dist/omp",
@@ -39,10 +39,10 @@
 		"prepublishOnly": "bun run generate-template && bun run clean && bun run build"
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-agent-core": "3.20.1",
-		"@oh-my-pi/pi-ai": "3.20.1",
-		"@oh-my-pi/pi-git-tool": "3.20.1",
-		"@oh-my-pi/pi-tui": "3.20.1",
+		"@mariozechner/pi-ai": "^0.37.4",
+		"@oh-my-pi/pi-agent-core": "3.24.0",
+		"@oh-my-pi/pi-git-tool": "3.24.0",
+		"@oh-my-pi/pi-tui": "3.24.0",
 		"@openai/agents": "^0.3.7",
 		"@sinclair/typebox": "^0.34.46",
 		"ajv": "^8.17.1",

package/src/cli/args.ts

@@ -5,11 +5,12 @@
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import chalk from "chalk";
 import { APP_NAME, CONFIG_DIR_NAME, ENV_AGENT_DIR } from "../config";
-import { allTools, type ToolName } from "../core/tools/index";
+import { BUILTIN_TOOLS } from "../core/tools/index";
 
 export type Mode = "text" | "json" | "rpc";
 
 export interface Args {
+	cwd?: string;
 	provider?: string;
 	model?: string;
 	smol?: string;
@@ -27,7 +28,7 @@ export interface Args {
 	session?: string;
 	sessionDir?: string;
 	models?: string[];
-	tools?: ToolName[];
+	tools?: string[];
 	hooks?: string[];
 	extensions?: string[];
 	print?: boolean;
@@ -94,13 +95,15 @@ export function parseArgs(args: string[], extensionFlags?: Map<string, { type: "
 			result.models = args[++i].split(",").map((s) => s.trim());
 		} else if (arg === "--tools" && i + 1 < args.length) {
 			const toolNames = args[++i].split(",").map((s) => s.trim());
-			const validTools: ToolName[] = [];
+			const validTools: string[] = [];
 			for (const name of toolNames) {
-				if (name in allTools) {
-					validTools.push(name as ToolName);
+				if (name in BUILTIN_TOOLS) {
+					validTools.push(name);
 				} else {
 					console.error(
-						chalk.yellow(`Warning: Unknown tool "${name}". Valid tools: ${Object.keys(allTools).join(", ")}`),
+						chalk.yellow(
+							`Warning: Unknown tool "${name}". Valid tools: ${Object.keys(BUILTIN_TOOLS).join(", ")}`,
+						),
 					);
 				}
 			}

package/src/cli/file-processor.ts

@@ -4,7 +4,7 @@
 
 import { existsSync, readFileSync, statSync } from "node:fs";
 import { resolve } from "node:path";
-import type { ImageContent } from "@oh-my-pi/pi-ai";
+import type { ImageContent } from "@mariozechner/pi-ai";
 import chalk from "chalk";
 import { resolveReadPath } from "../core/tools/path-utils";
 import { formatDimensionNote, resizeImage } from "../utils/image-resize";

package/src/cli/list-models.ts

@@ -2,7 +2,7 @@
  * List available models with optional fuzzy search
  */
 
-import type { Api, Model } from "@oh-my-pi/pi-ai";
+import type { Api, Model } from "@mariozechner/pi-ai";
 import type { ModelRegistry } from "../core/model-registry";
 import { fuzzyFilter } from "../utils/fuzzy";