@mrclrchtr/supi-code-intelligence 4.7.0 → 4.8.0

package/src/config.ts

@@ -2,7 +2,7 @@
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { loadSupiConfig } from "@mrclrchtr/supi-core/config";
-import { registerDeclarativeSettings } from "@mrclrchtr/supi-core/settings";
+import { defineConfigSettings, registerSettings } from "@mrclrchtr/supi-core/settings";
 
 const CODE_INTELLIGENCE_SECTION = "code-intelligence";
 
@@ -24,19 +24,22 @@ export function loadCodeIntelligenceConfig(cwd: string, homeDir?: string): CodeI
 
 /** Register code-intelligence settings with the shared SuPi settings registry. */
 export function registerCodeIntelligenceSettings(pi: ExtensionAPI, homeDir?: string): void {
-  registerDeclarativeSettings(pi, {
-    id: CODE_INTELLIGENCE_SECTION,
-    label: "Code Intelligence",
-    section: CODE_INTELLIGENCE_SECTION,
-    defaults: CODE_INTELLIGENCE_DEFAULTS,
-    fields: [
-      {
-        kind: "stringList" as const,
-        key: "instructionFileNames",
-        label: "Instruction File Names",
-        description: "Directory-local instruction file names shown by directory orientation",
-      },
-    ],
-    ...(homeDir ? { homeDir } : {}),
-  });
+  registerSettings(
+    pi,
+    defineConfigSettings({
+      id: CODE_INTELLIGENCE_SECTION,
+      label: "Code Intelligence",
+      section: CODE_INTELLIGENCE_SECTION,
+      defaults: CODE_INTELLIGENCE_DEFAULTS,
+      fields: [
+        {
+          kind: "stringList" as const,
+          key: "instructionFileNames",
+          label: "Instruction File Names",
+          description: "Directory-local instruction file names shown by directory orientation",
+        },
+      ],
+      ...(homeDir ? { homeDir } : {}),
+    }),
+  );
 }

package/src/substrate/lsp/settings.ts

@@ -6,7 +6,7 @@
 //
 // Registered fields:
 // - exclude: stringList
-// - disabled_servers: custom submenu that writes per-language disable config
+// - disabled_servers: custom submenu whose module action writes per-language disable config
 
 import { type ExtensionAPI, getSettingsListTheme } from "@earendil-works/pi-coding-agent";
 import type { Component, SettingItem } from "@earendil-works/pi-tui";
@@ -14,7 +14,8 @@ import { Container, Key, matchesKey, SettingsList, Text } from "@earendil-works/
 
 import { loadSupiConfigSectionForScope, writeSupiConfig } from "@mrclrchtr/supi-core/config";
 import {
-  registerDeclarativeSettings,
+  defineConfigSettings,
+  registerSettings,
   type SettingsScope,
   type ValueSource,
 } from "@mrclrchtr/supi-core/settings";
