@oh-my-pi/pi-coding-agent 16.0.0 → 16.0.2

package/dist/types/config/model-resolver.d.ts

@@ -37,7 +37,21 @@ export declare function parseModelString(modelStr: string): {
  * Format a model as "provider/modelId" string.
  */
 export declare function formatModelString(model: Model<Api>): string;
+export declare function formatModelStringWithRouting(model: Model<Api>): string;
 export declare function formatModelSelectorValue(selector: string, thinkingLevel: ThinkingLevel | undefined): string;
+/**
+ * Split a trailing `@<upstream>` provider-routing selector off a model pattern.
+ *
+ * `openrouter/z-ai/glm-4.7@cerebras` -> base `openrouter/z-ai/glm-4.7`, upstream
+ * `cerebras`. A `:thinking` suffix after the slug is kept on the base
+ * (`...@cerebras:high` -> base `...:high`). Returns undefined when there is no
+ * `@` or the suffix is not a bare provider slug, so model ids that legitimately
+ * contain `@` (`claude-opus-4-8@default`, `workers-ai/@cf/...`) are never split.
+ */
+export declare function splitUpstreamRouting(pattern: string): {
+    base: string;
+    upstream: string;
+} | undefined;
 export declare function resolveProviderModelReference(provider: string, modelId: string, availableModels: readonly Model<Api>[]): Model<Api> | undefined;
 export interface ModelMatchPreferences {
     /** Most-recently-used model keys (provider/modelId) to prefer when ambiguous. */

package/dist/types/config/settings-schema.d.ts

@@ -1,3 +1,4 @@
+import { type SearchProviderId } from "../web/search/types";
 /** Unified settings schema - single source of truth for all settings.
  *
  * Each setting is defined once here with:
@@ -3605,6 +3606,17 @@ export declare const SETTINGS_SCHEMA: {
             readonly description: "Enable plan mode for read-only exploration and planning before execution";
         };
     };
+    readonly "plan.defaultOnStartup": {
+        readonly type: "boolean";
+        readonly default: false;
+        readonly ui: {
+            readonly tab: "tasks";
+            readonly group: "Modes";
+            readonly label: "Start in Plan Mode";
+            readonly description: "Automatically enter plan mode at the start of every new session";
+            readonly condition: "planModeEnabled";
+        };
+    };
     readonly "goal.enabled": {
         readonly type: "boolean";
         readonly default: true;
@@ -4120,6 +4132,16 @@ export declare const SETTINGS_SCHEMA: {
             }];
         };
     };
+    readonly "providers.webSearchExclude": {
+        readonly type: "array";
+        readonly default: SearchProviderId[];
+        readonly ui: {
+            readonly tab: "providers";
+            readonly group: "Services";
+            readonly label: "Excluded Web Search Providers";
+            readonly description: "Providers that web_search should never use, even as fallbacks";
+        };
+    };
     readonly "providers.image": {
         readonly type: "enum";
         readonly values: readonly ["auto", "openai", "antigravity", "xai", "gemini", "openrouter"];

package/dist/types/discovery/helpers.d.ts

@@ -67,6 +67,13 @@ export declare function getUserPath(ctx: LoadContext, source: SourceId, subpath:
  * Get project-level path for a source (cwd only).
  */
 export declare function getProjectPath(ctx: LoadContext, source: SourceId, subpath: string): string | null;
+/**
+ * Resolve GitHub Copilot CLI's user-global config root. Copilot stores per-user
+ * instructions/prompts/agents/MCP under `~/.copilot`, relocatable via the
+ * `COPILOT_HOME` env var (mirrors Copilot CLI's `--config-dir`). Falls back to
+ * `<home>/.copilot` when the override is unset.
+ */
+export declare function resolveCopilotHome(home: string): string;
 /**
  * Create source metadata for an item.
  */

package/dist/types/eval/__tests__/prelude-agent.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/exec/non-interactive-env.d.ts

@@ -1 +1,3 @@
 export declare const NON_INTERACTIVE_ENV: Readonly<Record<string, string>>;
+/** Builds the per-command environment for non-interactive child processes. */
+export declare function buildNonInteractiveEnv(overrides?: Record<string, string>, baseEnv?: Record<string, string | undefined>, platform?: NodeJS.Platform): Record<string, string>;

package/dist/types/extensibility/plugins/runtime-config.d.ts

@@ -0,0 +1,3 @@
+import type { PluginRuntimeConfig } from "./types";
+/** Normalizes persisted plugin runtime config across legacy lockfile shapes. */
+export declare function normalizePluginRuntimeConfig(config: Partial<PluginRuntimeConfig>): PluginRuntimeConfig;

package/dist/types/modes/types.d.ts

@@ -45,6 +45,11 @@ export type SubmittedUserInput = {
      *  as a hidden agent-authored `developer` message rather than a visible user
      *  turn. Used by the `c`/`.` continue shortcut. */
     synthetic?: boolean;
+    /** Marks this submission as a deliberate user resume (set by the `.`/`c`
+     *  continue shortcut, which is also `synthetic`). Forwarded to
+     *  `session.prompt({ userInitiated })` so it clears advisor auto-resume
+     *  suppression even though it is synthetic. */
+    userInitiated?: boolean;
     display?: boolean;
     /** Queue intent if the session is (or becomes) busy when this submission is
      *  dispatched: "steer" (interrupt the active turn) or "followUp" (process after

package/dist/types/session/agent-session.d.ts

@@ -250,6 +250,12 @@ export interface PromptOptions {
     toolChoice?: ToolChoice;
     /** Send as developer/system message instead of user. Providers that support it use the developer role; others fall back to user. */
     synthetic?: boolean;
+    /** Marks this prompt as a deliberate user action (typed message, `.`/`c`
+     *  continue). Clears advisor auto-resume suppression that a user interrupt set.
+     *  Defaults to `!synthetic`; manual-continue is synthetic yet user-initiated, so
+     *  it sets this explicitly. Agent-initiated synthetic prompts (auto-continue,
+     *  plan re-prime, reminders) leave it unset and keep suppression latched. */
+    userInitiated?: boolean;
     /** Explicit billing/initiator attribution for the prompt. Defaults to user prompts as `user` and synthetic prompts as `agent`. */
     attribution?: MessageAttribution;
     /** Skip pre-send compaction checks for this prompt (internal use for maintenance flows). */
@@ -1129,7 +1135,7 @@ export declare class AgentSession {
         compact?: boolean;
     }): string;
     /**
-     * Enable or disable the advisor for this session. The setting is persisted,
+     * Enable or disable the advisor for this session. The setting is overridden for the session,
      * and the runtime is started or stopped to match.
      *
      * @returns true when the advisor is actively running after the call.
@@ -1141,6 +1147,10 @@ export declare class AgentSession {
      * @returns true when the advisor is actively running after the call.
      */
     toggleAdvisorEnabled(): boolean;
+    /**
+     * Whether the advisor setting is enabled for this session.
+     */
+    isAdvisorEnabled(): boolean;
     /**
      * Whether a live advisor agent is attached to this session. True only when
      * `advisor.enabled` is set AND a model resolved for the `advisor` role AND

package/dist/types/session/messages.d.ts

@@ -55,6 +55,9 @@ export declare function isSilentAbort(errorMessage: string | undefined): boolean
 export declare const USER_INTERRUPT_LABEL = "Interrupted by user";
 export declare function isUserInterruptAbort(errorMessage: string | undefined): boolean;
 export declare function shouldRenderAbortReason(errorMessage: string | undefined): boolean;
+/** Sentinel `errorMessage` the agent stamps on any abort that carried no custom
+ *  reason (bare `abort()`). Renderers treat it as "no specific reason given". */
+export declare const GENERIC_ABORT_SENTINEL = "Request was aborted";
 /** Resolve the operator-facing label for an aborted assistant turn. A custom
  *  abort reason threaded onto `errorMessage` is returned verbatim; aborts with
  *  no threaded reason fall back to the retry-aware generic label. Call

package/dist/types/session/session-manager.d.ts

@@ -250,8 +250,11 @@ export declare class SessionManager {
     /**
      * Open a specific session file.
      * @param sessionDir Optional dir for /new or /branch; defaults to the file's parent.
+     * @param options.initialCwd Cwd to use when the file is empty or missing.
      */
-    static open(filePath: string, sessionDir?: string, storage?: SessionStorage): Promise<SessionManager>;
+    static open(filePath: string, sessionDir?: string, storage?: SessionStorage, options?: {
+        initialCwd?: string;
+    }): Promise<SessionManager>;
     /** Continue the most recent session, or create a new one if none exists. */
     static continueRecent(cwd: string, sessionDir?: string, storage?: SessionStorage): Promise<SessionManager>;
     /** Create an in-memory session (no file persistence). */

package/dist/types/task/index.d.ts

@@ -26,6 +26,27 @@ export declare function formatResultOutputFallback(result: Pick<SingleResult, "o
  * the same agent ≥2× all without roles. Returns undefined when no nudge applies.
  */
 export declare function buildSpecializationAdvisory(agentName: string | undefined, items: TaskItem[], depthCapacity: boolean): string | undefined;
+/**
+ * Suggestion — never a rejection — nudging the spawner to coordinate via `irc`
+ * when one call creates ≥2 live siblings and it still holds spawn capacity.
+ * Returns undefined when there is nothing to coordinate or IRC is unavailable.
+ */
+export declare function buildCoordinationAdvisory(items: TaskItem[], depthCapacity: boolean, ircEnabled: boolean): string | undefined;
+/**
+ * Compose the non-blocking advisory appended to a `task` result: the
+ * specialization nudge, plus — only when the siblings keep running after this
+ * call (`willRunAsync`) — the coordination suggestion. Coordination is gated on
+ * async because a sync fanout's siblings have already finished, so a
+ * "coordinate while they run" hint would misfire. Returns undefined when
+ * neither applies.
+ */
+export declare function composeSpawnAdvisory(args: {
+    agentName: string | undefined;
+    items: TaskItem[];
+    depthCapacity: boolean;
+    ircEnabled: boolean;
+    willRunAsync: boolean;
+}): string | undefined;
 /**
  * Task tool - Delegate tasks to specialized agents.
  *

package/dist/types/tools/github-cache.d.ts

@@ -8,10 +8,11 @@
  *   helpers swallow open/IO failures and degrade to "no cache" so a corrupt or
  *   unreadable DB never blocks a `gh` call.
  *
- * TTL:
  *   Soft TTL → return cached row directly.
- *   Past soft TTL but within hard TTL → return cached row AND schedule a
- *     background refresh (errors logged, never thrown).
+ *   Stateful issue/PR rows past soft TTL but within hard TTL → refresh
+ *     synchronously, falling back to the cached row if the live fetch fails.
+ *   Expensive PR diff rows past soft TTL but within hard TTL → return cached
+ *     row AND schedule a background refresh (errors logged, never thrown).
  *   Past hard TTL → treat as miss and fetch fresh.
  */
 import { Database } from "bun:sqlite";
@@ -101,7 +102,7 @@ export interface CacheLookupOptions<T> {
     settings?: Settings | undefined;
     now?: number;
 }
-export type CacheStatus = "miss" | "fresh" | "stale" | "disabled";
+export type CacheStatus = "miss" | "fresh" | "refreshed" | "stale" | "disabled";
 export interface CacheLookupResult<T> {
     rendered: string;
     sourceUrl: string | undefined;

package/dist/types/tools/job.d.ts

@@ -56,6 +56,7 @@ export declare class JobTool implements AgentTool<typeof jobSchema, JobToolDetai
 interface JobRenderArgs {
     poll?: string[];
     cancel?: string[];
+    list?: boolean;
 }
 export declare const jobToolRenderer: {
     inline: boolean;

package/dist/types/utils/markit.d.ts

@@ -3,5 +3,13 @@ export interface MarkitConversionResult {
     ok: boolean;
     error?: string;
 }
+interface MuPdfWasmModuleConfig {
+    print?: (...values: unknown[]) => void;
+    printErr?: (...values: unknown[]) => void;
+}
+declare global {
+    var $libmupdf_wasm_Module: MuPdfWasmModuleConfig | undefined;
+}
 export declare function convertFileWithMarkit(filePath: string, signal?: AbortSignal): Promise<MarkitConversionResult>;
 export declare function convertBufferWithMarkit(buffer: Uint8Array, extension: string, signal?: AbortSignal): Promise<MarkitConversionResult>;
+export {};

package/dist/types/web/search/index.d.ts

@@ -80,6 +80,6 @@ export declare class WebSearchTool implements AgentTool<typeof webSearchSchema,
 /** Web search tool as CustomTool (for TUI rendering support) */
 export declare const webSearchCustomTool: CustomTool<typeof webSearchSchema, SearchRenderDetails>;
 export declare function getSearchTools(): CustomTool<any, any>[];
-export { getSearchProvider, setPreferredSearchProvider } from "./provider";
+export { getSearchProvider, setExcludedSearchProviders, setPreferredSearchProvider } from "./provider";
 export type { SearchProviderId as SearchProvider, SearchResponse } from "./types";
-export { isSearchProviderPreference } from "./types";
+export { isSearchProviderId, isSearchProviderPreference } from "./types";

package/dist/types/web/search/provider.d.ts

@@ -13,6 +13,8 @@ export declare function getSearchProviderLabel(id: SearchProviderId): string;
 export declare function getSearchProvider(id: SearchProviderId): Promise<SearchProvider>;
 /** Set the preferred web search provider from settings */
 export declare function setPreferredSearchProvider(provider: SearchProviderId | "auto"): void;
+/** Set providers that web search should never use, including fallbacks. */
+export declare function setExcludedSearchProviders(providers: readonly SearchProviderId[]): void;
 /**
  * Determine which providers are configured and currently available.
  * Each candidate is loaded (and its `isAvailable()` called) only as the chain

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "16.0.0",
+	"version": "16.0.2",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -47,17 +47,17 @@
 		"@agentclientprotocol/sdk": "0.25.0",
 		"@babel/parser": "^7.29.7",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/hashline": "16.0.0",
-		"@oh-my-pi/omp-stats": "16.0.0",
-		"@oh-my-pi/pi-agent-core": "16.0.0",
-		"@oh-my-pi/pi-ai": "16.0.0",
-		"@oh-my-pi/pi-catalog": "16.0.0",
-		"@oh-my-pi/pi-mnemopi": "16.0.0",
-		"@oh-my-pi/pi-natives": "16.0.0",
-		"@oh-my-pi/pi-tui": "16.0.0",
-		"@oh-my-pi/pi-utils": "16.0.0",
-		"@oh-my-pi/pi-wire": "16.0.0",
-		"@oh-my-pi/snapcompact": "16.0.0",
+		"@oh-my-pi/hashline": "16.0.2",
+		"@oh-my-pi/omp-stats": "16.0.2",
+		"@oh-my-pi/pi-agent-core": "16.0.2",
+		"@oh-my-pi/pi-ai": "16.0.2",
+		"@oh-my-pi/pi-catalog": "16.0.2",
+		"@oh-my-pi/pi-mnemopi": "16.0.2",
+		"@oh-my-pi/pi-natives": "16.0.2",
+		"@oh-my-pi/pi-tui": "16.0.2",
+		"@oh-my-pi/pi-utils": "16.0.2",
+		"@oh-my-pi/pi-wire": "16.0.2",
+		"@oh-my-pi/snapcompact": "16.0.2",
 		"@opentelemetry/api": "^1.9.1",
 		"@opentelemetry/context-async-hooks": "^2.7.1",
 		"@opentelemetry/exporter-trace-otlp-proto": "^0.218.0",

package/src/advisor/__tests__/advisor.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it, vi } from "bun:test";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import { createAdvisorMessageCard } from "../../modes/components/advisor-message";
 import { getThemeByName } from "../../modes/theme/theme";
+import { formatSessionDumpText } from "../../session/session-dump-format";
 import { formatSessionHistoryMarkdown } from "../../session/session-history-format";
 import { YieldQueue } from "../../session/yield-queue";
 import {
@@ -583,4 +584,47 @@ describe("advisor", () => {
 			expect(text).toContain("truncated.");
 		});
 	});
+	describe("formatSessionDumpText raw thinking", () => {
+		it("does not nest literal thinking envelopes", () => {
+			const md = formatSessionDumpText({
+				messages: [
+					{
+						role: "assistant",
+						content: [
+							{
+								type: "thinking",
+								thinking: "<thinking>\nCheck logs before accepting container health.\n</thinking>",
+							},
+						],
+						timestamp: Date.now(),
+					} as AgentMessage,
+				],
+				thinkingLevel: "high",
+			});
+
+			expect(md).toContain("Assistant: <thinking>\nCheck logs before accepting container health.\n</thinking>");
+			expect(md).not.toContain("<thinking>\n<thinking>");
+		});
+
+		it("unwraps sibling literal thinking envelopes independently", () => {
+			const md = formatSessionDumpText({
+				messages: [
+					{
+						role: "assistant",
+						content: [
+							{ type: "thinking", thinking: "<thinking>\nfirst\n</thinking>" },
+							{ type: "toolCall", id: "tc-1", name: "read", arguments: { path: "file.ts" } },
+							{ type: "thinking", thinking: "<thinking>\nsecond\n</thinking>" },
+						],
+						timestamp: Date.now(),
+					} as AgentMessage,
+				],
+				tools: [{ name: "read", description: "Read a file", parameters: { type: "object" } }],
+				thinkingLevel: "high",
+			});
+
+			expect(md).toContain("Assistant: <thinking>\nfirst\nsecond\n</thinking>");
+			expect(md).not.toContain("first\n</thinking>\n<thinking>\nsecond");
+		});
+	});
 });

package/src/cli/args.ts

@@ -279,6 +279,8 @@ export function getExtraHelpText(): string {
   KILO_API_KEY               - Kilo Gateway models
   MISTRAL_API_KEY            - Mistral models
   ZAI_API_KEY                - z.ai models (ZhipuAI/GLM)
+  UMANS_AI_CODING_PLAN_API_KEY - Umans AI Coding Plan models
+  UMANS_WEBSEARCH_PROVIDER    - Umans gateway web search backend (native or exa)
   MINIMAX_API_KEY            - MiniMax models
   OPENCODE_API_KEY           - OpenCode Zen/OpenCode Go models
   CURSOR_ACCESS_TOKEN        - Cursor AI models

package/src/collab/host.ts

@@ -396,7 +396,7 @@ export class CollabHost {
 		}
 		const name = peer.name;
 		void this.#ctx.session
-			.abort()
+			.abort({ reason: USER_INTERRUPT_LABEL })
 			.then(() => this.#ctx.session.emitNotice("info", `${name} interrupted`, "collab"))
 			.catch(err => logger.warn("collab guest abort failed", { error: String(err) }));
 	}

package/src/config/model-resolver.ts

@@ -92,6 +92,33 @@ export function formatModelString(model: Model<Api>): string {
 	return `${model.provider}/${model.id}`;
 }
 
+function getSingleRoutingOnly(routing: unknown): string | undefined {
+	if (!routing || typeof routing !== "object" || !("only" in routing) || !Array.isArray(routing.only)) {
+		return undefined;
+	}
+	if (routing.only.length !== 1) return undefined;
+	const upstream = routing.only[0];
+	return typeof upstream === "string" && upstream ? upstream : undefined;
+}
+
+function getSingleUpstreamRoute(model: Model<Api>): string | undefined {
+	const compat = model.compat;
+	if (!compat || typeof compat !== "object") return undefined;
+	if (modelMatchesHost(model, "vercelAIGateway") && "vercelGatewayRouting" in compat) {
+		return getSingleRoutingOnly(compat.vercelGatewayRouting);
+	}
+	if (modelMatchesHost(model, "openrouter") && "openRouterRouting" in compat) {
+		return getSingleRoutingOnly(compat.openRouterRouting);
+	}
+	return undefined;
+}
+
+export function formatModelStringWithRouting(model: Model<Api>): string {
+	const selector = formatModelString(model);
+	const upstream = getSingleUpstreamRoute(model);
+	return upstream ? `${selector}@${upstream}` : selector;
+}
+
 export function formatModelSelectorValue(selector: string, thinkingLevel: ThinkingLevel | undefined): string {
 	return thinkingLevel && thinkingLevel !== ThinkingLevel.Inherit ? `${selector}:${thinkingLevel}` : selector;
 }
@@ -161,7 +188,7 @@ const UPSTREAM_ROUTING_SLUG = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i;
  * `@` or the suffix is not a bare provider slug, so model ids that legitimately
  * contain `@` (`claude-opus-4-8@default`, `workers-ai/@cf/...`) are never split.
  */
-function splitUpstreamRouting(pattern: string): { base: string; upstream: string } | undefined {
+export function splitUpstreamRouting(pattern: string): { base: string; upstream: string } | undefined {
 	const at = pattern.lastIndexOf("@");
 	if (at <= 0) return undefined;
 	const rest = pattern.slice(at + 1);
@@ -481,6 +508,13 @@ function matchModel(
 			// The prefix is not a known provider in this candidate set, so treat the
 			// slash as part of the raw model ID and continue with generic matching.
 		} else {
+			// Let the routing fallback apply `@upstream` before fuzzy matching can consume the
+			// slug — but only for aggregator providers (OpenRouter / Vercel Gateway). Other
+			// providers have ids that legitimately end in `@` (Vertex `claude-opus-4-8@default`),
+			// and the fallback never routes them, so they must keep fuzzy matching.
+			if (splitUpstreamRouting(modelId) && providerModels.some(supportsUpstreamRouting)) {
+				return undefined;
+			}
 			const scored = providerModels
 				.map(model => ({ model, match: fuzzyMatch(modelId, model.id) }))
 				.filter(entry => entry.match.matches);

package/src/config/settings-schema.ts

@@ -34,7 +34,7 @@ import {
 	TTS_LOCAL_VOICE_VALUES,
 } from "../tts/models";
 import { EDIT_MODES } from "../utils/edit-mode";
-import { SEARCH_PROVIDER_OPTIONS, SEARCH_PROVIDER_PREFERENCES } from "../web/search/types";
+import { SEARCH_PROVIDER_OPTIONS, SEARCH_PROVIDER_PREFERENCES, type SearchProviderId } from "../web/search/types";
 
 /** Unified settings schema - single source of truth for all settings.
  *
@@ -3454,6 +3454,18 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 
+	"plan.defaultOnStartup": {
+		type: "boolean",
+		default: false,
+		ui: {
+			tab: "tasks",
+			group: "Modes",
+			label: "Start in Plan Mode",
+			description: "Automatically enter plan mode at the start of every new session",
+			condition: "planModeEnabled",
+		},
+	},
+
 	"goal.enabled": {
 		type: "boolean",
 		default: true,
@@ -3846,6 +3858,16 @@ export const SETTINGS_SCHEMA = {
 			options: SEARCH_PROVIDER_OPTIONS,
 		},
 	},
+	"providers.webSearchExclude": {
+		type: "array",
+		default: [] as SearchProviderId[],
+		ui: {
+			tab: "providers",
+			group: "Services",
+			label: "Excluded Web Search Providers",
+			description: "Providers that web_search should never use, even as fallbacks",
+		},
+	},
 	"providers.image": {
 		type: "enum",
 		values: ["auto", "openai", "antigravity", "xai", "gemini", "openrouter"] as const,

package/src/discovery/claude-plugins.ts

@@ -124,43 +124,6 @@ async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 	}
 	return { items, warnings };
 }
-async function loadSkillSlashCommands(ctx: LoadContext, root: ClaudePluginRoot): Promise<LoadResult<SlashCommand>> {
-	const { dir: skillsDir, warning } = await resolvePluginDir(root, ["skills"], "skills");
-	const warnings: string[] = warning ? [warning] : [];
-	const skillsResult = await scanSkillsFromDir(ctx, {
-		dir: skillsDir,
-		providerId: PROVIDER_ID,
-		level: root.scope,
-	});
-	warnings.push(...(skillsResult.warnings ?? []));
-
-	const commands = await Promise.all(
-		skillsResult.items.map(async skill => {
-			const content = await readFile(skill.path);
-			if (content === null) {
-				warnings.push(`Failed to read skill slash command: ${skill.path}`);
-				return null;
-			}
-			// Slash command name MUST come from the skill directory basename, not
-			// frontmatter `name`: `expandSlashCommand` splits the command at the first
-			// whitespace, so a display name like "Understand Anything" would never match
-			// `/understand`. The documented layout is `skills/<name>/SKILL.md` → `/<name>`.
-			const command: SlashCommand = {
-				name: path.basename(path.dirname(skill.path)),
-				path: skill.path,
-				content,
-				level: skill.level,
-				_source: skill._source,
-			};
-			return command;
-		}),
-	);
-
-	return {
-		items: commands.filter((command): command is SlashCommand => command !== null),
-		warnings,
-	};
-}
 
 // =============================================================================
 // Slash Commands
@@ -189,16 +152,14 @@ async function loadSlashCommands(ctx: LoadContext): Promise<LoadResult<SlashComm
 					};
 				},
 			});
-			const skillCommandResult = await loadSkillSlashCommands(ctx, root);
-			return { commandResult, skillCommandResult, warning };
+			return { commandResult, warning };
 		}),
 	);
 
-	for (const { commandResult, skillCommandResult, warning } of results) {
+	for (const { commandResult, warning } of results) {
 		if (warning) warnings.push(warning);
-		items.push(...commandResult.items, ...skillCommandResult.items);
+		items.push(...commandResult.items);
 		if (commandResult.warnings) warnings.push(...commandResult.warnings);
-		if (skillCommandResult.warnings) warnings.push(...skillCommandResult.warnings);
 	}
 
 	return { items, warnings };