pi-usereq 0.5.0 → 0.7.0

package/tests/extension-registration.test.ts

@@ -2,6 +2,7 @@ import test from "node:test";
 import assert from "node:assert/strict";
 import { spawnSync } from "node:child_process";
 import fs from "node:fs";
+import os from "node:os";
 import path from "node:path";
 import piUsereqExtension from "../src/index.ts";
 import {
@@ -9,8 +10,13 @@ import {
   getDefaultConfig,
   getProjectConfigPath,
 } from "../src/core/config.js";
-import { formatRuntimePathForDisplay } from "../src/core/path-context.js";
-import { setPiNotifyHttpsRequestForTests } from "../src/core/pi-notify.js";
+import {
+  setJsTiktokenModuleLoaderForTests,
+} from "../src/core/token-counter.js";
+import {
+  setPiNotifyHttpsRequestForTests,
+  setPiNotifySpawnForTests,
+} from "../src/core/pi-notify.js";
 import {
   PI_USEREQ_DEFAULT_ENABLED_TOOL_NAMES,
   PI_USEREQ_EMBEDDED_TOOL_NAMES,
@@ -289,42 +295,43 @@ function formatFakeThemeBackgroundFromForeground(color: string, text: string): s
 }
 
 /**
- * @brief Builds the expected fake context-bar payload for assertions.
- * @details Resolves the empty-state `◀ CLEAR ▶ ` overlay for unavailable or
- * non-positive percent, resolves the centered ` ◀ FULL ▶ ` overlay for percent
- * above 90, and otherwise reconstructs the 10-cell bar. Runtime is O(1). No
- * external state is mutated.
- * @param[in] options {{ filledCells: number; percent?: number | null }} Expected context-bar facts.
- * @return {string} Encoded context-bar string.
+ * @brief Builds the expected fake context-gauge payload for assertions.
+ * @details Resolves the documented icon thresholds for `0-100%` and emits the
+ * blinking red overflow icon for percent values above `100`. Runtime is O(1).
+ * No external state is mutated.
+ * @param[in] options {{ filledCells: number; percent?: number | null }} Expected context-gauge facts.
+ * @return {string} Encoded context-gauge string.
  */
 function buildExpectedFakeContextBar(options: {
   filledCells: number;
   percent?: number | null;
 }): string {
-  if (options.percent === undefined || options.percent === null || options.percent <= 0) {
-    return formatFakeThemeBackgroundFromForeground(
-      "accent",
-      formatFakeThemeForeground("warning", "◀ CLEAR ▶ "),
-    );
+  const percent = options.percent;
+  if (percent === undefined || percent === null || percent <= 0) {
+    return formatFakeThemeForeground("warning", "▕_▏");
   }
-  if (options.percent > 90) {
-    return formatFakeThemeBackgroundFromForeground(
-      "warning",
-      formatFakeThemeForeground("error", " ◀ FULL ▶ "),
-    );
+  if (percent > 100) {
+    return formatFakeThemeForeground("error", "\u001b[5m▕█▏\u001b[25m");
+  }
+  if (percent <= 25) {
+    return formatFakeThemeForeground("warning", "▕▂▏");
   }
-  return Array.from({ length: 10 }, (_value, index) =>
-    formatFakeThemeBackgroundFromForeground(
-      "accent",
-      formatFakeThemeForeground(index < options.filledCells ? "warning" : "dim", "▓"),
-    ),
-  ).join("");
+  if (percent <= 50) {
+    return formatFakeThemeForeground("warning", "▕▄▏");
+  }
+  if (percent <= 90) {
+    return formatFakeThemeForeground("warning", "▕▆▏");
+  }
+  return formatFakeThemeForeground("warning", "▕█▏");
 }
 
 /**
  * @brief Builds the expected fake pi-usereq status-bar string for assertions.
- * @details Reconstructs the field order, separators, context bar, consolidated elapsed field, and Pushover enable field emitted by the extension using deterministic fake theme markers. Runtime is O(1). No external state is mutated.
- * @param[in] options {{ basePath: string; contextFilledCells: number; contextPercent?: number | null; et: string; beep?: string; sound?: string; pushover?: string }} Expected status facts.
+ * @details Reconstructs the field order, separators, icon-based context gauge,
+ * consolidated elapsed field, and sound field emitted by the extension using
+ * deterministic fake theme markers. Runtime is O(1). No external state is
+ * mutated.
+ * @param[in] options {{ basePath: string; contextFilledCells: number; contextPercent?: number | null; et: string; sound?: string }} Expected status facts.
  * @return {string} Encoded status-bar string.
  */
 function buildExpectedFakeStatusText(options: {
@@ -335,9 +342,7 @@ function buildExpectedFakeStatusText(options: {
   contextFilledCells: number;
   contextPercent?: number | null;
   et: string;
-  beep?: string;
   sound?: string;
-  pushover?: string;
 }): string {
   const buildField = (fieldName: string, value: string): string =>
     `${formatFakeThemeForeground("accent", `${fieldName}:`)}${formatFakeThemeForeground("warning", value)}`;
@@ -349,9 +354,7 @@ function buildExpectedFakeStatusText(options: {
     buildField("base", options.basePath),
     `${formatFakeThemeForeground("accent", "context:")}${contextBar}`,
     buildField("elapsed", options.et),
-    buildField("beep", options.beep ?? "end,esc,err"),
     buildField("sound", options.sound ?? "none"),
-    buildField("pushover", options.pushover ?? "off"),
   ].join(formatFakeThemeForeground("dim", " • "));
 }
 
@@ -367,6 +370,54 @@ function buildExpectedFakeBasePath(cwd: string): string {
   return path.resolve(cwd).split(path.sep).join("/");
 }
 
+/**
+ * @brief Formats one expected home-relative base path for notify-template assertions.
+ * @details Resolves the supplied cwd, emits `~` or `~/...` when the path is inside the current user home directory, and otherwise returns the slash-normalized absolute path. Runtime is O(p) in path length. No external state is mutated.
+ * @param[in] cwd {string} Runtime working directory.
+ * @return {string} Home-relative or absolute base path used by notification templates.
+ */
+function buildExpectedNotifyBasePath(cwd: string): string {
+  const resolvedPath = path.resolve(cwd);
+  const homePath = path.resolve(process.env.HOME ?? os.homedir());
+  if (resolvedPath === homePath) {
+    return "~";
+  }
+  const relativePath = path.relative(homePath, resolvedPath);
+  if (relativePath !== "" && !relativePath.startsWith("..") && !path.isAbsolute(relativePath)) {
+    return `~/${relativePath.split(path.sep).join("/")}`;
+  }
+  return resolvedPath.split(path.sep).join("/");
+}
+
+/**
+ * @brief Formats the expected `Show configuration` path value.
+ * @details Resolves the current project config path and rewrites a leading home-directory prefix to `~` so top-level menu assertions match the documented display-only substitution without changing stored paths. Runtime is O(p) in path length. No external state is mutated.
+ * @param[in] cwd {string} Runtime working directory.
+ * @return {string} `~`-relative or absolute config-path display string.
+ */
+function buildExpectedShowConfigPath(cwd: string): string {
+  return buildExpectedNotifyBasePath(path.dirname(path.dirname(getProjectConfigPath(cwd)))) === buildExpectedNotifyBasePath(cwd)
+    ? `${buildExpectedNotifyBasePath(cwd)}/.pi-usereq/config.json`
+    : getProjectConfigPath(cwd).split(path.sep).join("/");
+}
+
+/**
+ * @brief Formats the expected `%%RESULT%%` placeholder value for one terminal stop reason.
+ * @details Maps the tested assistant stop reasons to the literal runtime result tokens required by the default notify and Pushover templates. Runtime is O(1). No external state is mutated.
+ * @param[in] stopReason {"stop" | "aborted" | "error"} Terminal stop reason under test.
+ * @return {string} `successed`, `aborted`, or `failed`.
+ */
+function buildExpectedNotifyResult(stopReason: "stop" | "aborted" | "error"): string {
+  switch (stopReason) {
+    case "aborted":
+      return "aborted";
+    case "error":
+      return "failed";
+    default:
+      return "successed";
+  }
+}
+
 /**
  * @brief Creates a fake extension command context with scripted UI interactions.
  * @details Materializes deterministic `select`, shared settings-menu `custom`, `input`, `notify`, `setStatus`, `setEditorText`, `waitForIdle`, `newSession`, `sessionManager`, `getContextUsage`, theme-color behaviors, and captured custom-menu render output backed by in-memory state so menu-oriented and prompt-command tests can assert side effects without a real UI. Optional `onNewSession` and theme overrides let tests emulate runtime replacement and strict token validation. Runtime is O(1) plus queued interaction count and delegated new-session setup cost. Side effects are limited to in-memory state mutation.
@@ -389,7 +440,7 @@ function createFakeCtx(cwd: string, plan: FakeCtxPlan = { selects: [] }, options
     editorText: "",
     statuses: new Map<string, string>(),
     notifications: [] as Array<{ message: string; level: string }>,
-    selectCalls: [] as Array<{ title: string; items: string[] }>,
+    selectCalls: [] as Array<{ title: string; items: string[]; selectedChoiceId?: string }>,
     customRenderLines: [] as string[][],
     waitForIdleCalls: 0,
     newSessions: [] as Array<{ messages: string[] }>,
@@ -460,6 +511,7 @@ function createFakeCtx(cwd: string, plan: FakeCtxPlan = { selects: [] }, options
           __piUsereqSettingsMenu?: {
             title: string;
             choices: Array<{ label: string }>;
+            selectedChoiceId?: string;
             selectByLabel: (label: string) => boolean;
             cancel: () => void;
           };
@@ -470,7 +522,11 @@ function createFakeCtx(cwd: string, plan: FakeCtxPlan = { selects: [] }, options
           state.customRenderLines.push(component.render(120));
         }
         const response = selects.shift();
-        state.selectCalls.push({ title: bridge.title, items: bridge.choices.map((choice) => choice.label) });
+        state.selectCalls.push({
+          title: bridge.title,
+          items: bridge.choices.map((choice) => choice.label),
+          selectedChoiceId: bridge.selectedChoiceId,
+        });
         if (response === undefined) {
           bridge.cancel();
         } else {
@@ -606,13 +662,13 @@ test("token tools register agent-oriented descriptions and schema details", () =
   assert.ok(filesTokens, "missing files-tokens tool");
   assert.ok(tokens, "missing tokens tool");
 
-  assert.match(filesTokens.description ?? "", /LLM-oriented JSON payload/);
+  assert.match(filesTokens.description ?? "", /token-optimized JSON payload/);
   assert.ok(filesTokens.promptGuidelines?.some((line) => line.includes("Output contract:")));
-  assert.match(String((filesTokens.parameters as { description?: string } | undefined)?.description ?? ""), /line ranges/);
+  assert.match(String((filesTokens.parameters as { description?: string } | undefined)?.description ?? ""), /token metrics/);
 
   assert.match(tokens.description ?? "", /canonical docs/);
-  assert.ok(tokens.promptGuidelines?.some((line) => line.includes("docs_dir_path")));
-  assert.match(String((tokens.parameters as { description?: string } | undefined)?.description ?? ""), /canonical_doc_names/);
+  assert.ok(tokens.promptGuidelines?.some((line) => line.includes("registration metadata")));
+  assert.match(String((tokens.parameters as { description?: string } | undefined)?.description ?? ""), /token-optimized JSON shape/);
 });
 
 test("reference tools register agent-oriented descriptions and schema details", () => {
@@ -624,7 +680,7 @@ test("reference tools register agent-oriented descriptions and schema details",
   assert.ok(filesReferences, "missing files-references tool");
   assert.ok(references, "missing references tool");
 
-  assert.match(filesReferences.description ?? "", /request, summary, repository, files, and execution sections/);
+  assert.match(filesReferences.description ?? "", /summary, repository, files, and execution sections/);
   assert.ok(filesReferences.promptGuidelines?.some((line) => line.includes("Numeric contract:")));
   assert.ok(filesReferences.promptGuidelines?.some((line) => line.includes("Behavior contract:")));
   assert.match(String((filesReferences.parameters as { description?: string } | undefined)?.description ?? ""), /structured Doxygen fields/);
@@ -644,11 +700,11 @@ test("find tools register agent-oriented descriptions and schema details", () =>
   assert.ok(filesFind, "missing files-find tool");
   assert.ok(find, "missing find tool");
 
-  assert.match(filesFind.description ?? "", /LLM-oriented JSON payload/);
+  assert.match(filesFind.description ?? "", /token-optimized JSON payload/);
   assert.ok(filesFind.promptGuidelines?.some((line) => line.includes("Regex rule:")));
   assert.ok(filesFind.promptGuidelines?.some((line) => line.includes("Supported tags [Typescript]:")));
   assert.ok(filesFind.promptGuidelines?.some((line) => line.includes("Supported tags [Python]:")));
-  assert.match(String((filesFind.parameters as { description?: string } | undefined)?.description ?? ""), /supported_tags_by_language/);
+  assert.match(String((filesFind.parameters as { description?: string } | undefined)?.description ?? ""), /Static supported-tag matrices are documented in tool registration metadata/);
 
   assert.match(find.description ?? "", /configured project source directories/);
   assert.ok(find.promptGuidelines?.some((line) => line.includes("source_directory_paths")));
@@ -665,7 +721,7 @@ test("compression tools register agent-oriented descriptions and schema details"
   assert.ok(filesCompress, "missing files-compress tool");
   assert.ok(compress, "missing compress tool");
 
-  assert.match(filesCompress.description ?? "", /request, summary, repository, files, and execution sections/);
+  assert.match(filesCompress.description ?? "", /summary, repository, files, and execution sections/);
   assert.ok(filesCompress.promptGuidelines?.some((line) => line.includes("Line-number behavior:")));
   assert.ok(filesCompress.promptGuidelines?.some((line) => line.includes("Behavior contract:")));
   assert.match(String((filesCompress.parameters as { description?: string } | undefined)?.description ?? ""), /structured compressed lines/);
@@ -676,7 +732,7 @@ test("compression tools register agent-oriented descriptions and schema details"
   assert.match(String((compress.parameters as { description?: string } | undefined)?.description ?? ""), /structured compressed lines/);
 });
 
-test("files-tokens returns structured source facts and separated guidance", async () => {
+test("files-tokens returns token-optimized structured source facts", async () => {
   const { projectBase } = initFixtureRepo({
     fixtures: [],
     docs: {
@@ -693,10 +749,6 @@ test("files-tokens returns structured source facts and separated guidance", asyn
     }) as {
       content?: Array<{ type: string; text?: string }>;
       details?: {
-        request: {
-          base_dir_path: string;
-          requested_input_paths: string[];
-        };
         summary: {
           counted_file_count: number;
           skipped_file_count: number;
@@ -709,14 +761,8 @@ test("files-tokens returns structured source facts and separated guidance", asyn
           line_count: number;
           byte_count: number;
           primary_heading_text?: string;
+          error_message?: string;
         }>;
-        guidance: {
-          source_observations: {
-            skipped_inputs: Array<{ input_path: string; canonical_path: string; reason: string }>;
-          };
-          derived_recommendations: Array<{ kind: string; ordered_paths: string[] }>;
-          actionable_next_steps: Array<{ kind: string; ordered_paths: string[] }>;
-        };
         execution: {
           stderr: string;
         };
@@ -725,8 +771,6 @@ test("files-tokens returns structured source facts and separated guidance", asyn
 
     const payload = result.details!;
     assert.deepEqual(JSON.parse(result.content?.[0]?.text ?? "{}"), JSON.parse(JSON.stringify(payload)));
-    assert.equal(payload.request.base_dir_path, projectBase);
-    assert.deepEqual(payload.request.requested_input_paths, [`${DEFAULT_DOCS_DIR}/REQUIREMENTS.md`, `${DEFAULT_DOCS_DIR}/MISSING.md`]);
     assert.equal(payload.summary.counted_file_count, 1);
     assert.equal(payload.summary.skipped_file_count, 1);
     assert.equal(payload.files[0]?.canonical_path, `${DEFAULT_DOCS_DIR}/REQUIREMENTS.md`);
@@ -734,17 +778,54 @@ test("files-tokens returns structured source facts and separated guidance", asyn
     assert.equal(payload.files[0]?.end_line_number, payload.files[0]?.line_count);
     assert.ok((payload.files[0]?.byte_count ?? 0) > 0);
     assert.equal(payload.files[0]?.primary_heading_text, "Requirements");
-    assert.deepEqual(payload.guidance.source_observations.skipped_inputs, [
-      { input_path: `${DEFAULT_DOCS_DIR}/MISSING.md`, canonical_path: `${DEFAULT_DOCS_DIR}/MISSING.md`, reason: "not found" },
-    ]);
-    assert.equal(payload.guidance.derived_recommendations[0]?.kind, "prioritize_high_token_paths");
-    assert.equal(payload.guidance.actionable_next_steps[0]?.kind, "read_top_token_paths_first");
+    assert.equal(payload.files[1]?.canonical_path, `${DEFAULT_DOCS_DIR}/MISSING.md`);
+    assert.equal(payload.files[1]?.error_message, "not found");
     assert.match(payload.execution.stderr, new RegExp(`skipped: ${DEFAULT_DOCS_DIR.replace("/", "\\/")}/MISSING\\.md: not found`));
   } finally {
     fs.rmSync(projectBase, { recursive: true, force: true });
   }
 });
 
+test("files-tokens defers js-tiktoken loading until execution and returns structured dependency failures", async () => {
+  const { projectBase } = initFixtureRepo({ fixtures: [] });
+  const missingModuleError = new Error("Cannot find module 'js-tiktoken'");
+  setJsTiktokenModuleLoaderForTests(() => {
+    throw missingModuleError;
+  });
+  try {
+    const pi = createFakePi();
+    assert.doesNotThrow(() => piUsereqExtension(pi));
+    const result = await executeRegisteredTool(pi, "files-tokens", projectBase, {
+      files: [`${DEFAULT_DOCS_DIR}/REQUIREMENTS.md`],
+    }) as {
+      details?: {
+        summary: {
+          counted_file_count: number;
+          skipped_file_count: number;
+          processable_file_count: number;
+        };
+        files: unknown[];
+        execution: {
+          code: number;
+          stderr: string;
+        };
+      };
+    };
+
+    const payload = result.details!;
+    assert.equal(payload.summary.processable_file_count, 0);
+    assert.equal(payload.summary.counted_file_count, 0);
+    assert.equal(payload.summary.skipped_file_count, 0);
+    assert.deepEqual(payload.files, []);
+    assert.equal(payload.execution.code, 1);
+    assert.match(payload.execution.stderr, /js-tiktoken/);
+    assert.match(payload.execution.stderr, /npm ci/);
+  } finally {
+    setJsTiktokenModuleLoaderForTests(undefined);
+    fs.rmSync(projectBase, { recursive: true, force: true });
+  }
+});
+
 test("files-references returns structured repository, symbol, and Doxygen facts", async () => {
   const { projectBase } = initFixtureRepo({ fixtures: [] });
   const samplePath = path.join(projectBase, "src", "sample.ts");
@@ -771,9 +852,6 @@ export function buildSample(input: string): string {
     }) as {
       content?: Array<{ type: string; text?: string }>;
       details?: {
-        request: {
-          requested_input_paths: string[];
-        };
         summary: {
           analyzed_file_count: number;
           skipped_file_count: number;
@@ -808,7 +886,6 @@ export function buildSample(input: string): string {
 
     const payload = result.details!;
     assert.deepEqual(JSON.parse(result.content?.[0]?.text ?? "{}"), JSON.parse(JSON.stringify(payload)));
-    assert.deepEqual(payload.request.requested_input_paths, ["src/sample.ts", "src/missing.ts"]);
     assert.equal(payload.summary.analyzed_file_count, 1);
     assert.equal(payload.summary.skipped_file_count, 1);
     assert.deepEqual(payload.repository.file_canonical_paths, ["src/sample.ts"]);
@@ -912,10 +989,6 @@ export function buildSample(input: string): string {
     }) as {
       content?: Array<{ type: string; text?: string }>;
       details?: {
-        request: {
-          line_number_mode: string;
-          requested_input_paths: string[];
-        };
         summary: {
           compressed_file_count: number;
           skipped_file_count: number;
@@ -950,8 +1023,6 @@ export function buildSample(input: string): string {
 
     const payload = result.details!;
     assert.deepEqual(JSON.parse(result.content?.[0]?.text ?? "{}"), JSON.parse(JSON.stringify(payload)));
-    assert.equal(payload.request.line_number_mode, "enabled");
-    assert.deepEqual(payload.request.requested_input_paths, ["src/sample.ts", "src/missing.ts"]);
     assert.equal(payload.summary.compressed_file_count, 1);
     assert.equal(payload.summary.skipped_file_count, 1);
     assert.equal(payload.summary.total_symbol_count, 1);
@@ -999,10 +1070,6 @@ test("compress returns a structured repository-scoped compression payload", asyn
     }) as {
       content?: Array<{ type: string; text?: string }>;
       details?: {
-        request: {
-          scope: string;
-          line_number_mode: string;
-        };
         summary: {
           compressed_file_count: number;
           total_compressed_line_count: number;
@@ -1026,8 +1093,6 @@ test("compress returns a structured repository-scoped compression payload", asyn
 
     const payload = result.details!;
     assert.deepEqual(JSON.parse(result.content?.[0]?.text ?? "{}"), JSON.parse(JSON.stringify(payload)));
-    assert.equal(payload.request.scope, "configured-source-directories");
-    assert.equal(payload.request.line_number_mode, "disabled");
     assert.equal(payload.summary.compressed_file_count, 2);
     assert.ok((payload.summary.total_compressed_line_count ?? 0) >= 2);
     assert.deepEqual(payload.repository.source_directory_paths, ["src"]);
@@ -1071,12 +1136,6 @@ export function buildSample(input: string): string {
     }) as {
       content?: Array<{ type: string; text?: string }>;
       details?: {
-        request: {
-          tag_filter_values: string[];
-          tag_filter_status: string;
-          line_number_mode: string;
-          requested_input_paths: string[];
-        };
         summary: {
           search_status: string;
           matched_file_count: number;
@@ -1084,7 +1143,7 @@ export function buildSample(input: string): string {
           total_match_count: number;
         };
         repository: {
-          supported_tags_by_language: Record<string, string[]>;
+          file_canonical_paths: string[];
         };
         files: Array<{
           canonical_path: string;
@@ -1117,15 +1176,11 @@ export function buildSample(input: string): string {
 
     const payload = result.details!;
     assert.deepEqual(JSON.parse(result.content?.[0]?.text ?? "{}"), JSON.parse(JSON.stringify(payload)));
-    assert.deepEqual(payload.request.tag_filter_values, ["FUNCTION"]);
-    assert.equal(payload.request.tag_filter_status, "valid");
-    assert.equal(payload.request.line_number_mode, "enabled");
-    assert.deepEqual(payload.request.requested_input_paths, ["src/sample.ts", "src/missing.ts"]);
     assert.equal(payload.summary.search_status, "matched");
     assert.equal(payload.summary.matched_file_count, 1);
     assert.equal(payload.summary.skipped_file_count, 1);
     assert.equal(payload.summary.total_match_count, 1);
-    assert.ok(payload.repository.supported_tags_by_language.typescript?.includes("FUNCTION"));
+    assert.deepEqual(payload.repository.file_canonical_paths, ["src/sample.ts", "src/missing.ts"]);
     assert.deepEqual(payload.files.map((file) => file.status), ["matched", "skipped"]);
     assert.equal(payload.files[0]?.canonical_path, "src/sample.ts");
     assert.equal(payload.files[0]?.match_count, 1);
@@ -1182,11 +1237,6 @@ export function buildAlpha(): number {
     }) as {
       content?: Array<{ type: string; text?: string }>;
       details?: {
-        request: {
-          scope: string;
-          regex_status: string;
-          requested_file_count: number;
-        };
         summary: {
           search_status: string;
           matched_file_count: number;
@@ -1196,7 +1246,6 @@ export function buildAlpha(): number {
         repository: {
           source_directory_paths: string[];
           file_canonical_paths: string[];
-          supported_tags_by_language: Record<string, string[]>;
         };
         files: Array<{
           canonical_path: string;
@@ -1216,16 +1265,12 @@ export function buildAlpha(): number {
 
     const payload = result.details!;
     assert.deepEqual(JSON.parse(result.content?.[0]?.text ?? "{}"), JSON.parse(JSON.stringify(payload)));
-    assert.equal(payload.request.scope, "configured-source-directories");
-    assert.equal(payload.request.regex_status, "valid");
-    assert.equal(payload.request.requested_file_count, 2);
     assert.equal(payload.summary.search_status, "matched");
     assert.equal(payload.summary.matched_file_count, 1);
     assert.equal(payload.summary.no_match_file_count, 1);
     assert.equal(payload.summary.total_match_count, 1);
     assert.deepEqual(payload.repository.source_directory_paths, ["src"]);
     assert.deepEqual(payload.repository.file_canonical_paths, ["src/alpha.ts", "src/nested/beta.ts"]);
-    assert.ok(payload.repository.supported_tags_by_language.typescript?.includes("FUNCTION"));
     assert.deepEqual(payload.files.map((file) => file.status), ["matched", "no_match"]);
     assert.equal(payload.files[0]?.matches[0]?.symbol_name, "buildAlpha");
     assert.match(payload.files[0]?.matches[0]?.code_lines[0]?.display_text ?? "", /^export function buildAlpha/);
@@ -1257,31 +1302,28 @@ test("path, static-check, git, docs, and worktree tools return structured JSON p
       content?: Array<{ text?: string }>;
       details?: {
         result: { path_value: string; path_present: boolean };
-        runtime_paths: { git_path: string };
         execution: { code: number };
       };
     };
     assert.deepEqual(JSON.parse(gitPathResult.content?.[0]?.text ?? "{}"), JSON.parse(JSON.stringify(gitPathResult.details)));
-    assert.equal(gitPathResult.details?.result.path_value, gitPathResult.details?.runtime_paths.git_path);
+    assert.equal(gitPathResult.details?.result.path_value, projectBase);
     assert.equal(gitPathResult.details?.result.path_present, true);
     assert.equal(gitPathResult.details?.execution.code, 0);
 
     const basePathResult = await executeRegisteredTool(pi, "get-base-path", projectBase) as {
       details?: {
         result: { path_value: string };
-        runtime_paths: { base_path: string };
         execution: { code: number };
       };
     };
-    assert.equal(basePathResult.details?.result.path_value, basePathResult.details?.runtime_paths.base_path);
+    assert.equal(basePathResult.details?.result.path_value, projectBase);
     assert.equal(basePathResult.details?.execution.code, 0);
 
     const gitCheckResult = await executeRegisteredTool(pi, "git-check", projectBase) as {
-      details?: { result: { status: string; worktree_status: string; head_status: string }; execution: { code: number } };
+      details?: { result: { git_path_present: boolean; status: string }; execution: { code: number } };
     };
+    assert.equal(gitCheckResult.details?.result.git_path_present, true);
     assert.equal(gitCheckResult.details?.result.status, "clean");
-    assert.equal(gitCheckResult.details?.result.worktree_status, "clean");
-    assert.equal(gitCheckResult.details?.result.head_status, "valid");
     assert.equal(gitCheckResult.details?.execution.code, 0);
 
     const docsCheckResult = await executeRegisteredTool(pi, "docs-check", projectBase) as {
@@ -1317,43 +1359,34 @@ test("path, static-check, git, docs, and worktree tools return structured JSON p
 
     const staticCheckResult = await executeRegisteredTool(pi, "static-check", projectBase) as {
       details?: {
-        request: { selection_directory_paths: string[]; excluded_directory_paths: string[] };
         summary: { selected_file_count: number };
         files: Array<{ canonical_path: string; status: string }>;
         execution: { code: number };
       };
     };
-    assert.deepEqual(staticCheckResult.details?.request.selection_directory_paths, ["src", "tests"]);
-    assert.ok(staticCheckResult.details?.request.excluded_directory_paths.includes("tests/fixtures"));
     assert.equal(staticCheckResult.details?.summary.selected_file_count, 1);
     assert.equal(staticCheckResult.details?.files[0]?.canonical_path, "src/check.ts");
     assert.equal(staticCheckResult.details?.files[0]?.status, "selected");
     assert.equal(staticCheckResult.details?.execution.code, 0);
 
     const gitWtNameResult = await executeRegisteredTool(pi, "git-wt-name", projectBase) as {
-      details?: { result: { worktree_name?: string; format_text: string; status: string }; execution: { code: number } };
+      details?: { result: { worktree_name?: string }; execution: { code: number } };
     };
     const wtName = gitWtNameResult.details?.result.worktree_name ?? "";
-    assert.equal(gitWtNameResult.details?.result.status, "generated");
-    assert.equal(gitWtNameResult.details?.result.format_text, "useReq-<project>-<sanitized-branch>-<YYYYMMDDHHMMSS>");
     assert.match(wtName, /^useReq-/);
     assert.equal(gitWtNameResult.details?.execution.code, 0);
 
     const gitWtCreateResult = await executeRegisteredTool(pi, "git-wt-create", projectBase, { wtName }) as {
-      details?: { result: { status: string; worktree_name: string; branch_name: string; worktree_path: string }; execution: { code: number } };
+      details?: { result: { worktree_name: string; worktree_path: string }; execution: { code: number } };
     };
-    assert.equal(gitWtCreateResult.details?.result.status, "created");
     assert.equal(gitWtCreateResult.details?.result.worktree_name, wtName);
-    assert.equal(gitWtCreateResult.details?.result.branch_name, wtName);
     assert.match(gitWtCreateResult.details?.result.worktree_path ?? "", new RegExp(`${wtName}$`));
     assert.equal(gitWtCreateResult.details?.execution.code, 0);
 
     const gitWtDeleteResult = await executeRegisteredTool(pi, "git-wt-delete", projectBase, { wtName }) as {
-      details?: { result: { status: string; worktree_name: string; branch_name: string; worktree_path: string }; execution: { code: number } };
+      details?: { result: { worktree_name: string; worktree_path: string }; execution: { code: number } };
     };
-    assert.equal(gitWtDeleteResult.details?.result.status, "deleted");
     assert.equal(gitWtDeleteResult.details?.result.worktree_name, wtName);
-    assert.equal(gitWtDeleteResult.details?.result.branch_name, wtName);
     assert.match(gitWtDeleteResult.details?.result.worktree_path ?? "", new RegExp(`${wtName}$`));
     assert.equal(gitWtDeleteResult.details?.execution.code, 0);
   } finally {
@@ -1402,35 +1435,142 @@ test("configuration menus expose show-config ordering and omit overview or notif
   piUsereqExtension(pi);
   const command = pi.commands.get("pi-usereq");
   assert.ok(command);
-  const ctx = createFakeCtx(cwd, { selects: ["show-config", "notifications", "Back", "Save and close"] });
+  const ctx = createFakeCtx(cwd, { selects: ["show-config", "notifications", "Save and close", "Save and close"] });
 
   await command!.handler("", ctx);
 
   const renderedMenu = (ctx.__state.customRenderLines[0] ?? []).join("\n");
   assert.deepEqual(ctx.__state.selectCalls[0]?.items ?? [], [
-    "docs-dir",
-    "tests-dir",
-    "src-dir",
-    "static-check",
-    "startup tools",
-    "notifications",
-    "show-config",
+    "Document directory",
+    "Source-code directories",
+    "Unit tests directory",
+    "Language static code checkers",
+    "Enable tools",
+    "Notifications",
+    "Show configuration",
     "Reset defaults",
     "Save and close",
   ]);
-  assert.ok(renderedMenu.includes(formatRuntimePathForDisplay(getProjectConfigPath(cwd))));
+  assert.ok(renderedMenu.includes(buildExpectedShowConfigPath(cwd)));
+  assert.ok(renderedMenu.includes("notification:off • sound:none • pushover:off"));
+  assert.doesNotMatch(renderedMenu, /beep:/);
   assert.deepEqual(ctx.__state.selectCalls[2]?.items ?? [], [
-    "Toggle beep on success",
-    "Toggle beep on escape",
-    "Toggle beep on error",
-    "Selected notify command",
+    "Enable notification",
+    "Notification events",
+    "Notify command",
+    "Enable sound",
+    "Sound events",
     "Sound toggle hotkey bind",
-    "Notify command (low vol.)",
-    "Notify command (mid vol.)",
-    "Notify command (high vol.)",
-    "Pushover notifications",
-    "Back",
+    "Sound command (low vol.)",
+    "Sound command (mid vol.)",
+    "Sound command (high vol.)",
+    "Enable pushover",
+    "Pushover events",
+    "Pushover priority",
+    "Pushover title",
+    "Pushover text",
+    "Pushover User Key/Delivery Group Key",
+    "Pushover Token/API Token Key",
+    "Reset defaults",
+    "Save and close",
+  ]);
+});
+
+test("notifications menu preserves focus on toggled and edited rows", async () => {
+  const cwd = createTempDir("pi-usereq-menu-focus-");
+  fs.mkdirSync(path.dirname(getProjectConfigPath(cwd)), { recursive: true });
+  const pi = createFakePi();
+  piUsereqExtension(pi);
+  const command = pi.commands.get("pi-usereq");
+  assert.ok(command);
+  const ctx = createFakeCtx(cwd, {
+    selects: [
+      "notifications",
+      "Notification events",
+      "Prompt failed",
+      "Save and close",
+      "Notify command",
+      "Save and close",
+      "Save and close",
+    ],
+    inputs: ["echo notify"],
+  });
+
+  await command!.handler("", ctx);
+
+  const notificationCalls = ctx.__state.selectCalls.filter((call) => call.title === "Notifications");
+  assert.equal(notificationCalls[0]?.selectedChoiceId, "notify-enabled");
+  assert.equal(notificationCalls[1]?.selectedChoiceId, "notification-events");
+  assert.equal(notificationCalls[2]?.selectedChoiceId, "notify-command");
+
+  const notificationEventCalls = ctx.__state.selectCalls.filter((call) => call.title === "Notification events");
+  assert.deepEqual(notificationEventCalls[0]?.items ?? [], [
+    "Prompt completed",
+    "Prompt interrupted",
+    "Prompt failed",
+    "Reset defaults",
+    "Save and close",
   ]);
+  assert.equal(notificationEventCalls[0]?.selectedChoiceId, "notify-on-completed");
+  assert.equal(notificationEventCalls[1]?.selectedChoiceId, "notify-on-failed");
+});
+
+test("notifications reset defaults preserves non-notification settings", async () => {
+  const cwd = createTempDir("pi-usereq-menu-reset-notifications-");
+  fs.mkdirSync(path.dirname(getProjectConfigPath(cwd)), { recursive: true });
+  const pi = createFakePi();
+  piUsereqExtension(pi);
+  const command = pi.commands.get("pi-usereq");
+  assert.ok(command);
+  const ctx = createFakeCtx(cwd, {
+    selects: [
+      "docs-dir",
+      "notifications",
+      "Enable notification",
+      "Enable sound",
+      "high",
+      "Reset defaults",
+      "Save and close",
+      "Save and close",
+    ],
+    inputs: ["docs/custom"],
+  });
+
+  await command!.handler("", ctx);
+
+  const config = JSON.parse(fs.readFileSync(getProjectConfigPath(cwd), "utf8"));
+  assert.equal(config["docs-dir"], "docs/custom");
+  assert.equal(config["notify-enabled"], false);
+  assert.equal(config["notify-sound"], "none");
+  assert.equal(config["notify-pushover-enabled"], false);
+});
+
+test("top-level reset defaults restores all configuration values", async () => {
+  const cwd = createTempDir("pi-usereq-menu-reset-all-");
+  fs.mkdirSync(path.dirname(getProjectConfigPath(cwd)), { recursive: true });
+  const pi = createFakePi();
+  piUsereqExtension(pi);
+  const command = pi.commands.get("pi-usereq");
+  assert.ok(command);
+  const ctx = createFakeCtx(cwd, {
+    selects: [
+      "docs-dir",
+      "notifications",
+      "Enable notification",
+      "Save and close",
+      "Reset defaults",
+      "Save and close",
+    ],
+    inputs: ["docs/custom"],
+  });
+
+  await command!.handler("", ctx);
+
+  const config = JSON.parse(fs.readFileSync(getProjectConfigPath(cwd), "utf8"));
+  assert.equal(config["docs-dir"], DEFAULT_DOCS_DIR);
+  assert.deepEqual(config["src-dir"], ["src"]);
+  assert.equal(config["notify-enabled"], false);
+  assert.equal(config["notify-sound"], "none");
 });
 
 test("configuration menus reuse CLI settings theme semantics", async () => {
@@ -1514,12 +1654,12 @@ test("session_start applies configured pi-usereq startup tools", async () => {
       testsDir: "tests",
       srcDir: ["src", "foobar"],
       contextFilledCells: 0,
-      et: " ⏱︎ --:-- ⚑ --:-- ⌛︎ --:--",
+      et: "⏱︎ --:-- ⚑ --:-- ⌛︎--:--",
     }),
   );
 });
 
-test("session_start renders the CLEAR overlay when context usage is empty", async () => {
+test("session_start renders the 0-percent context icon when context usage is empty", async () => {
   const cwd = createTempDir("pi-usereq-context-empty-status-");
   fs.mkdirSync(path.dirname(getProjectConfigPath(cwd)), { recursive: true });
   const pi = createFakePi();
@@ -1539,7 +1679,7 @@ test("session_start renders the CLEAR overlay when context usage is empty", asyn
       srcDir: ["src"],
       contextFilledCells: 0,
       contextPercent: 0,
-      et: " ⏱︎ --:-- ⚑ --:-- ⌛︎ --:--",
+      et: "⏱︎ --:-- ⚑ --:-- ⌛︎--:--",
     }),
   );
 });
@@ -1606,12 +1746,12 @@ test("context hook refreshes context usage and rounds progress cells upward", as
       srcDir: ["src"],
       contextFilledCells: 2,
       contextPercent: 19.1,
-      et: " ⏱︎ --:-- ⚑ --:-- ⌛︎ --:--",
+      et: "⏱︎ --:-- ⚑ --:-- ⌛︎--:--",
     }),
   );
 });
 
-test("context hook renders the FULL! overlay when usage exceeds ninety percent", async () => {
+test("context hook renders the full context icon when usage exceeds ninety percent", async () => {
   const cwd = createTempDir("pi-usereq-context-full-status-");
   fs.mkdirSync(path.dirname(getProjectConfigPath(cwd)), { recursive: true });
   const contextUsage = { tokens: 910, contextWindow: 1000, percent: 91 };
@@ -1633,19 +1773,19 @@ test("context hook renders the FULL! overlay when usage exceeds ninety percent",
       srcDir: ["src"],
       contextFilledCells: 10,
       contextPercent: 91,
-      et: " ⏱︎ --:-- ⚑ --:-- ⌛︎ --:--",
+      et: "⏱︎ --:-- ⚑ --:-- ⌛︎--:--",
     }),
   );
 });
 
-test("status FULL overlay uses only CLI-supported theme tokens", async () => {
+test("status overflow context icon uses only CLI-supported theme tokens", async () => {
   const cwd = createTempDir("pi-usereq-context-theme-contract-");
   fs.mkdirSync(path.dirname(getProjectConfigPath(cwd)), { recursive: true });
   const usedColors = new Set<string>();
   const pi = createFakePi();
   piUsereqExtension(pi);
   const ctx = createFakeCtx(cwd, { selects: [] }, {
-    getContextUsage: () => ({ tokens: 910, contextWindow: 1000, percent: 91 }),
+    getContextUsage: () => ({ tokens: 1250, contextWindow: 1000, percent: 125 }),
     theme: {
       fg(color: string, text: string) {
         assert.ok(["accent", "warning", "dim", "error"].includes(color));
@@ -1674,8 +1814,8 @@ test("status FULL overlay uses only CLI-supported theme tokens", async () => {
       testsDir: "tests",
       srcDir: ["src"],
       contextFilledCells: 10,
-      contextPercent: 91,
-      et: " ⏱︎ --:-- ⚑ --:-- ⌛︎ --:--",
+      contextPercent: 125,
+      et: "⏱︎ --:-- ⚑ --:-- ⌛︎--:--",
     }),
   );
 });
@@ -1714,7 +1854,7 @@ test("agent timing status updates et while preserving accumulated completed runt
         testsDir: "tests",
         srcDir: ["src"],
         contextFilledCells: 0,
-        et: " ⏱︎ 0:00 ⚑ --:-- ⌛︎ --:--",
+        et: "⏱︎ 0:00 ⚑ --:-- ⌛︎--:--",
       }),
     );
 
@@ -1728,7 +1868,7 @@ test("agent timing status updates et while preserving accumulated completed runt
         testsDir: "tests",
         srcDir: ["src"],
         contextFilledCells: 0,
-        et: " ⏱︎ 1:01 ⚑ --:-- ⌛︎ --:--",
+        et: "⏱︎ 1:01 ⚑ --:-- ⌛︎--:--",
       }),
     );
 
@@ -1749,7 +1889,7 @@ test("agent timing status updates et while preserving accumulated completed runt
         testsDir: "tests",
         srcDir: ["src"],
         contextFilledCells: 0,
-        et: " ⏱︎ --:-- ⚑ 1:01 ⌛︎ 1:01",
+        et: "⏱︎ --:-- ⚑ 1:01 ⌛︎1:01",
       }),
     );
 
@@ -1773,7 +1913,7 @@ test("agent timing status updates et while preserving accumulated completed runt
         testsDir: "tests",
         srcDir: ["src"],
         contextFilledCells: 0,
-        et: " ⏱︎ --:-- ⚑ 1:01 ⌛︎ 1:01",
+        et: "⏱︎ --:-- ⚑ 1:01 ⌛︎1:01",
       }),
     );
     assert.ok(clearedHandles.length >= 2);
@@ -1801,12 +1941,23 @@ test("session_start enables default custom tools and default embedded tools only
   assert.equal(activeTools.has("ls"), false);
 });
 
-test("default configuration enables all pi-notify beep outcomes", () => {
+test("default configuration applies the documented notify, sound, and pushover defaults", () => {
   const config = getDefaultConfig(createTempDir("pi-usereq-default-notify-"));
 
-  assert.equal(config["notify-beep-on-end"], true);
-  assert.equal(config["notify-beep-on-esc"], true);
-  assert.equal(config["notify-beep-on-error"], true);
+  assert.equal(config["notify-enabled"], false);
+  assert.equal(config["notify-on-completed"], true);
+  assert.equal(config["notify-on-interrupted"], false);
+  assert.equal(config["notify-on-failed"], false);
+  assert.equal(config["notify-sound"], "none");
+  assert.equal(config["notify-sound-on-completed"], true);
+  assert.equal(config["notify-sound-on-interrupted"], false);
+  assert.equal(config["notify-sound-on-failed"], false);
+  assert.equal(config["notify-pushover-enabled"], false);
+  assert.equal(config["notify-pushover-on-completed"], true);
+  assert.equal(config["notify-pushover-on-interrupted"], false);
+  assert.equal(config["notify-pushover-on-failed"], false);
+  assert.equal(config.PI_NOTIFY_CMD, 'notify-send -i %%INSTALLATION_PATH%%/resources/images/pi.dev.png -a "PI-useReq" "%%PROMT%% @ %%BASE%% [%%TIME%%]" "%%RESULT%%"');
+  assert.equal(config["notify-pushover-text"], "%%RESULT%%\n%%ARGS%%");
 });
 
 test("configuration menu can enable embedded builtin tools", async () => {
@@ -1820,7 +1971,7 @@ test("configuration menu can enable embedded builtin tools", async () => {
   await command!.handler(
     "",
     createFakeCtx(cwd, {
-      selects: ["startup tools", "Toggle tool", "grep", "Back", "Save and close"],
+      selects: ["Enable tools", "Enable tools", "grep", "Save and close", "Save and close"],
     }),
   );
 
@@ -1840,7 +1991,7 @@ test("configuration menu can disable configurable active tools", async () => {
   await command!.handler(
     "",
     createFakeCtx(cwd, {
-      selects: ["startup tools", "Disable all configurable tools", "Back", "Save and close"],
+      selects: ["Enable tools", "Disable all configurable tools", "Save and close", "Save and close"],
     }),
   );
 
@@ -1849,7 +2000,7 @@ test("configuration menu can disable configurable active tools", async () => {
   assert.deepEqual(pi.getActiveTools().filter((toolName: string) => PI_USEREQ_STARTUP_TOOL_NAMES.includes(toolName as never)), []);
 });
 
-test("configuration menu can persist pi-notify settings", async () => {
+test("configuration menu can persist notify and sound settings", async () => {
   const cwd = createTempDir("pi-usereq-menu-notify-");
   fs.mkdirSync(path.dirname(getProjectConfigPath(cwd)), { recursive: true });
   const pi = createFakePi();
@@ -1859,19 +2010,26 @@ test("configuration menu can persist pi-notify settings", async () => {
   const ctx = createFakeCtx(cwd, {
     selects: [
       "notifications",
-      "Toggle beep on success",
-      "Toggle beep on error",
-      "Selected notify command",
+      "Enable notification",
+      "Notification events",
+      "Prompt failed",
+      "Save and close",
+      "Enable sound",
       "high",
+      "Sound events",
+      "Prompt interrupted",
+      "Save and close",
       "Sound toggle hotkey bind",
-      "Notify command (low vol.)",
-      "Notify command (mid vol.)",
-      "Notify command (high vol.)",
-      "Back",
+      "Notify command",
+      "Sound command (low vol.)",
+      "Sound command (mid vol.)",
+      "Sound command (high vol.)",
+      "Save and close",
       "Save and close",
     ],
     inputs: [
       "alt+shift+s",
+      "notify-send -i %%INSTALLATION_PATH%%/resources/images/pi.dev.png -a \"PI-useReq\" \"%%PROMT%% @ %%BASE%% [%%TIME%%]\" \"%%RESULT%%\"",
       "echo low %%INSTALLATION_PATH%%",
       "echo mid %%INSTALLATION_PATH%%",
       "echo high %%INSTALLATION_PATH%%",
@@ -1881,11 +2039,16 @@ test("configuration menu can persist pi-notify settings", async () => {
   await command!.handler("", ctx);
 
   const config = JSON.parse(fs.readFileSync(getProjectConfigPath(cwd), "utf8"));
-  assert.equal(config["notify-beep-on-end"], false);
-  assert.equal(config["notify-beep-on-error"], false);
-  assert.equal(config["notify-beep-on-esc"], true);
+  assert.equal(config["notify-enabled"], true);
+  assert.equal(config["notify-on-completed"], true);
+  assert.equal(config["notify-on-interrupted"], false);
+  assert.equal(config["notify-on-failed"], true);
   assert.equal(config["notify-sound"], "high");
+  assert.equal(config["notify-sound-on-completed"], true);
+  assert.equal(config["notify-sound-on-interrupted"], true);
+  assert.equal(config["notify-sound-on-failed"], false);
   assert.equal(config["notify-sound-toggle-shortcut"], "alt+shift+s");
+  assert.equal(config.PI_NOTIFY_CMD, "notify-send -i %%INSTALLATION_PATH%%/resources/images/pi.dev.png -a \"PI-useReq\" \"%%PROMT%% @ %%BASE%% [%%TIME%%]\" \"%%RESULT%%\"");
   assert.equal(config.PI_NOTIFY_SOUND_LOW_CMD, "echo low %%INSTALLATION_PATH%%");
   assert.equal(config.PI_NOTIFY_SOUND_MID_CMD, "echo mid %%INSTALLATION_PATH%%");
   assert.equal(config.PI_NOTIFY_SOUND_HIGH_CMD, "echo high %%INSTALLATION_PATH%%");
@@ -1897,8 +2060,7 @@ test("configuration menu can persist pi-notify settings", async () => {
       testsDir: "tests",
       srcDir: ["src"],
       contextFilledCells: 0,
-      et: " ⏱︎ --:-- ⚑ --:-- ⌛︎ --:--",
-      beep: "esc",
+      et: "⏱︎ --:-- ⚑ --:-- ⌛︎--:--",
       sound: "high",
     }),
   );
@@ -1914,17 +2076,22 @@ test("configuration menu can persist pushover settings", async () => {
   const ctx = createFakeCtx(cwd, {
     selects: [
       "notifications",
-      "Pushover notifications",
-      "Notify on success",
-      "User Key/Delivery Group Key",
-      "Token/API Token Key",
-      "Priority",
-      "1=High Priority",
-      "Back",
-      "Back",
+      "Enable pushover",
+      "Pushover events",
+      "Prompt failed",
+      "Save and close",
+      "Pushover priority",
+      "High",
+      "Pushover title",
+      "Pushover text",
+      "Pushover User Key/Delivery Group Key",
+      "Pushover Token/API Token Key",
+      "Save and close",
       "Save and close",
     ],
     inputs: [
+      "%%PROMT%% @ %%BASE%% [%%TIME%%]",
+      "%%RESULT%%\n%%ARGS%%",
       "gzfjjvp1xxmhibqwzh9m7i1zwvf83j",
       "ah6bf5u2sj63mcvou6qamiabeoubbe",
     ],
@@ -1933,11 +2100,15 @@ test("configuration menu can persist pushover settings", async () => {
   await command!.handler("", ctx);
 
   const config = JSON.parse(fs.readFileSync(getProjectConfigPath(cwd), "utf8"));
-  assert.equal(config["notify-pushover-global-disable"], false);
-  assert.equal(config["notify-pushover-on-success"], true);
+  assert.equal(config["notify-pushover-enabled"], true);
+  assert.equal(config["notify-pushover-on-completed"], true);
+  assert.equal(config["notify-pushover-on-interrupted"], false);
+  assert.equal(config["notify-pushover-on-failed"], true);
   assert.equal(config["notify-pushover-user-key"], "gzfjjvp1xxmhibqwzh9m7i1zwvf83j");
   assert.equal(config["notify-pushover-api-token"], "ah6bf5u2sj63mcvou6qamiabeoubbe");
   assert.equal(config["notify-pushover-priority"], 1);
+  assert.equal(config["notify-pushover-title"], "%%PROMT%% @ %%BASE%% [%%TIME%%]");
+  assert.equal(config["notify-pushover-text"], "%%RESULT%%\n%%ARGS%%");
   assert.equal(
     ctx.__state.statuses.get("pi-usereq"),
     buildExpectedFakeStatusText({
@@ -1946,13 +2117,13 @@ test("configuration menu can persist pushover settings", async () => {
       testsDir: "tests",
       srcDir: ["src"],
       contextFilledCells: 0,
-      et: " ⏱︎ --:-- ⚑ --:-- ⌛︎ --:--",
-      pushover: "on",
+      et: "⏱︎ --:-- ⚑ --:-- ⌛︎--:--",
+      sound: "none",
     }),
   );
 });
 
-test("successful req prompt completion sends pushover requests and suppresses invalid scenarios", async () => {
+test("prompt-end pushover requests honor global enable, event toggles, credentials, priority, and templates", async () => {
   const cwd = createTempDir("pi-usereq-pushover-run-");
   fs.mkdirSync(path.dirname(getProjectConfigPath(cwd)), { recursive: true });
   const configPath = getProjectConfigPath(cwd);
@@ -1995,10 +2166,13 @@ test("successful req prompt completion sends pushover requests and suppresses in
 
   try {
     writeConfig({
-      "notify-pushover-on-success": true,
+      "notify-pushover-enabled": true,
+      "notify-pushover-on-completed": true,
       "notify-pushover-user-key": "gzfjjvp1xxmhibqwzh9m7i1zwvf83j",
       "notify-pushover-api-token": "ah6bf5u2sj63mcvou6qamiabeoubbe",
       "notify-pushover-priority": 1,
+      "notify-pushover-title": "%%PROMT%% @ %%BASE%% [%%TIME%%]",
+      "notify-pushover-text": "%%RESULT%%\n%%ARGS%%",
     });
     await pi.emit("session_start", { reason: "startup" }, ctx);
     recordedRequests.length = 0;
@@ -2022,8 +2196,8 @@ test("successful req prompt completion sends pushover requests and suppresses in
     assert.equal(successParams.get("token"), "ah6bf5u2sj63mcvou6qamiabeoubbe");
     assert.equal(successParams.get("user"), "gzfjjvp1xxmhibqwzh9m7i1zwvf83j");
     assert.equal(successParams.get("priority"), "1");
-    assert.equal(successParams.get("message"), "Inspect src/index.ts");
-    assert.equal(successParams.get("title"), `analyze @ ${buildExpectedFakeBasePath(cwd)} [0:05]`);
+    assert.equal(successParams.get("message"), `${buildExpectedNotifyResult("stop")}\nInspect src/index.ts`);
+    assert.equal(successParams.get("title"), `analyze @ ${buildExpectedNotifyBasePath(cwd)} [0:05]`);
 
     recordedRequests.length = 0;
     nowMs = 10_000;
@@ -2058,17 +2232,69 @@ test("successful req prompt completion sends pushover requests and suppresses in
     assert.equal(recordedRequests.length, 0);
 
     writeConfig({
-      "notify-pushover-on-success": true,
+      "notify-pushover-enabled": true,
+      "notify-pushover-on-interrupted": true,
+      "notify-pushover-on-failed": true,
       "notify-pushover-user-key": "gzfjjvp1xxmhibqwzh9m7i1zwvf83j",
-      "notify-pushover-api-token": "",
+      "notify-pushover-api-token": "ah6bf5u2sj63mcvou6qamiabeoubbe",
       "notify-pushover-priority": 1,
+      "notify-pushover-title": "%%PROMT%% @ %%BASE%% [%%TIME%%]",
+      "notify-pushover-text": "%%RESULT%%\n%%ARGS%%",
     });
     await pi.emit("session_start", { reason: "startup" }, ctx);
     recordedRequests.length = 0;
     nowMs = 30_000;
-    await pi.commands.get("req-write")!.handler("Write docs", ctx);
+    await pi.commands.get("req-change")!.handler("Adjust docs", ctx);
     await pi.emit("agent_start", {}, ctx);
     nowMs = 32_000;
+    await pi.emit("agent_end", {
+      messages: [
+        {
+          role: "assistant",
+          stopReason: "aborted",
+          content: [],
+        },
+      ],
+    }, ctx);
+    assert.equal(recordedRequests.length, 1);
+    const abortedParams = new URLSearchParams(recordedRequests[0]?.body ?? "");
+    assert.equal(abortedParams.get("title"), `change @ ${buildExpectedNotifyBasePath(cwd)} [0:02]`);
+    assert.equal(abortedParams.get("message"), `${buildExpectedNotifyResult("aborted")}\nAdjust docs`);
+
+    recordedRequests.length = 0;
+    nowMs = 40_000;
+    await pi.commands.get("req-write")!.handler("Write docs", ctx);
+    await pi.emit("agent_start", {}, ctx);
+    nowMs = 42_000;
+    await pi.emit("agent_end", {
+      messages: [
+        {
+          role: "assistant",
+          stopReason: "error",
+          content: [],
+        },
+      ],
+    }, ctx);
+    assert.equal(recordedRequests.length, 1);
+    const errorParams = new URLSearchParams(recordedRequests[0]?.body ?? "");
+    assert.equal(errorParams.get("title"), `write @ ${buildExpectedNotifyBasePath(cwd)} [0:02]`);
+    assert.equal(errorParams.get("message"), `${buildExpectedNotifyResult("error")}\nWrite docs`);
+
+    writeConfig({
+      "notify-pushover-enabled": true,
+      "notify-pushover-on-completed": true,
+      "notify-pushover-user-key": "gzfjjvp1xxmhibqwzh9m7i1zwvf83j",
+      "notify-pushover-api-token": "",
+      "notify-pushover-priority": 1,
+      "notify-pushover-title": "%%PROMT%% @ %%BASE%% [%%TIME%%]",
+      "notify-pushover-text": "%%RESULT%%\n%%ARGS%%",
+    });
+    await pi.emit("session_start", { reason: "startup" }, ctx);
+    recordedRequests.length = 0;
+    nowMs = 50_000;
+    await pi.commands.get("req-check")!.handler("Check docs", ctx);
+    await pi.emit("agent_start", {}, ctx);
+    nowMs = 53_000;
     await pi.emit("agent_end", {
       messages: [
         {
@@ -2085,7 +2311,7 @@ test("successful req prompt completion sends pushover requests and suppresses in
   }
 });
 
-test("pushover global disable suppresses delivery without clearing enabled state", async () => {
+test("pushover global enable controls status and suppresses delivery when disabled", async () => {
   const cwd = createTempDir("pi-usereq-pushover-disabled-");
   fs.mkdirSync(path.dirname(getProjectConfigPath(cwd)), { recursive: true });
   const pi = createFakePi();
@@ -2095,13 +2321,9 @@ test("pushover global disable suppresses delivery without clearing enabled state
   const ctx = createFakeCtx(cwd, {
     selects: [
       "notifications",
-      "Pushover notifications",
-      "Notify on success",
-      "Global disable",
-      "User Key/Delivery Group Key",
-      "Token/API Token Key",
-      "Back",
-      "Back",
+      "Pushover User Key/Delivery Group Key",
+      "Pushover Token/API Token Key",
+      "Save and close",
       "Save and close",
     ],
     inputs: [
@@ -2113,8 +2335,8 @@ test("pushover global disable suppresses delivery without clearing enabled state
   await command!.handler("", ctx);
 
   const config = JSON.parse(fs.readFileSync(getProjectConfigPath(cwd), "utf8"));
-  assert.equal(config["notify-pushover-on-success"], true);
-  assert.equal(config["notify-pushover-global-disable"], true);
+  assert.equal(config["notify-pushover-enabled"], false);
+  assert.equal(config["notify-pushover-on-completed"], true);
   assert.equal(
     ctx.__state.statuses.get("pi-usereq"),
     buildExpectedFakeStatusText({
@@ -2123,8 +2345,8 @@ test("pushover global disable suppresses delivery without clearing enabled state
       testsDir: "tests",
       srcDir: ["src"],
       contextFilledCells: 0,
-      et: " ⏱︎ --:-- ⚑ --:-- ⌛︎ --:--",
-      pushover: "on",
+      et: "⏱︎ --:-- ⚑ --:-- ⌛︎--:--",
+      sound: "none",
     }),
   );
 
@@ -2171,6 +2393,201 @@ test("pushover global disable suppresses delivery without clearing enabled state
   }
 });
 
+test("command notify routes through PI_NOTIFY_CMD placeholders and per-event toggles", async () => {
+  const cwd = createTempDir("pi-usereq-command-notify-");
+  fs.mkdirSync(path.dirname(getProjectConfigPath(cwd)), { recursive: true });
+  const configPath = getProjectConfigPath(cwd);
+  const writeConfig = (overrides: Record<string, unknown>) => {
+    const config = {
+      ...getDefaultConfig(cwd),
+      ...overrides,
+    };
+    fs.writeFileSync(configPath, `${JSON.stringify(config, null, 2)}\n`, "utf8");
+  };
+  const pi = createFakePi();
+  piUsereqExtension(pi);
+  const ctx = createFakeCtx(cwd);
+  const originalDateNow = Date.now;
+  const recordedCommands: string[] = [];
+  let nowMs = 0;
+  setPiNotifySpawnForTests(((command: string, args?: readonly string[] | undefined, _options?: Record<string, unknown>) => {
+    void command;
+    recordedCommands.push(String(args && args.length > 0 ? args[args.length - 1] : ""));
+    const fakeChild = {
+      once(_eventName: string, _handler: (...handlerArgs: unknown[]) => void) {
+        return fakeChild;
+      },
+      unref() {
+        return undefined;
+      },
+    };
+    return fakeChild as unknown as ReturnType<typeof import("node:child_process").spawn>;
+  }) as typeof import("node:child_process").spawn);
+  Date.now = () => nowMs;
+
+  try {
+    writeConfig({
+      "notify-enabled": true,
+      "notify-on-completed": true,
+      "notify-on-interrupted": false,
+      "notify-on-failed": true,
+      "notify-sound": "none",
+      PI_NOTIFY_CMD: 'notify-send "%%PROMT%% @ %%BASE%% [%%TIME%%]" "%%RESULT%%"',
+    });
+    await pi.emit("session_start", { reason: "startup" }, ctx);
+    recordedCommands.length = 0;
+    nowMs = 0;
+    await pi.commands.get("req-analyze")!.handler("Inspect src/index.ts", ctx);
+    await pi.emit("agent_start", {}, ctx);
+    nowMs = 5_000;
+    await pi.emit("agent_end", {
+      messages: [{ role: "assistant", stopReason: "stop", content: [] }],
+    }, ctx);
+
+    assert.equal(recordedCommands.length, 1);
+    assert.match(
+      recordedCommands[0] ?? "",
+      new RegExp(`analyze @ ${buildExpectedNotifyBasePath(cwd).replace(/[.*+?^${}()|[\]\\]/g, "\\$&")} \\[0:05\\]`),
+    );
+    assert.match(recordedCommands[0] ?? "", new RegExp(buildExpectedNotifyResult("stop")));
+
+    recordedCommands.length = 0;
+    nowMs = 10_000;
+    await pi.commands.get("req-change")!.handler("Adjust docs", ctx);
+    await pi.emit("agent_start", {}, ctx);
+    nowMs = 12_000;
+    await pi.emit("agent_end", {
+      messages: [{ role: "assistant", stopReason: "aborted", content: [] }],
+    }, ctx);
+    assert.equal(recordedCommands.length, 0);
+
+    writeConfig({
+      "notify-enabled": true,
+      "notify-on-completed": true,
+      "notify-on-interrupted": true,
+      "notify-on-failed": true,
+      "notify-sound": "none",
+      PI_NOTIFY_CMD: 'notify-send "%%PROMT%% @ %%BASE%% [%%TIME%%]" "%%RESULT%%"',
+    });
+    await pi.emit("session_start", { reason: "startup" }, ctx);
+    recordedCommands.length = 0;
+    nowMs = 20_000;
+    await pi.commands.get("req-change")!.handler("Adjust docs", ctx);
+    await pi.emit("agent_start", {}, ctx);
+    nowMs = 22_000;
+    await pi.emit("agent_end", {
+      messages: [{ role: "assistant", stopReason: "aborted", content: [] }],
+    }, ctx);
+    assert.equal(recordedCommands.length, 1);
+    assert.match(
+      recordedCommands[0] ?? "",
+      new RegExp(`change @ ${buildExpectedNotifyBasePath(cwd).replace(/[.*+?^${}()|[\]\\]/g, "\\$&")} \\[0:02\\]`),
+    );
+    assert.match(recordedCommands[0] ?? "", new RegExp(buildExpectedNotifyResult("aborted")));
+
+    recordedCommands.length = 0;
+    nowMs = 30_000;
+    await pi.commands.get("req-write")!.handler("Write docs", ctx);
+    await pi.emit("agent_start", {}, ctx);
+    nowMs = 33_000;
+    await pi.emit("agent_end", {
+      messages: [{ role: "assistant", stopReason: "error", content: [] }],
+    }, ctx);
+    assert.equal(recordedCommands.length, 1);
+    assert.match(
+      recordedCommands[0] ?? "",
+      new RegExp(`write @ ${buildExpectedNotifyBasePath(cwd).replace(/[.*+?^${}()|[\]\\]/g, "\\$&")} \\[0:03\\]`),
+    );
+    assert.match(recordedCommands[0] ?? "", new RegExp(buildExpectedNotifyResult("error")));
+  } finally {
+    setPiNotifySpawnForTests(undefined);
+    Date.now = originalDateNow;
+  }
+});
+
+test("sound routing honors the selected sound state and per-event toggles", async () => {
+  const cwd = createTempDir("pi-usereq-sound-routing-");
+  fs.mkdirSync(path.dirname(getProjectConfigPath(cwd)), { recursive: true });
+  const configPath = getProjectConfigPath(cwd);
+  const writeConfig = (overrides: Record<string, unknown>) => {
+    const config = {
+      ...getDefaultConfig(cwd),
+      ...overrides,
+    };
+    fs.writeFileSync(configPath, `${JSON.stringify(config, null, 2)}\n`, "utf8");
+  };
+  const pi = createFakePi();
+  piUsereqExtension(pi);
+  const ctx = createFakeCtx(cwd);
+  const recordedCommands: string[] = [];
+  setPiNotifySpawnForTests(((command: string, args?: readonly string[] | undefined, _options?: Record<string, unknown>) => {
+    void command;
+    recordedCommands.push(String(args && args.length > 0 ? args[args.length - 1] : ""));
+    const fakeChild = {
+      once(_eventName: string, _handler: (...handlerArgs: unknown[]) => void) {
+        return fakeChild;
+      },
+      unref() {
+        return undefined;
+      },
+    };
+    return fakeChild as unknown as ReturnType<typeof import("node:child_process").spawn>;
+  }) as typeof import("node:child_process").spawn);
+
+  try {
+    writeConfig({
+      "notify-enabled": false,
+      "notify-sound": "none",
+      "notify-sound-on-completed": true,
+      PI_NOTIFY_SOUND_HIGH_CMD: "echo high %%INSTALLATION_PATH%%",
+    });
+    await pi.emit("session_start", { reason: "startup" }, ctx);
+    recordedCommands.length = 0;
+    await pi.commands.get("req-analyze")!.handler("Inspect src/index.ts", ctx);
+    await pi.emit("agent_start", {}, ctx);
+    await pi.emit("agent_end", {
+      messages: [{ role: "assistant", stopReason: "stop", content: [] }],
+    }, ctx);
+    assert.deepEqual(recordedCommands, []);
+
+    writeConfig({
+      "notify-enabled": false,
+      "notify-sound": "high",
+      "notify-sound-on-completed": false,
+      "notify-sound-on-interrupted": true,
+      "notify-sound-on-failed": false,
+      PI_NOTIFY_SOUND_HIGH_CMD: "echo high %%INSTALLATION_PATH%%",
+    });
+    await pi.emit("session_start", { reason: "startup" }, ctx);
+    recordedCommands.length = 0;
+    await pi.commands.get("req-change")!.handler("Adjust docs", ctx);
+    await pi.emit("agent_start", {}, ctx);
+    await pi.emit("agent_end", {
+      messages: [{ role: "assistant", stopReason: "aborted", content: [] }],
+    }, ctx);
+    assert.equal(recordedCommands.length, 1);
+
+    writeConfig({
+      "notify-enabled": false,
+      "notify-sound": "high",
+      "notify-sound-on-completed": false,
+      "notify-sound-on-interrupted": false,
+      "notify-sound-on-failed": true,
+      PI_NOTIFY_SOUND_HIGH_CMD: "echo high %%INSTALLATION_PATH%%",
+    });
+    await pi.emit("session_start", { reason: "startup" }, ctx);
+    recordedCommands.length = 0;
+    await pi.commands.get("req-write")!.handler("Write docs", ctx);
+    await pi.emit("agent_start", {}, ctx);
+    await pi.emit("agent_end", {
+      messages: [{ role: "assistant", stopReason: "error", content: [] }],
+    }, ctx);
+    assert.equal(recordedCommands.length, 1);
+  } finally {
+    setPiNotifySpawnForTests(undefined);
+  }
+});
+
 test("sound toggle shortcut cycles persisted pi-notify sound levels", async () => {
   const cwd = createTempDir("pi-usereq-shortcut-notify-");
   fs.mkdirSync(path.dirname(getProjectConfigPath(cwd)), { recursive: true });
@@ -2200,7 +2617,7 @@ test("sound toggle shortcut cycles persisted pi-notify sound levels", async () =
         testsDir: "tests",
         srcDir: ["src"],
         contextFilledCells: 0,
-        et: " ⏱︎ --:-- ⚑ --:-- ⌛︎ --:--",
+        et: "⏱︎ --:-- ⚑ --:-- ⌛︎--:--",
         sound: expectedSound,
       }),
     );
@@ -2219,11 +2636,11 @@ test("git-path tool derives the repository root at runtime", async () => {
     piUsereqExtension(pi);
     const result = await executeRegisteredTool(pi, "git-path", projectBase) as {
       content?: Array<{ text?: string }>;
-      details?: { result: { path_value: string }; runtime_paths: { git_path: string } };
+      details?: { result: { path_value: string } };
     };
 
     assert.deepEqual(JSON.parse(result.content?.[0]?.text ?? "{}"), JSON.parse(JSON.stringify(result.details)));
-    assert.equal(result.details?.result.path_value, result.details?.runtime_paths.git_path);
+    assert.equal(result.details?.result.path_value, projectBase);
   } finally {
     fs.rmSync(projectBase, { recursive: true, force: true });
   }
@@ -2239,24 +2656,24 @@ test("static-check exposes the supported programming languages", () => {
   });
 });
 
-test("configuration menu can add static-check entries from raw specs", async () => {
+test("configuration menu omits removed static-check raw-spec and reference actions", async () => {
   const cwd = createTempDir("pi-usereq-menu-sc-");
   fs.mkdirSync(path.dirname(getProjectConfigPath(cwd)), { recursive: true });
   const pi = createFakePi();
   piUsereqExtension(pi);
   const command = pi.commands.get("pi-usereq");
   assert.ok(command);
+  const ctx = createFakeCtx(cwd, {
+    selects: ["static-check"],
+  });
 
-  await command!.handler(
-    "",
-    createFakeCtx(cwd, {
-      selects: ["static-check", "Add entry from LANG=MODULE[,CMD[,PARAM...]]", "Back", "Save and close"],
-      inputs: ["Python=Command,true"],
-    }),
-  );
+  await command!.handler("", ctx);
 
-  const config = JSON.parse(fs.readFileSync(getProjectConfigPath(cwd), "utf8"));
-  assert.deepEqual(config["static-check"].Python, [{ module: "Command", cmd: "true" }]);
+  const renderedStaticCheckMenu = (ctx.__state.customRenderLines[1] ?? []).join("\n");
+  assert.match(renderedStaticCheckMenu, /Add static code checker/);
+  assert.match(renderedStaticCheckMenu, /Remove static code checker/);
+  assert.doesNotMatch(renderedStaticCheckMenu, /Add entry from LANG=MODULE\[,CMD\[,PARAM\.\.\.\]\]/);
+  assert.doesNotMatch(renderedStaticCheckMenu, /Show supported languages/);
 });
 
 test("configuration menu hides removed static-check modules from user-facing actions", async () => {
@@ -2273,7 +2690,7 @@ test("configuration menu hides removed static-check modules from user-facing act
   await command!.handler("", ctx);
 
   const renderedStaticCheckMenu = (ctx.__state.customRenderLines[1] ?? []).join("\n");
-  assert.match(renderedStaticCheckMenu, /Add entry for supported language/);
+  assert.match(renderedStaticCheckMenu, /Add static code checker/);
   assert.doesNotMatch(renderedStaticCheckMenu, /Pylance/);
   assert.doesNotMatch(renderedStaticCheckMenu, /Ruff/);
   assert.doesNotMatch(renderedStaticCheckMenu, /Dummy/);
@@ -2292,9 +2709,9 @@ test("configuration menu can add guided static-check entries for explicit suppor
     createFakeCtx(cwd, {
       selects: [
         "static-check",
-        "Add entry for supported language",
+        "Add static code checker",
         "Python",
-        "Back",
+        "Save and close",
         "Save and close",
       ],
       inputs: ["true", ""],