@mrclrchtr/supi-code-intelligence 4.7.0 → 4.9.0

package/src/analysis/search/pattern.ts

@@ -1,51 +1,33 @@
-import type {
-  CodeResult,
-  OutlineData,
-  StructuralProvider as StructuralSubstrate,
-} from "@mrclrchtr/supi-code-runtime/api";
+import type { StructuralProvider as StructuralSubstrate } from "@mrclrchtr/supi-code-runtime/api";
 import type { StructuralSearchOperation } from "@mrclrchtr/supi-tree-sitter/api";
 import type { CodeFindAstKind } from "../../tool/find/ast-kinds.ts";
 import type { EvidencePartialReason } from "../evidence.ts";
 import {
   type AstScanExclusion,
-  type AstScanLimitation,
   type AstScanOperations,
   type AstScanPolicy,
   DEFAULT_AST_SCAN_MAX_FILES,
   DEFAULT_AST_SCAN_TIMEOUT_MS,
   enumerateAstFiles,
 } from "./ast-scan.ts";
-import { callableExpressionForMatching } from "./call-name.ts";
-import { settleByDeadline } from "./deadline.ts";
+import { startAstScanTimer } from "./ast-scan-timing.ts";
 import { relativeDisplayPath } from "./paths.ts";
-
-export interface StructuredPatternParams {
-  readonly pattern: string;
-  readonly kind: CodeFindAstKind;
-}
-
-export interface StructuredMatch {
-  readonly file: string;
-  readonly name: string;
-  readonly kind: string;
-  readonly line: number;
-}
-
-export type StructuredFailureKind = Exclude<CodeResult<never>, { kind: "success" }>["kind"];
-
-export interface StructuredFailure {
-  readonly file: string;
-  readonly kind: StructuredFailureKind;
-  readonly reason: string;
-}
-
-export type StructuredScanLimitation = AstScanLimitation | ProviderScanLimitation;
-
-export interface ProviderScanLimitation {
-  readonly reason: "provider-failure";
-  readonly pathCount: number;
-  readonly examples: readonly string[];
-}
+import {
+  analyzeStructuredFiles,
+  type StructuredFailure,
+  type StructuredMatch,
+  type StructuredPatternParams,
+  type StructuredScanLimitation,
+} from "./pattern-analysis.ts";
+
+export type {
+  ProviderScanLimitation,
+  StructuredFailure,
+  StructuredFailureKind,
+  StructuredMatch,
+  StructuredPatternParams,
+  StructuredScanLimitation,
+} from "./pattern-analysis.ts";
 
 /** Structured completeness state for the AST source-file scan. */
 export interface StructuredScanSummary {
@@ -98,6 +80,7 @@ export interface StructuredPatternSearchOptions {
 export async function getStructuredPatternMatches(
   options: StructuredPatternSearchOptions,
 ): Promise<StructuredPatternOutcome> {
+  const scanTimer = startAstScanTimer();
   const now = options.control?.now ?? Date.now;
   const maxFiles = options.control?.maxFiles ?? DEFAULT_AST_SCAN_MAX_FILES;
   const timeoutMs = options.control?.timeoutMs ?? DEFAULT_AST_SCAN_TIMEOUT_MS;
@@ -143,6 +126,7 @@ export async function getStructuredPatternMatches(
     };
   }
 
+  scanTimer.enumerationCompleted();
   const analysis = await analyzeStructuredFiles({
     files: enumeration.files,
     displayBase: enumeration.displayBase,
@@ -156,13 +140,14 @@ export async function getStructuredPatternMatches(
   const capabilityMismatches = analysis.failures.filter(
     (failure) => failure.kind === "unsupported-language",
   );
+  const complete = enumeration.complete && analysis.limitations.length === 0;
+  scanTimer.record({ context: options, operation, roots, enumeration, analysis, complete });
   if (capabilityMismatches.length > 0) {
     return {
       kind: "unavailable",
       reason: `Structural provider rejected ${capabilityMismatches.length} file${capabilityMismatches.length === 1 ? "" : "s"} declared eligible for ${operation} analysis.`,
     };
   }
-  const complete = enumeration.complete && analysis.limitations.length === 0;
   return {
     kind: "completed",
     result: {
@@ -183,92 +168,6 @@ export async function getStructuredPatternMatches(
   };
 }
 
-interface AnalyzeStructuredFilesOptions {
-  readonly files: readonly string[];
-  readonly displayBase: string;
-  readonly params: StructuredPatternParams;
-  readonly structural: StructuralSubstrate;
-  readonly deadline: number;
-  readonly now: () => number;
-  readonly signal?: AbortSignal;
-  readonly initialLimitations: readonly AstScanLimitation[];
-}
-
-async function analyzeStructuredFiles(options: AnalyzeStructuredFilesOptions): Promise<{
-  matches: StructuredMatch[];
-  failures: StructuredFailure[];
-  limitations: StructuredScanLimitation[];
-  analyzedFileCount: number;
-}> {
-  const matches: StructuredMatch[] = [];
-  const failures: StructuredFailure[] = [];
-  const limitations: StructuredScanLimitation[] = [...options.initialLimitations];
-  const matcher = createStructuredMatcher(options.params.pattern);
-  let analyzedFileCount = 0;
-
-  for (const [index, absoluteFile] of options.files.entries()) {
-    options.signal?.throwIfAborted();
-    if (options.now() > options.deadline) {
-      addAnalysisTimeout(limitations, options.files.slice(index), options.displayBase);
-      break;
-    }
-    const relativeFile = relativeDisplayPath(options.displayBase, absoluteFile);
-    const fileMatches: StructuredMatch[] = [];
-    const fileFailures: StructuredFailure[] = [];
-    const outcome = await settleByDeadline(
-      async () => {
-        try {
-          await collectMatchesForFile(
-            fileMatches,
-            fileFailures,
-            options.structural,
-            relativeFile,
-            options.params.kind,
-            matcher,
-          );
-        } catch (error) {
-          fileFailures.push({
-            file: relativeFile,
-            kind: "runtime-error",
-            reason: errorMessage(error),
-          });
-        }
-      },
-      { deadline: options.deadline, now: options.now, signal: options.signal },
-    );
-    if (outcome.kind === "timeout") {
-      addAnalysisTimeout(limitations, options.files.slice(index), options.displayBase);
-      break;
-    }
-    options.signal?.throwIfAborted();
-    matches.push(...fileMatches);
-    failures.push(...fileFailures);
-    if (fileFailures.length === 0) analyzedFileCount += 1;
-  }
-
-  if (failures.length > 0) {
-    limitations.push({
-      reason: "provider-failure",
-      pathCount: failures.length,
-      examples: failures.slice(0, 5).map((failure) => failure.file),
-    });
-  }
-  return { matches, failures, limitations, analyzedFileCount };
-}
-
-function addAnalysisTimeout(
-  limitations: StructuredScanLimitation[],
-  remainingFiles: readonly string[],
-  cwd: string,
-): void {
-  if (limitations.some((limitation) => limitation.reason === "timeout")) return;
-  limitations.push({
-    reason: "timeout",
-    pathCount: remainingFiles.length,
-    examples: remainingFiles.slice(0, 5).map((file) => relativeDisplayPath(cwd, file)),
-  });
-}
-
 function primaryPartialReason(
   limitations: readonly StructuredScanLimitation[],
 ): EvidencePartialReason {
@@ -282,94 +181,6 @@ function primaryPartialReason(
   return "provider-limited";
 }
 
-// biome-ignore lint/complexity/useMaxParams: helper takes explicit collection inputs to avoid intermediate objects in the hot path
-// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: kind-specific tree-sitter matching is clearest as one helper
-async function collectMatchesForFile(
-  matches: StructuredMatch[],
-  failures: StructuredFailure[],
-  structural: StructuralSubstrate,
-  relFile: string,
-  kind: CodeFindAstKind,
-  matcher: (value: string) => boolean,
-): Promise<void> {
-  const recordFailure = (kind: StructuredFailureKind, reason: string) => {
-    failures.push({ file: relFile, kind, reason });
-  };
-
-  if (kind === "definition") {
-    const outline = await structural.outline(relFile);
-    if (!handleStructuralResult(outline, recordFailure)) return;
-    for (const item of flattenOutlineItems(outline.data)) {
-      if (!matcher(item.name)) continue;
-      matches.push({ file: relFile, name: item.name, kind: item.kind, line: item.startLine });
-    }
-    return;
-  }
-
-  if (kind === "export") {
-    const exportsResult = await structural.exports(relFile);
-    if (!handleStructuralResult(exportsResult, recordFailure)) return;
-    for (const item of exportsResult.data) {
-      if (!matcher(item.name)) continue;
-      matches.push({ file: relFile, name: item.name, kind: item.kind, line: item.startLine });
-    }
-    return;
-  }
-
-  if (kind === "import") {
-    const importsResult = await structural.imports(relFile);
-    if (!handleStructuralResult(importsResult, recordFailure)) return;
-    for (const item of importsResult.data) {
-      if (!matcher(item.moduleSpecifier)) continue;
-      matches.push({
-        file: relFile,
-        name: item.moduleSpecifier,
-        kind: "import",
-        line: item.startLine,
-      });
-    }
-    return;
-  }
-
-  if (kind === "call") {
-    const callResult = await structural.callSites(relFile);
-    if (!handleStructuralResult(callResult, recordFailure)) return;
-    for (const call of callResult.data) {
-      if (!matcher(callableExpressionForMatching(call.name))) continue;
-      matches.push({ file: relFile, name: call.name, kind: "call", line: call.startLine });
-    }
-    return;
-  }
-
-  const outline = await structural.outline(relFile);
-  if (!handleStructuralResult(outline, recordFailure)) return;
-  for (const item of flattenOutlineItems(outline.data)) {
-    if (kind === "type" && !TYPE_KIND.test(item.kind.toLowerCase())) continue;
-    if (kind === "interface" && item.kind.toLowerCase() !== "interface") continue;
-    if (kind === "class" && item.kind.toLowerCase() !== "class") continue;
-    if (kind === "method" && item.kind.toLowerCase() !== "method") continue;
-    if (kind === "enum" && item.kind.toLowerCase() !== "enum") continue;
-    if (!matcher(item.name)) continue;
-    matches.push({ file: relFile, name: item.name, kind: item.kind, line: item.startLine });
-  }
-}
-
-/** Flatten provider outlines so nested class/interface/enum declarations remain searchable. */
-function flattenOutlineItems(items: readonly OutlineData[]): OutlineData[] {
-  return items.flatMap((item) => [item, ...flattenOutlineItems(item.children ?? [])]);
-}
-
-function handleStructuralResult<T>(
-  result: CodeResult<T>,
-  recordFailure: (kind: StructuredFailureKind, reason: string) => void,
-): result is { kind: "success"; data: T } {
-  if (result.kind === "success") return true;
-  recordFailure(result.kind, result.message);
-  return false;
-}
-
-const TYPE_KIND = /^(?:class|interface|type|enum|struct|union|record|object|concept)$/;
-
 const AST_KIND_OPERATIONS = {
   definition: "outline",
   import: "imports",
@@ -385,16 +196,3 @@ const AST_KIND_OPERATIONS = {
 function structuralOperationForKind(kind: CodeFindAstKind): StructuralSearchOperation {
   return AST_KIND_OPERATIONS[kind];
 }
-
-function createStructuredMatcher(pattern: string): (value: string) => boolean {
-  const ignoreCase = !/[A-Z]/.test(pattern);
-  const needle = ignoreCase ? pattern.toLowerCase() : pattern;
-  return (value: string) => {
-    const haystack = ignoreCase ? value.toLowerCase() : value;
-    return haystack.includes(needle);
-  };
-}
-
-function errorMessage(error: unknown): string {
-  return error instanceof Error ? error.message : "Structural provider failed.";
-}

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);