@@ -94,34 +95,16 @@ function createDisabledServersSubmenu(
   return {
     render: (width: number) => container.render(width),
     invalidate: () => container.invalidate(),
-    // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: single event handler for the submenu
     handleInput: (data: string) => {
       if (matchesKey(data, Key.escape)) {
         if (!dirty) {
           done();
           return;
         }
-        // Write per-language enabled/disabled into lsp.servers
-        const currentSection = loadSupiConfigSectionForScope("lsp", cwd, { scope });
-        const servers =
-          (currentSection?.servers as Record<string, Record<string, unknown>> | undefined) ?? {};
-
-        for (const item of items) {
-          if (item.currentValue === "disabled") {
-            servers[item.id] = { ...(servers[item.id] ?? {}), enabled: false };
-          } else {
-            const srv = servers[item.id];
-            if (srv) {
-              delete srv.enabled;
-              if (Object.keys(srv).length === 0) {
-                delete servers[item.id];
-              }
-            }
-          }
-        }
-
-        writeSupiConfig({ section: "lsp", scope, cwd }, { servers });
-        done("saved");
+        const disabled = items
+          .filter((item) => item.currentValue === "disabled")
+          .map((item) => item.id);
+        done(JSON.stringify(disabled));
         return;
       }
       settingsList.handleInput?.(data);
@@ -129,75 +112,91 @@ function createDisabledServersSubmenu(
   };
 }
 
+/** Persist the complete disabled-server choice through the settings module action path. */
+function persistDisabledServers(
+  scope: SettingsScope,
+  cwd: string,
+  value: string | undefined,
+): void {
+  const selected = value ? JSON.parse(value) : [];
+  if (!Array.isArray(selected) || !selected.every((item) => typeof item === "string")) {
+    throw new Error("Invalid disabled-server selection");
+  }
+  const disabled = new Set<string>(selected);
+  const currentSection = loadSupiConfigSectionForScope("lsp", cwd, { scope });
+  const servers =
+    (currentSection?.servers as Record<string, Record<string, unknown>> | undefined) ?? {};
+  const names = new Set([...Object.keys(servers), ...getConfiguredServers(cwd)]);
+  for (const name of names) {
+    if (disabled.has(name)) {
+      servers[name] = { ...(servers[name] ?? {}), enabled: false };
+      continue;
+    }
+    const server = servers[name];
+    if (!server) continue;
+    delete server.enabled;
+    if (Object.keys(server).length === 0) delete servers[name];
+  }
+  writeSupiConfig({ section: "lsp", scope, cwd }, { servers });
+}
+
 export function registerLspSettings(pi: ExtensionAPI): void {
-  registerDeclarativeSettings(pi, {
-    id: "lsp",
-    label: "LSP",
-    section: "lsp",
-    defaults: LSP_DEFAULTS,
-    fields: [
-      {
-        kind: "stringList" as const,
-        key: "exclude",
-        label: "Exclude Patterns",
-        description: "Gitignore patterns to suppress LSP diagnostics (comma-separated)",
-      },
-      {
-        kind: "custom" as const,
-        key: "disabled_servers",
-        label: "Disabled Servers",
-        description: "Press Enter to choose which language servers to disable",
-        resolve: (scope, cwd) => {
-          const scopedDisabled = getDisabledServersFromConfig(scope, cwd);
-          const otherScope = scope === "project" ? "global" : "project";
-          const otherDisabled =
-            scope === "project" ? getDisabledServersFromConfig("global", cwd) : new Set<string>();
-
-          // Effective disabled servers = union of both scopes (since either disables)
-          const effectiveDisabled = new Set([...scopedDisabled, ...otherDisabled]);
-          const label =
-            effectiveDisabled.size > 0 ? [...effectiveDisabled].sort().join(", ") : "none disabled";
-
-          // Source: where the override comes from
-          let source: ValueSource;
-          if (scopedDisabled.size > 0) {
-            source = scope;
-          } else if (otherDisabled.size > 0) {
-            source = otherScope as ValueSource;
-          } else {
-            source = "default";
-          }
-
-          let inheritanceSource: "global" | "default" | undefined;
-          if (scope === "project" && source === "project") {
-            inheritanceSource =
-              getDisabledServersFromConfig("global", cwd).size > 0 ? "global" : "default";
-          }
-
-          return { displayValue: label, source, inheritanceSource };
+  registerSettings(
+    pi,
+    defineConfigSettings({
+      id: "lsp",
+      label: "LSP",
+      section: "lsp",
+      defaults: LSP_DEFAULTS,
+      fields: [
+        {
+          kind: "stringList" as const,
+          key: "exclude",
+          label: "Exclude Patterns",
+          description: "Gitignore patterns to suppress LSP diagnostics (comma-separated)",
         },
-        submenu: (_currentValue, done, scope, cwd) =>
-          createDisabledServersSubmenu(scope, cwd, done),
-        // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: custom field persist handler orchestrates nested config writes
-        persist: (scope, cwd, action, _helpers) => {
-          if (action.kind === "inherit" || action.kind === "resetToDefault") {
-            // Clear all per-server enable/disable entries for this scope
-            const currentSection = loadSupiConfigSectionForScope("lsp", cwd, { scope });
-            const servers =
-              (currentSection?.servers as Record<string, Record<string, unknown>> | undefined) ??
-              {};
-            for (const name of Object.keys(servers)) {
-              const srv = servers[name];
-              if (srv) {
-                delete srv.enabled;
-                if (Object.keys(srv).length === 0) delete servers[name];
-              }
+        {
+          kind: "custom" as const,
+          key: "disabled_servers",
+          label: "Disabled Servers",
+          description: "Press Enter to choose which language servers to disable",
+          resolve: (scope, cwd) => {
+            const scopedDisabled = getDisabledServersFromConfig(scope, cwd);
+            const otherScope = scope === "project" ? "global" : "project";
+            const otherDisabled =
+              scope === "project" ? getDisabledServersFromConfig("global", cwd) : new Set<string>();
+
+            // Effective disabled servers = union of both scopes (since either disables)
+            const effectiveDisabled = new Set([...scopedDisabled, ...otherDisabled]);
+            const label =
+              effectiveDisabled.size > 0
+                ? [...effectiveDisabled].sort().join(", ")
+                : "none disabled";
+
+            // Source: where the override comes from
+            let source: ValueSource;
+            if (scopedDisabled.size > 0) {
+              source = scope;
+            } else if (otherDisabled.size > 0) {
+              source = otherScope as ValueSource;
+            } else {
+              source = "default";
+            }
+
+            let inheritanceSource: "global" | "default" | undefined;
+            if (scope === "project" && source === "project") {
+              inheritanceSource =
+                getDisabledServersFromConfig("global", cwd).size > 0 ? "global" : "default";
             }
-            writeSupiConfig({ section: "lsp", scope, cwd }, { servers });
-          }
-          // Explicit set actions are handled entirely inside the submenu
+
+            return { displayValue: label, source, inheritanceSource };
+          },
+          submenu: (_currentValue, done, scope, cwd) =>
+            createDisabledServersSubmenu(scope, cwd, done),
+          persist: (scope, cwd, action) =>
+            persistDisabledServers(scope, cwd, action.kind === "set" ? action.value : undefined),
         },
-      },
-    ],
-  });
+      ],
+    }),
+  );
 }

package/src/tool/find/execute.ts

@@ -2,8 +2,8 @@
 
 import type { FindMode, FindWorkflowInput } from "../../session/find-types.ts";
 import type { CodeIntelResult, CodeIntelToolExecCtx } from "../../types/index.ts";
-import { unavailableSearchDetails } from "../infra/error-results.ts";
 import { toWorkflowControl } from "../infra/workflow-control.ts";
+import { searchErrorResult } from "../result/errors.ts";
 import { assembleFindWorkflowResult } from "../result/find.ts";
 import type { CodeFindAstKind } from "./ast-kinds.ts";
 import { renderFindResult } from "./render.ts";
@@ -23,13 +23,10 @@ export async function executeFindTool(
   const outcome = await ctx.session.find(params as FindWorkflowInput, toWorkflowControl(ctx));
   if (outcome.kind === "unavailable") throw new Error(outcome.reason);
   if (outcome.kind === "invalid-input") {
-    return {
-      content: `**Error:** ${outcome.message}`,
-      details: unavailableSearchDetails(
-        Array.isArray(params?.scope) ? params.scope.join(", ") : null,
-        ["Fix the search input and retry"],
-      ),
-    };
+    return searchErrorResult(`**Error:** ${outcome.message}`, {
+      scope: Array.isArray(params?.scope) ? params.scope.join(", ") : null,
+      nextQueries: ["Fix the search input and retry"],
+    });
   }
 
   const assembly = assembleFindWorkflowResult(outcome);

package/src/tool/graph/execute.ts

@@ -3,8 +3,8 @@
 import type { GraphWorkflowInput, RequestedGraphRelation } from "../../session/graph-types.ts";
 import type { GraphTargetInput } from "../../session/target-input.ts";
 import type { CodeIntelResult, CodeIntelToolExecCtx } from "../../types/index.ts";
-import { searchErrorResult } from "../infra/error-results.ts";
 import { toWorkflowControl } from "../infra/workflow-control.ts";
+import { searchErrorResult } from "../result/errors.ts";
 import { assembleGraphResult } from "../result/graph.ts";
 import { renderGraphResult } from "./markdown.ts";
 

package/src/tool/health/execute.ts

@@ -2,8 +2,8 @@
 
 import type { HealthSection, HealthWorkflowInput } from "../../session/health-types.ts";
 import type { CodeIntelResult, CodeIntelToolExecCtx } from "../../types/index.ts";
-import { unavailableHealthDetails } from "../infra/error-results.ts";
 import { toWorkflowControl } from "../infra/workflow-control.ts";
+import { healthErrorResult } from "../result/errors.ts";
 import { assembleHealthResult } from "../result/health.ts";
 import { renderHealthResult } from "./markdown.ts";
 
@@ -21,10 +21,7 @@ export async function executeHealthTool(
   const outcome = await ctx.session.health(params as HealthWorkflowInput, toWorkflowControl(ctx));
   if (outcome.kind === "unavailable") throw new Error(outcome.reason);
   if (outcome.kind === "invalid-input") {
-    return {
-      content: `**Error:** ${outcome.message}`,
-      details: unavailableHealthDetails("invalid input"),
-    };
+    return healthErrorResult(`**Error:** ${outcome.message}`, "invalid input");
   }
 
   const assembly = assembleHealthResult(outcome.data);

package/src/tool/inspect/execute.ts

@@ -3,8 +3,8 @@
 import type { InspectWorkflowInput } from "../../session/inspect-types.ts";
 import type { SourcePointInput } from "../../session/target-input.ts";
 import type { CodeIntelResult, CodeIntelToolExecCtx } from "../../types/index.ts";
-import { unavailableInspectDetails } from "../infra/error-results.ts";
 import { toWorkflowControl } from "../infra/workflow-control.ts";
+import { inspectErrorResult } from "../result/errors.ts";
 import { assembleInspectResult } from "../result/inspect.ts";
 import { renderInspectResult } from "./markdown.ts";
 
@@ -20,12 +20,10 @@ export async function executeInspectTool(
   const outcome = await ctx.session.inspect(params as InspectWorkflowInput, toWorkflowControl(ctx));
   if (outcome.kind === "unavailable") throw new Error(outcome.reason);
   if (outcome.kind === "invalid-input") {
-    return {
-      content: `**Error:** ${outcome.message}`,
-      details: unavailableInspectDetails("invalid input", [
-        "Provide an existing file and exact 1-based point",
-      ]),
-    };
+    return inspectErrorResult(`**Error:** ${outcome.message}`, {
+      focusTarget: "invalid input",
+      nextQueries: ["Provide an existing file and exact 1-based point"],
+    });
   }
 
   const assembly = assembleInspectResult(outcome.data, outcome.nextQueries);

package/src/tool/orientation/execute.ts

@@ -5,8 +5,8 @@ import type {
   OrientationWorkflowInput,
 } from "../../session/orientation-types.ts";
 import type { CodeIntelResult, CodeIntelToolExecCtx } from "../../types/index.ts";
-import { unavailableContextDetails } from "../infra/error-results.ts";
 import { toWorkflowControl } from "../infra/workflow-control.ts";
+import { contextErrorResult } from "../result/errors.ts";
 import { assembleOrientationDetails, assembleOrientationResult } from "../result/orientation.ts";
 import { renderOrientationResult } from "./markdown.ts";
 
@@ -25,10 +25,9 @@ export async function executeOrientationTool(
   );
   if (outcome.kind === "unavailable") throw new Error(outcome.reason);
   if (outcome.kind === "invalid-input") {
-    return {
-      content: `**Error:** ${outcome.message}`,
-      details: unavailableContextDetails(["Choose an existing path, module, or precise target"]),
-    };
+    return contextErrorResult(`**Error:** ${outcome.message}`, {
+      nextQueries: ["Choose an existing path, module, or precise target"],
+    });
   }
   if (outcome.kind === "disambiguation" || outcome.kind === "kind-mismatch") {
     const candidates = outcome.candidates ?? [];

package/src/tool/refactor-apply/execute.ts

@@ -1,9 +1,9 @@
 /** Thin Pi adapter for session-owned refactor application. */
 
 import type { CodeIntelResult, CodeIntelToolExecCtx } from "../../types/index.ts";
-import { unavailableSearchDetails } from "../infra/error-results.ts";
 import { toWorkflowControl } from "../infra/workflow-control.ts";
 import { renderRefactorApplyResult } from "../refactor-plan/markdown.ts";
+import { searchErrorResult } from "../result/errors.ts";
 import { assembleRefactorApplyDetails } from "../result/refactor.ts";
 
 export interface CodeRefactorApplyToolParams {
@@ -17,10 +17,9 @@ export async function executeRefactorApplyTool(
   const outcome = await ctx.session.applyRefactor(params, toWorkflowControl(ctx));
   if (outcome.kind === "unavailable") throw new Error(outcome.reason);
   if (outcome.kind === "invalid-input") {
-    return {
-      content: `**Error:** ${outcome.message}`,
-      details: unavailableSearchDetails(null, ["Generate a fresh plan with code_refactor_plan"]),
-    };
+    return searchErrorResult(`**Error:** ${outcome.message}`, {
+      nextQueries: ["Generate a fresh plan with code_refactor_plan"],
+    });
   }
 
   const assembly = assembleRefactorApplyDetails(outcome.result, outcome.plan);

package/src/tool/refactor-plan/execute.ts

@@ -6,8 +6,8 @@ import type {
 } from "../../session/refactor-types.ts";
 import type { RefactorTargetInput } from "../../session/target-input.ts";
 import type { CodeIntelResult, CodeIntelToolExecCtx } from "../../types/index.ts";
-import { unavailableSearchDetails } from "../infra/error-results.ts";
 import { toWorkflowControl } from "../infra/workflow-control.ts";
+import { searchErrorResult } from "../result/errors.ts";
 import { assembleRefactorPlanDetails } from "../result/refactor.ts";
 import { renderRefactorPlanResult } from "./markdown.ts";
 
@@ -27,10 +27,9 @@ export async function executeRefactorPlanTool(
   );
   if (outcome.kind === "unavailable") throw new Error(outcome.reason);
   if (outcome.kind === "invalid-input") {
-    return {
-      content: `**Error:** ${outcome.message}`,
-      details: unavailableSearchDetails(null, ["Fix the target or operation and retry"]),
-    };
+    return searchErrorResult(`**Error:** ${outcome.message}`, {
+      nextQueries: ["Fix the target or operation and retry"],
+    });
   }
   if (outcome.kind === "ambiguous") {
     const candidates = outcome.candidates
@@ -39,10 +38,9 @@ export async function executeRefactorPlanTool(
           `${index + 1}. ${candidate.description} (${candidate.file}:${candidate.line})`,
       )
       .join("\n");
-    return {
-      content: `**Refactor ambiguous:**\n${candidates}`,
-      details: unavailableSearchDetails(null, ["Use a precise target handle or anchor"]),
-    };
+    return searchErrorResult(`**Refactor ambiguous:**\n${candidates}`, {
+      nextQueries: ["Use a precise target handle or anchor"],
+    });
   }
 
   const assembly = assembleRefactorPlanDetails(outcome.plan, ctx.cwd);

package/src/tool/result/errors.ts

@@ -7,16 +7,9 @@
  * capability failures may still throw so PI marks the tool call as failed.
  */
 
-import type {
-  CodeIntelResult,
-  ContextDetails,
-  HealthDetails,
-  InspectDetails,
-  ResolveDetails,
-  SearchDetails,
-} from "../../types/index.ts";
+import type { CodeIntelResult } from "../../types/index.ts";
 
-// ── Combined error-result factories (preferred) ──────────────────────
+// ── Error-result factories ──────────────────────────────────────────
 
 /** Full error result for search-family tools (code_find, code_graph, code_refactor_plan). */
 export function searchErrorResult(
@@ -60,27 +53,6 @@ export function contextErrorResult(
   };
 }
 
-/** Full error result for code_resolve. */
-export function resolveErrorResult(
-  content: string,
-  opts?: { nextQueries?: string[] },
-): CodeIntelResult {
-  return {
-    content,
-    details: {
-      type: "resolve" as const,
-      data: {
-        resultKind: "unavailable" as const,
-        confidence: "unavailable" as const,
-        targetCount: 0,
-        omittedCount: 0,
-        targets: [],
-        nextQueries: opts?.nextQueries ?? [],
-      },
-    },
-  };
-}
-
 /** Full error result for code_inspect. */
 export function inspectErrorResult(
   content: string,
@@ -131,55 +103,3 @@ export function healthErrorResult(content: string, reason?: string): CodeIntelRe
     },
   };
 }
-
-// ── Details-only helpers (thin wrappers — prefer combined factories above) ─
-
-export function unavailableSearchDetails(
-  scope: string | null,
-  nextQueries: string[],
-): { type: "search"; data: SearchDetails } {
-  return searchErrorResult("", { scope, nextQueries }).details as {
-    type: "search";
-    data: SearchDetails;
-  };
-}
-
-export function unavailableContextDetails(nextQueries: string[]): {
-  type: "context";
-  data: ContextDetails;
-} {
-  return contextErrorResult("", { nextQueries }).details as {
-    type: "context";
-    data: ContextDetails;
-  };
-}
-
-export function unavailableResolveDetails(nextQueries: string[]): {
-  type: "resolve";
-  data: ResolveDetails;
-} {
-  return resolveErrorResult("", { nextQueries }).details as {
-    type: "resolve";
-    data: ResolveDetails;
-  };
-}
-
-export function unavailableInspectDetails(
-  focusTarget: string,
-  nextQueries: string[],
-): { type: "inspect"; data: InspectDetails } {
-  return inspectErrorResult("", { focusTarget, nextQueries }).details as {
-    type: "inspect";
-    data: InspectDetails;
-  };
-}
-
-export function unavailableHealthDetails(reason: string): {
-  type: "health";
-  data: HealthDetails;
-} {
-  return healthErrorResult("", reason).details as {
-    type: "health";
-    data: HealthDetails;
-  };
-}

package/src/ui/tui/common.ts

@@ -8,7 +8,7 @@
 
 import { getMarkdownTheme, type Theme } from "@earendil-works/pi-coding-agent";
 import { Container, Markdown, Spacer, Text } from "@earendil-works/pi-tui";
-import { formatEvidenceBadge } from "@mrclrchtr/supi-code-runtime/api";
+import { formatEvidenceBadge } from "@mrclrchtr/supi-core/evidence-badge";
 
 // ── Result type ──────────────────────────────────────────────────