pi-usereq 0.4.0 → 0.6.0

package/src/index.ts

@@ -8,7 +8,7 @@
  * @brief Declares the extension version string.
  * @details The value is exported for external inspection and packaging metadata alignment. Access complexity is O(1).
  */
-export const VERSION = "0.4.0"
+export const VERSION = "0.6.0"
 
 import path from "node:path";
 import type {
@@ -53,6 +53,7 @@ import {
 } from "./core/find-payload.js";
 import {
   getDefaultConfig,
+  getProjectConfigPath,
   loadConfig,
   normalizeConfigPaths,
   saveConfig,
@@ -62,10 +63,15 @@ import {
 import {
   cyclePiNotifySoundLevel,
   formatPiNotifyBeepStatus,
+  formatPiNotifyPushoverStatus,
+  normalizePiNotifyPushoverCredential,
+  normalizePiNotifyPushoverPriority,
   runPiNotifyEffects,
+  type PiNotifyPushoverPriority,
+  type PiNotifyPushoverRequest,
   type PiNotifySoundLevel,
 } from "./core/pi-notify.js";
-import { buildRuntimePathContext, buildRuntimePathFacts } from "./core/path-context.js";
+import { formatRuntimePathForDisplay } from "./core/path-context.js";
 import { resolveRuntimeGitPath } from "./core/runtime-project-paths.js";
 import { showPiUsereqSettingsMenu, type PiUsereqSettingsMenuChoice } from "./core/settings-menu.js";
 import {
@@ -154,20 +160,6 @@ function getProjectBase(cwd: string): string {
   return path.resolve(cwd);
 }
 
-/**
- * @brief Builds the shared runtime path facts for the current command or tool context.
- * @details Derives installation, execution, base, config, resource, docs, test, source, and optional git paths from the cwd-derived project configuration plus runtime-only repository probing, then converts them into prompt/tool-facing strings. Runtime is O(s + p) where s is configured source-directory count and p is aggregate path length. Side effects are limited to git subprocess execution.
- * @param[in] cwd {string} Current working directory.
- * @param[in] config {UseReqConfig} Effective project configuration.
- * @return {import("./core/path-context.js").RuntimePathFacts} Shared runtime path facts.
- * @satisfies REQ-145, REQ-146
- */
-function buildSharedRuntimePathFacts(cwd: string, config: UseReqConfig): import("./core/path-context.js").RuntimePathFacts {
-  const projectBase = getProjectBase(cwd);
-  const gitPath = resolveRuntimeGitPath(projectBase);
-  return buildRuntimePathFacts(buildRuntimePathContext(projectBase, config, { gitPath }));
-}
-
 /**
  * @brief Loads project configuration for the extension runtime.
  * @details Resolves the project base, loads persisted config, and normalizes configured directory paths without reading or persisting runtime-derived `base-path` or `git-path` metadata. Runtime is dominated by config I/O. Side effects are limited to filesystem reads.
@@ -193,6 +185,19 @@ function saveProjectConfig(cwd: string, config: UseReqConfig): void {
   saveConfig(projectBase, normalizeConfigPaths(projectBase, config));
 }
 
+/**
+ * @brief Formats the current project config path for top-level menu display.
+ * @details Resolves `<base-path>/.pi-usereq/config.json` from the cwd-derived
+ * project base and formats it relative to the user home when possible. Runtime
+ * is O(p) in path length. No external state is mutated.
+ * @param[in] cwd {string} Current working directory.
+ * @return {string} User-home-relative or absolute config path display value.
+ * @satisfies REQ-162
+ */
+function formatProjectConfigPathForMenu(cwd: string): string {
+  return formatRuntimePathForDisplay(getProjectConfigPath(getProjectBase(cwd)));
+}
+
 /**
  * @brief Collects the project-scoped static-check selection used by the agent tool.
  * @details Resolves configured source plus test directories, reuses the same fixture-root exclusions as `runProjectStaticCheck`, and returns canonical relative file paths for structured payload emission. Runtime is O(F) plus project file-discovery cost. Side effects are limited to filesystem reads and git subprocesses delegated through `collectSourceFiles`.
@@ -240,10 +245,12 @@ function collectProjectStaticCheckSelection(
  * @return {string} Newline-delimited execution diagnostics.
  */
 function buildTokenToolExecutionStderr(payload: TokenToolPayload): string {
-  const skippedLines = payload.guidance.source_observations.skipped_inputs
-    .map((entry) => `skipped: ${entry.canonical_path}: ${entry.reason}`);
-  const errorLines = payload.guidance.source_observations.error_inputs
-    .map((entry) => `error: ${entry.canonical_path}: ${entry.reason}`);
+  const skippedLines = payload.files
+    .filter((entry) => entry.status === "skipped" && entry.error_message)
+    .map((entry) => `skipped: ${entry.canonical_path}: ${entry.error_message!}`);
+  const errorLines = payload.files
+    .filter((entry) => entry.status === "error" && entry.error_message)
+    .map((entry) => `error: ${entry.canonical_path}: ${entry.error_message!}`);
   return [...skippedLines, ...errorLines].join("\n");
 }
 
@@ -261,10 +268,8 @@ function buildTokenToolExecuteResult(
   details: TokenToolPayload & { execution: { code: number; stderr: string } };
 } {
   const details = {
-    request: payload.request,
     summary: payload.summary,
     files: payload.files,
-    guidance: payload.guidance,
     execution: {
       code: payload.summary.counted_file_count > 0 ? 0 : 1,
       stderr: buildTokenToolExecutionStderr(payload),
@@ -287,7 +292,6 @@ function buildReferenceToolExecuteResult(
   details: ReferenceToolPayload & { execution: { code: number; stderr: string } };
 } {
   const details = {
-    request: payload.request,
     summary: payload.summary,
     repository: payload.repository,
     files: payload.files,
@@ -313,7 +317,6 @@ function buildCompressionToolExecuteResult(
   details: CompressToolPayload & { execution: { code: number; stderr: string } };
 } {
   const details = {
-    request: payload.request,
     summary: payload.summary,
     repository: payload.repository,
     files: payload.files,
@@ -400,7 +403,7 @@ function buildFindToolSchemaDescription(scope: FindToolScope): string {
   const inputContract = scope === "explicit-files"
     ? "Input contract: tag + pattern + files[] + optional enableLineNumbers."
     : "Input contract: tag + pattern + optional enableLineNumbers. Scope is the configured src-dir list resolved from the current project configuration.";
-  return `${inputContract} Output contract: JSON object with request, summary, repository, files, and execution. Repository exposes file_canonical_paths and supported_tags_by_language. File entries expose path facts, supported_tags, structured statuses, file_doxygen, and match records with typed line ranges, stripped code lines, and structured Doxygen fields. Regex matches construct names only.`;
+  return `${inputContract} Output contract: JSON object with summary, repository, files, and execution. Static supported-tag matrices are documented in tool registration metadata instead of runtime responses. File entries expose structured statuses, file_doxygen, and match records with typed line ranges, stripped code lines, and structured Doxygen fields. Regex matches construct names only.`;
 }
 
 /**
@@ -414,13 +417,13 @@ function buildFindToolPromptGuidelines(scope: FindToolScope): string[] {
     ? "Scope: explicit source files selected by files[]; caller order is preserved; each item may be project-relative or absolute."
     : "Scope: resolve src-dir from the current project configuration and scan the configured source surface from the current working directory.";
   const outputLine = scope === "explicit-files"
-    ? "Output contract: request + summary + repository + files + execution. Repository exposes requested file scope and supported_tags_by_language; file entries expose status, supported_tags, line ranges, file_doxygen, and matches; match entries expose symbol_kind, signature_text, line ranges, code_lines, stripped_source_text, and structured Doxygen fields."
-    : "Output contract: request + summary + repository + files + execution. Repository exposes source_directory_paths, file_canonical_paths, and supported_tags_by_language; file entries expose status, supported_tags, line ranges, file_doxygen, and matches; match entries expose symbol_kind, signature_text, line ranges, code_lines, stripped_source_text, and structured Doxygen fields.";
+    ? "Output contract: summary + repository + files + execution. Repository exposes requested file scope only when it adds dynamic search context; supported tags remain documented in registration metadata. File entries expose status, line ranges, file_doxygen, and matches; match entries expose symbol_kind, signature_text, line ranges, code_lines, stripped_source_text, and structured Doxygen fields."
+    : "Output contract: summary + repository + files + execution. Repository exposes source_directory_paths and file_canonical_paths when project-scope search context varies; supported tags remain documented in registration metadata. File entries expose status, line ranges, file_doxygen, and matches; match entries expose symbol_kind, signature_text, line ranges, code_lines, stripped_source_text, and structured Doxygen fields.";
   return [
     scopeLine,
     outputLine,
     "Regex rule: pattern is applied to construct names only with JavaScript RegExp search semantics; it never matches construct bodies; use ^...$ for exact-name matching.",
-    "Tag rule: tag is pipe-separated and case-insensitive; unsupported tags are ignored; if no valid tag remains, request.tag_filter_status becomes invalid.",
+    "Tag rule: tag is pipe-separated and case-insensitive; unsupported tags are ignored; if no valid tag remains, the response search_status becomes invalid_tag_filter.",
     "Line-number behavior: enableLineNumbers changes only display_text and stripped_source_text rendering; numeric source_line_number and line_range facts remain dedicated fields.",
     "Failure contract: invalid tag filters, invalid regex patterns, unsupported extensions, unsupported tag-language combinations, no-match files, and analysis failures are surfaced as structured statuses plus optional execution.stderr diagnostics.",
     ...buildFindToolSupportedTagGuidelines(),
@@ -442,7 +445,6 @@ function buildFindToolExecuteResult(
 } {
   const stderr = buildFindToolExecutionStderr(payload);
   const details = {
-    request: payload.request,
     summary: payload.summary,
     repository: payload.repository,
     files: payload.files,
@@ -537,18 +539,20 @@ function applyConfiguredPiUsereqTools(pi: ExtensionAPI, config: UseReqConfig): v
  * @details Applies session-start-specific resource validation, project-config
  * refresh, and startup-tool enablement before forwarding the originating hook
  * name and payload into the shared `updateExtensionStatus(...)` pipeline.
- * On `agent_end`, also dispatches configured pi-notify beep and sound effects.
- * Runtime is dominated by configuration loading during `session_start`; all
- * other hooks are O(1). Side effects include resource checks, active-tool
- * mutation, status updates, live-ticker disposal on shutdown, stdout writes,
- * and optional child-process spawning.
+ * On `agent_end`, also dispatches configured pi-notify beep, sound, and
+ * prompt-specific Pushover effects when the current run originates from a
+ * bundled prompt command. Runtime is dominated by configuration loading during
+ * `session_start`; all other hooks are O(1). Side effects include resource
+ * checks, active-tool mutation, status updates, live-ticker disposal on
+ * shutdown, stdout writes, optional child-process spawning, and outbound
+ * HTTPS requests.
  * @param[in] pi {ExtensionAPI} Active extension API instance.
  * @param[in,out] statusController {PiUsereqStatusController} Mutable status controller.
  * @param[in] hookName {PiUsereqStatusHookName} Intercepted hook name.
  * @param[in] event {unknown} Hook payload forwarded by pi.
  * @param[in] ctx {ExtensionContext} Active extension context.
  * @return {Promise<void>} Promise resolved when hook processing completes.
- * @satisfies REQ-117, REQ-118, REQ-119, REQ-129, REQ-130, REQ-131, REQ-132, REQ-133
+ * @satisfies REQ-117, REQ-118, REQ-119, REQ-129, REQ-130, REQ-131, REQ-132, REQ-133, REQ-166, REQ-167, REQ-168, REQ-169, REQ-172
  */
 async function handleExtensionStatusEvent(
   pi: ExtensionAPI,
@@ -564,8 +568,24 @@ async function handleExtensionStatusEvent(
     setPiUsereqStatusConfig(statusController, config);
   }
   updateExtensionStatus(statusController, hookName, event, ctx);
-  if (hookName === "agent_end" && statusController.config) {
-    runPiNotifyEffects(statusController.config, event as { messages: AgentEndEvent["messages"] });
+  if (hookName === "agent_end") {
+    if (statusController.config) {
+      const pushoverRequest: PiNotifyPushoverRequest | undefined = statusController.state.activePromptRequest
+        && statusController.state.lastRunDurationMs !== undefined
+        ? {
+            promptName: statusController.state.activePromptRequest.promptName,
+            promptArgs: statusController.state.activePromptRequest.promptArgs,
+            basePath: path.resolve(ctx.cwd),
+            completionTimeMs: statusController.state.lastRunDurationMs,
+          }
+        : undefined;
+      runPiNotifyEffects(
+        statusController.config,
+        event as { messages: AgentEndEvent["messages"] },
+        pushoverRequest,
+      );
+    }
+    statusController.state.activePromptRequest = undefined;
   }
   if (hookName === "session_shutdown") {
     disposePiUsereqStatusController(statusController);
@@ -671,12 +691,162 @@ function togglePiNotifyBeepFlag(config: UseReqConfig, key: PiNotifyBeepConfigKey
   return config[key];
 }
 
+/**
+ * @brief Formats one persisted Pushover priority for menu display.
+ * @details Maps the canonical `0|1` priority domain to deterministic menu text reused by the Pushover configuration UI. Runtime is O(1). No external state is mutated.
+ * @param[in] priority {PiNotifyPushoverPriority} Persisted Pushover priority.
+ * @return {string} Menu-display label.
+ * @satisfies REQ-165
+ */
+function formatPiNotifyPushoverPriority(priority: PiNotifyPushoverPriority): string {
+  return priority === 1 ? "1=High Priority" : "0=Normal";
+}
+
+/**
+ * @brief Builds the shared settings-menu choices for Pushover configuration.
+ * @details Serializes the Pushover global-disable flag, successful-completion enable flag, credential strings, and priority value into right-valued menu rows consumed by the shared settings-menu renderer. Runtime is O(1). No external state is mutated.
+ * @param[in] config {UseReqConfig} Effective project configuration.
+ * @return {PiUsereqSettingsMenuChoice[]} Ordered Pushover-menu choice vector.
+ * @satisfies REQ-163, REQ-165, REQ-166, REQ-172
+ */
+function buildPiNotifyPushoverMenuChoices(config: UseReqConfig): PiUsereqSettingsMenuChoice[] {
+  return [
+    {
+      id: "pushover-global-disable",
+      label: "Global disable",
+      value: config["notify-pushover-global-disable"] ? "on" : "off",
+      description: "Suppress all Pushover delivery without changing the successful-prompt enable flag.",
+    },
+    {
+      id: "pushover-on-success",
+      label: "Notify on success",
+      value: formatPiNotifyPushoverStatus(config),
+      description: "Toggle Pushover delivery after successful prompt completion only.",
+    },
+    {
+      id: "pushover-user-key",
+      label: "User Key/Delivery Group Key",
+      value: config["notify-pushover-user-key"] || "(empty)",
+      description: "Edit the Pushover user key or delivery group key sent with successful prompt notifications.",
+    },
+    {
+      id: "pushover-api-token",
+      label: "Token/API Token Key",
+      value: config["notify-pushover-api-token"] || "(empty)",
+      description: "Edit the Pushover application token used for successful prompt notifications.",
+    },
+    {
+      id: "pushover-priority",
+      label: "Priority",
+      value: formatPiNotifyPushoverPriority(config["notify-pushover-priority"]),
+      description: "Select whether successful prompt notifications use normal or high Pushover priority.",
+    },
+    {
+      id: "back",
+      label: "Back",
+      value: "",
+      description: "Return to the notifications menu.",
+    },
+  ];
+}
+
+/**
+ * @brief Opens the shared settings-menu selector for Pushover priority.
+ * @details Reuses the pi-usereq settings-menu renderer so Pushover priority selection remains stylistically aligned with the existing notification menus and returns the chosen priority or `undefined` on cancel. Runtime depends on user interaction count. Side effects are limited to transient custom-UI rendering.
+ * @param[in] ctx {ExtensionCommandContext} Active command context.
+ * @param[in] currentPriority {PiNotifyPushoverPriority} Persisted priority value.
+ * @return {Promise<PiNotifyPushoverPriority | undefined>} Selected priority or `undefined` when cancelled.
+ * @satisfies REQ-165
+ */
+async function selectPiNotifyPushoverPriority(
+  ctx: ExtensionCommandContext,
+  currentPriority: PiNotifyPushoverPriority,
+): Promise<PiNotifyPushoverPriority | undefined> {
+  const choice = await showPiUsereqSettingsMenu(ctx, "Pushover priority", [
+    {
+      id: "0",
+      label: "0=Normal",
+      value: currentPriority === 0 ? "selected" : "",
+      description: "Send successful prompt notifications with normal Pushover priority.",
+    },
+    {
+      id: "1",
+      label: "1=High Priority",
+      value: currentPriority === 1 ? "selected" : "",
+      description: "Send successful prompt notifications with high Pushover priority.",
+    },
+  ]);
+  if (!choice) {
+    return undefined;
+  }
+  return normalizePiNotifyPushoverPriority(choice);
+}
+
+/**
+ * @brief Runs the interactive Pushover-configuration menu.
+ * @details Exposes the Pushover global-disable flag, successful-completion enable flag, user key, API token, and priority selector through the shared settings-menu renderer. Runtime depends on user interaction count. Side effects include UI updates and config mutation.
+ * @param[in] ctx {ExtensionCommandContext} Active command context.
+ * @param[in,out] config {UseReqConfig} Mutable configuration object.
+ * @return {Promise<void>} Promise resolved when the menu closes.
+ * @satisfies REQ-163, REQ-165, REQ-166, REQ-172
+ */
+async function configurePiNotifyPushoverMenu(
+  ctx: ExtensionCommandContext,
+  config: UseReqConfig,
+): Promise<void> {
+  while (true) {
+    const choice = await showPiUsereqSettingsMenu(ctx, "Pushover notifications", buildPiNotifyPushoverMenuChoices(config));
+    if (!choice || choice === "back") {
+      return;
+    }
+    if (choice === "pushover-global-disable") {
+      config["notify-pushover-global-disable"] = !config["notify-pushover-global-disable"];
+      ctx.ui.notify(`Pushover global disable ${config["notify-pushover-global-disable"] ? "enabled" : "disabled"}`, "info");
+      continue;
+    }
+    if (choice === "pushover-on-success") {
+      config["notify-pushover-on-success"] = !config["notify-pushover-on-success"];
+      ctx.ui.notify(`Pushover on success ${config["notify-pushover-on-success"] ? "enabled" : "disabled"}`, "info");
+      continue;
+    }
+    if (choice === "pushover-user-key") {
+      const value = await ctx.ui.input(
+        "User Key/Delivery Group Key",
+        config["notify-pushover-user-key"] || "gzfjjvp1xxmhibqwzh9m7i1zwvf83j",
+      );
+      if (value !== undefined) {
+        config["notify-pushover-user-key"] = normalizePiNotifyPushoverCredential(value);
+        ctx.ui.notify("Updated Pushover user key", "info");
+      }
+      continue;
+    }
+    if (choice === "pushover-api-token") {
+      const value = await ctx.ui.input(
+        "Token/API Token Key",
+        config["notify-pushover-api-token"] || "ah6bf5u2sj63mcvou6qamiabeoubbe",
+      );
+      if (value !== undefined) {
+        config["notify-pushover-api-token"] = normalizePiNotifyPushoverCredential(value);
+        ctx.ui.notify("Updated Pushover API token", "info");
+      }
+      continue;
+    }
+    if (choice === "pushover-priority") {
+      const nextPriority = await selectPiNotifyPushoverPriority(ctx, config["notify-pushover-priority"]);
+      if (nextPriority !== undefined) {
+        config["notify-pushover-priority"] = nextPriority;
+        ctx.ui.notify(`Pushover priority set to ${formatPiNotifyPushoverPriority(nextPriority)}`, "info");
+      }
+    }
+  }
+}
+
 /**
  * @brief Builds the shared settings-menu choices for notification configuration.
- * @details Serializes the current beep flags, selected notify command, hotkey bind, and per-level notify commands into right-valued menu rows consumed by the shared settings-menu renderer. Runtime is O(1) plus command-length formatting. No external state is mutated.
+ * @details Serializes the current beep flags, selected notify command, hotkey bind, per-level notify commands, and the Pushover submenu entry into right-valued menu rows consumed by the shared settings-menu renderer. Runtime is O(1) plus command-length formatting. No external state is mutated.
  * @param[in] config {UseReqConfig} Effective project configuration.
  * @return {PiUsereqSettingsMenuChoice[]} Ordered notification-menu choice vector.
- * @satisfies REQ-137, REQ-149, REQ-150, REQ-151, REQ-152
+ * @satisfies REQ-137, REQ-149, REQ-150, REQ-151, REQ-152, REQ-163, REQ-164, REQ-165, REQ-166, REQ-172
  */
 function buildPiNotifyMenuChoices(config: UseReqConfig): PiUsereqSettingsMenuChoice[] {
   return [
@@ -728,6 +898,12 @@ function buildPiNotifyMenuChoices(config: UseReqConfig): PiUsereqSettingsMenuCho
       value: config.PI_NOTIFY_SOUND_HIGH_CMD,
       description: "Edit the shell command used when the selected notify command is `high`.",
     },
+    {
+      id: "pushover-notifications",
+      label: "Pushover notifications",
+      value: formatPiNotifyPushoverStatus(config),
+      description: "Open the Pushover submenu for successful-completion delivery, credentials, priority, and global disable.",
+    },
     {
       id: "back",
       label: "Back",
@@ -780,11 +956,11 @@ async function selectPiNotifySoundLevel(
 
 /**
  * @brief Runs the interactive notification-configuration menu.
- * @details Exposes prompt-end beep toggles, selected notify-command selection, hotkey-bind editing, and per-level notify-command editors through the shared settings-menu renderer. Runtime depends on user interaction count. Side effects include UI updates and config mutation.
+ * @details Exposes prompt-end beep toggles, selected notify-command selection, hotkey-bind editing, per-level notify-command editors, and the nested Pushover submenu through the shared settings-menu renderer. Runtime depends on user interaction count. Side effects include UI updates and config mutation.
  * @param[in] ctx {ExtensionCommandContext} Active command context.
  * @param[in,out] config {UseReqConfig} Mutable configuration object.
  * @return {Promise<boolean>} `true` when the sound-toggle shortcut changed.
- * @satisfies REQ-129, REQ-131, REQ-133, REQ-134, REQ-137, REQ-149, REQ-150, REQ-151, REQ-152, REQ-153, REQ-154
+ * @satisfies REQ-129, REQ-131, REQ-133, REQ-134, REQ-137, REQ-149, REQ-150, REQ-151, REQ-152, REQ-153, REQ-154, REQ-163, REQ-164, REQ-165, REQ-166, REQ-172
  */
 async function configurePiNotifyMenu(
   ctx: ExtensionCommandContext,
@@ -849,6 +1025,10 @@ async function configurePiNotifyMenu(
         config.PI_NOTIFY_SOUND_HIGH_CMD = value.trim();
         ctx.ui.notify("Updated notify command (high vol.)", "info");
       }
+      continue;
+    }
+    if (choice === "pushover-notifications") {
+      await configurePiNotifyPushoverMenu(ctx, config);
     }
   }
 }
@@ -890,12 +1070,16 @@ function registerPiNotifyShortcut(
 
 /**
  * @brief Registers bundled prompt commands with the extension.
- * @details Creates one `req-<prompt>` command per bundled prompt name. Each handler ensures resources exist, renders the prompt, and sends it into the current active session. Runtime is O(p) for registration; handler cost depends on prompt rendering plus prompt dispatch. Side effects include command registration and user-message delivery during execution.
+ * @details Creates one `req-<prompt>` command per bundled prompt name. Each handler ensures resources exist, records the prompt metadata needed for successful completion notifications, renders the prompt, and sends it into the current active session. Runtime is O(p) for registration; handler cost depends on prompt rendering plus prompt dispatch. Side effects include command registration, status-controller mutation, and user-message delivery during execution.
  * @param[in] pi {ExtensionAPI} Active extension API instance.
+ * @param[in,out] statusController {PiUsereqStatusController} Mutable status controller.
  * @return {void} No return value.
- * @satisfies REQ-004, REQ-067, REQ-068
+ * @satisfies REQ-004, REQ-067, REQ-068, REQ-169
  */
-function registerPromptCommands(pi: ExtensionAPI): void {
+function registerPromptCommands(
+  pi: ExtensionAPI,
+  statusController: PiUsereqStatusController,
+): void {
   PROMPT_NAMES.forEach((promptName) => {
     pi.registerCommand(`req-${promptName}`, {
       description: `Run pi-usereq prompt ${promptName}`,
@@ -903,6 +1087,10 @@ function registerPromptCommands(pi: ExtensionAPI): void {
         ensureBundledResourcesAccessible();
         const projectBase = getProjectBase(ctx.cwd);
         const config = loadProjectConfig(ctx.cwd);
+        statusController.state.pendingPromptRequest = {
+          promptName,
+          promptArgs: args,
+        };
         const content = renderPrompt(promptName, args, projectBase, config);
         await deliverPromptCommand(pi, content);
       },
@@ -922,17 +1110,17 @@ function registerAgentTools(pi: ExtensionAPI): void {
   const gitPathSchema = Type.Object(
     {},
     {
-      description: "Input contract: no params. Output contract: JSON object with request, result, and execution. Result exposes path_key, path_value, and path_present for the cwd-derived runtime git root.",
+      description: "Input contract: no params. Output contract: JSON object with result and execution. Result exposes path_value and path_present for the cwd-derived runtime git root.",
     },
   );
   pi.registerTool({
     name: "git-path",
     label: "git-path",
-    description: "Scope: current runtime path. Return a JSON-first payload with request, result, and execution sections. Result exposes the resolved `git-path` value through direct-access fields instead of text-only output.",
+    description: "Scope: current runtime path. Return a token-optimized JSON payload with result and execution sections. Result exposes the resolved `git-path` value through direct-access fields without request echoes.",
     promptSnippet: "Return the structured runtime git-root payload for the current project.",
     promptGuidelines: [
       "Input contract: no params. Scope is the cwd-derived runtime path context.",
-      "Output contract: request + result + execution. Result exposes path_key, path_value, and path_present.",
+      "Output contract: result + execution. Result exposes path_value and path_present.",
       "Behavior contract: git-path is derived at runtime from the current working directory and repository ancestry rules.",
       "Failure contract: configuration-loading failures surface through execution.code and execution.stderr_lines.",
     ],
@@ -941,14 +1129,12 @@ function registerAgentTools(pi: ExtensionAPI): void {
       ensureBundledResourcesAccessible();
       const projectBase = getProjectBase(process.cwd());
       const config = loadProjectConfig(process.cwd());
-      const runtimePaths = buildSharedRuntimePathFacts(process.cwd(), config);
       const result = runGitPath(projectBase, config);
       const payload = buildPathQueryToolPayload(
         "git-path",
         process.cwd(),
         projectBase,
         result.stdout.trimEnd(),
-        runtimePaths,
         buildToolExecutionSection(result),
       );
       return buildStructuredToolExecuteResult(payload);
@@ -958,17 +1144,17 @@ function registerAgentTools(pi: ExtensionAPI): void {
   const basePathSchema = Type.Object(
     {},
     {
-      description: "Input contract: no params. Output contract: JSON object with request, result, and execution. Result exposes path_key, path_value, and path_present for the cwd-derived runtime base path.",
+      description: "Input contract: no params. Output contract: JSON object with result and execution. Result exposes path_value and path_present for the cwd-derived runtime base path.",
     },
   );
   pi.registerTool({
     name: "get-base-path",
     label: "get-base-path",
-    description: "Scope: current runtime path. Return a JSON-first payload with request, result, and execution sections. Result exposes the resolved `base-path` value through direct-access fields instead of text-only output.",
+    description: "Scope: current runtime path. Return a token-optimized JSON payload with result and execution sections. Result exposes the resolved `base-path` value through direct-access fields without request echoes.",
     promptSnippet: "Return the structured runtime project-base payload.",
     promptGuidelines: [
       "Input contract: no params. Scope is the cwd-derived runtime path context.",
-      "Output contract: request + result + execution. Result exposes path_key, path_value, and path_present.",
+      "Output contract: result + execution. Result exposes path_value and path_present.",
       "Behavior contract: base-path equals the current working directory used by the extension command or tool.",
       "Failure contract: configuration-loading failures surface through execution.code and execution.stderr_lines.",
     ],
@@ -976,14 +1162,12 @@ function registerAgentTools(pi: ExtensionAPI): void {
     async execute() {
       const projectBase = getProjectBase(process.cwd());
       const config = loadProjectConfig(process.cwd());
-      const runtimePaths = buildSharedRuntimePathFacts(process.cwd(), config);
       const result = runGetBasePath(projectBase, config);
       const payload = buildPathQueryToolPayload(
         "get-base-path",
         process.cwd(),
         projectBase,
         result.stdout.trimEnd(),
-        runtimePaths,
         buildToolExecutionSection(result),
       );
       return buildStructuredToolExecuteResult(payload);
@@ -998,7 +1182,7 @@ function registerAgentTools(pi: ExtensionAPI): void {
       ),
     },
     {
-      description: "Input contract: files[]. Output contract: JSON object with request, summary, repository, files, and execution. File entries expose canonical paths, numeric line ranges, imports, symbols, structured Doxygen fields, standalone comments, and structured status facts. Missing or unsupported inputs become skipped entries. The tool fails when no source file can be analyzed.",
+      description: "Input contract: files[]. Output contract: JSON object with summary, repository, files, and execution. File entries expose canonical paths, numeric line ranges, imports, symbols, structured Doxygen fields, standalone comments, and structured status facts. Missing or unsupported inputs become skipped entries. The tool fails when no source file can be analyzed.",
     },
   );
   const multiFileSchema = Type.Object(
@@ -1009,7 +1193,7 @@ function registerAgentTools(pi: ExtensionAPI): void {
       ),
     },
     {
-      description: "Input contract: files[]. Output contract: JSON object with request, summary, files, and execution. File entries expose canonical paths, detected language, configured checker modules, selection status, and error facts.",
+      description: "Input contract: files[]. Output contract: JSON object with summary, files, and execution. File entries expose canonical paths, detected language, configured checker modules, selection status, and error facts.",
     },
   );
   const filesTokensSchema = Type.Object(
@@ -1020,19 +1204,19 @@ function registerAgentTools(pi: ExtensionAPI): void {
       ),
     },
     {
-      description: "Input contract: files[]. Output contract: JSON object with request, summary, files, guidance, and execution. File entries expose path identifiers, access facts, line ranges, sizes, token metrics, and optional heading or Doxygen metadata. Missing or non-file inputs become skipped entries. The tool fails when no processable files remain.",
+      description: "Input contract: files[]. Output contract: JSON object with summary, files, and execution. File entries expose direct-access facts, token metrics, and optional heading or Doxygen metadata. Missing or non-file inputs become skipped entries. The tool fails when no processable files remain.",
     },
   );
 
   pi.registerTool({
     name: "files-tokens",
     label: "files-tokens",
-    description: "Scope: explicit files. Return an LLM-oriented JSON payload with request, summary, files, guidance, and execution sections. File entries expose direct-access path facts, status, line ranges, sizes, token metrics, and optional heading or Doxygen metadata.",
+    description: "Scope: explicit files. Return a token-optimized JSON payload with summary, files, and execution sections. File entries expose direct-access path facts, status, size metrics, and optional heading or Doxygen metadata.",
     promptSnippet: "Return the structured token-analysis payload for caller-selected files.",
     promptGuidelines: [
       "Scope: explicit files selected by files[]; caller order is preserved; each item may be project-relative or absolute.",
-      "Output contract: request + summary + files + guidance + execution. File entries expose canonical paths, absolute paths, existence, file status, line range, line count, byte count, character count, token count, shares, and optional primary-heading or Doxygen file metadata.",
-      "Numeric contract: counts, sizes, shares, and line ranges remain in dedicated numeric fields; descriptive text is limited to stable reasons and guidance labels.",
+      "Output contract: summary + files + execution. File entries expose canonical paths, absolute paths, existence, file status, line range, line count, byte count, character count, token count, shares, and optional primary-heading or Doxygen file metadata.",
+      "Numeric contract: counts, sizes, shares, and line ranges remain in dedicated numeric fields; static request metadata and derived guidance are omitted from runtime responses.",
       "Behavior contract: missing or non-file inputs become skipped entries; read failures become error entries; the tool fails only when no processable files remain.",
     ],
     parameters: filesTokensSchema,
@@ -1051,11 +1235,11 @@ function registerAgentTools(pi: ExtensionAPI): void {
   pi.registerTool({
     name: "files-references",
     label: "files-references",
-    description: "Scope: explicit source files. Return an LLM-oriented JSON payload with request, summary, repository, files, and execution sections. File entries expose canonical paths, numeric line ranges, imports, symbols, structured Doxygen fields, standalone comments, and structured status facts.",
+    description: "Scope: explicit source files. Return a token-optimized JSON payload with summary, repository, files, and execution sections. File entries expose canonical paths, numeric line ranges, imports, symbols, structured Doxygen fields, standalone comments, and structured status facts.",
     promptSnippet: "Return the structured references payload for caller-selected source files.",
     promptGuidelines: [
       "Scope: explicit source files selected by files[]; caller order is preserved; each item may be project-relative or absolute.",
-      "Output contract: request + summary + repository + files + execution. File entries expose canonical paths, absolute paths, file status, line counts, line ranges, imports, symbols, child relationships, standalone comments, and structured Doxygen metadata.",
+      "Output contract: summary + repository + files + execution. File entries expose canonical paths, absolute paths, file status, line counts, line ranges, imports, symbols, child relationships, standalone comments, and structured Doxygen metadata.",
       "Numeric contract: line counts, line ranges, symbol counts, import counts, comment counts, and Doxygen counts remain in dedicated numeric fields; text is limited to residual comment or signature content that cannot be split safely.",
       "Behavior contract: missing inputs, non-file inputs, and unsupported extensions become structured skipped entries; analysis failures become structured error entries; the tool fails only when no source file can be analyzed.",
     ],
@@ -1080,18 +1264,18 @@ function registerAgentTools(pi: ExtensionAPI): void {
       enableLineNumbers: Type.Optional(Type.Boolean({ description: "When true, `compressed_source_text` and `compressed_lines[].display_text` include original source line-number prefixes" })),
     },
     {
-      description: "Input contract: files[] plus optional enableLineNumbers. Output contract: JSON object with request, summary, repository, files, and execution. File entries expose path identifiers, source and compressed line metrics, structured compressed lines, symbols, structured Doxygen fields, and stable status facts. Missing, unsupported, or invalid inputs become structured skipped entries. The tool fails when no file is compressed.",
+      description: "Input contract: files[] plus optional enableLineNumbers. Output contract: JSON object with summary, repository, files, and execution. File entries expose path identifiers, source and compressed line metrics, structured compressed lines, symbols, structured Doxygen fields, and stable status facts. Missing, unsupported, or invalid inputs become structured skipped entries. The tool fails when no file is compressed.",
     },
   );
 
   pi.registerTool({
     name: "files-compress",
     label: "files-compress",
-    description: "Scope: explicit files. Return an LLM-oriented JSON payload with request, summary, repository, files, and execution sections. File entries expose canonical paths, source and compressed line metrics, structured compressed lines, symbols, structured Doxygen fields, and stable status facts.",
+    description: "Scope: explicit files. Return a token-optimized JSON payload with summary, repository, files, and execution sections. File entries expose canonical paths, source and compressed line metrics, structured compressed lines, symbols, structured Doxygen fields, and stable status facts.",
     promptSnippet: "Return the structured compression payload for caller-selected source files.",
     promptGuidelines: [
       "Scope: explicit source files selected by files[]; caller order is preserved; each item may be project-relative or absolute.",
-      "Output contract: request + summary + repository + files + execution. File entries expose canonical paths, absolute paths, line_number_mode, source line counts, source line ranges, compressed line counts, removed line counts, compressed_lines, compressed_source_text, symbols, and file_doxygen.",
+      "Output contract: summary + repository + files + execution. File entries expose canonical paths, absolute paths, line_number_mode, source line counts, source line ranges, compressed line counts, removed line counts, compressed_lines, compressed_source_text, symbols, and file_doxygen.",
       "Line-number behavior: enableLineNumbers changes only rendered display strings; numeric source_line_number facts remain dedicated fields on compressed_lines for direct access.",
       "Behavior contract: missing inputs, non-file inputs, and unsupported extensions become structured skipped entries; compression failures become structured error entries; symbol-analysis failures retain compressed output with symbol_analysis_status=error; the tool fails only when no file is compressed.",
     ],
@@ -1126,7 +1310,7 @@ function registerAgentTools(pi: ExtensionAPI): void {
   pi.registerTool({
     name: "files-find",
     label: "files-find",
-    description: "Scope: explicit source files. Return an LLM-oriented JSON payload with request, summary, repository, files, and execution sections. File entries expose structured statuses and match records with typed location, symbol, stripped-code, and Doxygen facts.",
+    description: "Scope: explicit source files. Return a token-optimized JSON payload with summary, repository, files, and execution sections. File entries expose structured statuses and match records with typed location, symbol, stripped-code, and Doxygen facts.",
     promptSnippet: "Return the structured construct-search payload for caller-selected source files.",
     promptGuidelines: buildFindToolPromptGuidelines("explicit-files"),
     parameters: filesFindSchema,
@@ -1147,24 +1331,24 @@ function registerAgentTools(pi: ExtensionAPI): void {
   const referencesSchema = Type.Object(
     {},
     {
-      description: "Input contract: no params. Scope is the configured src-dir list resolved from the current project configuration. Output contract: JSON object with request, summary, repository, files, and execution. Repository exposes the structured directory tree; file entries expose canonical paths, numeric line ranges, imports, symbols, structured Doxygen fields, and status facts. The tool fails when no configured source file can be analyzed.",
+      description: "Input contract: no params. Scope is the configured src-dir list resolved from the current project configuration. Output contract: JSON object with summary, repository, files, and execution. Repository exposes the structured directory tree; file entries expose canonical paths, numeric line ranges, imports, symbols, structured Doxygen fields, and status facts. The tool fails when no configured source file can be analyzed.",
     },
   );
   const tokensSchema = Type.Object(
     {},
     {
-      description: "Input contract: no params. Scope is the configured docs-dir plus canonical docs REQUIREMENTS.md, WORKFLOW.md, and REFERENCES.md. Output contract: same structured JSON shape as files-tokens, plus docs_dir_path and canonical_doc_names in request. Missing canonical docs become skipped entries. The tool fails when no processable canonical docs remain.",
+      description: "Input contract: no params. Scope is the configured docs-dir plus canonical docs REQUIREMENTS.md, WORKFLOW.md, and REFERENCES.md. Output contract: same token-optimized JSON shape as files-tokens. Missing canonical docs become skipped entries. The tool fails when no processable canonical docs remain.",
     },
   );
 
   pi.registerTool({
     name: "references",
     label: "references",
-    description: "Scope: configured project source directories. Return an LLM-oriented JSON payload with request, summary, repository, files, and execution sections. The repository section exposes the structured directory tree; file entries expose canonical paths, numeric line ranges, imports, symbols, structured Doxygen fields, standalone comments, and status facts.",
+    description: "Scope: configured project source directories. Return a token-optimized JSON payload with summary, repository, files, and execution sections. The repository section exposes the structured directory tree; file entries expose canonical paths, numeric line ranges, imports, symbols, structured Doxygen fields, standalone comments, and status facts.",
     promptSnippet: "Return the structured project references payload from the configured source directories.",
     promptGuidelines: [
       "Scope: no params; resolve src-dir from the current project configuration and scan the configured source surface from the current working directory.",
-      "Output contract: request + summary + repository + files + execution. Repository exposes source_directory_paths, file_canonical_paths, and directory_tree; file entries expose canonical paths, line counts, line ranges, imports, symbols, hierarchy, standalone comments, and structured Doxygen metadata.",
+      "Output contract: summary + repository + files + execution. Repository exposes source_directory_paths, file_canonical_paths, and directory_tree; file entries expose canonical paths, line counts, line ranges, imports, symbols, hierarchy, standalone comments, and structured Doxygen metadata.",
       "Configuration contract: output changes with cwd-derived project config, src-dir values, and repository source discovery; the tool does not accept explicit file overrides.",
       "Behavior contract: configured source files are analyzed in deterministic order, analysis failures become structured error entries, and the tool fails when no configured source file can be analyzed.",
     ],
@@ -1188,18 +1372,18 @@ function registerAgentTools(pi: ExtensionAPI): void {
       enableLineNumbers: Type.Optional(Type.Boolean({ description: "When true, `compressed_source_text` and `compressed_lines[].display_text` include original source line-number prefixes" })),
     },
     {
-      description: "Input contract: optional enableLineNumbers boolean. Scope is the configured src-dir list resolved from the current project configuration. Output contract: JSON object with request, summary, repository, files, and execution. File entries expose path identifiers, source and compressed line metrics, structured compressed lines, symbols, structured Doxygen fields, and stable status facts. The tool fails when no configured source file is compressed.",
+      description: "Input contract: optional enableLineNumbers boolean. Scope is the configured src-dir list resolved from the current project configuration. Output contract: JSON object with summary, repository, files, and execution. File entries expose path identifiers, source and compressed line metrics, structured compressed lines, symbols, structured Doxygen fields, and stable status facts. The tool fails when no configured source file is compressed.",
     },
   );
 
   pi.registerTool({
     name: "compress",
     label: "compress",
-    description: "Scope: configured project source directories. Return an LLM-oriented JSON payload with request, summary, repository, files, and execution sections. File entries expose canonical paths, source and compressed line metrics, structured compressed lines, symbols, structured Doxygen fields, and stable status facts.",
+    description: "Scope: configured project source directories. Return a token-optimized JSON payload with summary, repository, files, and execution sections. File entries expose canonical paths, source and compressed line metrics, structured compressed lines, symbols, structured Doxygen fields, and stable status facts.",
     promptSnippet: "Return the structured project compression payload from the configured source directories.",
     promptGuidelines: [
       "Scope: resolve src-dir from the current project configuration and scan the configured source surface from the current working directory.",
-      "Output contract: request + summary + repository + files + execution. Repository exposes source_directory_paths and file_canonical_paths; file entries expose line_number_mode, source line counts, source line ranges, compressed line counts, removed line counts, compressed_lines, compressed_source_text, symbols, and file_doxygen.",
+      "Output contract: summary + repository + files + execution. Repository exposes source_directory_paths and file_canonical_paths; file entries expose line_number_mode, source line counts, source line ranges, compressed line counts, removed line counts, compressed_lines, compressed_source_text, symbols, and file_doxygen.",
       "Configuration contract: output changes with cwd-derived project config, src-dir values, and repository source discovery; the tool does not accept explicit file overrides.",
       "Behavior contract: configured source files are processed in deterministic order, compression failures become structured error entries, symbol-analysis failures retain compressed output with symbol_analysis_status=error, and the tool fails only when no configured source file is compressed.",
     ],
@@ -1234,7 +1418,7 @@ function registerAgentTools(pi: ExtensionAPI): void {
   pi.registerTool({
     name: "find",
     label: "find",
-    description: "Scope: configured project source directories. Return an LLM-oriented JSON payload with request, summary, repository, files, and execution sections. File entries expose structured statuses and match records with typed location, symbol, stripped-code, and Doxygen facts.",
+    description: "Scope: configured project source directories. Return a token-optimized JSON payload with summary, repository, files, and execution sections. File entries expose structured statuses and match records with typed location, symbol, stripped-code, and Doxygen facts.",
     promptSnippet: "Return the structured construct-search payload from the configured source directories.",
     promptGuidelines: buildFindToolPromptGuidelines("configured-source-directories"),
     parameters: findSchema,
@@ -1259,12 +1443,12 @@ function registerAgentTools(pi: ExtensionAPI): void {
   pi.registerTool({
     name: "tokens",
     label: "tokens",
-    description: "Scope: canonical docs from the configured docs-dir. Return the same LLM-oriented JSON contract as files-tokens, plus canonical-doc selection metadata in request for REQUIREMENTS.md, WORKFLOW.md, and REFERENCES.md.",
+    description: "Scope: canonical docs from the configured docs-dir. Return the same token-optimized JSON contract as files-tokens, omitting canonical-doc request echoes from runtime responses.",
     promptSnippet: "Return the structured token-analysis payload for canonical documentation files.",
     promptGuidelines: [
       "Scope: no params; resolve docs-dir from project config; target canonical docs REQUIREMENTS.md, WORKFLOW.md, and REFERENCES.md.",
-      "Output contract: request + summary + files + guidance + execution. Request includes docs_dir_path and canonical_doc_names; file entries expose direct-access path facts, line ranges, sizes, token metrics, and optional metadata.",
-      "Numeric contract: counts, sizes, shares, and line ranges remain in dedicated numeric fields; guidance separates source observations, derived recommendations, and actionable next-step hints.",
+      "Output contract: summary + files + execution. Static docs-dir and canonical-doc selection facts remain documented in registration metadata; file entries expose direct-access path facts, line ranges, sizes, token metrics, and optional metadata.",
+      "Numeric contract: counts, sizes, shares, and line ranges remain in dedicated numeric fields; derived guidance is omitted from runtime responses to reduce token cost.",
       "Behavior contract: missing canonical docs become skipped entries; read failures become error entries; the tool fails only when no processable canonical docs remain.",
     ],
     parameters: tokensSchema,
@@ -1289,11 +1473,11 @@ function registerAgentTools(pi: ExtensionAPI): void {
   pi.registerTool({
     name: "files-static-check",
     label: "files-static-check",
-    description: "Scope: explicit files. Return a JSON-first payload with request, summary, files, and execution sections. File entries expose canonical paths, detected language, configured checker modules, selection status, and stable error facts.",
+    description: "Scope: explicit files. Return a token-optimized JSON payload with summary, files, and execution sections. File entries expose canonical paths, detected language, configured checker modules, selection status, and stable error facts.",
     promptSnippet: "Return the structured explicit-file static-check payload for the current project configuration.",
     promptGuidelines: [
       "Input contract: files[]. Scope is explicit caller-selected files resolved from the current working directory.",
-      "Output contract: request + summary + files + execution. File entries expose canonical_path, language_name, configured_checker_modules, status, and error_message.",
+      "Output contract: summary + files + execution. File entries expose canonical_path, language_name, configured_checker_modules, status, and error_message.",
       "Configuration contract: checker selection is derived from the cwd-resolved static-check configuration and file extensions only.",
       "Failure contract: execution.code mirrors aggregated checker failures; execution.stdout_lines and execution.stderr_lines preserve residual checker diagnostics.",
     ],
@@ -1301,7 +1485,6 @@ function registerAgentTools(pi: ExtensionAPI): void {
     async execute(_toolCallId, params) {
       const projectBase = getProjectBase(process.cwd());
       const config = loadProjectConfig(process.cwd());
-      const runtimePaths = buildSharedRuntimePathFacts(process.cwd(), config);
       const staticCheckConfig = config["static-check"] ?? {};
       const result = runFilesStaticCheck(params.files, projectBase, config);
       const payload = buildStaticCheckToolPayload(
@@ -1312,7 +1495,6 @@ function registerAgentTools(pi: ExtensionAPI): void {
         [],
         [],
         staticCheckConfig,
-        runtimePaths,
         buildToolExecutionSection(result),
       );
       return buildStructuredToolExecuteResult(payload);
@@ -1322,17 +1504,17 @@ function registerAgentTools(pi: ExtensionAPI): void {
   const staticCheckSchema = Type.Object(
     {},
     {
-      description: "Input contract: no params. Scope is the configured src-dir plus tests-dir selection after fixture exclusion. Output contract: JSON object with request, summary, files, and execution.",
+      description: "Input contract: no params. Scope is the configured src-dir plus tests-dir selection after fixture exclusion. Output contract: JSON object with summary, files, and execution.",
     },
   );
   pi.registerTool({
     name: "static-check",
     label: "static-check",
-    description: "Scope: configured source and test directories. Return a JSON-first payload with request, summary, files, and execution sections. File entries expose selected-path facts, checker coverage, selection status, and residual diagnostics metadata.",
+    description: "Scope: configured source and test directories. Return a token-optimized JSON payload with summary, files, and execution sections. File entries expose selected-path facts, checker coverage, selection status, and residual diagnostics metadata.",
     promptSnippet: "Return the structured project static-check payload for the current configuration.",
     promptGuidelines: [
       "Input contract: no params. Scope is src-dir plus tests-dir from the cwd-derived project configuration.",
-      "Output contract: request + summary + files + execution. Request exposes selection_directory_paths and excluded_directory_paths; file entries expose configured_checker_modules and status.",
+      "Output contract: summary + files + execution. Selection-directory rules remain documented in registration metadata; file entries expose configured_checker_modules and status.",
       "Selection contract: tests/fixtures and <tests-dir>/fixtures are excluded before checker dispatch.",
       "Failure contract: execution.code mirrors aggregated checker failures or selection failures; execution.stderr_lines preserve residual diagnostics.",
     ],
@@ -1340,7 +1522,6 @@ function registerAgentTools(pi: ExtensionAPI): void {
     async execute() {
       const projectBase = getProjectBase(process.cwd());
       const config = loadProjectConfig(process.cwd());
-      const runtimePaths = buildSharedRuntimePathFacts(process.cwd(), config);
       const staticCheckConfig = config["static-check"] ?? {};
       const selectionDirectoryPaths = [...config["src-dir"], config["tests-dir"]];
       const testsDirRel = makeRelativeIfContainsProject(config["tests-dir"], projectBase)
@@ -1368,7 +1549,6 @@ function registerAgentTools(pi: ExtensionAPI): void {
         selectionDirectoryPaths,
         excludedDirectoryPaths,
         staticCheckConfig,
-        runtimePaths,
         execution,
       );
       return buildStructuredToolExecuteResult(payload);
@@ -1378,17 +1558,17 @@ function registerAgentTools(pi: ExtensionAPI): void {
   const gitCheckSchema = Type.Object(
     {},
     {
-      description: "Input contract: no params. Output contract: JSON object with request, result, and execution. Result exposes git-root presence plus clean-versus-error repository status fields.",
+      description: "Input contract: no params. Output contract: JSON object with result and execution. Result exposes git-path presence plus aggregate repository status fields.",
     },
   );
   pi.registerTool({
     name: "git-check",
     label: "git-check",
-    description: "Scope: current runtime path. Return a JSON-first payload with request, result, and execution sections. Result exposes repository validation status through direct fields instead of empty-success text.",
+    description: "Scope: current runtime path. Return a token-optimized JSON payload with result and execution sections. Result exposes repository validation status through direct fields without request echoes.",
     promptSnippet: "Return the structured git-validation payload for the runtime repository.",
     promptGuidelines: [
       "Input contract: no params. Scope is the cwd-derived runtime path context.",
-      "Output contract: request + result + execution. Result exposes git_path_present, status, worktree_status, and head_status.",
+      "Output contract: result + execution. Result exposes git_path_present and aggregate status.",
       "Behavior contract: the tool checks work-tree membership, porcelain cleanliness, and symbolic-or-detached HEAD validity.",
       "Failure contract: execution.code and execution.stderr_lines surface git-path or repository-state errors.",
     ],
@@ -1396,14 +1576,13 @@ function registerAgentTools(pi: ExtensionAPI): void {
     async execute() {
       const projectBase = getProjectBase(process.cwd());
       const config = loadProjectConfig(process.cwd());
-      const runtimePaths = buildSharedRuntimePathFacts(process.cwd(), config);
       let execution;
       try {
         execution = buildToolExecutionSection(runGitCheck(projectBase, config));
       } catch (error) {
         execution = buildToolExecutionSection(normalizeToolFailure(error));
       }
-      const payload = buildGitCheckToolPayload(projectBase, resolveRuntimeGitPath(projectBase), runtimePaths, execution);
+      const payload = buildGitCheckToolPayload(projectBase, resolveRuntimeGitPath(projectBase), execution);
       return buildStructuredToolExecuteResult(payload);
     },
   });
@@ -1411,17 +1590,17 @@ function registerAgentTools(pi: ExtensionAPI): void {
   const docsCheckSchema = Type.Object(
     {},
     {
-      description: "Input contract: no params. Output contract: JSON object with request, summary, files, and execution. File entries expose canonical paths, prompt_command remediation, and presence status for canonical docs.",
+      description: "Input contract: no params. Output contract: JSON object with summary, files, and execution. File entries expose canonical paths, prompt_command remediation, and presence status for canonical docs.",
     },
   );
   pi.registerTool({
     name: "docs-check",
     label: "docs-check",
-    description: "Scope: canonical docs. Return a JSON-first payload with request, summary, files, and execution sections. File entries expose remediation prompt commands and direct presence facts for REQUIREMENTS.md, WORKFLOW.md, and REFERENCES.md.",
+    description: "Scope: canonical docs. Return a token-optimized JSON payload with summary, files, and execution sections. File entries expose remediation prompt commands and direct presence facts for REQUIREMENTS.md, WORKFLOW.md, and REFERENCES.md.",
     promptSnippet: "Return the structured canonical-document validation payload.",
     promptGuidelines: [
       "Input contract: no params. Scope is docs-dir from the cwd-derived project configuration.",
-      "Output contract: request + summary + files + execution. File entries expose file_name, canonical_path, prompt_command, and status.",
+      "Output contract: summary + files + execution. File entries expose file_name, canonical_path, prompt_command, and status.",
       "Specialization trigger: remediation differs per missing canonical file through prompt_command.",
       "Failure contract: execution.code is non-zero when any canonical document is missing; execution.stderr_lines enumerate missing files.",
     ],
@@ -1429,8 +1608,7 @@ function registerAgentTools(pi: ExtensionAPI): void {
     async execute() {
       const projectBase = getProjectBase(process.cwd());
       const config = loadProjectConfig(process.cwd());
-      const runtimePaths = buildSharedRuntimePathFacts(process.cwd(), config);
-      const payload = buildDocsCheckToolPayload(projectBase, config["docs-dir"], runtimePaths);
+      const payload = buildDocsCheckToolPayload(projectBase, config["docs-dir"]);
       return buildStructuredToolExecuteResult(payload);
     },
   });
@@ -1438,17 +1616,17 @@ function registerAgentTools(pi: ExtensionAPI): void {
   const gitWtNameSchema = Type.Object(
     {},
     {
-      description: "Input contract: no params. Output contract: JSON object with request, result, and execution. Result exposes worktree_name and the normative useReq naming format string.",
+      description: "Input contract: no params. Output contract: JSON object with result and execution. Result exposes worktree_name when generation succeeds.",
     },
   );
   pi.registerTool({
     name: "git-wt-name",
     label: "git-wt-name",
-    description: "Scope: current runtime path. Return a JSON-first payload with request, result, and execution sections. Result exposes the generated worktree name plus its normative format as direct fields.",
+    description: "Scope: current runtime path. Return a token-optimized JSON payload with result and execution sections. Result exposes the generated worktree name while static naming rules remain in registration metadata.",
     promptSnippet: "Return the structured worktree-name generation payload.",
     promptGuidelines: [
       "Input contract: no params. Scope is the cwd-derived runtime path context.",
-      "Output contract: request + result + execution. Result exposes worktree_name and format_text.",
+      "Output contract: result + execution. Result exposes worktree_name.",
       "Behavior contract: generation follows useReq-<project>-<sanitized-branch>-<YYYYMMDDHHMMSS>.",
       "Failure contract: execution.code and execution.stderr_lines surface git-path or branch-resolution errors.",
     ],
@@ -1456,14 +1634,13 @@ function registerAgentTools(pi: ExtensionAPI): void {
     async execute() {
       const projectBase = getProjectBase(process.cwd());
       const config = loadProjectConfig(process.cwd());
-      const runtimePaths = buildSharedRuntimePathFacts(process.cwd(), config);
       let execution;
       try {
         execution = buildToolExecutionSection(runGitWtName(projectBase, config));
       } catch (error) {
         execution = buildToolExecutionSection(normalizeToolFailure(error));
       }
-      const payload = buildWorktreeNameToolPayload(projectBase, resolveRuntimeGitPath(projectBase), runtimePaths, execution);
+      const payload = buildWorktreeNameToolPayload(projectBase, resolveRuntimeGitPath(projectBase), execution);
       return buildStructuredToolExecuteResult(payload);
     },
   });
@@ -1473,17 +1650,17 @@ function registerAgentTools(pi: ExtensionAPI): void {
       wtName: Type.String({ description: "Exact target worktree name and branch name" }),
     },
     {
-      description: "Input contract: wtName. Output contract: JSON object with request, result, and execution. Result exposes operation, worktree_name, branch_name, derived worktree_path, and status.",
+      description: "Input contract: wtName. Output contract: JSON object with result and execution. Result exposes worktree_name and derived worktree_path.",
     },
   );
   pi.registerTool({
     name: "git-wt-create",
     label: "git-wt-create",
-    description: "Scope: current runtime path. Return a JSON-first payload with request, result, and execution sections. Result exposes the requested create operation, exact worktree name, derived path, and mutation status.",
+    description: "Scope: current runtime path. Return a token-optimized JSON payload with result and execution sections. Result exposes the exact worktree name and derived path without static operation echoes.",
     promptSnippet: "Return the structured worktree-creation payload for the requested name.",
     promptGuidelines: [
       "Input contract: wtName is required and must match the exact worktree/branch name to create.",
-      "Output contract: request + result + execution. Result exposes operation=create, worktree_name, branch_name, worktree_path, and status.",
+      "Output contract: result + execution. Result exposes worktree_name and worktree_path.",
       "Specialization trigger: worktree_path depends on the runtime git root parent directory.",
       "Failure contract: execution.code and execution.stderr_lines surface invalid-name, git, or finalization errors.",
     ],
@@ -1491,7 +1668,6 @@ function registerAgentTools(pi: ExtensionAPI): void {
     async execute(_toolCallId, params) {
       const projectBase = getProjectBase(process.cwd());
       const config = loadProjectConfig(process.cwd());
-      const runtimePaths = buildSharedRuntimePathFacts(process.cwd(), config);
       let execution;
       try {
         execution = buildToolExecutionSection(runGitWtCreate(projectBase, params.wtName, config));
@@ -1503,7 +1679,6 @@ function registerAgentTools(pi: ExtensionAPI): void {
         projectBase,
         resolveRuntimeGitPath(projectBase),
         params.wtName,
-        runtimePaths,
         execution,
       );
       return buildStructuredToolExecuteResult(payload);
@@ -1515,17 +1690,17 @@ function registerAgentTools(pi: ExtensionAPI): void {
       wtName: Type.String({ description: "Exact target worktree name and branch name" }),
     },
     {
-      description: "Input contract: wtName. Output contract: JSON object with request, result, and execution. Result exposes operation, worktree_name, branch_name, derived worktree_path, and status.",
+      description: "Input contract: wtName. Output contract: JSON object with result and execution. Result exposes worktree_name and derived worktree_path.",
     },
   );
   pi.registerTool({
     name: "git-wt-delete",
     label: "git-wt-delete",
-    description: "Scope: current runtime path. Return a JSON-first payload with request, result, and execution sections. Result exposes the requested delete operation, exact worktree name, derived path, and mutation status.",
+    description: "Scope: current runtime path. Return a token-optimized JSON payload with result and execution sections. Result exposes the exact worktree name and derived path without static operation echoes.",
     promptSnippet: "Return the structured worktree-deletion payload for the requested name.",
     promptGuidelines: [
       "Input contract: wtName is required and must match the exact worktree/branch name to delete.",
-      "Output contract: request + result + execution. Result exposes operation=delete, worktree_name, branch_name, worktree_path, and status.",
+      "Output contract: result + execution. Result exposes worktree_name and worktree_path.",
       "Specialization trigger: worktree_path depends on the runtime git root parent directory.",
       "Failure contract: execution.code and execution.stderr_lines surface missing-target or deletion errors.",
     ],
@@ -1533,7 +1708,6 @@ function registerAgentTools(pi: ExtensionAPI): void {
     async execute(_toolCallId, params) {
       const projectBase = getProjectBase(process.cwd());
       const config = loadProjectConfig(process.cwd());
-      const runtimePaths = buildSharedRuntimePathFacts(process.cwd(), config);
       let execution;
       try {
         execution = buildToolExecutionSection(runGitWtDelete(projectBase, params.wtName, config));
@@ -1545,7 +1719,6 @@ function registerAgentTools(pi: ExtensionAPI): void {
         projectBase,
         resolveRuntimeGitPath(projectBase),
         params.wtName,
-        runtimePaths,
         execution,
       );
       return buildStructuredToolExecuteResult(payload);
@@ -1721,7 +1894,7 @@ function formatStaticCheckLanguagesSummary(config: UseReqConfig): string {
 
 /**
  * @brief Renders the static-check configuration reference view.
- * @details Produces a markdown-like summary containing configured entries, supported languages, supported modules, and example specifications. Runtime is O(l log l). No side effects occur.
+ * @details Produces a markdown-like summary containing configured entries, supported languages, the Command-only user module surface, and canonical example specifications. Runtime is O(l log l). No side effects occur.
  * @param[in] config {UseReqConfig} Effective project configuration.
  * @return {string} Reference text for the editor view.
  */
@@ -1744,16 +1917,23 @@ function renderStaticCheckReference(config: UseReqConfig): string {
   for (const { language, extensions } of getSupportedStaticCheckLanguageSupport()) {
     lines.push(`- ${language}: ${extensions.join(", ")}`);
   }
-  lines.push("", `Supported modules: ${STATIC_CHECK_MODULES.join(", ")}`, "", "Examples:", "- Python=Ruff", "- Python=Command,mypy,--strict", "- TypeScript=Command,eslint,--max-warnings,0");
+  lines.push(
+    "",
+    `Supported modules: ${STATIC_CHECK_MODULES.join(", ")}`,
+    "",
+    "Examples:",
+    "- Python=Command,mypy,--strict",
+    "- TypeScript=Command,eslint,--max-warnings,0",
+  );
   return `${lines.join("\n")}\n`;
 }
 
 /**
  * @brief Builds the shared settings-menu choices for static-check management.
- * @details Serializes static-check actions into right-valued menu rows consumed by the shared settings-menu renderer. Runtime is O(1). No external state is mutated.
+ * @details Serializes Command-oriented static-check actions into right-valued menu rows consumed by the shared settings-menu renderer while omitting user-facing module selection. Runtime is O(1). No external state is mutated.
  * @param[in] config {UseReqConfig} Effective project configuration.
  * @return {PiUsereqSettingsMenuChoice[]} Ordered static-check menu choices.
- * @satisfies REQ-008, REQ-151, REQ-152, REQ-153, REQ-154
+ * @satisfies REQ-008, REQ-160, REQ-161, REQ-151, REQ-152, REQ-153, REQ-154
  */
 function buildStaticCheckMenuChoices(config: UseReqConfig): PiUsereqSettingsMenuChoice[] {
   const supportedLanguageCount = getSupportedStaticCheckLanguageSupport().length;
@@ -1763,13 +1943,13 @@ function buildStaticCheckMenuChoices(config: UseReqConfig): PiUsereqSettingsMenu
       id: "add-entry-supported-language",
       label: "Add entry for supported language",
       value: `${supportedLanguageCount} languages`,
-      description: "Select a supported language, then select one static-check module to add.",
+      description: "Select a supported language, then configure the Command static-check executable.",
     },
     {
       id: "add-entry-raw-spec",
       label: "Add entry from LANG=MODULE[,CMD[,PARAM...]]",
       value: "raw spec",
-      description: "Enter one raw static-check specification string in canonical CLI format.",
+      description: "Enter one raw Command-based static-check specification string in canonical CLI format.",
     },
     {
       id: "remove-language-entry",
@@ -1794,7 +1974,7 @@ function buildStaticCheckMenuChoices(config: UseReqConfig): PiUsereqSettingsMenu
 
 /**
  * @brief Builds the shared settings-menu choices for supported static-check languages.
- * @details Exposes every supported language as one row whose right-side value reports extensions plus the current configured checker count. Runtime is O(l log l). No external state is mutated.
+ * @details Exposes every supported language as one row whose right-side value reports extensions plus the current configured checker count for Command-oriented configuration flows. Runtime is O(l log l). No external state is mutated.
  * @param[in] config {UseReqConfig} Effective project configuration.
  * @return {PiUsereqSettingsMenuChoice[]} Ordered language-choice vector.
  */
@@ -1807,7 +1987,7 @@ function buildSupportedStaticCheckLanguageChoices(config: UseReqConfig): PiUsere
         id: language,
         label: language,
         value: `${extensions.join(", ")} • ${configuredCount} ${suffix}`,
-        description: `Configure static-check modules for ${language}. Supported extensions: ${extensions.join(", ")}.`,
+        description: `Configure the Command static-check entry for ${language}. Supported extensions: ${extensions.join(", ")}.`,
       };
     }),
     {
@@ -1819,31 +1999,6 @@ function buildSupportedStaticCheckLanguageChoices(config: UseReqConfig): PiUsere
   ];
 }
 
-/**
- * @brief Builds the shared settings-menu choices for static-check modules.
- * @details Exposes every supported static-check module as one selectable row with a concise execution description. Runtime is O(m) in module count. No external state is mutated.
- * @param[in] language {string} Canonical selected language.
- * @return {PiUsereqSettingsMenuChoice[]} Ordered module-choice vector.
- */
-function buildStaticCheckModuleChoices(language: string): PiUsereqSettingsMenuChoice[] {
-  return [
-    ...STATIC_CHECK_MODULES.map((moduleName) => ({
-      id: moduleName,
-      label: moduleName,
-      value: language,
-      description: moduleName === "Command"
-        ? `Run one explicit external command against ${language} files.`
-        : `Run the built-in ${moduleName} checker for ${language} files.`,
-    })),
-    {
-      id: "back",
-      label: "Back",
-      value: "",
-      description: "Return to language selection.",
-    },
-  ];
-}
-
 /**
  * @brief Builds the shared settings-menu choices for configured static-check languages.
  * @details Exposes only languages that currently have at least one configured checker so removal remains deterministic. Runtime is O(l log l). No external state is mutated.
@@ -1871,11 +2026,11 @@ function buildConfiguredStaticCheckLanguageChoices(config: UseReqConfig): PiUser
 
 /**
  * @brief Runs the interactive static-check configuration menu.
- * @details Lets the user inspect support, add entries by guided prompts or raw spec strings, and remove configured language entries through the shared settings-menu renderer until the user exits. Runtime depends on user interaction count. Side effects include UI updates and config mutation.
+ * @details Lets the user inspect support, add Command entries by guided prompts or raw spec strings, and remove configured language entries through the shared settings-menu renderer until the user exits. Runtime depends on user interaction count. Side effects include UI updates and config mutation.
  * @param[in] ctx {ExtensionCommandContext} Active command context.
  * @param[in,out] config {UseReqConfig} Mutable configuration object.
  * @return {Promise<void>} Promise resolved when the menu closes.
- * @satisfies REQ-008, REQ-151, REQ-152, REQ-153, REQ-154
+ * @satisfies REQ-008, REQ-160, REQ-161, REQ-151, REQ-152, REQ-153, REQ-154
  */
 async function configureStaticCheckMenu(ctx: ExtensionCommandContext, config: UseReqConfig): Promise<void> {
   while (true) {
@@ -1895,23 +2050,16 @@ async function configureStaticCheckMenu(ctx: ExtensionCommandContext, config: Us
       if (!selectedLanguage || selectedLanguage === "back") {
         continue;
       }
-      const moduleName = await showPiUsereqSettingsMenu(ctx, `static-check for ${selectedLanguage}`, buildStaticCheckModuleChoices(selectedLanguage));
-      if (!moduleName || moduleName === "back") {
-        continue;
-      }
 
-      const entry: StaticCheckEntry = { module: moduleName };
-      if (moduleName === "Command") {
-        const cmd = await ctx.ui.input(`Command executable for ${selectedLanguage}`, "");
-        if (!cmd?.trim()) {
-          ctx.ui.notify(`Command executable is required for ${selectedLanguage}`, "error");
-          continue;
-        }
-        entry.cmd = cmd.trim();
+      const cmd = await ctx.ui.input(`Command executable for ${selectedLanguage}`, "");
+      if (!cmd?.trim()) {
+        ctx.ui.notify(`Command executable is required for ${selectedLanguage}`, "error");
+        continue;
       }
 
+      const entry: StaticCheckEntry = { module: "Command", cmd: cmd.trim() };
       const paramsInput = await ctx.ui.input(
-        `Additional parameters for ${moduleName} on ${selectedLanguage} (optional, shell-style)`,
+        `Additional parameters for Command on ${selectedLanguage} (optional, shell-style)`,
         "",
       );
       const params = paramsInput?.trim() ? shellSplit(paramsInput.trim()) : [];
@@ -1926,7 +2074,7 @@ async function configureStaticCheckMenu(ctx: ExtensionCommandContext, config: Us
     }
 
     if (staticChoice === "add-entry-raw-spec") {
-      const spec = await ctx.ui.input("Static-check spec", "Python=Ruff");
+      const spec = await ctx.ui.input("Static-check spec", "Python=Command,true");
       if (!spec?.trim()) {
         continue;
       }
@@ -1954,12 +2102,16 @@ async function configureStaticCheckMenu(ctx: ExtensionCommandContext, config: Us
 
 /**
  * @brief Builds the shared settings-menu choices for the top-level pi-usereq configuration UI.
- * @details Serializes primary configuration actions into right-valued menu rows consumed by the shared settings-menu renderer. Runtime is O(s) in source-directory count. No external state is mutated.
+ * @details Serializes primary configuration actions into right-valued menu rows consumed by the shared settings-menu renderer, including the display-only config path beside `show-config`. Runtime is O(s) in source-directory count. No external state is mutated.
+ * @param[in] cwd {string} Current working directory.
  * @param[in] config {UseReqConfig} Effective project configuration.
  * @return {PiUsereqSettingsMenuChoice[]} Ordered top-level menu choices.
- * @satisfies REQ-006, REQ-031, REQ-137, REQ-150, REQ-151, REQ-152
+ * @satisfies REQ-006, REQ-031, REQ-137, REQ-150, REQ-151, REQ-152, REQ-162
  */
-function buildPiUsereqMenuChoices(config: UseReqConfig): PiUsereqSettingsMenuChoice[] {
+function buildPiUsereqMenuChoices(
+  cwd: string,
+  config: UseReqConfig,
+): PiUsereqSettingsMenuChoice[] {
   return [
     {
       id: "docs-dir",
@@ -1995,7 +2147,14 @@ function buildPiUsereqMenuChoices(config: UseReqConfig): PiUsereqSettingsMenuCho
       id: "notifications",
       label: "notifications",
       value: `beep:${formatPiNotifyBeepStatus(config)} • sound:${config["notify-sound"]}`,
-      description: "Manage terminal beep flags, selected notify command, hotkey bind, and per-level notify commands.",
+      description: "Manage terminal beep flags, selected notify command, hotkey bind, per-level notify commands, and the nested Pushover submenu.",
+    },
+    {
+      id: "show-config",
+      label: "show-config",
+      value: formatProjectConfigPathForMenu(cwd),
+      valueTone: "dim",
+      description: "Write the current project configuration JSON into the editor without saving additional changes.",
     },
     {
       id: "reset-defaults",
@@ -2003,12 +2162,6 @@ function buildPiUsereqMenuChoices(config: UseReqConfig): PiUsereqSettingsMenuCho
       value: "",
       description: "Restore the default pi-usereq configuration for the current project base.",
     },
-    {
-      id: "show-config",
-      label: "show-config",
-      value: "",
-      description: "Write the current project configuration JSON into the editor without saving additional changes.",
-    },
     {
       id: "save-and-close",
       label: "Save and close",
@@ -2074,12 +2227,12 @@ function buildSrcDirRemovalChoices(config: UseReqConfig): PiUsereqSettingsMenuCh
 
 /**
  * @brief Runs the top-level pi-usereq configuration menu.
- * @details Loads project config, exposes docs/test/source/static-check/startup-tool/notification actions through the shared settings-menu renderer, persists changes on exit, and refreshes the single-line status bar. Runtime depends on user interaction count. Side effects include UI updates, config writes, and active-tool changes.
+ * @details Loads project config, exposes docs/test/source/static-check/startup-tool/notification actions through the shared settings-menu renderer, persists changes on exit, and refreshes the single-line status bar. Runtime depends on user interaction count. Side effects include UI updates, config writes, active-tool changes, and editor text updates.
  * @param[in] pi {ExtensionAPI} Active extension API instance.
  * @param[in] ctx {ExtensionCommandContext} Active command context.
  * @param[in,out] statusController {PiUsereqStatusController} Mutable status controller.
  * @return {Promise<void>} Promise resolved when configuration is saved and the menu closes.
- * @satisfies REQ-006, REQ-031, REQ-137, REQ-150, REQ-151, REQ-152, REQ-153, REQ-154
+ * @satisfies REQ-006, REQ-031, REQ-137, REQ-150, REQ-151, REQ-152, REQ-153, REQ-154, REQ-162
  */
 async function configurePiUsereq(
   pi: ExtensionAPI,
@@ -2096,7 +2249,11 @@ async function configurePiUsereq(
   };
 
   while (true) {
-    const choice = await showPiUsereqSettingsMenu(ctx, "pi-usereq", buildPiUsereqMenuChoices(config));
+    const choice = await showPiUsereqSettingsMenu(
+      ctx,
+      "pi-usereq",
+      buildPiUsereqMenuChoices(ctx.cwd, config),
+    );
     if (!choice || choice === "save-and-close") {
       ensureSaved();
       refreshStatus();
@@ -2190,18 +2347,20 @@ function registerConfigCommands(
  * configuration commands plus agent tools, registers the configurable
  * successful-run sound shortcut when the runtime supports shortcuts, and
  * installs shared wrappers for all supported pi lifecycle hooks so status
- * telemetry, context usage, prompt timing, and pi-notify effects remain
- * synchronized with runtime events. Runtime is O(h) in hook count during
- * registration. Side effects include filesystem reads, command/tool/shortcut
- * registration, UI updates, active-tool changes, and timer scheduling.
+ * telemetry, context usage, prompt timing, cumulative runtime, prompt-specific
+ * Pushover metadata, and pi-notify effects remain synchronized with runtime
+ * events. Runtime is O(h) in hook
+ * count during registration. Side effects include filesystem reads,
+ * command/tool/shortcut registration, UI updates, active-tool changes, and
+ * timer scheduling.
  * @param[in] pi {ExtensionAPI} Active extension API instance.
  * @return {void} No return value.
- * @satisfies DES-002, REQ-004, REQ-005, REQ-009, REQ-044, REQ-045, REQ-067, REQ-068, REQ-109, REQ-110, REQ-111, REQ-112, REQ-113, REQ-114, REQ-115, REQ-116, REQ-117, REQ-118, REQ-119, REQ-120, REQ-121, REQ-122, REQ-123, REQ-124, REQ-125, REQ-126, REQ-129, REQ-130, REQ-131, REQ-132, REQ-133, REQ-134, REQ-135, REQ-136, REQ-137
+ * @satisfies DES-002, REQ-004, REQ-005, REQ-009, REQ-044, REQ-045, REQ-067, REQ-068, REQ-109, REQ-111, REQ-112, REQ-113, REQ-114, REQ-115, REQ-116, REQ-117, REQ-118, REQ-119, REQ-120, REQ-121, REQ-122, REQ-123, REQ-124, REQ-125, REQ-126, REQ-129, REQ-130, REQ-131, REQ-132, REQ-133, REQ-134, REQ-135, REQ-136, REQ-137, REQ-148, REQ-159, REQ-163, REQ-164, REQ-165, REQ-166, REQ-167, REQ-168, REQ-169, REQ-170, REQ-171, REQ-172
  */
 export default function piUsereqExtension(pi: ExtensionAPI): void {
-  const statusController = createPiUsereqStatusController(() => pi.getActiveTools());
+  const statusController = createPiUsereqStatusController();
   ensureBundledResourcesAccessible();
-  registerPromptCommands(pi);
+  registerPromptCommands(pi, statusController);
   registerAgentTools(pi);
   registerConfigCommands(pi, statusController);
   registerPiNotifyShortcut(pi, statusController);