@mrclrchtr/supi-debug 2.6.1 → 2.8.0

package/README.md

@@ -114,7 +114,7 @@ Defaults come from the shared debug registry:
 
 ## Extra status logging
 
-If `SUPI_LOG_STATUS` is enabled in the environment, the package emits a versioned SuPi load-status marker to stderr on `session_start` and appends the same payload as a session entry. Version 2 reports observed tool and command inventory only; external harnesses decide which resources they require.
+If `SUPI_LOG_STATUS` is enabled in the environment, the package emits a versioned SuPi load-status marker to stderr during `resources_discover` (after session-start registrations) and appends the same payload as a session entry. The payload uses `phase: "resources_discover"`. Version 2 reports observed tool and command inventory only; external harnesses decide which resources they require.
 
 ## Source
 

package/node_modules/@mrclrchtr/supi-core/README.md

@@ -43,7 +43,7 @@ Config file locations:
 - `registerSettingsCommand(pi)` — register `/supi-settings` (used by `@mrclrchtr/supi-settings`)
 - `openSettingsOverlay(pi, ctx)` — open the shared settings UI directly
 - `createInputSubmenu()` — helper for simple text-entry submenus
-- `createModelPickerSubmenu()` — helper for scoped model selection submenus
+- `createModelPickerSubmenu()` — helper for scoped model selection submenus, with optional host-owned choices and `disabled` control
 
 The built-in settings UI supports:
 

