@mrclrchtr/supi-code-intelligence 6.0.1 → 6.1.0

package/src/session/target-workflow.ts

@@ -23,6 +23,7 @@ import type {
 } from "../analysis/target/types.ts";
 import type { CapabilityAdapter } from "./capability-adapter.ts";
 import { parseTargetInput } from "./input/common.ts";
+import { resolveWorkspaceSemanticDemand } from "./semantic-demand.ts";
 import { registerTargetCandidates, type TargetWorkflowCandidate } from "./target-candidates.ts";
 import type { TargetInput, TargetSymbolKind } from "./target-input.ts";
 import {
@@ -201,22 +202,15 @@ async function resolveSymbolWorkflow(
     scope = resolved.path;
   }
 
-  const readiness = await deps.capability.ensureSemanticReadiness(
-    deps.cwd,
-    { kind: "workspace" },
-    control,
-  );
-  if (readiness.kind === "timeout") {
+  const semanticDemand = await resolveWorkspaceSemanticDemand(deps.capability, deps.cwd, control);
+  if (semanticDemand.kind === "timeout") {
     return { kind: "unavailable", reason: "LSP readiness timed out. Retry shortly." };
   }
-  if (readiness.kind === "unavailable") {
-    return { kind: "unavailable", reason: readiness.reason };
+  if (semanticDemand.kind === "unavailable") {
+    return { kind: "unavailable", reason: semanticDemand.reason };
   }
 
-  const provider = withSemanticRequestControl(
-    deps.capability.getSemanticProvider(deps.cwd),
-    control,
-  );
+  const provider = withSemanticRequestControl(semanticDemand.provider, control);
   if (!provider) {
     return {
       kind: "unavailable",
@@ -291,6 +285,9 @@ function toWorkflowOutcome(
   policy: TargetWorkflowPolicy,
   deps: TargetWorkflowDeps,
 ): TargetWorkflowOutcome {
+  if (outcome.kind === "unavailable") {
+    return { kind: "unavailable", reason: outcome.reason };
+  }
   if (outcome.kind === "error") {
     return { kind: "invalid-input", message: outcome.message };
   }

package/src/tool/code_health/guidance.ts

@@ -1,8 +1,8 @@
 export const toolDescription =
-  "Report live diagnostics as observations, language-server status, and final semantic health state. Tracked-file snapshots do not prove workspace completeness; server inventory is workspace-wide.";
+  "Report live diagnostics as observations, language-server route status, and final semantic health state. Tracked-file snapshots do not prove workspace completeness; server inventory and route issue counts are workspace-wide. Server-only calls are passive.";
 
 export const promptSnippet = "live workspace health observations";
 
 export const promptGuidelines = [
-  "Use code_health with refresh:true before relying on potentially stale diagnostics.",
+  "Use code_health with refresh:true before relying on potentially stale diagnostics; explicit refresh can recover crashed routes with tracked files in scope.",
 ];

package/src/tool/code_health/markdown.ts

@@ -6,6 +6,11 @@
  */
 
 import type { CapabilityWarningReport } from "../../analysis/capability/capability-warnings.ts";
+import {
+  formatProjectServerRoot,
+  formatProjectServerRouteSummary,
+  formatProjectServerStatusReason,
+} from "../../analysis/health/server-status.ts";
 import type {
   HealthData,
   HealthDiagnosticObservation,
@@ -28,7 +33,9 @@ export function renderHealthResult(result: HealthResultAssembly, cwd: string): s
   renderRefreshStatus(lines, data, hasDiagnostics, cwd);
   if (hasDiagnostics) renderDiagnosticsSection(lines, data, cwd);
   if (semanticRequested) renderCapabilityWarningsSection(lines, result.details.capabilityWarnings);
-  if (hasSection("servers")) renderServersSection(lines, data, sectionStatus(result, "servers"));
+  if (hasSection("servers")) {
+    renderServersSection(lines, data, sectionStatus(result, "servers"), cwd);
+  }
   return lines.join("\n");
 }
 
@@ -158,7 +165,8 @@ function renderCapabilityWarningsSection(
 function renderStatusLine(lines: string[], data: HealthData, semanticRequested: boolean): void {
   if (!semanticRequested) return;
 
-  lines.push(`**LSP**: ${displaySemanticStatus(data)}`);
+  const routeSummary = formatProjectServerRouteSummary(data.servers);
+  lines.push(`**LSP**: ${displaySemanticStatus(data)}${routeSummary ? ` — ${routeSummary}` : ""}`);
   if (data.structuralStatus) lines.push(`**Structural**: ${data.structuralStatus}`);
   lines.push("");
 }
@@ -316,6 +324,7 @@ function renderServersSection(
   lines: string[],
   data: HealthData,
   status: "complete" | "partial" | "unavailable" | undefined,
+  cwd: string,
 ): void {
   lines.push("### Servers");
   lines.push("");
@@ -329,8 +338,11 @@ function renderServersSection(
   } else {
     for (const server of data.servers) {
       const statusIcon = server.status === "running" ? "✓" : "✗";
+      const reason = server.statusReason
+        ? ` — ${formatProjectServerStatusReason(server.statusReason)}`
+        : "";
       lines.push(
-        `- ${statusIcon} **${server.name}** (${server.fileTypes.join(", ")}) — ${server.status}`,
+        `- ${statusIcon} **${server.name}** @ \`${formatProjectServerRoot(cwd, server.root)}\` (${server.fileTypes.join(", ")}) — ${server.status}${reason}`,
       );
     }
   }

package/src/tool/code_health/result.ts

@@ -1,4 +1,9 @@
 import type { ConfidenceMode } from "@mrclrchtr/supi-code-runtime/api";
+import {
+  countProjectServerRouteStatuses,
+  formatProjectServerRoot,
+  formatProjectServerStatusReason,
+} from "../../analysis/health/server-status.ts";
 import type { HealthData, HealthSection } from "../../session/health-types.ts";
 import {
   assembleToolResult,
@@ -36,7 +41,7 @@ const SECTION_TITLES: Record<HealthSection, string> = {
 };
 
 /** Assemble public code_health evidence and details before presentation adapters render it. */
-export function assembleHealthResult(data: HealthData): HealthResultAssembly {
+export function assembleHealthResult(data: HealthData, cwd?: string): HealthResultAssembly {
   const projections = data.includedSections.map((section) => projectSection(section, data));
   const sections = projections.map((projection) => projection.section);
   const sectionDetails = projections.map((projection) => projection.details);
@@ -55,7 +60,7 @@ export function assembleHealthResult(data: HealthData): HealthResultAssembly {
     provenance,
   });
 
-  const displaySections = buildHealthDisplaySections(data);
+  const displaySections = buildHealthDisplaySections(data, cwd);
 
   return {
     data,
@@ -78,12 +83,13 @@ export function assembleHealthResult(data: HealthData): HealthResultAssembly {
       capabilityWarnings: data.capabilityWarnings ?? null,
       diagnosticFileCount: data.diagnostics.entries.length,
       serverCount: data.servers.length,
+      serverRouteStatusCounts: countProjectServerRouteStatuses(data.servers),
       evidenceLists: [...assembled.evidenceLists],
     },
   };
 }
 
-function buildHealthDisplaySections(data: HealthData): ToolDisplaySection[] {
+function buildHealthDisplaySections(data: HealthData, cwd?: string): ToolDisplaySection[] {
   const sections: ToolDisplaySection[] = [];
 
   if (data.includedSections.includes("diagnostics") && data.diagnostics.entries.length > 0) {
@@ -107,7 +113,10 @@ function buildHealthDisplaySections(data: HealthData): ToolDisplaySection[] {
         title: "Servers",
         items: data.servers,
         totalCount: data.servers.length,
-        format: (server) => `${server.name} (${server.fileTypes.join(", ")}) — ${server.status}`,
+        format: (server) => {
+          const root = cwd ? formatProjectServerRoot(cwd, server.root) : server.root;
+          return `${server.name} @ ${root} (${server.fileTypes.join(", ")}) — ${server.status}${server.statusReason ? ` — ${formatProjectServerStatusReason(server.statusReason)}` : ""}`;
+        },
       }),
     );
   }
@@ -255,7 +264,7 @@ export function finishHealthResult(outcome: HealthOutcome, cwd: string): CodeInt
     return healthErrorResult(`**Error:** ${outcome.message}`, outcome.message);
   }
 
-  const assembly = assembleHealthResult(outcome.data);
+  const assembly = assembleHealthResult(outcome.data, cwd);
   return {
     content: renderHealthResult(assembly, cwd),
     details: {

package/src/tool/code_health/spec.ts

@@ -17,7 +17,8 @@ export const codeHealthSpec = {
       scope: Type.Optional(ScopeParam),
       refresh: Type.Optional(
         Type.Boolean({
-          description: "Attempt diagnostic recovery before collecting; result reports the outcome.",
+          description:
+            "Attempt diagnostic and required process-crash recovery before collecting; result reports the outcome.",
         }),
       ),
       include: Type.Optional(

package/src/tool/code_health/tui.ts

@@ -4,6 +4,10 @@
 
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { Container, Spacer, Text } from "@earendil-works/pi-tui";
+import {
+  formatProjectServerRouteStatusCounts,
+  type ProjectServerRouteStatusCounts,
+} from "../../analysis/health/server-status.ts";
 import {
   type EvidenceEntry,
   formatCallValue,
@@ -132,8 +136,11 @@ function buildCompactSummary(data: Record<string, unknown> | null, theme: Theme)
   );
   if (semanticRequested) {
     const semanticStatus = readSemanticStatus(data);
+    const routeSummary = readServerRouteStatusSummary(data);
     const statusColor = semanticStatus.startsWith("ready") ? "success" : "warning";
-    segments.push(`${theme.fg("dim", "lsp")} ${theme.fg(statusColor, semanticStatus)}`);
+    segments.push(
+      `${theme.fg("dim", "lsp")} ${theme.fg(statusColor, semanticStatus)}${routeSummary ? ` ${theme.fg("warning", routeSummary)}` : ""}`,
+    );
   }
   const previousRefresh = readPreviousRefreshStatus(data);
   if (previousRefresh) segments.push(theme.fg("dim", previousRefresh));
@@ -179,7 +186,10 @@ function buildStatusBar(data: Record<string, unknown> | null, theme: Theme): Tex
   const lspColor = semanticStatus.startsWith("ready") ? "success" : "warning";
   const structuralColor = structuralStatus === "ready" ? "success" : "muted";
 
-  const lines: string[] = [`LSP: ${theme.fg(lspColor, semanticStatus)}`];
+  const routeSummary = readServerRouteStatusSummary(data);
+  const lines: string[] = [
+    `LSP: ${theme.fg(lspColor, semanticStatus)}${routeSummary ? ` — ${theme.fg("warning", routeSummary)}` : ""}`,
+  ];
   if (structuralStatus) {
     lines.push(`Tree-sitter: ${theme.fg(structuralColor, structuralStatus)}`);
   }
@@ -287,7 +297,8 @@ function buildHealthSectionSummary(data: Record<string, unknown> | null, theme:
     if (section.status === "unavailable" || !section.available) {
       return `${label} unavailable`;
     }
-    return `${label} ${section.itemCount}`;
+    const routeSummary = section.key === "servers" ? readServerRouteStatusSummary(data) : null;
+    return `${label} ${section.itemCount}${routeSummary ? ` — ${routeSummary}` : ""}`;
   });
   return new Text(theme.fg("muted", lines.join("  ")), 0, 0);
 }
@@ -345,6 +356,16 @@ function readSemanticStatus(data: Record<string, unknown> | null): string {
   return formatSemanticHealthState(readSemanticHealthState(data?.semanticState));
 }
 
+function readServerRouteStatusSummary(data: Record<string, unknown> | null): string | null {
+  const counts = readRecord(data?.serverRouteStatusCounts);
+  if (!counts) return null;
+  return formatProjectServerRouteStatusCounts({
+    recovering: typeof counts.recovering === "number" ? counts.recovering : 0,
+    error: typeof counts.error === "number" ? counts.error : 0,
+    unavailable: typeof counts.unavailable === "number" ? counts.unavailable : 0,
+  } satisfies ProjectServerRouteStatusCounts);
+}
+
 function readString(data: Record<string, unknown> | null, key: string): string | null {
   const value = data?.[key];
   return typeof value === "string" ? value : null;

package/src/tool/result/errors.ts

@@ -100,6 +100,7 @@ export function healthErrorResult(content: string, reason?: string): CodeIntelRe
         capabilityWarnings: null,
         diagnosticFileCount: 0,
         serverCount: 0,
+        serverRouteStatusCounts: { recovering: 0, error: 0, unavailable: 0 },
       },
       status: "invalid-input",
       message: reason ?? content,

package/src/tool/result/types.ts

@@ -251,5 +251,11 @@ export interface HealthDetails {
   capabilityWarnings: CapabilityWarningReport | null;
   diagnosticFileCount: number;
   serverCount: number;
+  /** Workspace-wide non-running LSP route counts, separate from semantic readiness. */
+  serverRouteStatusCounts: {
+    recovering: number;
+    error: number;
+    unavailable: number;
+  };
   evidenceLists?: EvidenceListMetadata[];
 }

package/src/ui/footer.ts

@@ -8,6 +8,7 @@
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { footerContributions } from "@mrclrchtr/supi-core/footer-registry";
+import { countProjectServerRouteStatuses } from "../analysis/health/server-status.ts";
 import { LSP_STATE_CHANGE_EVENT, type LspAdapterState } from "../substrate/lsp/state.ts";
 
 /** Build the LSP status text: "λ lsp • 3 ✓ • 1 ⟳ • 1 ✗ • 2 open files" */
@@ -22,17 +23,18 @@ export function buildLspStatusText(lspState: LspAdapterState): string | undefine
   // Aggregate server states
   const ready = servers.filter((s) => s.status === "running" && s.ready).length;
   const starting = servers.filter((s) => s.status === "running" && !s.ready).length;
-  const error = servers.filter((s) => s.status === "error").length;
-  const unavailable = servers.filter((s) => s.status === "unavailable").length;
+  const routeCounts = countProjectServerRouteStatuses(servers);
 
-  const hasServers = ready + starting + error + unavailable > 0;
+  const hasServers =
+    ready + starting + routeCounts.recovering + routeCounts.error + routeCounts.unavailable > 0;
   if (!hasServers && openFiles === 0) return undefined;
 
   const parts = ["λ lsp"];
   if (ready > 0) parts.push(`${ready} ✓`);
   if (starting > 0) parts.push(`${starting} ⟳`);
-  if (error > 0) parts.push(`${error} ✗`);
-  if (unavailable > 0) parts.push(`${unavailable} ⊘`);
+  if (routeCounts.recovering > 0) parts.push(`${routeCounts.recovering} ↻`);
+  if (routeCounts.error > 0) parts.push(`${routeCounts.error} ✗`);
+  if (routeCounts.unavailable > 0) parts.push(`${routeCounts.unavailable} ⊘`);
   if (openFiles > 0) parts.push(`${openFiles} ${openFiles === 1 ? "open file" : "open files"}`);
   return parts.join(" • ");
 }

package/src/ui/status-command.ts

@@ -9,6 +9,7 @@ import {
   evaluateCapabilityWarnings,
   gatherCapabilityWarningInput,
 } from "../analysis/capability/capability-warnings.ts";
+import { countProjectServerRouteStatuses } from "../analysis/health/server-status.ts";
 import { type CiStatusData, createCiStatusDialog } from "./status-overlay.ts";
 
 const STATUS_KEY = "code-intelligence";
@@ -120,6 +121,7 @@ async function gatherCiStatusData(cwd: string, pi: ExtensionAPI): Promise<CiStat
   const capabilityWarnings = evaluateCapabilityWarnings(gatherCapabilityWarningInput(cwd, null));
 
   return {
+    workspaceRoot: cwd,
     servers,
     diagnostics,
     serverInventoryAvailable,
@@ -202,12 +204,40 @@ function renderFooterLine(ctx: ExtensionContext, data: CiStatusData): string {
   if (totalWarnings > 0) {
     parts.push(t.fg("warning", `${totalWarnings} warning${totalWarnings === 1 ? "" : "s"}`));
   }
+  addProjectServerRouteCounts(parts, data, t);
   const structKind = data.capabilities.structural.kind;
   if (structKind === "ready") parts.push(t.fg("success", "✓ ts"));
   if (parts.length === 0) return t.fg("dim", "CI — no data available");
   return parts.join(t.fg("dim", "  "));
 }
 
+function addProjectServerRouteCounts(
+  parts: string[],
+  data: CiStatusData,
+  theme: ExtensionContext["ui"]["theme"],
+): void {
+  const counts = countProjectServerRouteStatuses(data.servers);
+  if (counts.recovering > 0) {
+    parts.push(
+      theme.fg(
+        "warning",
+        `${counts.recovering} route${counts.recovering === 1 ? "" : "s"} recovering`,
+      ),
+    );
+  }
+  if (counts.error > 0) {
+    parts.push(theme.fg("error", `${counts.error} route error${counts.error === 1 ? "" : "s"}`));
+  }
+  if (counts.unavailable > 0) {
+    parts.push(
+      theme.fg(
+        "warning",
+        `${counts.unavailable} route${counts.unavailable === 1 ? "" : "s"} unavailable`,
+      ),
+    );
+  }
+}
+
 function truncateFooterLine(line: string, width: number): string {
   return truncateToWidth(line, width, "…");
 }
@@ -230,6 +260,7 @@ function updateStatusAndWidget(ctx: ExtensionContext, data: CiStatusData): void
   if (totalWarnings > 0) {
     parts.push(t.fg("warning", `${totalWarnings} warning${totalWarnings === 1 ? "" : "s"}`));
   }
+  addProjectServerRouteCounts(parts, data, t);
   const structKind = data.capabilities.structural.kind;
   if (structKind === "ready") parts.push(t.fg("success", "✓ ts"));
 

package/src/ui/status-overlay.ts

@@ -18,6 +18,11 @@ import type {
   ProjectServerInfo,
 } from "@mrclrchtr/supi-lsp/api";
 import type { CapabilityWarningReport } from "../analysis/capability/capability-warnings.ts";
+import {
+  countProjectServerRouteStatuses,
+  formatProjectServerRoot,
+  formatProjectServerStatusReason,
+} from "../analysis/health/server-status.ts";
 import { diagnosticMessageString } from "../substrate/lsp/utils.ts";
 
 /**
@@ -32,6 +37,8 @@ export interface CiDialogTheme {
 }
 
 export interface CiStatusData {
+  /** Canonical workspace root used to display LSP route roots. */
+  workspaceRoot: string;
   servers: ProjectServerInfo[];
   /** Whether the server list is complete status evidence. */
   serverInventoryAvailable: boolean;
@@ -263,31 +270,65 @@ export class CiStatusDialog {
   }
 
   private renderSummaryLine(width: number): string {
-    const t = this.theme;
-    const running = this.data.servers.filter((s) => s.status === "running").length;
-    const totalErrors = this.data.diagnostics.reduce((sum, d) => sum + d.errors, 0);
-    const totalWarnings = this.data.diagnostics.reduce((sum, d) => sum + d.warnings, 0);
-    const sep = t.fg("dim", " · ");
-
-    const parts: string[] = [];
-    if (running > 0) {
-      parts.push(t.fg("text", `${running} server${running === 1 ? "" : "s"}`));
-    }
-    if (totalErrors > 0) {
-      parts.push(t.fg("error", `${totalErrors} error${totalErrors === 1 ? "" : "s"}`));
-    }
-    if (totalWarnings > 0) {
-      parts.push(t.fg("warning", `${totalWarnings} warning${totalWarnings === 1 ? "" : "s"}`));
-    }
-    const structKind = this.data.capabilities.structural.kind;
-    if (structKind === "ready") parts.push(t.fg("success", "✓ ts ready"));
-    else if (structKind === "pending") parts.push(t.fg("dim", "ts pending…"));
-    else parts.push(t.fg("error", "ts unavailable"));
-
-    const joined = parts.length > 0 ? parts.join(sep) : t.fg("dim", "(no data)");
+    const parts = [
+      ...this.serverSummaryParts(),
+      ...this.diagnosticSummaryParts(),
+      ...this.routeSummaryParts(),
+      this.structuralSummaryPart(),
+    ];
+    const joined =
+      parts.length > 0
+        ? parts.join(this.theme.fg("dim", " · "))
+        : this.theme.fg("dim", "(no data)");
     return truncateToWidth(joined, width);
   }
 
+  private serverSummaryParts(): string[] {
+    const running = this.data.servers.filter((server) => server.status === "running").length;
+    return running > 0
+      ? [this.theme.fg("text", `${running} server${running === 1 ? "" : "s"}`)]
+      : [];
+  }
+
+  private diagnosticSummaryParts(): string[] {
+    const errors = this.data.diagnostics.reduce((sum, entry) => sum + entry.errors, 0);
+    const warnings = this.data.diagnostics.reduce((sum, entry) => sum + entry.warnings, 0);
+    return [
+      errors > 0 ? this.theme.fg("error", `${errors} error${errors === 1 ? "" : "s"}`) : null,
+      warnings > 0
+        ? this.theme.fg("warning", `${warnings} warning${warnings === 1 ? "" : "s"}`)
+        : null,
+    ].filter((part): part is string => part !== null);
+  }
+
+  private routeSummaryParts(): string[] {
+    const counts = countProjectServerRouteStatuses(this.data.servers);
+    return [
+      counts.recovering > 0
+        ? this.theme.fg(
+            "warning",
+            `${counts.recovering} route${counts.recovering === 1 ? "" : "s"} recovering`,
+          )
+        : null,
+      counts.error > 0
+        ? this.theme.fg("error", `${counts.error} route error${counts.error === 1 ? "" : "s"}`)
+        : null,
+      counts.unavailable > 0
+        ? this.theme.fg(
+            "warning",
+            `${counts.unavailable} route${counts.unavailable === 1 ? "" : "s"} unavailable`,
+          )
+        : null,
+    ].filter((part): part is string => part !== null);
+  }
+
+  private structuralSummaryPart(): string {
+    const kind = this.data.capabilities.structural.kind;
+    if (kind === "ready") return this.theme.fg("success", "✓ ts ready");
+    if (kind === "pending") return this.theme.fg("dim", "ts pending…");
+    return this.theme.fg("error", "ts unavailable");
+  }
+
   private addServerSection(container: Container): void {
     const t = this.theme;
     container.addChild(new Text(t.fg("accent", t.bold(" Servers")), 1, 0));
@@ -328,7 +369,7 @@ export class CiStatusDialog {
           " " +
           t.fg(statusColor, icon) +
           " " +
-          t.fg("dim", `root: ${server.root}`),
+          t.fg("dim", `root: ${formatProjectServerRoot(this.data.workspaceRoot, server.root)}`),
         0,
         0,
       ),
@@ -337,6 +378,11 @@ export class CiStatusDialog {
     const fileTypes = server.fileTypes.map((f) => `.${f}`).join(" ");
     container.addChild(new Text(t.fg("dim", `    files: ${fileTypes || "(none)"}`), 0, 0));
 
+    const statusReason = formatProjectServerStatusReason(server.statusReason);
+    if (statusReason) {
+      container.addChild(new Text(t.fg("warning", `    ${statusReason}`), 0, 0));
+    }
+
     if (server.openFiles.length > 0) {
       const shown = server.openFiles.slice(0, MAX_OPEN_FILES_SHOWN);
       const remaining = server.openFiles.length - shown.length;