@mrclrchtr/supi-settings 4.10.0 → 6.0.0

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

@@ -28,6 +28,7 @@ pnpm add @mrclrchtr/supi-core
 - `loadSupiConfig()` — merged config with resolution order `defaults <- global <- project`
 - `loadSupiConfigForScope()` — load one scope at a time for settings UIs
 - `writeSupiConfig()` — persist values
+- `replaceSupiConfigSection()` — replace one nested section while preserving other sections
 - `removeSupiConfigKey()` — remove a key or override
 
 Config file locations:
@@ -49,6 +50,7 @@ Config file locations:
 
 - context-provider registry for `/supi-context`
 - debug-event registry and monotonic phase timers for producers that want shared debug capture
+- optional Debug Operation IDs for exact, directly owned public Tool-call correlation; ambient events stay uncorrelated
 - settings registry used by `/supi-settings`
 
 ### Project and session helpers

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

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "4.10.0",
+  "version": "6.0.0",
   "description": "Shared settings, configuration, reporting, and session infrastructure",
   "license": "MIT",
   "repository": {
@@ -53,7 +53,7 @@
     "./api": "./src/api.ts",
     "./config": "./src/config.ts",
     "./context": "./src/context.ts",
-    "./debug": "./src/debug-registry.ts",
+    "./debug": "./src/debug.ts",
     "./evidence-badge": "./src/evidence-badge.ts",
     "./footer-registry": "./src/footer-registry.ts",
     "./llm": "./src/llm.ts",

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

@@ -11,7 +11,7 @@ export * from "./config.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./context.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./debug-registry.ts";
+export * from "./debug.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./evidence-badge.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel

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

@@ -148,6 +148,37 @@ export function writeSupiConfig(
   fs.writeFileSync(configPath, `${JSON.stringify(existing, null, 2)}\n`, "utf-8");
 }
 
+/**
+ * Replace one complete config section while preserving other sections.
+ *
+ * This is useful for nested settings that must remove stale keys as part of
+ * one update. An empty section is removed from the config file.
+ */
+export function replaceSupiConfigSection(
+  loc: SupiConfigLocation,
+  value: Record<string, unknown>,
+  options?: SupiConfigOptions,
+): void {
+  const configPath = getSupiConfigPath(loc.scope, loc.cwd, options);
+  const existing = readJsonFile(configPath) ?? {};
+
+  if (Object.keys(value).length > 0) existing[loc.section] = value;
+  else delete existing[loc.section];
+
+  const content = Object.keys(existing).length > 0 ? `${JSON.stringify(existing, null, 2)}\n` : "";
+  if (content) {
+    fs.mkdirSync(path.dirname(configPath), { recursive: true });
+    fs.writeFileSync(configPath, content, "utf-8");
+    return;
+  }
+
+  try {
+    fs.unlinkSync(configPath);
+  } catch {
+    // File may not exist.
+  }
+}
+
 /**
  * Remove a key from a config section.
  * Used by `interval default` to remove the project override.

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

@@ -1,10 +1,12 @@
 // supi-core config domain — config loading.
 export type { SupiConfigLocation, SupiConfigOptions } from "./config/config.ts";
 export {
+  getSupiConfigPath,
   loadSupiConfig,
   loadSupiConfigForScope,
   loadSupiConfigSectionForScope,
   readJsonFile,
   removeSupiConfigKey,
+  replaceSupiConfigSection,
   writeSupiConfig,
 } from "./config/config.ts";

package/node_modules/@mrclrchtr/supi-core/src/debug-registry.ts

@@ -4,9 +4,6 @@
 // supi-debug extension owns policy/configuration and exposes events through a
 // command/tool while this module stays dependency-free for producers.
 
-// biome-ignore lint/performance/noReExportAll: preserve the stable debug domain entry point
-export * from "./debug-timing.ts";
-
 export type DebugLevel = "debug" | "info" | "warning" | "error";
 export type DebugAgentAccess = "off" | "sanitized" | "raw";
 export interface DebugRegistryConfig {
@@ -25,6 +22,8 @@ export const DEBUG_REGISTRY_DEFAULTS: DebugRegistryConfig = {
 };
 
 export interface DebugEventInput {
+  /** Opaque identity for events directly owned by one public Tool call. */
+  operationId?: string;
   source: string;
   level: DebugLevel;
   category: string;
@@ -42,6 +41,8 @@ export interface DebugEvent extends DebugEventInput {
 }
 
 export interface DebugEventQuery {
+  /** Match one exact Debug Operation ID. */
+  operationId?: string;
   source?: string;
   level?: DebugLevel;
   category?: string;
@@ -53,6 +54,7 @@ export interface DebugEventQuery {
 export interface DebugEventView {
   id: number;
   timestamp: number;
+  operationId?: string;
   source: string;
   level: DebugLevel;
   category: string;
@@ -84,6 +86,7 @@ interface DebugRegistryState {
 }
 
 const REGISTRY_KEY = Symbol.for("@mrclrchtr/supi-core/debug-registry");
+const DEBUG_OPERATION_ID_RE = /^op-[A-Za-z0-9_-]{21}[AQgw]$/;
 const SECRET_KEY_RE = /(?:token|password|passwd|secret|api[_-]?key|authorization|credential)/i;
 const ENV_SECRET_RE =
   /\b([A-Za-z0-9_]*(?:token|password|passwd|secret|api[_-]?key|authorization|credential)[A-Za-z0-9_]*)=(?:'[^']*'|"[^"]*"|\S+)/gi;
@@ -135,11 +138,17 @@ export function isDebugLevel(value: unknown): value is DebugLevel {
   return value === "debug" || value === "info" || value === "warning" || value === "error";
 }
 
-/** Match a debug event against the supported source, level, and category filters. */
+/** Return whether a value has the exact 16-byte base64url Debug Operation ID form. */
+export function isDebugOperationId(value: unknown): value is string {
+  return typeof value === "string" && DEBUG_OPERATION_ID_RE.test(value);
+}
+
+/** Match a debug event against the supported exact filters. */
 export function matchesDebugEventQuery(
-  event: Pick<DebugEventView, "source" | "level" | "category">,
-  query: Pick<DebugEventQuery, "source" | "level" | "category">,
+  event: Pick<DebugEventView, "operationId" | "source" | "level" | "category">,
+  query: Pick<DebugEventQuery, "operationId" | "source" | "level" | "category">,
 ): boolean {
+  if (query.operationId && event.operationId !== query.operationId) return false;
   if (query.source && event.source !== query.source) return false;
   if (query.level && event.level !== query.level) return false;
   if (query.category && event.category !== query.category) return false;
@@ -197,6 +206,7 @@ function toSanitizedView(event: DebugEvent): DebugEventView {
   return {
     id: event.id,
     timestamp: event.timestamp,
+    operationId: event.operationId,
     source: event.source,
     level: event.level,
     category: event.category,
@@ -216,6 +226,9 @@ export function subscribeDebugEvents(listener: DebugEventListener): () => void {
 /** Record a session-local debug event if debugging is enabled. */
 export function recordDebugEvent(input: DebugEventInput): DebugEvent | null {
   const state = getState();
+  if (input.operationId !== undefined && !isDebugOperationId(input.operationId)) {
+    return null;
+  }
   if (!state.config.enabled) {
     return null;
   }

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

@@ -0,0 +1,9 @@
+// Debug domain entry for `@mrclrchtr/supi-core/debug`.
+//
+// Kept separate from debug-registry.ts so debug-timing.ts can import the
+// registry without creating an import cycle through the barrel re-export.
+
+// biome-ignore lint/performance/noReExportAll: preserve the stable debug domain entry point
+export * from "./debug-registry.ts";
+// biome-ignore lint/performance/noReExportAll: preserve the stable debug domain entry point
+export * from "./debug-timing.ts";

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

@@ -11,7 +11,7 @@ export * from "./config.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./context.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./debug-registry.ts";
+export * from "./debug.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./footer-registry.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel

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

@@ -41,7 +41,10 @@ export interface SettingsApplyResult {
  */
 export interface SettingsModule {
   id: string;
+  /** Human-readable section label shown in the UI. */
   label: string;
+  /** Optional label that groups this module within its section. */
+  subsection?: string;
   read(context: SettingsContext): Promise<SettingsSnapshot>;
   apply(request: SettingsActionRequest): Promise<SettingsApplyResult>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-settings",
-  "version": "4.10.0",
+  "version": "6.0.0",
   "description": "One project/global settings UI for SuPi packages",
   "license": "MIT",
   "repository": {
@@ -30,7 +30,7 @@
     "!__tests__"
   ],
   "dependencies": {
-    "@mrclrchtr/supi-core": "4.10.0"
+    "@mrclrchtr/supi-core": "6.0.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-core"

package/src/ui/scoped-settings-list.ts

@@ -1,5 +1,3 @@
-// Source-aware settings list with scope actions and custom submenus.
-
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { Input, Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import type { SettingsAction, SettingsModule, SettingsScope } from "@mrclrchtr/supi-core/settings";
@@ -13,7 +11,7 @@ import { renderDescriptionViewport } from "./settings-list-layout.ts";
 import { type LoadedSettingsModule, readSettingsModules } from "./settings-module-reader.ts";
 import {
   filterSettingsRows,
-  maxVisibleSectionCount,
+  maxVisibleHeaderCount,
   rowsFromModules,
   type ScopedRow,
 } from "./settings-row-model.ts";
@@ -66,7 +64,6 @@ export class ScopedSettingsList {
     this.onError = onError;
     this.rebuildRows(initial);
   }
-
   async reload(scope: SettingsScope, cwd: string, ctx?: ExtensionContext): Promise<void> {
     this.scope = scope;
     this.cwd = cwd;
@@ -89,12 +86,10 @@ export class ScopedSettingsList {
   hasOpenSubmenu(): boolean {
     return this.submenu !== null || this.actionPending;
   }
-
   invalidate(): void {
     this.cachedWidth = undefined;
     this.cachedLines = undefined;
   }
-
   render(width: number): string[] {
     if (this.cachedLines && this.cachedWidth === width) return this.cachedLines;
     if (this.submenu) {
@@ -106,7 +101,6 @@ export class ScopedSettingsList {
     this.cachedLines = this.renderList(width);
     return this.cachedLines;
   }
-
   // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: One pass handles filtering, grouping, selection, scrolling, and descriptions.
   private renderList(width: number): string[] {
     const lines: string[] = [];
@@ -137,7 +131,8 @@ export class ScopedSettingsList {
       Math.max(...displayRows.map((row) => visibleWidth(row.field.field.label))),
     );
     let previousSection: string | undefined;
-    let visibleSectionCount = 0;
+    let previousSubsection: string | undefined;
+    let visibleHeaderCount = 0;
     for (let i = start; i < end; i++) {
       const row = displayRows[i];
       if (!row) continue;
@@ -145,22 +140,33 @@ export class ScopedSettingsList {
         lines.push(
           truncateToWidth(`  ${this.theme.fg("muted", this.theme.bold(row.moduleLabel))}`, width),
         );
-        visibleSectionCount++;
+        visibleHeaderCount++;
         previousSection = row.moduleLabel;
+        previousSubsection = undefined;
+      }
+      if (row.subsectionLabel !== previousSubsection) {
+        previousSubsection = row.subsectionLabel;
+        if (row.subsectionLabel) {
+          lines.push(truncateToWidth(`    ${this.theme.fg("dim", row.subsectionLabel)}`, width));
+          visibleHeaderCount++;
+        }
       }
       const isSelected = i === this.selectedIndex;
-      const prefix = isSelected ? `  ${this.theme.fg("accent", "→ ")}` : "    ";
+      const indent = row.subsectionLabel ? 6 : 4;
+      const prefix = isSelected
+        ? `${" ".repeat(indent - 2)}${this.theme.fg("accent", "→ ")}`
+        : " ".repeat(indent);
       const label = row.field.field.label.padEnd(
         row.field.field.label.length + maxLabelWidth - visibleWidth(row.field.field.label),
       );
       const labelText = this.theme.fg(isSelected ? "accent" : "text", label);
-      const valueWidth = Math.max(0, width - 4 - maxLabelWidth - 2);
+      const valueWidth = Math.max(0, width - indent - maxLabelWidth - 2);
       const value = truncateToWidth(row.field.displayValue, valueWidth, "");
       const valueText = this.theme.fg(isSelected ? "accent" : "muted", value);
       lines.push(truncateToWidth(`${prefix}${labelText}  ${valueText}`, width));
     }
-    const reservedSectionCount = maxVisibleSectionCount(displayRows, maxVisible);
-    for (let i = visibleSectionCount; i < reservedSectionCount; i++) lines.push("");
+    const reservedHeaderCount = maxVisibleHeaderCount(displayRows, maxVisible);
+    for (let i = visibleHeaderCount; i < reservedHeaderCount; i++) lines.push("");
     if (start > 0 || end < displayRows.length) {
       lines.push(this.theme.fg("dim", `  (${this.selectedIndex + 1}/${displayRows.length})`));
     }

package/src/ui/settings-row-model.ts

@@ -4,29 +4,44 @@ import type { LoadedSettingsModule } from "./settings-module-reader.ts";
 export interface ScopedRow {
   flatId: string;
   moduleLabel: string;
+  subsectionLabel?: string;
   field: ScopedFieldValue;
 }
 
 export function rowsFromModules(loaded: LoadedSettingsModule[]): ScopedRow[] {
-  return loaded.flatMap(({ module, snapshot }) =>
-    snapshot.rows.map((field) => ({
-      flatId: `${module.id}.${field.field.key}`,
-      moduleLabel: module.label,
-      field,
-    })),
-  );
+  const rowsByModuleLabel = new Map<string, ScopedRow[]>();
+  for (const { module, snapshot } of loaded) {
+    const rows = rowsByModuleLabel.get(module.label) ?? [];
+    rows.push(
+      ...snapshot.rows.map((field) => ({
+        flatId: `${module.id}.${field.field.key}`,
+        moduleLabel: module.label,
+        subsectionLabel: module.subsection,
+        field,
+      })),
+    );
+    rowsByModuleLabel.set(module.label, rows);
+  }
+  return [...rowsByModuleLabel.values()].flat();
 }
 
-/** Return the largest section-header count for any row window of the given size. */
-export function maxVisibleSectionCount(rows: ScopedRow[], windowSize: number): number {
+/** Return the largest group-header count for any row window of the given size. */
+export function maxVisibleHeaderCount(rows: ScopedRow[], windowSize: number): number {
   let maximum = 0;
   for (let start = 0; start <= rows.length - windowSize; start++) {
     let count = 0;
     let previousSection: string | undefined;
+    let previousSubsection: string | undefined;
     for (const row of rows.slice(start, start + windowSize)) {
-      if (row.moduleLabel === previousSection) continue;
-      count++;
-      previousSection = row.moduleLabel;
+      if (row.moduleLabel !== previousSection) {
+        count++;
+        previousSection = row.moduleLabel;
+        previousSubsection = undefined;
+      }
+      if (row.subsectionLabel !== previousSubsection) {
+        previousSubsection = row.subsectionLabel;
+        if (row.subsectionLabel) count++;
+      }
     }
     maximum = Math.max(maximum, count);
   }
@@ -39,6 +54,7 @@ export function filterSettingsRows(rows: ScopedRow[], query: string): ScopedRow[
   return rows.filter(
     (row) =>
       row.moduleLabel.toLowerCase().includes(normalized) ||
+      row.subsectionLabel?.toLowerCase().includes(normalized) ||
       row.field.field.label.toLowerCase().includes(normalized) ||
       row.field.field.key.toLowerCase().includes(normalized) ||
       row.field.displayValue.toLowerCase().includes(normalized),