@oh-my-pi/pi-coding-agent 13.1.2 → 13.2.1

package/src/commit/prompts/reduce-system.md

@@ -10,7 +10,7 @@ Determine:
 4. CHANGELOG: Metadata for user-visible changes
 </instructions>
 <scope-rules>
-- Component name if >=60% changes target it
+- Component name if ≥60% changes target it
 - null if spread across multiple components
 - scope_candidates as primary source
 - Valid: specific component names (api, parser, config, etc.)

package/src/commit/types.ts

@@ -1,7 +1,6 @@
 /**
  * Types for the omp commit pipeline.
  */
-
 export type CommitType =
 	| "feat"
 	| "fix"
@@ -24,6 +23,16 @@ export type ChangelogCategory =
 	| "Fixed"
 	| "Security";
 
+export const CHANGELOG_CATEGORIES: ChangelogCategory[] = [
+	"Breaking Changes",
+	"Added",
+	"Changed",
+	"Deprecated",
+	"Removed",
+	"Fixed",
+	"Security",
+];
+
 export interface CommitCommandArgs {
 	/** Push after commit */
 	push: boolean;

package/src/config/keybindings.ts

@@ -8,8 +8,7 @@ import {
 	matchesKey,
 	setEditorKeybindings,
 } from "@oh-my-pi/pi-tui";
-import { isEnoent, logger } from "@oh-my-pi/pi-utils";
-import { getAgentDir } from "@oh-my-pi/pi-utils/dirs";
+import { getAgentDir, isEnoent, logger } from "@oh-my-pi/pi-utils";
 
 /**
  * Application-level actions (coding agent specific).

package/src/config/model-registry.ts

@@ -47,7 +47,7 @@ export const MODEL_ROLES: Record<ModelRole, ModelRoleInfo> = {
 	smol: { tag: "SMOL", name: "Fast", color: "warning" },
 	slow: { tag: "SLOW", name: "Thinking", color: "accent" },
 	plan: { tag: "PLAN", name: "Architect", color: "muted" },
-	commit: { name: "Commit" },
+	commit: { tag: "COMMIT", name: "Commit", color: "dim" },
 };
 
 export const MODEL_ROLE_IDS: ModelRole[] = ["default", "smol", "slow", "plan", "commit"];

package/src/config/prompt-templates.ts

@@ -1,7 +1,6 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { logger } from "@oh-my-pi/pi-utils";
-import { getProjectDir, getProjectPromptsDir, getPromptsDir } from "@oh-my-pi/pi-utils/dirs";
+import { getProjectDir, getProjectPromptsDir, getPromptsDir, logger } from "@oh-my-pi/pi-utils";
 import Handlebars from "handlebars";
 import { computeLineHash } from "../patch/hashline";
 import { jtdToTypeScript } from "../tools/jtd-to-typescript";
@@ -230,6 +229,19 @@ handlebars.registerHelper("jtdToTypeScript", (schema: unknown): string => jtdToT
 
 handlebars.registerHelper("jsonStringify", (value: unknown): string => JSON.stringify(value));
 
+/**
+ * Renders a section separator:
+ *
+ * ═══════════════════════════════
+ *  Name
+ * ═══════════════════════════════
+ */
+export function sectionSeparator(name: string): string {
+	return `\n\n═══════════${name}═══════════\n`;
+}
+
+handlebars.registerHelper("SECTION_SEPERATOR", (name: unknown): string => sectionSeparator(String(name)));
+
 /**
  * {{hlineref lineNum "content"}} — compute a real hashline ref for prompt examples.
  * Returns `"lineNum#hash"` using the actual hash algorithm.

package/src/config/settings-schema.ts

@@ -176,6 +176,16 @@ export const SETTINGS_SCHEMA = {
 			description: "Use blue instead of green for diff additions",
 		},
 	},
+	"display.tabWidth": {
+		type: "number",
+		default: 3,
+		ui: {
+			tab: "display",
+			label: "Tab width",
+			description: "Default number of spaces used when rendering tab characters",
+			submenu: true,
+		},
+	},
 	defaultThinkingLevel: {
 		type: "enum",
 		values: ["off", "minimal", "low", "medium", "high", "xhigh"] as const,

package/src/config/settings.ts

@@ -13,8 +13,15 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { isEnoent, logger, procmgr } from "@oh-my-pi/pi-utils";
-import { getAgentDbPath, getAgentDir, getProjectDir } from "@oh-my-pi/pi-utils/dirs";
+import {
+	getAgentDbPath,
+	getAgentDir,
+	getProjectDir,
+	isEnoent,
+	logger,
+	procmgr,
+	setDefaultTabWidth,
+} from "@oh-my-pi/pi-utils";
 import { YAML } from "bun";
 import { type Settings as SettingsCapabilityItem, settingsCapability } from "../capability/settings";
 import type { ModelRole } from "../config/model-registry";
@@ -438,6 +445,7 @@ export class Settings {
 
 		// Build merged view
 		this.#rebuildMerged();
+		this.#fireAllHooks();
 		return this;
 	}
 
@@ -610,6 +618,16 @@ export class Settings {
 		this.#merged = this.#deepMerge(this.#merged, this.#overrides);
 	}
 
+	#fireAllHooks(): void {
+		for (const key of Object.keys(SETTING_HOOKS) as SettingPath[]) {
+			const hook = SETTING_HOOKS[key];
+			if (hook) {
+				const value = this.get(key);
+				hook(value, value);
+			}
+		}
+	}
+
 	#deepMerge(base: RawSettings, overrides: RawSettings): RawSettings {
 		const result = { ...base };
 		for (const key of Object.keys(overrides)) {
@@ -666,6 +684,11 @@ const SETTING_HOOKS: Partial<Record<SettingPath, SettingHook<any>>> = {
 			});
 		}
 	},
+	"display.tabWidth": value => {
+		if (typeof value === "number") {
+			setDefaultTabWidth(value);
+		}
+	},
 };
 
 // ═══════════════════════════════════════════════════════════════════════════

package/src/config.ts

@@ -1,8 +1,7 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { isEnoent, logger } from "@oh-my-pi/pi-utils";
-import { CONFIG_DIR_NAME, getAgentDir, getProjectDir } from "@oh-my-pi/pi-utils/dirs";
+import { CONFIG_DIR_NAME, getAgentDir, getProjectDir, isEnoent, logger } from "@oh-my-pi/pi-utils";
 import type { TSchema } from "@sinclair/typebox";
 import { Value } from "@sinclair/typebox/value";
 import { Ajv, type ErrorObject, type ValidateFunction } from "ajv";

package/src/debug/index.ts

@@ -7,7 +7,7 @@ import * as fs from "node:fs/promises";
 import * as url from "node:url";
 import { getWorkProfile } from "@oh-my-pi/pi-natives";
 import { Container, Loader, type SelectItem, SelectList, Spacer, Text } from "@oh-my-pi/pi-tui";
-import { getSessionsDir } from "@oh-my-pi/pi-utils/dirs";
+import { getSessionsDir } from "@oh-my-pi/pi-utils";
 import { DynamicBorder } from "../modes/components/dynamic-border";
 import { getSelectListTheme, getSymbolTheme, theme } from "../modes/theme/theme";
 import type { InteractiveModeContext } from "../modes/types";

package/src/debug/report-bundle.ts

@@ -6,8 +6,7 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import type { WorkProfile } from "@oh-my-pi/pi-natives";
-import { isEnoent } from "@oh-my-pi/pi-utils";
-import { APP_NAME, getLogPath, getLogsDir, getReportsDir } from "@oh-my-pi/pi-utils/dirs";
+import { APP_NAME, getLogPath, getLogsDir, getReportsDir, isEnoent } from "@oh-my-pi/pi-utils";
 import type { CpuProfile, HeapSnapshot } from "./profiler";
 import { collectSystemInfo, sanitizeEnv } from "./system-info";
 

package/src/debug/system-info.ts

@@ -3,8 +3,7 @@
  */
 
 import * as os from "node:os";
-import { formatBytes } from "@oh-my-pi/pi-utils";
-import { getProjectDir, VERSION } from "@oh-my-pi/pi-utils/dirs";
+import { formatBytes, getProjectDir, VERSION } from "@oh-my-pi/pi-utils";
 
 export interface SystemInfo {
 	os: string;

package/src/discovery/agents.ts

@@ -13,7 +13,7 @@ import { type Skill, skillCapability } from "../capability/skill";
 import { type SlashCommand, slashCommandCapability } from "../capability/slash-command";
 import { type SystemPrompt, systemPromptCapability } from "../capability/system-prompt";
 import type { LoadContext, LoadResult } from "../capability/types";
-import { buildRuleFromMarkdown, createSourceMeta, loadFilesFromDir, loadSkillsFromDir } from "./helpers";
+import { buildRuleFromMarkdown, createSourceMeta, loadFilesFromDir, scanSkillsFromDir } from "./helpers";
 
 const PROVIDER_ID = "agents";
 const DISPLAY_NAME = "Agents (standard)";
@@ -28,7 +28,7 @@ async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 	const items: Skill[] = [];
 	const warnings: string[] = [];
 	for (const userSkillsDir of getUserAgentPathCandidates(ctx, "skills")) {
-		const result = await loadSkillsFromDir(ctx, {
+		const result = await scanSkillsFromDir(ctx, {
 			dir: userSkillsDir,
 			providerId: PROVIDER_ID,
 			level: "user",

package/src/discovery/builtin.ts

@@ -4,7 +4,7 @@
  * Primary provider for OMP native configs. Supports all capabilities.
  */
 import * as path from "node:path";
-import { logger } from "@oh-my-pi/pi-utils";
+import { logger, tryParseJson } from "@oh-my-pi/pi-utils";
 import { registerProvider } from "../capability";
 import { type ContextFile, contextFileCapability } from "../capability/context-file";
 import { type Extension, type ExtensionManifest, extensionCapability } from "../capability/extension";
@@ -30,9 +30,8 @@ import {
 	expandEnvVarsDeep,
 	getExtensionNameFromPath,
 	loadFilesFromDir,
-	loadSkillsFromDir,
-	parseJSON,
 	SOURCE_PATHS,
+	scanSkillsFromDir,
 } from "./helpers";
 
 const PROVIDER_ID = "native";
@@ -98,7 +97,7 @@ async function loadMCPServers(ctx: LoadContext): Promise<LoadResult<MCPServer>>
 
 	const parseMcpServers = (content: string, path: string, level: "user" | "project"): MCPServer[] => {
 		const result: MCPServer[] = [];
-		const data = parseJSON<{ mcpServers?: Record<string, unknown> }>(content);
+		const data = tryParseJson<{ mcpServers?: Record<string, unknown> }>(content);
 		if (!data?.mcpServers) return result;
 
 		const expanded = expandEnvVarsDeep(data.mcpServers);
@@ -245,7 +244,7 @@ async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 	const configDirs = await getConfigDirs(ctx);
 	const results = await Promise.all(
 		configDirs.map(({ dir, level }) =>
-			loadSkillsFromDir(ctx, {
+			scanSkillsFromDir(ctx, {
 				dir: path.join(dir, "skills"),
 				providerId: PROVIDER_ID,
 				level,
@@ -404,7 +403,7 @@ async function loadExtensionModules(ctx: LoadContext): Promise<LoadResult<Extens
 		if (!settingsContent) continue;
 
 		const settingsPath = path.join(dir, "settings.json");
-		const settingsData = parseJSON<{ extensions?: unknown }>(settingsContent);
+		const settingsData = tryParseJson<{ extensions?: unknown }>(settingsContent);
 		const extensions = settingsData?.extensions;
 		if (!Array.isArray(extensions)) continue;
 
@@ -508,7 +507,7 @@ async function loadExtensions(ctx: LoadContext): Promise<LoadResult<Extension>>
 		if (!content) continue;
 
 		const { extDir, manifestPath, entryName, level } = manifestCandidates[i];
-		const manifest = parseJSON<ExtensionManifest>(content);
+		const manifest = tryParseJson<ExtensionManifest>(content);
 		if (!manifest) {
 			warnings.push(`Failed to parse ${manifestPath}`);
 			continue;
@@ -655,21 +654,31 @@ async function loadTools(ctx: LoadContext): Promise<LoadResult<CustomTool>> {
 				extensions: ["json", "md", "ts", "js", "sh", "bash", "py"],
 				transform: (name, content, path, source) => {
 					if (name.endsWith(".json")) {
-						const data = parseJSON<{ name?: string; description?: string }>(content);
+						const data = tryParseJson<{ name?: string; description?: string }>(content);
+						const toolName = data?.name || name.replace(/\.json$/, "");
+						const description =
+							typeof data?.description === "string" && data.description.trim()
+								? data.description
+								: `${toolName} custom tool`;
 						return {
-							name: data?.name || name.replace(/\.json$/, ""),
+							name: toolName,
 							path,
-							description: data?.description,
+							description,
 							level,
 							_source: source,
 						};
 					}
 					if (name.endsWith(".md")) {
 						const { frontmatter } = parseFrontmatter(content, { source: path });
+						const toolName = (frontmatter.name as string) || name.replace(/\.md$/, "");
+						const description =
+							typeof frontmatter.description === "string" && frontmatter.description.trim()
+								? String(frontmatter.description)
+								: `${toolName} custom tool`;
 						return {
-							name: (frontmatter.name as string) || name.replace(/\.md$/, ""),
+							name: toolName,
 							path,
-							description: frontmatter.description as string | undefined,
+							description,
 							level,
 							_source: source,
 						};
@@ -679,6 +688,7 @@ async function loadTools(ctx: LoadContext): Promise<LoadResult<CustomTool>> {
 					return {
 						name: toolName,
 						path,
+						description: `${toolName} custom tool`,
 						level,
 						_source: source,
 					};
@@ -715,7 +725,7 @@ async function loadTools(ctx: LoadContext): Promise<LoadResult<CustomTool>> {
 			items.push({
 				name: entryName,
 				path: indexPath,
-				description: undefined,
+				description: `${entryName} custom tool`,
 				level,
 				_source: createSourceMeta(PROVIDER_ID, indexPath, level),
 			});
@@ -743,7 +753,7 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 		const content = await readFile(settingsPath);
 		if (!content) continue;
 
-		const data = parseJSON<Record<string, unknown>>(content);
+		const data = tryParseJson<Record<string, unknown>>(content);
 		if (!data) {
 			warnings.push(`Failed to parse ${settingsPath}`);
 			continue;

package/src/discovery/claude-plugins.ts

@@ -11,7 +11,7 @@ import { type Skill, skillCapability } from "../capability/skill";
 import { type SlashCommand, slashCommandCapability } from "../capability/slash-command";
 import { type CustomTool, toolCapability } from "../capability/tool";
 import type { LoadContext, LoadResult } from "../capability/types";
-import { type ClaudePluginRoot, listClaudePluginRoots, loadFilesFromDir, loadSkillsFromDir } from "./helpers";
+import { type ClaudePluginRoot, listClaudePluginRoots, loadFilesFromDir, scanSkillsFromDir } from "./helpers";
 
 const PROVIDER_ID = "claude-plugins";
 const DISPLAY_NAME = "Claude Code Marketplace";
@@ -31,7 +31,7 @@ async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 	const results = await Promise.all(
 		roots.map(async root => {
 			const skillsDir = path.join(root.path, "skills");
-			return loadSkillsFromDir(ctx, {
+			return scanSkillsFromDir(ctx, {
 				dir: skillsDir,
 				providerId: PROVIDER_ID,
 				level: root.scope,
@@ -152,6 +152,7 @@ async function loadTools(ctx: LoadContext): Promise<LoadResult<CustomTool>> {
 					return {
 						name: toolName,
 						path: filePath,
+						description: `${toolName} custom tool`,
 						level: root.scope,
 						_source: source,
 					};

package/src/discovery/claude.ts

@@ -5,6 +5,7 @@
  * Priority: 80 (tool-specific, below builtin but above shared standards)
  */
 import * as path from "node:path";
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import { registerProvider } from "../capability";
 import { type ContextFile, contextFileCapability } from "../capability/context-file";
 import { type ExtensionModule, extensionModuleCapability } from "../capability/extension-module";
@@ -24,8 +25,7 @@ import {
 	expandEnvVarsDeep,
 	getExtensionNameFromPath,
 	loadFilesFromDir,
-	loadSkillsFromDir,
-	parseJSON,
+	scanSkillsFromDir,
 } from "./helpers";
 
 const PROVIDER_ID = "claude";
@@ -77,7 +77,7 @@ async function loadMCPServers(ctx: LoadContext): Promise<LoadResult<MCPServer>>
 
 	const parseMcpServers = (content: string | null, path: string, level: "user" | "project"): MCPServer[] => {
 		if (!content) return [];
-		const json = parseJSON<{ mcpServers?: Record<string, unknown> }>(content);
+		const json = tryParseJson<{ mcpServers?: Record<string, unknown> }>(content);
 		if (!json?.mcpServers) return [];
 
 		const mcpServers = expandEnvVarsDeep(json.mcpServers);
@@ -163,8 +163,8 @@ async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 	const projectSkillsDir = path.join(getProjectClaude(ctx), "skills");
 
 	const results = await Promise.all([
-		loadSkillsFromDir(ctx, { dir: userSkillsDir, providerId: PROVIDER_ID, level: "user" }),
-		loadSkillsFromDir(ctx, { dir: projectSkillsDir, providerId: PROVIDER_ID, level: "project" }),
+		scanSkillsFromDir(ctx, { dir: userSkillsDir, providerId: PROVIDER_ID, level: "user" }),
+		scanSkillsFromDir(ctx, { dir: projectSkillsDir, providerId: PROVIDER_ID, level: "project" }),
 	]);
 
 	return {
@@ -324,10 +324,10 @@ async function loadTools(ctx: LoadContext): Promise<LoadResult<CustomTool>> {
 	const userResult = await loadFilesFromDir<CustomTool>(ctx, userToolsDir, PROVIDER_ID, "user", {
 		transform: (name, _content, path, source) => {
 			const toolName = name.replace(/\.(ts|js|sh|bash|py)$/, "");
-
 			return {
 				name: toolName,
 				path,
+				description: `${toolName} custom tool`,
 				level: "user",
 				_source: source,
 			};
@@ -343,10 +343,10 @@ async function loadTools(ctx: LoadContext): Promise<LoadResult<CustomTool>> {
 	const projectResult = await loadFilesFromDir<CustomTool>(ctx, projectToolsDir, PROVIDER_ID, "project", {
 		transform: (name, _content, path, source) => {
 			const toolName = name.replace(/\.(ts|js|sh|bash|py)$/, "");
-
 			return {
 				name: toolName,
 				path,
+				description: `${toolName} custom tool`,
 				level: "project",
 				_source: source,
 			};
@@ -396,7 +396,7 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 
 	const userContent = await readFile(userSettingsJson);
 	if (userContent) {
-		const data = parseJSON<Record<string, unknown>>(userContent);
+		const data = tryParseJson<Record<string, unknown>>(userContent);
 		if (data) {
 			items.push({
 				path: userSettingsJson,
@@ -413,7 +413,7 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 	const projectSettingsJson = path.join(projectBase, "settings.json");
 	const projectContent = await readFile(projectSettingsJson);
 	if (projectContent) {
-		const data = parseJSON<Record<string, unknown>>(projectContent);
+		const data = tryParseJson<Record<string, unknown>>(projectContent);
 		if (data) {
 			items.push({
 				path: projectSettingsJson,

package/src/discovery/codex.ts

@@ -35,8 +35,8 @@ import {
 	discoverExtensionModulePaths,
 	getExtensionNameFromPath,
 	loadFilesFromDir,
-	loadSkillsFromDir,
 	SOURCE_PATHS,
+	scanSkillsFromDir,
 } from "./helpers";
 
 const PROVIDER_ID = "codex";
@@ -214,12 +214,12 @@ async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 	const projectSkillsDir = path.join(codexDir, "skills");
 
 	const results = await Promise.all([
-		loadSkillsFromDir(ctx, {
+		scanSkillsFromDir(ctx, {
 			dir: userSkillsDir,
 			providerId: PROVIDER_ID,
 			level: "user",
 		}),
-		loadSkillsFromDir(ctx, {
+		scanSkillsFromDir(ctx, {
 			dir: projectSkillsDir,
 			providerId: PROVIDER_ID,
 			level: "project",

package/src/discovery/cursor.ts

@@ -13,6 +13,8 @@
  * - rules: From rules/*.mdc files with MDC frontmatter (description, globs, alwaysApply)
  * - settings: From settings.json if present
  */
+
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import { registerProvider } from "../capability";
 import { readFile } from "../capability/fs";
 import { type MCPServer, mcpCapability } from "../capability/mcp";
@@ -28,7 +30,6 @@ import {
 	getProjectPath,
 	getUserPath,
 	loadFilesFromDir,
-	parseJSON,
 } from "./helpers";
 
 const PROVIDER_ID = "cursor";
@@ -46,7 +47,7 @@ function parseMCPServers(
 ): { items: MCPServer[]; warning?: string } {
 	const items: MCPServer[] = [];
 
-	const parsed = parseJSON<{ mcpServers?: Record<string, unknown> }>(content);
+	const parsed = tryParseJson<{ mcpServers?: Record<string, unknown> }>(content);
 	if (!parsed?.mcpServers) {
 		return { items, warning: `${path}: missing or invalid 'mcpServers' key` };
 	}
@@ -158,7 +159,7 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 	const projectContentPromise = projectPath ? readFile(projectPath) : Promise.resolve(null);
 
 	if (userContent && userPath) {
-		const parsed = parseJSON<Record<string, unknown>>(userContent);
+		const parsed = tryParseJson<Record<string, unknown>>(userContent);
 		if (parsed) {
 			items.push({
 				path: userPath,
@@ -173,7 +174,7 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 
 	const projectContent = await projectContentPromise;
 	if (projectContent && projectPath) {
-		const parsed = parseJSON<Record<string, unknown>>(projectContent);
+		const parsed = tryParseJson<Record<string, unknown>>(projectContent);
 		if (parsed) {
 			items.push({
 				path: projectPath,

package/src/discovery/gemini.ts

@@ -16,6 +16,7 @@
  * - settings: From settings.json
  */
 import * as path from "node:path";
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import { registerProvider } from "../capability";
 import { type ContextFile, contextFileCapability } from "../capability/context-file";
 import { type Extension, type ExtensionManifest, extensionCapability } from "../capability/extension";
@@ -33,7 +34,6 @@ import {
 	getExtensionNameFromPath,
 	getProjectPath,
 	getUserPath,
-	parseJSON,
 } from "./helpers";
 
 const PROVIDER_ID = "gemini";
@@ -80,7 +80,7 @@ async function loadMCPFromSettings(
 		return { items, warnings };
 	}
 
-	const parsed = parseJSON<{ mcpServers?: Record<string, unknown> }>(content);
+	const parsed = tryParseJson<{ mcpServers?: Record<string, unknown> }>(content);
 	if (!parsed) {
 		warnings.push(`Invalid JSON in ${path}`);
 		return { items, warnings };
@@ -206,7 +206,7 @@ async function loadExtensionsFromDir(extensionsDir: string, level: "user" | "pro
 	for (const { entry, extPath, manifestPath, content } of results) {
 		if (!content) continue;
 
-		const manifest = parseJSON<ExtensionManifest>(content);
+		const manifest = tryParseJson<ExtensionManifest>(content);
 		if (!manifest) {
 			warnings.push(`Invalid JSON in ${manifestPath}`);
 			continue;
@@ -268,7 +268,7 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 	if (userPath) {
 		const content = await readFile(userPath);
 		if (content) {
-			const parsed = parseJSON<Record<string, unknown>>(content);
+			const parsed = tryParseJson<Record<string, unknown>>(content);
 			if (parsed) {
 				items.push({
 					path: userPath,
@@ -287,7 +287,7 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 	if (projectPath) {
 		const content = await readFile(projectPath);
 		if (content) {
-			const parsed = parseJSON<Record<string, unknown>>(content);
+			const parsed = tryParseJson<Record<string, unknown>>(content);
 			if (parsed) {
 				items.push({
 					path: projectPath,