package/node_modules/@mrclrchtr/supi-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "2.6.1",
+  "version": "2.8.0",
   "description": "SuPi core — shared infrastructure for SuPi extensions (XML context tags, config system)",
   "license": "MIT",
   "repository": {

package/node_modules/@mrclrchtr/supi-core/src/settings/scoped-settings-list.ts

@@ -324,6 +324,7 @@ export class ScopedSettingsList {
             this.tui.requestRender();
           },
           this.ctx,
+          row.field.field,
         ),
         onDone: () => {
           this.submenu = null;

package/node_modules/@mrclrchtr/supi-core/src/settings/settings-schema.ts

@@ -91,9 +91,23 @@ export interface StringListField extends BaseField {
   kind: "stringList";
 }
 
+/** One non-model choice shown before the scoped models in a model picker. */
+export interface ModelPickerStaticOption {
+  /** Persisted value for the choice. */
+  value: string;
+  /** Human-readable picker label. */
+  label: string;
+  /** Optional explanation shown alongside the label. */
+  description?: string;
+}
+
 /** Model picker backed by the scoped model set. */
 export interface ModelPickerField extends BaseField {
   kind: "modelPicker";
+  /** Additional host-owned choices shown before scoped models. */
+  staticOptions?: ModelPickerStaticOption[];
+  /** Whether to include the built-in `disabled` choice. Defaults to true. */
+  includeDisabled?: boolean;
 }
 
 /**

package/node_modules/@mrclrchtr/supi-core/src/settings/settings-submenus.ts

@@ -14,6 +14,7 @@ import {
   Text,
 } from "@earendil-works/pi-tui";
 import { getSelectableModels } from "../model-selection.ts";
+import type { ModelPickerField } from "./settings-schema.ts";
 
 /**
  * Creates a pi-tui Input-backed submenu component with enter-to-confirm
@@ -57,25 +58,26 @@ export function createInputSubmenu(
 }
 
 /**
- * Creates a model picker submenu for settings with "disabled" as the first option.
+ * Creates a model picker submenu backed by the scoped model set.
+ *
+ * The built-in `disabled` choice remains enabled by default. Callers can add
+ * host-owned static choices or omit `disabled` through the field options.
  */
 export function createModelPickerSubmenu(
   currentValue: string,
   done: (selectedValue?: string) => void,
   ctx?: ExtensionContext,
+  options: Pick<ModelPickerField, "includeDisabled" | "staticOptions"> = {},
 ): {
   render: (width: number) => string[];
   invalidate: () => void;
   handleInput: (data: string) => boolean;
 } {
-  const items = buildModelItems(ctx);
-  const initialIndex =
-    currentValue === "disabled"
-      ? 0
-      : Math.max(
-          0,
-          items.findIndex((item) => item.value === currentValue),
-        );
+  const items = buildModelItems(ctx, options);
+  const initialIndex = Math.max(
+    0,
+    items.findIndex((item) => item.value === currentValue),
+  );
 
   const container = new Container();
   container.addChild(new Text("  Select model", 1, 0));
@@ -105,20 +107,35 @@ export function createModelPickerSubmenu(
   };
 }
 
-/** Build selectable model items with "disabled" as the first option. */
-function buildModelItems(ctx?: ExtensionContext): SelectItem[] {
-  const items: SelectItem[] = [
-    { value: "disabled", label: "disabled", description: "No model selected" },
-  ];
+/** Build static choices followed by the selectable scoped models. */
+function buildModelItems(
+  ctx: ExtensionContext | undefined,
+  options: Pick<ModelPickerField, "includeDisabled" | "staticOptions">,
+): SelectItem[] {
+  const items: SelectItem[] = [];
+  const seen = new Set<string>();
+  for (const option of options.staticOptions ?? []) {
+    if (seen.has(option.value)) continue;
+    items.push({ ...option });
+    seen.add(option.value);
+  }
+
+  if (options.includeDisabled !== false && !seen.has("disabled")) {
+    items.push({ value: "disabled", label: "disabled", description: "No model selected" });
+    seen.add("disabled");
+  }
+
   if (!ctx) return items;
   const models = getSelectableModels(ctx);
   for (const model of models) {
+    if (seen.has(model.canonicalId)) continue;
     const suffix = model.isCurrent ? "  [current]" : "";
     items.push({
       value: model.canonicalId,
       label: `${model.canonicalId}${suffix}`,
       description: model.label !== model.canonicalId ? model.label : undefined,
     });
+    seen.add(model.canonicalId);
   }
   return items;
 }

package/node_modules/@mrclrchtr/supi-core/src/settings.ts

@@ -20,6 +20,7 @@ export type {
   DeclarativeSettingsOptions,
   EnumField,
   ModelPickerField,
+  ModelPickerStaticOption,
   NumberField,
   ScopedFieldValue,
   SettingsField,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-debug",
-  "version": "2.6.1",
+  "version": "2.8.0",
   "description": "SuPi Debug extension — shared debug event inspection for SuPi extensions",
   "license": "MIT",
   "repository": {
@@ -31,7 +31,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@mrclrchtr/supi-core": "2.6.1"
+    "@mrclrchtr/supi-core": "2.8.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-core"

package/src/debug.ts

@@ -279,7 +279,12 @@ export default function debugExtension(pi: ExtensionAPI) {
   pi.on("session_start", async (_event, ctx) => {
     clearDebugEvents();
     applyDebugConfig(ctx.cwd);
-    maybeLogLoadStatus(pi, ctx.cwd);
+  });
+
+  // Commands registered during every extension's session_start handler are
+  // available before resource discovery, so this inventory is load-order safe.
+  pi.on("resources_discover", async (_event, ctx) => {
+    maybeLogLoadStatus(pi, ctx.cwd, "resources_discover");
   });
 
   pi.registerCommand("supi-debug", {

package/src/status-log.ts

@@ -24,7 +24,11 @@ function statusLogEnabled(): boolean {
  * stderr is captured by Harbor's `2>&1 | tee pi.txt` command for `--no-session`
  * runs where session entries are not inspectable.
  */
-export function maybeLogLoadStatus(pi: ExtensionAPI, cwd: string): void {
+export function maybeLogLoadStatus(
+  pi: ExtensionAPI,
+  cwd: string,
+  phase: "session_start" | "resources_discover" = "session_start",
+): void {
   if (!statusLogEnabled()) return;
 
   const allTools = typeof pi.getAllTools === "function" ? pi.getAllTools() : [];
@@ -37,7 +41,7 @@ export function maybeLogLoadStatus(pi: ExtensionAPI, cwd: string): void {
   const status = {
     type: "supi_status",
     version: 2,
-    phase: "session_start",
+    phase,
     cwd,
     tools: {
       registered: registeredToolNames,