pi-usereq 0.6.0 → 0.7.0

package/src/core/settings-menu.ts

@@ -26,10 +26,21 @@ export interface PiUsereqSettingsMenuChoice {
 export interface PiUsereqSettingsMenuBridge {
   title: string;
   choices: PiUsereqSettingsMenuChoice[];
+  selectedChoiceId?: string;
   selectByLabel: (label: string) => boolean;
   cancel: () => void;
 }
 
+/**
+ * @brief Describes optional behavior overrides for one settings-menu render.
+ * @details Carries the caller-selected initial focus row so menu re-renders can
+ * preserve selection after an in-place toggle or value edit. The interface is
+ * compile-time only and introduces no runtime cost.
+ */
+export interface PiUsereqSettingsMenuOptions {
+  initialSelectedId?: string;
+}
+
 /**
  * @brief Represents a custom menu component augmented with the offline bridge.
  * @details Extends the generic TUI `Component` contract with one optional bridge field consumed only by deterministic test and debug harness adapters. The interface is compile-time only and introduces no runtime cost.
@@ -177,13 +188,15 @@ function buildSettingItems(
  * @param[in] ctx {ExtensionCommandContext} Active command context.
  * @param[in] title {string} Menu title displayed in the heading and offline bridge.
  * @param[in] choices {PiUsereqSettingsMenuChoice[]} Ordered menu-choice vector.
+ * @param[in] options {PiUsereqSettingsMenuOptions | undefined} Optional initial-focus override.
  * @return {Promise<string | undefined>} Selected choice identifier or `undefined` when cancelled.
- * @satisfies REQ-151, REQ-152, REQ-153, REQ-154, REQ-156
+ * @satisfies REQ-151, REQ-152, REQ-153, REQ-154, REQ-156, REQ-192
  */
 export async function showPiUsereqSettingsMenu(
   ctx: ExtensionCommandContext,
   title: string,
   choices: PiUsereqSettingsMenuChoice[],
+  options: PiUsereqSettingsMenuOptions = {},
 ): Promise<string | undefined> {
   return ctx.ui.custom<string | undefined>((tui, theme, _keybindings, done) => {
     const container = new Container();
@@ -199,6 +212,12 @@ export async function showPiUsereqSettingsMenu(
       () => undefined,
       () => done(undefined),
     );
+    const initialSelectedIndex = options.initialSelectedId === undefined
+      ? 0
+      : choices.findIndex((choice) => choice.id === options.initialSelectedId);
+    if (initialSelectedIndex >= 0) {
+      (settingsList as SettingsList & { selectedIndex: number }).selectedIndex = initialSelectedIndex;
+    }
     container.addChild(titleText);
     container.addChild(new Text("", 0, 0));
     container.addChild(settingsList);
@@ -218,6 +237,7 @@ export async function showPiUsereqSettingsMenu(
       __piUsereqSettingsMenu: {
         title,
         choices,
+        selectedChoiceId: initialSelectedIndex >= 0 ? choices[initialSelectedIndex]?.id : undefined,
         selectByLabel(label: string): boolean {
           const choice = choices.find(
             (candidate) => candidate.label === label || candidate.id === label,

package/src/core/token-counter.ts

@@ -6,9 +6,10 @@
 
 import fs from "node:fs";
 import path from "node:path";
-import { getEncoding } from "js-tiktoken";
+import { createRequire } from "node:module";
 import { detectLanguage as detectSourceLanguage } from "./compress.js";
 import { parseDoxygenComment, type DoxygenFieldMap } from "./doxygen-parser.js";
+import { ReqError } from "./errors.js";
 
 /**
  * @brief Declares the tokenizer encoding used by token-count workflows.
@@ -196,6 +197,57 @@ export interface BuildTokenToolPayloadOptions {
   encodingName?: string;
 }
 
+type TokenCounterEncoding = {
+  encode(content: string): ArrayLike<number>;
+};
+
+type JsTiktokenModule = {
+  getEncoding(encodingName: string): TokenCounterEncoding;
+};
+
+const require = createRequire(import.meta.url);
+
+function defaultJsTiktokenModuleLoader(): JsTiktokenModule {
+  return require("js-tiktoken") as JsTiktokenModule;
+}
+
+let jsTiktokenModuleLoader: () => JsTiktokenModule = defaultJsTiktokenModuleLoader;
+
+/**
+ * @brief Overrides the `js-tiktoken` loader for tests.
+ * @details Enables deterministic dependency-failure tests without mutating repository dependencies on disk. Runtime is O(1). Side effects are limited to module-local test state.
+ * @param[in] loader {(() => JsTiktokenModule) | undefined} Replacement loader, or `undefined` to restore the default loader.
+ * @return {void} No return value.
+ */
+export function setJsTiktokenModuleLoaderForTests(loader?: () => JsTiktokenModule): void {
+  jsTiktokenModuleLoader = loader ?? defaultJsTiktokenModuleLoader;
+}
+
+/**
+ * @brief Loads the `js-tiktoken` module on demand.
+ * @details Defers dependency resolution until token counting is requested so extension registration can succeed even when the optional runtime dependency has not yet been installed. Runtime is O(1) plus module resolution cost. Side effects are limited to Node module loading.
+ * @return {JsTiktokenModule} Loaded tokenizer module.
+ * @throws {ReqError} Throws when `js-tiktoken` is unavailable.
+ */
+function loadJsTiktokenModule(): JsTiktokenModule {
+  try {
+    const module = jsTiktokenModuleLoader();
+    if (!module || typeof module.getEncoding !== "function") {
+      throw new ReqError("Error: token-count dependency 'js-tiktoken' is unavailable. Run `npm ci` in the PI-useReq repository.", 1);
+    }
+    return module;
+  } catch (error) {
+    if (error instanceof ReqError) {
+      throw error;
+    }
+    const message = error instanceof Error ? error.message : String(error);
+    if (/Cannot find (module|package) 'js-tiktoken'|ERR_MODULE_NOT_FOUND/.test(message)) {
+      throw new ReqError("Error: token-count dependency 'js-tiktoken' is not installed. Run `npm ci` in the PI-useReq repository.", 1);
+    }
+    throw error;
+  }
+}
+
 /**
  * @brief Encapsulates one tokenizer instance for repeated token counting.
  * @details Caches a `js-tiktoken` encoding object so multiple documents can be counted without repeated encoding lookup. Counting cost is O(n) in content length. The class mutates only instance state during construction.
@@ -205,7 +257,7 @@ export class TokenCounter {
    * @brief Stores the tokenizer implementation used for subsequent counts.
    * @details The field holds the encoder returned by `getEncoding`. Access complexity is O(1). The value is initialized once per instance.
    */
-  private encoding;
+  private encoding: TokenCounterEncoding;
 
   /**
    * @brief Initializes a token counter for one encoding family.
@@ -214,7 +266,7 @@ export class TokenCounter {
    * @return {TokenCounter} New token counter instance.
    */
   constructor(encodingName = TOKEN_COUNTER_ENCODING) {
-    this.encoding = getEncoding(encodingName);
+    this.encoding = loadJsTiktokenModule().getEncoding(encodingName);
   }
 
   /**