@oh-my-pi/pi-coding-agent 13.3.6 → 13.3.8

package/CHANGELOG.md

@@ -2,6 +2,121 @@
 
 ## [Unreleased]
 
+## [13.3.8] - 2026-02-28
+
+### Added
+
+- Added `ast_find` tool for structural code search using AST matching via ast-grep, enabling syntax-aware pattern discovery across codebases
+- Added `ast_replace` tool for structural AST-aware rewrites via ast-grep, enabling safe syntax-level codemods without text-based fragility
+- Added `astFind.enabled` and `astReplace.enabled` settings to control availability of AST tools
+- Added system prompt guidance to prefer AST tools over bash text manipulation (grep/sed/awk/perl) for syntax-aware operations
+- Extracted prompt formatting logic into reusable `formatPromptContent()` utility with configurable render phases and formatting options
+- Added `type_definition` action to navigate to symbol type definitions with source context
+- Added `implementation` action to find concrete implementations of symbols with source context
+- Added `code_actions` action to list and apply language server code fixes, refactors, and import suggestions
+- Added `symbol` parameter to automatically resolve column position by searching for substring on target line
+- Added `occurrence` parameter to disambiguate repeated `symbol` matches on the same line
+- Added source code context display (3 lines) for definition, type definition, and implementation results
+- Added context display for first 50 references with remaining references shown location-only to balance detail and performance
+- Added support for glob patterns in `file` parameter for diagnostics action (e.g., `src/**/*.ts`)
+- Added `waitForIdle()` method to ensure prompt completion waits for all deferred recovery work (TTSR continuations, context promotions, compaction retries) to fully settle
+- Added `getLastAssistantMessage()` method to retrieve the most recent assistant message from session state without manual array indexing
+- Implemented TTSR resume gate to ensure `prompt()` blocks until TTSR interrupt continuations complete, preventing race conditions between TTSR injections and subsequent prompts
+- Added `tools.maxTimeout` setting to enforce a global timeout ceiling across all tool calls
+
+### Changed
+
+- Replaced `globSync` from `glob` package with native `Bun.Glob` API for glob pattern matching
+- Replaced `fileTypeFromBuffer` from `file-type` package with inline MIME type detection for JPEG, PNG, GIF, and WebP formats
+- Reduced MIME type sniffing buffer size from 4100 bytes to 12 bytes for improved performance
+- Changed mermaid cache key type from `string` to `bigint` for more efficient hashing
+- Replaced `smol-toml` dependency with native `Bun.TOML.parse()` for TOML parsing, reducing external dependencies
+- Replaced `node-html-parser` dependency with `linkedom` for HTML parsing, improving performance and reducing bundle size
+- Updated HTML parsing API calls from `node-html-parser` to `linkedom` across all web scrapers (arXiv, IACR, Go pkg, Read the Docs, Twitter, Wikipedia)
+- Changed element text extraction from `.text` property to `.textContent` property for compatibility with linkedom DOM API
+- Optimized document link extraction to use regex-based parsing with deduplication and a 20-link limit instead of full DOM traversal
+- Unified `path` parameter in ast_find and ast_replace tools to accept files, directories, or glob patterns directly, eliminating the separate `glob` parameter
+- Removed `strictness` parameter from ast_find and ast_replace tools
+- Removed `fail_on_parse_error` parameter from ast_replace tool (now always false)
+- Updated ast_find and ast_replace prompt guidance to clarify that `path` accepts glob patterns and no longer requires separate glob specification
+- Refactored prompt template rendering to use unified `formatPromptContent()` function with phase-aware formatting (pre-render vs post-render)
+- Updated `format-prompts.ts` script to use centralized prompt formatting utility instead of inline implementation
+- Replaced `column` parameter with `symbol` parameter for more intuitive position specification
+- Removed `files` parameter; use glob patterns in `file` parameter instead
+- Removed `end_line` and `end_character` parameters; range operations now use single position
+- Changed `include_declaration` parameter to always be true for references (removed from API)
+- Updated LSP client capabilities to advertise support for `typeDefinition` and `implementation` requests
+- Improved definition results to include source context alongside location information
+- Refactored deferred continuation scheduling to use centralized post-prompt task tracking instead of raw `setTimeout()` calls, improving reliability of concurrent recovery operations
+- Updated subagent executor to explicitly await `waitForIdle()` after each prompt and reminder, ensuring terminal assistant state is determined only after all background work completes
+- Replaced `#waitForRetry()` with `#waitForPostPromptRecovery()` to handle both retry and TTSR resume gates, ensuring prompt completion waits for all post-prompt recovery operations
+- Introduced structured post-prompt recovery task tracking in `AgentSession` and added explicit session completion APIs (`waitForIdle()`, `getLastAssistantMessage()`) for callers that need deterministic turn finalization
+- Updated intent field parameter name from `agent__intent` to `_i` for cleaner tool call contracts
+- Refined intent parameter guidance to require concise 2-6 word sentences in present participle form
+- Centralized per-tool timeout constants and clamping into `tool-timeouts.ts`
+
+### Removed
+
+- Removed `file-type` dependency, reducing external dependencies
+- Removed `glob` dependency in favor of native `Bun.Glob` API
+- Removed `ignore` dependency and ignore file handling utilities
+- Removed `marked` dependency
+- Removed `zod` dependency
+- Removed `ms` and `@types/ms` dev dependencies
+- Removed `rootDir` and `ignoreMatcher` parameters from `loadFilesFromDir()` (kept for API compatibility)
+- Removed `smol-toml` dependency from package.json
+- Removed `node-html-parser` dependency from package.json
+- Removed `files` array parameter for batch file operations
+- Removed `column`, `end_line`, and `end_character` parameters in favor of symbol-based positioning
+- Removed `include_declaration` parameter from references action
+
+### Fixed
+
+- Fixed TTSR violations during subagent execution aborting the entire subagent run; `#waitForPostPromptRecovery()` now also awaits agent idle after TTSR/retry gates resolve, preventing `prompt()` from returning while a fire-and-forget `agent.continue()` is still streaming
+- Fixed deferred TTSR/context-promotion continuations still racing `prompt()` completion by tracking compaction checks and deferred `agent.continue()` tasks under a shared post-prompt recovery orchestrator
+- Fixed subagent reminder/finalization sequencing to await session-level idle recovery between prompts before determining terminal assistant stop state
+- Fixed `code_actions` apply mode to execute command-based actions via `workspace/executeCommand`
+- Fixed diagnostics glob detection to recognize bracket character class patterns (e.g., `src/[ab].ts`)
+- Fixed LSP render metadata sanitization for `symbol` values to prevent tab/newline layout breakage
+- Fixed LSP diagnostics glob requests that appeared stuck by capping glob expansion and shortening per-file diagnostic waits in batch mode
+- Fixed workspace symbol search to query all configured LSP servers and filter out non-matching results
+- Fixed `references`/`rename`/`hover` symbol targeting to error when `symbol` is missing on the line or `occurrence` is out of bounds
+- Fixed `reload` without a file to reload all active configured language servers instead of only the first server
+- Fixed `todo_write` task normalization to auto-activate the first remaining task and include explicit remaining-items output in tool results, removing the need for an immediate follow-up start update
+
+## [13.3.7] - 2026-02-27
+### Breaking Changes
+
+- Removed `preloadedSkills` option from `CreateAgentSessionOptions`; skills are no longer inlined into system prompts
+- Removed `skills` field from Task schema; subagents now always inherit the session skill set instead of per-task skill selection
+- Removed Task tool per-task `tasks[].skills` support; subagents now always inherit the session skill set
+- Removed `preloadedSkills` system prompt plumbing and template sections; skills are no longer inlined as a separate preloaded block
+
+### Changed
+
+- Refactored schema reference resolution to inline all `$ref` definitions instead of preserving them at the root level, eliminating unresolved references in tool parameters
+- Added `lenientArgValidation` flag to SubmitResultTool to allow the agent loop to bypass strict argument validation errors
+- Modified schema validation to allow non-conforming output on second validation failure, enabling recovery from strict schema constraints after initial rejection
+- Updated JTD-to-TypeScript conversion to gracefully fall back to 'unknown' type when conversion fails, preventing template rendering errors
+- Changed JTD-to-JSON Schema conversion to normalize nested JTD fragments within JSON Schema nodes, enabling mixed schema definitions
+- Changed output schema validation to gracefully fall back to unconstrained object when schema is invalid, instead of rejecting submissions
+- Changed schema sanitization to remove strict-mode incompatible constraints (minLength, pattern, etc.) from tool parameters while preserving them for runtime validation
+- Simplified task execution to always pass available session skills to subagents instead of resolving per-task skill lists
+- Added `KILO_API_KEY` to CLI environment variable help text for Kilo Gateway provider setup ([#193](https://github.com/can1357/oh-my-pi/issues/193))
+
+### Removed
+
+- Removed preloaded skills section from system prompt templates; skills are now referenced only as available resources
+
+### Fixed
+
+- Fixed schema compilation validation by adding explicit AJV compilation check to catch unresolved `$ref` references and other schema errors before tool execution
+- Fixed handling of circular and deeply nested output schemas to prevent stack overflow and enable successful result submission with fallback unconstrained schema
+- Fixed processing of non-object output schemas (arrays, primitives, booleans) to accept valid result submissions without blocking
+- Fixed handling of mixed JTD and JSON Schema output definitions to properly convert all nested JTD elements (e.g., `elements` → `items`, `int32` → `integer`)
+- Fixed strict schema generation for output schemas with only required fields, enabling proper Claude API compatibility
+- Fixed handling of union type schemas (e.g., object|null) to normalize them into strict-mode compatible variants
+
 ## [13.3.6] - 2026-02-26
 ### Breaking Changes
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "13.3.6",
+	"version": "13.3.8",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -41,32 +41,23 @@
 	},
 	"dependencies": {
 		"@mozilla/readability": "^0.6",
-		"@oh-my-pi/omp-stats": "13.3.6",
-		"@oh-my-pi/pi-agent-core": "13.3.6",
-		"@oh-my-pi/pi-ai": "13.3.6",
-		"@oh-my-pi/pi-natives": "13.3.6",
-		"@oh-my-pi/pi-tui": "13.3.6",
-		"@oh-my-pi/pi-utils": "13.3.6",
+		"@oh-my-pi/omp-stats": "13.3.8",
+		"@oh-my-pi/pi-agent-core": "13.3.8",
+		"@oh-my-pi/pi-ai": "13.3.8",
+		"@oh-my-pi/pi-natives": "13.3.8",
+		"@oh-my-pi/pi-tui": "13.3.8",
+		"@oh-my-pi/pi-utils": "13.3.8",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",
 		"chalk": "^5.6",
 		"diff": "^8.0",
-		"file-type": "^21.3",
-		"glob": "^13.0",
 		"handlebars": "^4.7",
-		"ignore": "^7.0",
 		"linkedom": "^0.18",
-		"marked": "^17.0",
-		"node-html-parser": "^7.0",
-		"puppeteer": "^24.37",
-		"smol-toml": "^1.6",
-		"zod": "^4.3"
+		"puppeteer": "^24.37"
 	},
 	"devDependencies": {
-		"@types/bun": "^1.3",
-		"@types/ms": "^2.1",
-		"ms": "^2.1"
+		"@types/bun": "^1.3"
 	},
 	"engines": {
 		"bun": ">=1.3.7"

package/scripts/format-prompts.ts

@@ -14,6 +14,7 @@
  * 9. Bold RFC 2119 keywords (MUST, SHOULD, MAY, etc.) in prompt content
  */
 import { Glob } from "bun";
+import { formatPromptContent } from "../src/utils/prompt-format";
 
 const PROMPTS_DIR = new URL("../src/prompts/", import.meta.url).pathname;
 const COMMIT_PROMPTS_DIR = new URL("../src/commit/prompts/", import.meta.url).pathname;
@@ -21,177 +22,11 @@ const AGENTIC_PROMPTS_DIR = new URL("../src/commit/agentic/prompts/", import.met
 
 const PROMPT_DIRS = [PROMPTS_DIR, COMMIT_PROMPTS_DIR, AGENTIC_PROMPTS_DIR];
 
-// Opening XML tag (not self-closing, not closing)
-const OPENING_XML = /^<([a-z_-]+)(?:\s+[^>]*)?>$/;
-// Closing XML tag
-const CLOSING_XML = /^<\/([a-z_-]+)>$/;
-// Handlebars block start: {{#if}}, {{#has}}, {{#list}}, etc.
-const OPENING_HBS = /^\{\{#/;
-// Handlebars block end: {{/if}}, {{/has}}, {{/list}}, etc.
-const CLOSING_HBS = /^\{\{\//;
-// List item (- or * or 1.)
-const LIST_ITEM = /^[-*]|\d+\.\s/;
-// Code fence
-const CODE_FENCE = /^```/;
-// Table row
-const TABLE_ROW = /^\|.*\|$/;
-// Table separator (|---|---|)
-const TABLE_SEP = /^\|[-:\s|]+\|$/;
-
-/** RFC 2119 keywords used in prompts. */
-const RFC2119_KEYWORDS = /\b(?:MUST NOT|SHOULD NOT|SHALL NOT|RECOMMENDED|REQUIRED|OPTIONAL|SHOULD|SHALL|MUST|MAY)\b/g;
-
-function boldRfc2119Keywords(line: string): string {
-	return line.replace(RFC2119_KEYWORDS, (match, offset, source) => {
-		const isAlreadyBold =
-			source[offset - 2] === "*" &&
-			source[offset - 1] === "*" &&
-			source[offset + match.length] === "*" &&
-			source[offset + match.length + 1] === "*";
-		if (isAlreadyBold) {
-			return match;
-		}
-		return `**${match}**`;
-	});
-}
-
-/** Compact a table row by trimming cell padding */
-function compactTableRow(line: string): string {
-	// Split by |, trim each cell, rejoin
-	const cells = line.split("|");
-	return cells.map((c) => c.trim()).join("|");
-}
-
-/** Compact a table separator row */
-function compactTableSep(line: string): string {
-	// Normalize to minimal |---|---|
-	const cells = line.split("|").filter((c) => c.trim());
-	const normalized = cells.map((c) => {
-		const trimmed = c.trim();
-		// Preserve alignment markers
-		const left = trimmed.startsWith(":");
-		const right = trimmed.endsWith(":");
-		if (left && right) return ":---:";
-		if (left) return ":---";
-		if (right) return "---:";
-		return "---";
-	});
-	return "|" + normalized.join("|") + "|";
-}
-
-function formatPrompt(content: string): string {
-	const lines = content.split("\n");
-	const result: string[] = [];
-	let inCodeBlock = false;
-	// Stack of tag names whose opening tag was at column 0 (top-level)
-	const topLevelTags: string[] = [];
-
-	for (let i = 0; i < lines.length; i++) {
-		let line = lines[i].trimEnd();
-
-		const trimmed = line.trimStart();
-
-		// Track code blocks - don't modify inside them
-		if (CODE_FENCE.test(trimmed)) {
-			inCodeBlock = !inCodeBlock;
-			result.push(line);
-			continue;
-		}
-
-		if (inCodeBlock) {
-			result.push(line);
-			continue;
-		}
-
-		// Replace common ascii ellipsis and arrow patterns with their unicode equivalents
-		line = line
-			.replace(/\.{3}/g, "…")
-			.replace(/->/g, "→")
-			.replace(/<-/g, "←")
-			.replace(/<->/g, "↔")
-			.replace(/!=/g, "≠")
-			.replace(/<=/g, "≤")
-			.replace(/>=/g, "≥");
-			
-		// Track top-level XML opening tags for depth-aware indent stripping
-		const isOpeningXml = OPENING_XML.test(trimmed) && !trimmed.endsWith("/>");
-		if (isOpeningXml && line.length === trimmed.length) {
-			// Opening tag at column 0 — track as top-level
-			const match = OPENING_XML.exec(trimmed);
-			if (match) topLevelTags.push(match[1]);
-		}
-
-		// Strip leading whitespace from top-level closing XML tags and Handlebars
-		const closingMatch = CLOSING_XML.exec(trimmed);
-		if (closingMatch) {
-			const tagName = closingMatch[1];
-			if (topLevelTags.length > 0 && topLevelTags[topLevelTags.length - 1] === tagName) {
-				// Closing tag matches a top-level opener — strip indent
-				line = trimmed;
-				topLevelTags.pop();
-			} else {
-				line = line.trimEnd();
-			}
-		} else if (trimmed.startsWith("{{")) {
-			line = trimmed;
-		} else if (TABLE_SEP.test(trimmed)) {
-			// Compact table separator
-			line = compactTableSep(trimmed);
-		} else if (TABLE_ROW.test(trimmed)) {
-			// Compact table row
-			line = compactTableRow(trimmed);
-		} else {
-			// Trim trailing whitespace (preserve leading for non-closing-tags)
-			line = line.trimEnd();
-		}
-		line = boldRfc2119Keywords(line);
-
-		const isBlank = trimmed === "";
-
-		// Skip blank lines that violate our rules
-		if (isBlank) {
-			const prevLine = result[result.length - 1]?.trim() ?? "";
-			const nextLine = lines[i + 1]?.trim() ?? "";
-
-			// Rule 1: No blank line before list items
-			if (LIST_ITEM.test(nextLine)) {
-				continue;
-			}
-
-			// Rule 2: No blank after opening XML tag or Handlebars block
-			if (OPENING_XML.test(prevLine) || OPENING_HBS.test(prevLine)) {
-				continue;
-			}
-
-			// Rule 3: No blank before closing XML tag or Handlebars block
-			if (CLOSING_XML.test(nextLine) || CLOSING_HBS.test(nextLine)) {
-				continue;
-			}
-
-			// Rule 4: Collapse multiple blank lines
-			const prevIsBlank = prevLine === "";
-			if (prevIsBlank) {
-				continue;
-			}
-		}
-
-		// Rule 3 (cleanup): Remove trailing blanks before closing tag
-		if (CLOSING_XML.test(trimmed) || CLOSING_HBS.test(trimmed)) {
-			while (result.length > 0 && result[result.length - 1].trim() === "") {
-				result.pop();
-			}
-		}
-
-		result.push(line);
-	}
-
-	// Rule 8: No trailing newline at EOF
-	while (result.length > 0 && result[result.length - 1].trim() === "") {
-		result.pop();
-	}
-
-	return result.join("\n");
-}
+const PROMPT_FORMAT_OPTIONS = {
+	renderPhase: "pre-render",
+	replaceAsciiSymbols: true,
+	boldRfc2119Keywords: true,
+} as const;
 
 async function main() {
 	const glob = new Glob("**/*.md");
@@ -207,7 +42,7 @@ async function main() {
 
 	for (const fullPath of files) {
 		const original = await Bun.file(fullPath).text();
-		const formatted = formatPrompt(original);
+		const formatted = formatPromptContent(original, PROMPT_FORMAT_OPTIONS);
 
 		if (original !== formatted) {
 			if (check) {

package/src/capability/mcp.ts

@@ -32,6 +32,11 @@ export interface MCPServer {
 		type: "oauth" | "apikey";
 		credentialId?: string;
 	};
+	/** OAuth configuration (clientId, callbackPort) for servers requiring explicit client credentials */
+	oauth?: {
+		clientId?: string;
+		callbackPort?: number;
+	};
 	/** Transport type */
 	transport?: "stdio" | "sse" | "http";
 	/** Source metadata (added by loader) */

package/src/cli/args.ts

@@ -201,6 +201,7 @@ export function getExtraHelpText(): string {
   CEREBRAS_API_KEY           - Cerebras models
   XAI_API_KEY                - xAI Grok models
   OPENROUTER_API_KEY         - OpenRouter aggregated models
+  KILO_API_KEY               - Kilo Gateway models
   MISTRAL_API_KEY            - Mistral models
   ZAI_API_KEY                - z.ai models (ZhipuAI/GLM)
   MINIMAX_API_KEY            - MiniMax models

package/src/config/prompt-templates.ts

@@ -6,6 +6,7 @@ import { computeLineHash } from "../patch/hashline";
 import { jtdToTypeScript } from "../tools/jtd-to-typescript";
 import { parseCommandArgs, substituteArgs } from "../utils/command-args";
 import { parseFrontmatter } from "../utils/frontmatter";
+import { formatPromptContent } from "../utils/prompt-format";
 
 /**
  * Represents a prompt template loaded from a markdown file
@@ -225,7 +226,13 @@ handlebars.registerHelper("includes", (collection: unknown, item: unknown): bool
  */
 handlebars.registerHelper("not", (value: unknown): boolean => !value);
 
-handlebars.registerHelper("jtdToTypeScript", (schema: unknown): string => jtdToTypeScript(schema));
+handlebars.registerHelper("jtdToTypeScript", (schema: unknown): string => {
+	try {
+		return jtdToTypeScript(schema);
+	} catch {
+		return "unknown";
+	}
+});
 
 handlebars.registerHelper("jsonStringify", (value: unknown): string => JSON.stringify(value));
 
@@ -270,60 +277,7 @@ handlebars.registerHelper("hlinefull", (lineNum: unknown, content: unknown): str
 export function renderPromptTemplate(template: string, context: TemplateContext = {}): string {
 	const compiled = handlebars.compile(template, { noEscape: true, strict: false });
 	const rendered = compiled(context ?? {});
-	return optimizePromptLayout(rendered);
-}
-
-function optimizePromptLayout(input: string): string {
-	// 1) strip CR / normalize line endings
-	let s = input.replace(/\r\n?/g, "\n");
-
-	// normalize NBSP -> space
-	s = s.replace(/\u00A0/g, " ");
-
-	const lines = s.split("\n").map(line => {
-		// 2) remove trailing whitespace (spaces/tabs) per line
-		let l = line.replace(/[ \t]+$/g, "");
-
-		// 3) lines with only whitespace -> empty line
-		if (/^[ \t]*$/.test(l)) return "";
-
-		// 4) normalize leading indentation: every 2 spaces -> \t (preserve leftover 1 space)
-		//    NOTE: This is intentionally *only* leading indentation to avoid mangling prose.
-		const m = l.match(/^[ \t]+/);
-		if (m) {
-			const indent = m[0];
-			const rest = l.slice(indent.length);
-
-			let out = "";
-			let spaces = 0;
-
-			for (const ch of indent) {
-				if (ch === "\t") {
-					// flush pending spaces before existing tab
-					out += "\t".repeat(Math.floor(spaces / 2));
-					if (spaces % 2) out += " ";
-					spaces = 0;
-					out += "\t";
-				} else {
-					spaces++;
-				}
-			}
-
-			out += "\t".repeat(Math.floor(spaces / 2));
-			if (spaces % 2) out += " ";
-
-			l = out + rest;
-		}
-
-		return l;
-	});
-
-	s = lines.join("\n");
-
-	// 5) collapse excessive blank lines
-	s = s.replace(/\n{3,}/g, "\n\n");
-
-	return s.trim();
+	return formatPromptContent(rendered, { renderPhase: "post-render" });
 }
 
 /**

package/src/config/settings-schema.ts

@@ -455,6 +455,20 @@ export const SETTINGS_SCHEMA = {
 			submenu: true,
 		},
 	},
+	"astFind.enabled": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tools", label: "Enable AST Find", description: "Enable the ast_find tool for structural AST search" },
+	},
+	"astReplace.enabled": {
+		type: "boolean",
+		default: true,
+		ui: {
+			tab: "tools",
+			label: "Enable AST Replace",
+			description: "Enable the ast_replace tool for structural AST rewrites",
+		},
+	},
 	"notebook.enabled": {
 		type: "boolean",
 		default: true,
@@ -511,6 +525,16 @@ export const SETTINGS_SCHEMA = {
 			description: "Ask the agent to describe the intent of each tool call before executing it",
 		},
 	},
+	"tools.maxTimeout": {
+		type: "number",
+		default: 0,
+		ui: {
+			tab: "tools",
+			label: "Max tool timeout",
+			description: "Maximum timeout in seconds the agent can set for any tool (0 = no limit)",
+			submenu: true,
+		},
+	},
 	"async.enabled": {
 		type: "boolean",
 		default: false,

package/src/discovery/builtin.ts

@@ -157,6 +157,7 @@ async function loadMCPServers(ctx: LoadContext): Promise<LoadResult<MCPServer>>
 				url: serverConfig.url as string | undefined,
 				headers: serverConfig.headers as Record<string, string> | undefined,
 				auth: serverConfig.auth as { type: "oauth" | "apikey"; credentialId?: string } | undefined,
+				oauth: serverConfig.oauth as { clientId?: string; callbackPort?: number } | undefined,
 				transport: serverConfig.type as "stdio" | "sse" | "http" | undefined,
 				_source: createSourceMeta(PROVIDER_ID, path, level),
 			});

package/src/discovery/codex.ts

@@ -8,7 +8,6 @@
  */
 import * as path from "node:path";
 import { logger } from "@oh-my-pi/pi-utils";
-import { parse as parseToml } from "smol-toml";
 import { registerProvider } from "../capability";
 import type { ContextFile } from "../capability/context-file";
 import { contextFileCapability } from "../capability/context-file";
@@ -116,7 +115,7 @@ async function loadTomlConfig(_ctx: LoadContext, path: string): Promise<Record<s
 	if (!content) return null;
 
 	try {
-		return parseToml(content) as Record<string, unknown>;
+		return Bun.TOML.parse(content) as Record<string, unknown>;
 	} catch (error) {
 		logger.warn("Failed to parse TOML config", { path, error: String(error) });
 		return null;

package/src/discovery/helpers.ts

@@ -8,7 +8,6 @@ import { parseRuleConditionAndScope, type Rule, type RuleFrontmatter } from "../
 import type { Skill, SkillFrontmatter } from "../capability/skill";
 import type { LoadContext, LoadResult, SourceMeta } from "../capability/types";
 import { parseFrontmatter } from "../utils/frontmatter";
-import type { IgnoreMatcher } from "../utils/ignore-files";
 
 const VALID_THINKING_LEVELS: readonly string[] = ["off", "minimal", "low", "medium", "high", "xhigh"];
 
@@ -378,10 +377,6 @@ export async function loadFilesFromDir<T>(
 		transform: (name: string, content: string, path: string, source: SourceMeta) => T | null;
 		/** Whether to recurse into subdirectories (default: false) */
 		recursive?: boolean;
-		/** Root directory for ignore file handling (unused, kept for API compat) */
-		rootDir?: string;
-		/** Ignore matcher (unused, kept for API compat) */
-		ignoreMatcher?: IgnoreMatcher;
 	},
 ): Promise<LoadResult<T>> {
 	const items: T[] = [];

package/src/discovery/mcp-json.ts

@@ -36,6 +36,7 @@ interface MCPConfigFile {
 				credentialId?: string;
 			};
 			type?: "stdio" | "sse" | "http";
+			oauth?: { clientId?: string; callbackPort?: number };
 		}
 	>;
 }
@@ -81,6 +82,7 @@ function transformMCPConfig(config: MCPConfigFile, source: SourceMeta): MCPServe
 				url: serverConfig.url,
 				headers: serverConfig.headers,
 				auth: serverConfig.auth,
+				oauth: serverConfig.oauth,
 				transport: serverConfig.type,
 				_source: source,
 			};