@oh-my-pi/pi-coding-agent 10.5.0 → 10.6.1

package/CHANGELOG.md

@@ -2,6 +2,54 @@
 
 ## [Unreleased]
 
+## [10.6.1] - 2026-02-04
+
+### Added
+
+- Added `commit` model role for dedicated commit message generation
+- Exported `resolveModelOverride` function from model resolver for external use
+
+### Changed
+
+- Updated model role resolution to accept optional `roleOrder` parameter for custom role priority
+- Made `tag` and `color` properties optional in `ModelRoleInfo` interface
+- Updated model selector to safely handle roles without tag or color definitions
+- Refactored role label display to use centralized `MODEL_ROLES` registry instead of hardcoded strings
+- Refactored model role system to use centralized `MODEL_ROLES` registry with consistent tag, name, and color definitions
+- Simplified model role resolution to use `MODEL_ROLE_IDS` array instead of hardcoded role checks
+- Updated model selector to dynamically generate menu actions from `MODEL_ROLES` registry
+
+### Removed
+
+- Removed support for `omp/` model role prefix; use `pi/` prefix instead
+
+## [10.6.0] - 2026-02-04
+### Breaking Changes
+
+- Removed `output_mode` parameter from grep tool—results now always use content mode with formatted match output
+- Renamed grep context parameters from `context_pre`/`context_post` to `pre`/`post`
+- Removed `n` (show line numbers) parameter—line numbers are now always displayed in grep results
+
+### Added
+
+- Added Jina as a web search provider option alongside Exa, Perplexity, and Anthropic
+- Added support for Jina Reader API integration with automatic provider detection when JINA_API_KEY is configured
+
+### Changed
+
+- Reformatted grep output to display matches grouped by file with numbered match headers and aligned context lines
+- Updated grep output to use `>>` prefix for match lines and aligned spacing for context lines for improved readability
+- Changed multiline matching to automatically enable when pattern contains literal newlines (`
+`)
+- Split grep context parameter into separate `context_pre` and `context_post` options for independent control of lines before and after matches
+- Updated grep tool to use configurable default context settings from `grep.contextBefore` and `grep.contextAfter` configuration
+- Added configurable grep context defaults and reduced the default to 1 line before, 3 lines after
+- Enabled the browser tool by default
+
+### Removed
+
+- Removed `filesWithMatches` and `count` output modes from grep tool
+
 ## [10.5.0] - 2026-02-04
 
 ### Breaking Changes

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "10.5.0",
+	"version": "10.6.1",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"ompConfig": {
@@ -80,12 +80,12 @@
 	},
 	"dependencies": {
 		"@mozilla/readability": "0.6.0",
-		"@oh-my-pi/omp-stats": "10.5.0",
-		"@oh-my-pi/pi-agent-core": "10.5.0",
-		"@oh-my-pi/pi-ai": "10.5.0",
-		"@oh-my-pi/pi-natives": "10.5.0",
-		"@oh-my-pi/pi-tui": "10.5.0",
-		"@oh-my-pi/pi-utils": "10.5.0",
+		"@oh-my-pi/omp-stats": "10.6.1",
+		"@oh-my-pi/pi-agent-core": "10.6.1",
+		"@oh-my-pi/pi-ai": "10.6.1",
+		"@oh-my-pi/pi-natives": "10.6.1",
+		"@oh-my-pi/pi-tui": "10.6.1",
+		"@oh-my-pi/pi-utils": "10.6.1",
 		"@openai/agents": "^0.4.5",
 		"@sinclair/typebox": "^0.34.48",
 		"ajv": "^8.17.1",

package/src/commit/model-selection.ts

@@ -1,5 +1,12 @@
 import type { Api, Model } from "@oh-my-pi/pi-ai";
-import { parseModelPattern, parseModelString, SMOL_MODEL_PRIORITY } from "../config/model-resolver";
+import { MODEL_ROLE_IDS } from "../config/model-registry";
+import {
+	expandRoleAlias,
+	parseModelPattern,
+	resolveModelFromSettings,
+	resolveModelFromString,
+	SMOL_MODEL_PRIORITY,
+} from "../config/model-resolver";
 import type { Settings } from "../config/settings";
 
 export async function resolvePrimaryModel(
@@ -12,9 +19,15 @@ export async function resolvePrimaryModel(
 ): Promise<{ model: Model<Api>; apiKey: string }> {
 	const available = modelRegistry.getAvailable();
 	const matchPreferences = { usageOrder: settings.getStorage()?.getModelUsageOrder() };
+	const roleOrder = ["commit", "smol", ...MODEL_ROLE_IDS] as const;
 	const model = override
 		? resolveModelFromString(expandRoleAlias(override, settings), available, matchPreferences)
-		: resolveModelFromSettings(settings, available, matchPreferences);
+		: resolveModelFromSettings({
+				settings,
+				availableModels: available,
+				matchPreferences,
+				roleOrder,
+			});
 	if (!model) {
 		throw new Error("No model available for commit generation");
 	}
@@ -37,7 +50,9 @@ export async function resolveSmolModel(
 	const available = modelRegistry.getAvailable();
 	const matchPreferences = { usageOrder: settings.getStorage()?.getModelUsageOrder() };
 	const role = settings.getModelRole("smol");
-	const roleModel = role ? resolveModelFromString(role, available, matchPreferences) : undefined;
+	const roleModel = role
+		? resolveModelFromString(expandRoleAlias(role, settings), available, matchPreferences)
+		: undefined;
 	if (roleModel) {
 		const apiKey = await modelRegistry.getApiKey(roleModel);
 		if (apiKey) return { model: roleModel, apiKey };
@@ -52,39 +67,3 @@ export async function resolveSmolModel(
 
 	return { model: fallbackModel, apiKey: fallbackApiKey };
 }
-
-function resolveModelFromSettings(
-	settings: Settings,
-	available: Model<Api>[],
-	matchPreferences: { usageOrder?: string[] },
-): Model<Api> | undefined {
-	const roles = ["commit", "smol", "default"];
-	for (const role of roles) {
-		const configured = settings.getModelRole(role);
-		if (!configured) continue;
-		const resolved = resolveModelFromString(expandRoleAlias(configured, settings), available, matchPreferences);
-		if (resolved) return resolved;
-	}
-	return available[0];
-}
-
-function resolveModelFromString(
-	value: string,
-	available: Model<Api>[],
-	matchPreferences: { usageOrder?: string[] },
-): Model<Api> | undefined {
-	const parsed = parseModelString(value);
-	if (parsed) {
-		return available.find(model => model.provider === parsed.provider && model.id === parsed.id);
-	}
-	return parseModelPattern(value, available, matchPreferences).model;
-}
-
-function expandRoleAlias(value: string, settings: Settings): string {
-	const lower = value.toLowerCase();
-	if (lower.startsWith("pi/") || lower.startsWith("omp/")) {
-		const role = lower.startsWith("pi/") ? value.slice(3) : value.slice(4);
-		return settings.getModelRole(role) ?? value;
-	}
-	return value;
-}

package/src/config/model-registry.ts

@@ -15,8 +15,27 @@ import { isEnoent, logger } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import AjvModule from "ajv";
 import { YAML } from "bun";
+import type { ThemeColor } from "../modes/theme/theme";
 import type { AuthStorage } from "../session/auth-storage";
 
+export type ModelRole = "default" | "smol" | "slow" | "plan" | "commit";
+
+export interface ModelRoleInfo {
+	tag?: string;
+	name: string;
+	color?: ThemeColor;
+}
+
+export const MODEL_ROLES: Record<ModelRole, ModelRoleInfo> = {
+	default: { tag: "DEFAULT", name: "Default", color: "success" },
+	smol: { tag: "SMOL", name: "Fast", color: "warning" },
+	slow: { tag: "SLOW", name: "Thinking", color: "accent" },
+	plan: { tag: "PLAN", name: "Architect", color: "muted" },
+	commit: { name: "Commit" },
+};
+
+export const MODEL_ROLE_IDS: ModelRole[] = ["default", "smol", "slow", "plan", "commit"];
+
 const Ajv = (AjvModule as any).default || AjvModule;
 
 const OpenRouterRoutingSchema = Type.Object({

package/src/config/model-resolver.ts

@@ -6,7 +6,8 @@ import { type Api, type KnownProvider, type Model, modelsAreEqual } from "@oh-my
 import chalk from "chalk";
 import { isValidThinkingLevel } from "../cli/args";
 import { fuzzyMatch } from "../utils/fuzzy";
-import type { ModelRegistry } from "./model-registry";
+import { MODEL_ROLE_IDS, type ModelRegistry, type ModelRole } from "./model-registry";
+import type { Settings } from "./settings";
 
 /** Default model IDs for each known provider */
 export const defaultModelPerProvider: Record<KnownProvider, string> = {
@@ -310,6 +311,96 @@ export function parseModelPattern(
 	return parseModelPatternWithContext(pattern, availableModels, context);
 }
 
+const PREFIX_MODEL_ROLE = "pi/";
+const DEFAULT_MODEL_ROLE = "default";
+
+/**
+ * Check if a model override value is effectively the default role.
+ */
+export function isDefaultModelAlias(value: string | string[] | undefined): boolean {
+	if (!value) return true;
+	if (Array.isArray(value)) return value.every(entry => isDefaultModelAlias(entry));
+	if (value.startsWith(PREFIX_MODEL_ROLE)) {
+		value = value.slice(PREFIX_MODEL_ROLE.length);
+	}
+	return value === DEFAULT_MODEL_ROLE;
+}
+
+/**
+ * Expand a role alias like "pi/smol" to the configured model string.
+ */
+export function expandRoleAlias(value: string, settings?: Settings): string {
+	const normalized = value.trim();
+	if (normalized === "default") return settings?.getModelRole("default") ?? value;
+	if (!normalized.startsWith(PREFIX_MODEL_ROLE)) return value;
+	const role = normalized.slice(PREFIX_MODEL_ROLE.length) as ModelRole;
+	if (!MODEL_ROLE_IDS.includes(role)) return value;
+	return settings?.getModelRole(role) ?? value;
+}
+
+/**
+ * Resolve a model identifier or pattern to a Model instance.
+ */
+export function resolveModelFromString(
+	value: string,
+	available: Model<Api>[],
+	matchPreferences?: ModelMatchPreferences,
+): Model<Api> | undefined {
+	const parsed = parseModelString(value);
+	if (parsed) {
+		return available.find(model => model.provider === parsed.provider && model.id === parsed.id);
+	}
+	return parseModelPattern(value, available, matchPreferences).model;
+}
+
+/**
+ * Resolve a model from configured roles, honoring order and overrides.
+ */
+export function resolveModelFromSettings(options: {
+	settings: Settings;
+	availableModels: Model<Api>[];
+	matchPreferences?: ModelMatchPreferences;
+	roleOrder?: readonly ModelRole[];
+}): Model<Api> | undefined {
+	const { settings, availableModels, matchPreferences, roleOrder } = options;
+	const roles = roleOrder ?? MODEL_ROLE_IDS;
+	for (const role of roles) {
+		const configured = settings.getModelRole(role);
+		if (!configured) continue;
+		const resolved = resolveModelFromString(expandRoleAlias(configured, settings), availableModels, matchPreferences);
+		if (resolved) return resolved;
+	}
+	return availableModels[0];
+}
+
+/**
+ * Resolve a list of override patterns to the first matching model.
+ */
+export function resolveModelOverride(
+	modelPatterns: string[],
+	modelRegistry: ModelRegistry,
+	settings?: Settings,
+): { model?: Model<Api>; thinkingLevel?: ThinkingLevel } {
+	if (modelPatterns.length === 0) return {};
+	const matchPreferences = { usageOrder: settings?.getStorage()?.getModelUsageOrder() };
+	for (const pattern of modelPatterns) {
+		const normalized = pattern.trim();
+		if (!normalized || isDefaultModelAlias(normalized)) {
+			continue;
+		}
+		const effectivePattern = expandRoleAlias(pattern, settings);
+		const { model, thinkingLevel } = parseModelPattern(
+			effectivePattern,
+			modelRegistry.getAvailable(),
+			matchPreferences,
+		);
+		if (model) {
+			return { model, thinkingLevel: thinkingLevel !== "off" ? thinkingLevel : undefined };
+		}
+	}
+	return {};
+}
+
 /**
  * Resolve model patterns to actual Model objects with optional thinking levels
  * Format: "pattern:level" where :level is optional

package/src/config/settings-schema.ts

@@ -329,6 +329,26 @@ export const SETTINGS_SCHEMA = {
 		default: true,
 		ui: { tab: "tools", label: "Enable Grep", description: "Enable the grep tool for content searching" },
 	},
+	"grep.contextBefore": {
+		type: "number",
+		default: 1,
+		ui: {
+			tab: "tools",
+			label: "Grep context before",
+			description: "Lines of context before each grep match",
+			submenu: true,
+		},
+	},
+	"grep.contextAfter": {
+		type: "number",
+		default: 3,
+		ui: {
+			tab: "tools",
+			label: "Grep context after",
+			description: "Lines of context after each grep match",
+			submenu: true,
+		},
+	},
 	"notebook.enabled": {
 		type: "boolean",
 		default: true,
@@ -360,7 +380,7 @@ export const SETTINGS_SCHEMA = {
 	},
 	"browser.enabled": {
 		type: "boolean",
-		default: false,
+		default: true,
 		ui: {
 			tab: "tools",
 			label: "Enable Browser",
@@ -485,7 +505,7 @@ export const SETTINGS_SCHEMA = {
 	// ─────────────────────────────────────────────────────────────────────────
 	"providers.webSearch": {
 		type: "enum",
-		values: ["auto", "exa", "perplexity", "anthropic"] as const,
+		values: ["auto", "exa", "jina", "perplexity", "anthropic"] as const,
 		default: "auto",
 		ui: { tab: "services", label: "Web search provider", description: "Provider for web search tool", submenu: true },
 	},

package/src/config/settings.ts

@@ -13,6 +13,7 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
+import type { ModelRole } from "@oh-my-pi/pi-coding-agent/config/model-registry";
 import { isEnoent, logger, procmgr } from "@oh-my-pi/pi-utils";
 import { YAML } from "bun";
 import { type Settings as SettingsCapabilityItem, settingsCapability } from "../capability/settings";
@@ -387,7 +388,7 @@ export class Settings {
 	/**
 	 * Set a model role (helper for modelRoles record).
 	 */
-	setModelRole(role: string, modelId: string): void {
+	setModelRole(role: ModelRole | string, modelId: string): void {
 		const current = this.get("modelRoles");
 		this.set("modelRoles", { ...current, [role]: modelId });
 	}
@@ -395,11 +396,31 @@ export class Settings {
 	/**
 	 * Get a model role (helper for modelRoles record).
 	 */
-	getModelRole(role: string): string | undefined {
+	getModelRole(role: ModelRole | string): string | undefined {
 		const roles = this.get("modelRoles");
 		return roles[role];
 	}
 
+	/**
+	 * Get all model roles (helper for modelRoles record).
+	 */
+	getModelRoles(): ReadOnlyDict<string> {
+		return this.get("modelRoles");
+	}
+
+	/*
+	 * Override model roles (helper for modelRoles record).
+	 */
+	overrideModelRoles(roles: ReadOnlyDict<string>): void {
+		const prev = this.get("modelRoles");
+		for (const [role, modelId] of Object.entries(roles)) {
+			if (modelId) {
+				prev[role] = modelId;
+			}
+		}
+		this.set("modelRoles", prev);
+	}
+
 	/**
 	 * Set disabled providers (for compatibility with discovery system).
 	 */

package/src/cursor.ts

@@ -167,7 +167,7 @@ export class CursorExecHandlers implements ICursorExecHandlers {
 			pattern: args.pattern,
 			path: args.path || undefined,
 			glob: args.glob || undefined,
-			output_mode: args.outputMode || undefined,
+			mode: args.outputMode || undefined,
 			context: args.context ?? args.contextBefore ?? args.contextAfter ?? undefined,
 			ignore_case: args.caseInsensitive || undefined,
 			type: args.type || undefined,

package/src/extensibility/custom-tools/types.ts

@@ -51,7 +51,7 @@ export interface CustomToolContext {
 	/** Model registry - use for API key resolution and model retrieval */
 	modelRegistry: ModelRegistry;
 	/** Current model (may be undefined if no model is selected yet) */
-	model: Model<any> | undefined;
+	model: Model | undefined;
 	/** Whether the agent is idle (not streaming) */
 	isIdle(): boolean;
 	/** Whether there are queued messages waiting to be processed */

package/src/extensibility/extensions/loader.ts

@@ -206,7 +206,7 @@ class ConcreteExtensionAPI implements ExtensionAPI, IExtensionRuntime {
 		return this.runtime.setActiveTools(toolNames);
 	}
 
-	setModel(model: Model<any>): Promise<boolean> {
+	setModel(model: Model): Promise<boolean> {
 		return this.runtime.setModel(model);
 	}
 

package/src/extensibility/extensions/runner.ts

@@ -112,7 +112,7 @@ export class ExtensionRunner {
 	private sessionManager: SessionManager;
 	private modelRegistry: ModelRegistry;
 	private errorListeners: Set<ExtensionErrorListener> = new Set();
-	private getModel: () => Model<any> | undefined = () => undefined;
+	private getModel: () => Model | undefined = () => undefined;
 	private isIdleFn: () => boolean = () => true;
 	private waitForIdleFn: () => Promise<void> = async () => {};
 	private abortFn: () => void = () => {};

package/src/extensibility/extensions/types.ts

@@ -162,7 +162,7 @@ export interface ExtensionContext {
 	/** Model registry for API key resolution */
 	modelRegistry: ModelRegistry;
 	/** Current model (may be undefined) */
-	model: Model<any> | undefined;
+	model: Model | undefined;
 	/** Whether the agent is idle (not streaming) */
 	isIdle(): boolean;
 	/** Abort the current agent operation */
@@ -776,7 +776,7 @@ export interface ExtensionAPI {
 	setActiveTools(toolNames: string[]): Promise<void>;
 
 	/** Set the current model. Returns false if no API key available. */
-	setModel(model: Model<any>): Promise<boolean>;
+	setModel(model: Model): Promise<boolean>;
 
 	/** Get current thinking level. */
 	getThinkingLevel(): ThinkingLevel;
@@ -835,7 +835,7 @@ export type GetAllToolsHandler = () => string[];
 
 export type SetActiveToolsHandler = (toolNames: string[]) => Promise<void>;
 
-export type SetModelHandler = (model: Model<any>) => Promise<boolean>;
+export type SetModelHandler = (model: Model) => Promise<boolean>;
 
 export type GetThinkingLevelHandler = () => ThinkingLevel;
 
@@ -862,7 +862,7 @@ export interface ExtensionActions {
 
 /** Actions for ExtensionContext (ctx.* in event handlers). */
 export interface ExtensionContextActions {
-	getModel: () => Model<any> | undefined;
+	getModel: () => Model | undefined;
 	isIdle: () => boolean;
 	abort: () => void;
 	hasPendingMessages: () => boolean;

package/src/extensibility/hooks/runner.ts

@@ -69,7 +69,7 @@ export class HookRunner {
 	private sessionManager: SessionManager;
 	private modelRegistry: ModelRegistry;
 	private errorListeners: Set<HookErrorListener> = new Set();
-	private getModel: () => Model<any> | undefined = () => undefined;
+	private getModel: () => Model | undefined = () => undefined;
 	private isIdleFn: () => boolean = () => true;
 	private waitForIdleFn: () => Promise<void> = async () => {};
 	private abortFn: () => void = () => {};
@@ -93,7 +93,7 @@ export class HookRunner {
 	 */
 	initialize(options: {
 		/** Function to get the current model */
-		getModel: () => Model<any> | undefined;
+		getModel: () => Model | undefined;
 		/** Handler for hooks to send messages */
 		sendMessageHandler: SendMessageHandler;
 		/** Handler for hooks to append entries */

package/src/extensibility/hooks/types.ts

@@ -147,7 +147,7 @@ export interface HookContext {
 	/** Model registry - use for API key resolution and model retrieval */
 	modelRegistry: ModelRegistry;
 	/** Current model (may be undefined if no model is selected yet) */
-	model: Model<any> | undefined;
+	model: Model | undefined;
 	/** Whether the agent is idle (not streaming) */
 	isIdle(): boolean;
 	/** Abort the current agent operation (fire-and-forget, does not wait) */

package/src/main.ts

@@ -391,8 +391,7 @@ async function buildSessionOptions(
 			process.exit(1);
 		}
 		options.model = model;
-		const currentRoles = settings.get("modelRoles") as Record<string, string>;
-		settings.override("modelRoles", { ...currentRoles, default: `${model.provider}/${model.id}` });
+		settings.overrideModelRoles({ default: `${model.provider}/${model.id}` });
 	} else if (scopedModels.length > 0 && !parsed.continue && !parsed.resume) {
 		const remembered = settings.getModelRole("default");
 		if (remembered) {