@mrclrchtr/supi-code-intelligence 1.16.1 → 2.0.0

package/src/{brief.ts → analysis/brief/public-brief.ts}

@@ -1,15 +1,16 @@
 // Public facade — delegates to the new use-case and presentation layers.
-// Existing callers (api.ts, index.ts, code-intelligence.ts) remain compatible.
+// Existing callers (api.ts and index.ts) remain compatible.
 
-import { formatGitContext, gatherGitContext } from "./git-context.ts";
-import type { ArchitectureModel } from "./model.ts";
-import { getDependents } from "./model.ts";
-import { renderOverview } from "./presentation/markdown/overview.ts";
-import type { BriefDetails, ConfidenceMode } from "./types.ts";
-import { buildOverviewData } from "./use-case/build-overview.ts";
+import type { ConfidenceMode } from "@mrclrchtr/supi-code-runtime/api";
+import type { BriefDetails } from "../../types/details.ts";
+import { renderOverview } from "../../ui/markdown/overview.ts";
+import { buildOverviewData } from "../../ui/markdown/overview-data.ts";
+import type { ArchitectureModel } from "../architecture/model.ts";
+import { getDependents } from "../architecture/model.ts";
+import { formatGitContext, gatherGitContext } from "../signals/git.ts";
 
 // Re-export focused brief generation
-export { generateFocusedBrief } from "./brief-focused.ts";
+export { generateFocusedBrief } from "./main.ts";
 
 // ── Overview (first-turn injection) ───────────────────────────────────
 
@@ -17,7 +18,7 @@ export { generateFocusedBrief } from "./brief-focused.ts";
  * Generate a compact architecture overview for first-turn session injection.
  * Targets roughly 500 tokens or less; prefers dense module-edge format.
  *
- * Delegates to use-case/build-overview + presentation/markdown/overview.
+ * Delegates to analysis overview data + ui/markdown/overview.
  */
 export function generateOverview(model: ArchitectureModel): string | null {
   const data = buildOverviewData(model);
@@ -30,7 +31,10 @@ export function generateOverview(model: ArchitectureModel): string | null {
 /**
  * Generate a full-project brief from the architecture model.
  */
-export function generateProjectBrief(model: ArchitectureModel): {
+export function generateProjectBrief(
+  model: ArchitectureModel,
+  opts?: { showGitContext?: boolean },
+): {
   content: string;
   details: BriefDetails;
 } {
@@ -45,9 +49,11 @@ export function generateProjectBrief(model: ArchitectureModel): {
     lines.push("");
   }
 
-  const gitCtx = gatherGitContext(model.root);
-  if (gitCtx) {
-    lines.push(formatGitContext(gitCtx));
+  if (opts?.showGitContext !== false) {
+    const gitCtx = gatherGitContext(model.root);
+    if (gitCtx) {
+      lines.push(formatGitContext(gitCtx));
+    }
   }
 
   if (model.modules.length === 0) {
@@ -75,7 +81,6 @@ export function generateProjectBrief(model: ArchitectureModel): {
   addStartHereSection(lines, topStartHere);
 
   const nextQueries = buildNextQueries(model, publicSurfaces);
-  addNextSection(lines, nextQueries);
 
   return {
     content: lines.join("\n"),
@@ -164,21 +169,11 @@ function buildNextQueries(model: ArchitectureModel, publicSurfaces: string[]): s
   if (model.modules.length > 0) {
     const firstMod = model.modules[0];
     nextQueries.push(
-      `\`code_brief\` with \`path: "${firstMod.relativePath}"\` for a focused module brief`,
+      `\`code_orientation\` with \`focus: "${firstMod.relativePath}"\` for a focused module brief`,
     );
   }
   if (publicSurfaces.length > 0) {
-    nextQueries.push("`code_affected` before modifying shared exports");
+    nextQueries.push("`code_impact` before modifying shared exports");
   }
   return nextQueries;
 }
-
-function addNextSection(lines: string[], nextQueries: string[]): void {
-  if (nextQueries.length === 0) return;
-  lines.push("## Next");
-  lines.push("");
-  for (const q of nextQueries.slice(0, 2)) {
-    lines.push(`- ${q}`);
-  }
-  lines.push("");
-}

package/src/analysis/brief/summarize.ts

@@ -0,0 +1,208 @@
+/**
+ * Recursive directory summary — source file discovery, import/export counting,
+ * and named-export extraction.
+ *
+ * Extracted from brief-focused.ts to keep the focus-generation modules
+ * cohesive and avoid a single 800+ line file.
+ */
+
+import * as fs from "node:fs";
+import * as path from "node:path";
+
+// ── Types ─────────────────────────────────────────────────────────────
+
+export interface RecursiveDirectorySummary {
+  directFiles: string[];
+  allFiles: string[];
+  totalSourceFiles: number;
+  subdirs: Array<{ name: string; fileCount: number }>;
+  publicSurfaces: string[];
+  importCount: number;
+  exportCount: number;
+}
+
+// ── Recognized source extensions ──────────────────────────────────────
+
+export const SOURCE_EXTENSIONS = new Set([
+  // JS/TS
+  ".ts",
+  ".tsx",
+  ".js",
+  ".jsx",
+  ".mts",
+  ".cts",
+  ".mjs",
+  ".cjs",
+  // Python
+  ".py",
+  ".pyi",
+  // Rust
+  ".rs",
+  // Go
+  ".go",
+  ".mod",
+  // C/C++
+  ".c",
+  ".h",
+  ".cpp",
+  ".hpp",
+  ".cc",
+  ".cxx",
+  ".hxx",
+  ".c++",
+  ".h++",
+  // Java / Kotlin
+  ".java",
+  ".kt",
+  ".kts",
+  // Ruby
+  ".rb",
+  // Shell
+  ".sh",
+  ".bash",
+  ".zsh",
+  // Web
+  ".html",
+  ".htm",
+  ".xhtml",
+  ".css",
+  ".scss",
+  ".less",
+  // Data / Config
+  ".json",
+  ".yaml",
+  ".yml",
+  ".toml",
+  ".md",
+  // Other languages
+  ".php",
+  ".swift",
+  ".cs",
+  ".r",
+  ".sql",
+]);
+
+// ── Public API ────────────────────────────────────────────────────────
+
+/** List source files (by extension) in a flat directory. */
+export function listSourceFiles(dir: string): string[] {
+  const files: string[] = [];
+  try {
+    const entries = fs.readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isFile()) continue;
+      if (entry.name.startsWith(".")) continue;
+      if (SOURCE_EXTENSIONS.has(path.extname(entry.name))) {
+        files.push(entry.name);
+      }
+    }
+  } catch {
+    // Directory not readable
+  }
+  return files.sort((a, b) => a.localeCompare(b));
+}
+
+/** Recursively summarize a directory tree: source files, imports, exports, subdirectories. */
+export function summarizeDirectoryRecursively(dir: string): RecursiveDirectorySummary {
+  const directFiles = listSourceFiles(dir);
+  const summary: RecursiveDirectorySummary = {
+    directFiles,
+    allFiles: directFiles.map((file) => path.join(dir, file)),
+    totalSourceFiles: directFiles.length,
+    subdirs: [],
+    publicSurfaces: [],
+    importCount: 0,
+    exportCount: 0,
+  };
+
+  accumulateJsTsSignals(summary, dir, directFiles, "");
+
+  try {
+    const entries = fs.readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isDirectory() || entry.name.startsWith(".")) continue;
+      const childDir = path.join(dir, entry.name);
+      const childSummary = summarizeDirectoryRecursively(childDir);
+      if (childSummary.totalSourceFiles === 0) continue;
+      summary.totalSourceFiles += childSummary.totalSourceFiles;
+      summary.allFiles.push(...childSummary.allFiles);
+      summary.subdirs.push({ name: entry.name, fileCount: childSummary.totalSourceFiles });
+      summary.publicSurfaces.push(
+        ...childSummary.publicSurfaces.map((surface) => `${entry.name}/${surface}`),
+      );
+      summary.importCount += childSummary.importCount;
+      summary.exportCount += childSummary.exportCount;
+    }
+  } catch {
+    // Directory not readable
+  }
+
+  summary.subdirs.sort((a, b) => a.name.localeCompare(b.name));
+  return summary;
+}
+
+// ── Internal helpers ──────────────────────────────────────────────────
+
+function accumulateJsTsSignals(
+  summary: RecursiveDirectorySummary,
+  dir: string,
+  files: string[],
+  prefix: string,
+): void {
+  for (const file of files) {
+    if (!isJsTsFile(file)) continue;
+    try {
+      const relFile = prefix ? `${prefix}/${file}` : file;
+      const content = fs.readFileSync(path.join(dir, file), "utf-8");
+      summary.importCount += countMatches(content, /^import\s/gm);
+      const exports = extractNamedExports(content);
+      summary.exportCount += exports.length;
+      for (const exportedName of exports) {
+        summary.publicSurfaces.push(`\`${exportedName}\` — \`${relFile}\``);
+      }
+    } catch {
+      // File not readable
+    }
+  }
+}
+
+function isJsTsFile(file: string): boolean {
+  return [".ts", ".tsx", ".js", ".jsx", ".mts", ".cts", ".mjs", ".cjs"].includes(
+    path.extname(file),
+  );
+}
+
+/**
+ * Lightweight exported-name extraction for recursive directory briefs.
+ *
+ * Best-effort only: handles exported declarations and simple named export lists,
+ * but intentionally does not try to cover default exports, export-all forms,
+ * re-exported defaults, or every multiline formatting variant.
+ */
+function extractNamedExports(content: string): string[] {
+  const names = new Set<string>();
+  const declarationRegex =
+    /export\s+(?:async\s+)?(?:function|class|interface|type|const|let|var|enum)\s+([A-Za-z_$][\w$]*)/g;
+  const namedExportRegex = /export\s*\{\s*([^}]+)\s*\}/g;
+
+  for (const match of content.matchAll(declarationRegex)) {
+    if (match[1]) names.add(match[1]);
+  }
+
+  for (const match of content.matchAll(namedExportRegex)) {
+    const parts = match[1]?.split(",") ?? [];
+    for (const part of parts) {
+      const candidate = part
+        .trim()
+        .split(/\s+as\s+/i)[0]
+        ?.trim();
+      if (candidate) names.add(candidate);
+    }
+  }
+
+  return [...names].sort((a, b) => a.localeCompare(b));
+}
+
+function countMatches(content: string, regex: RegExp): number {
+  return [...content.matchAll(regex)].length;
+}

package/src/analysis/brief/types.ts

@@ -0,0 +1,27 @@
+// Brief use-case types — moved from shared/context/types.ts (Phase 2.5)
+
+import type { SessionLspServiceState } from "@mrclrchtr/supi-lsp/api";
+import type { BriefDetails } from "../../types/details.ts";
+import type { ArchitectureModel } from "../architecture/model.ts";
+import type { CodeProvider } from "../provider.ts";
+
+export type BriefInput =
+  | { kind: "project"; maxResults?: number }
+  | { kind: "path"; path: string; maxResults?: number }
+  | { kind: "file"; file: string; maxResults?: number }
+  | { kind: "symbol"; symbol: string; path?: string; maxResults?: number };
+
+export interface BriefDeps {
+  model: ArchitectureModel | null;
+  provider: CodeProvider | null;
+  cwd: string;
+  /** Show git context in orientation output. Defaults to true. */
+  showGitContext?: boolean;
+  /** LSP service state for diagnostic access. */
+  lspService: SessionLspServiceState;
+}
+
+export interface BriefUseCaseResult {
+  content: string;
+  details: BriefDetails;
+}

package/src/{use-case/generate-brief.ts → analysis/brief/use-case.ts}

@@ -1,27 +1,14 @@
-// Brief orchestration use-case — dispatches by mode, coordinates substrate access,
-// and returns fully rendered markdown content + details metadata.
-
-import * as fs from "node:fs";
 import * as path from "node:path";
-import { generateFocusedBrief, generateProjectBrief } from "../brief.ts";
-import type { ArchitectureModel } from "../model.ts";
-import { findModuleForPath } from "../model.ts";
-import { renderAnchoredBrief, renderSymbolBrief } from "../presentation/markdown/brief.ts";
-import { normalizePath } from "../search-helpers.ts";
-import type { TargetResolutionResult } from "../target-resolution.ts";
-import { resolveSymbolTarget } from "../target-resolution.ts";
-import type { CodeProvider } from "../workspace/request-context.ts";
+import { renderSymbolBrief } from "../../ui/markdown/brief.ts";
+import { gatherTreeSitterContext } from "../../ui/markdown/gather.ts";
+import type { ArchitectureModel } from "../architecture/model.ts";
+import { findModuleForPath } from "../architecture/model.ts";
+import { normalizePath } from "../search/ripgrep.ts";
+import { resolveSymbolTarget } from "../target/symbol.ts";
+import type { TargetOutcome } from "../target/types.ts";
+import { generateFocusedBrief, generateProjectBrief } from "./public-brief.ts";
 import type { BriefDeps, BriefInput, BriefUseCaseResult } from "./types.ts";
 
-// ── TreeSitterContext is an intermediate data shape from the use-case ──
-
-export interface TreeSitterContext {
-  nodeInfo: { type: string; text: string; startLine: number; startCharacter: number } | null;
-  outline: Array<{ name: string; kind: string; startLine: number; endLine: number }>;
-  imports: Array<{ moduleSpecifier: string }>;
-  exports: Array<{ name: string; kind: string }>;
-}
-
 // ── Public entrypoint ─────────────────────────────────────────────────
 
 export async function executeBrief(
@@ -31,15 +18,13 @@ export async function executeBrief(
   switch (input.kind) {
     case "project":
       if (deps.model) {
-        return executeProjectBrief(deps.model);
+        return executeProjectBrief(deps.model, deps.showGitContext);
       }
       return noModelResult();
     case "path":
-      return executePathBrief(input.path, deps);
+      return executePathBrief(input.path, deps, input);
     case "file":
-      return executeFileBrief(input.file, deps);
-    case "anchored":
-      return executeAnchoredBrief(input, deps);
+      return executeFileBrief(input.file, deps, input);
     case "symbol":
       return executeSymbolBrief(input.symbol, input.path, deps);
   }
@@ -47,85 +32,59 @@ export async function executeBrief(
 
 // ── Project brief ─────────────────────────────────────────────────────
 
-function executeProjectBrief(model: ArchitectureModel): BriefUseCaseResult {
+function executeProjectBrief(
+  model: ArchitectureModel,
+  showGitContext?: boolean,
+): BriefUseCaseResult {
   if (!model) {
     return noModelResult();
   }
-  const result = generateProjectBrief(model);
+  const result = generateProjectBrief(model, { showGitContext });
   return { content: result.content, details: result.details };
 }
 
 // ── Path / file briefs ────────────────────────────────────────────────
 
-function executePathBrief(requestPath: string, deps: BriefDeps): BriefUseCaseResult {
+async function executePathBrief(
+  requestPath: string,
+  deps: BriefDeps,
+  input: BriefInput,
+): Promise<BriefUseCaseResult> {
   if (!deps.model) {
     return noModelResult();
   }
   const resolved = normalizePath(requestPath, deps.cwd);
-  const result = generateFocusedBrief(deps.model, resolved);
+  const maxResults =
+    "maxResults" in input ? (input as { maxResults?: number }).maxResults : undefined;
+  const result = await generateFocusedBrief(deps.model, resolved, {
+    provider: deps.provider,
+    cwd: deps.cwd,
+    maxResults,
+    showGitContext: deps.showGitContext ?? true,
+    lspService: deps.lspService,
+  });
   return { content: result.content, details: result.details };
 }
 
-function executeFileBrief(file: string, deps: BriefDeps): BriefUseCaseResult {
+async function executeFileBrief(
+  file: string,
+  deps: BriefDeps,
+  input: BriefInput,
+): Promise<BriefUseCaseResult> {
   if (!deps.model) {
     return noModelResult();
   }
   const resolved = normalizePath(file, deps.cwd);
-  const result = generateFocusedBrief(deps.model, resolved);
-  return { content: result.content, details: result.details };
-}
-
-// ── Anchored brief ────────────────────────────────────────────────────
-
-async function executeAnchoredBrief(
-  input: { file: string; line: number; character: number },
-  deps: BriefDeps,
-): Promise<BriefUseCaseResult> {
-  const { file, line, character } = input;
-  const resolvedFile = normalizePath(file, deps.cwd);
-
-  if (!fs.existsSync(resolvedFile)) {
-    return {
-      content: `**Error:** File not found: \`${file}\``,
-      details: {
-        confidence: "unavailable",
-        focusTarget: `${file}:${line}:${character}`,
-        startHere: [],
-        publicSurfaces: [],
-        dependencySummary: null,
-        omittedCount: 0,
-        nextQueries: [],
-      },
-    };
-  }
-
-  const relPath = path.relative(deps.cwd, resolvedFile);
-  const context = await gatherTreeSitterContext(deps.provider, relPath, line, character);
-
-  const details = {
-    confidence: "structural" as const,
-    focusTarget: `${relPath}:${line}:${character}`,
-    startHere: [] as Array<{ target: string; reason: string }>,
-    publicSurfaces: [] as string[],
-    dependencySummary: null as { moduleCount: number; edgeCount: number } | null,
-    omittedCount: 0,
-    nextQueries: [
-      `\`code_relations\` with \`kind: "callers"\`, \`file: "${relPath}"\`, \`line: ${line}\`, and \`character: ${character}\` for call sites`,
-      `\`code_affected\` with \`file: "${relPath}"\`, \`line: ${line}\`, and \`character: ${character}\` for impact analysis`,
-    ],
-  };
-
-  const rendered = renderAnchoredBrief({
-    relPath,
-    line,
-    character,
-    context,
-    model: deps.model ?? null,
-    details,
+  const maxResults =
+    "maxResults" in input ? (input as { maxResults?: number }).maxResults : undefined;
+  const result = await generateFocusedBrief(deps.model, resolved, {
+    provider: deps.provider,
     cwd: deps.cwd,
+    maxResults,
+    showGitContext: deps.showGitContext ?? true,
+    lspService: deps.lspService,
   });
-
-  return rendered;
+  return { content: result.content, details: result.details };
 }
 
 // ── Symbol brief ──────────────────────────────────────────────────────
@@ -153,7 +112,8 @@ async function executeSymbolBrief(
   const provider = deps.provider;
   if (!provider) {
     return {
-      content: `**Error:** Symbol discovery requires an active code provider. Use \`file\` + coordinates, or enable LSP and retry.`,
+      content:
+        "**Error:** Symbol discovery requires an active code provider. Use `code_orientation` with `focus` for file orientation, or use `code_inspect` with `file` + coordinates for point facts.",
       details: {
         confidence: "unavailable",
         focusTarget: symbol,
@@ -162,7 +122,7 @@ async function executeSymbolBrief(
         dependencySummary: null,
         omittedCount: 0,
         nextQueries: [
-          "Use `file` + coordinates for a precise symbol brief, or enable LSP and retry",
+          "Use `code_orientation` with `focus` for file orientation, or `code_inspect` with file + coordinates for point facts",
         ],
       },
     };
@@ -182,7 +142,7 @@ async function executeSymbolBrief(
         dependencySummary: null,
         omittedCount: 0,
         nextQueries: [
-          "Use `file` + coordinates for a precise symbol brief, or enable LSP and retry",
+          "Use `code_orientation` with `focus` for file orientation, or `code_inspect` with file + coordinates for point facts",
         ],
       },
     };
@@ -200,12 +160,27 @@ async function executeSymbolBrief(
         dependencySummary: null,
         omittedCount: resolved.omittedCount,
         nextQueries: [
-          "Use `file` + coordinates for a precise symbol brief, or enable LSP and retry",
+          "Use `code_orientation` with `focus` for file orientation, or `code_inspect` with file + coordinates for point facts",
         ],
       },
     };
   }
 
+  if (resolved.kind === "group") {
+    return {
+      content: `**Error:** Unexpected group result from symbol resolution for \`${symbol}\`. Use \`code_orientation\` with a file focus.`,
+      details: {
+        confidence: "unavailable",
+        focusTarget: symbol,
+        startHere: [],
+        publicSurfaces: [],
+        dependencySummary: null,
+        omittedCount: 0,
+        nextQueries: ["Use `code_orientation` with `focus` for file or directory orientation"],
+      },
+    };
+  }
+
   const target = resolved.target;
   const relPath = path.relative(deps.cwd, target.file);
 
@@ -225,8 +200,9 @@ async function executeSymbolBrief(
     dependencySummary: mod ? { moduleCount: 1, edgeCount: mod.internalDeps.length } : null,
     omittedCount: 0,
     nextQueries: [
-      `\`code_relations\` with \`kind: "callers"\`, \`file: "${relPath}"\`, \`line: ${target.displayLine}\`, and \`character: ${target.displayCharacter}\` for call sites`,
-      `\`code_affected\` with \`file: "${relPath}"\`, \`line: ${target.displayLine}\`, and \`character: ${target.displayCharacter}\` for impact analysis`,
+      `\`code_inspect\` with \`file: "${relPath}"\`, \`line: ${target.displayLine}\`, and \`character: ${target.displayCharacter}\` for point facts`,
+      `\`code_graph\`, \`file: "${relPath}"\`, \`line: ${target.displayLine}\`, and \`character: ${target.displayCharacter}\` for reference sites`,
+      `\`code_impact\` with \`file: "${relPath}"\`, \`line: ${target.displayLine}\`, and \`character: ${target.displayCharacter}\` for impact analysis`,
     ],
   };
 
@@ -247,59 +223,6 @@ async function executeSymbolBrief(
 
 // ── Helpers ───────────────────────────────────────────────────────────
 
-async function gatherTreeSitterContext(
-  provider: CodeProvider | null,
-  relPath: string,
-  line: number,
-  character: number,
-): Promise<TreeSitterContext> {
-  let nodeInfo: TreeSitterContext["nodeInfo"] = null;
-  let outline: TreeSitterContext["outline"] = [];
-  let imports: TreeSitterContext["imports"] = [];
-  let exports: TreeSitterContext["exports"] = [];
-
-  if (!provider) return { nodeInfo, outline, imports, exports };
-
-  try {
-    const nodeResult = await provider.nodeAt(relPath, line, character);
-    if (nodeResult.kind === "success") {
-      nodeInfo = {
-        type: nodeResult.data.type,
-        text: nodeResult.data.text,
-        startLine: nodeResult.data.startLine,
-        startCharacter: nodeResult.data.startCharacter,
-      };
-    }
-
-    const outlineResult = await provider.outline(relPath);
-    if (outlineResult.kind === "success") {
-      outline = outlineResult.data.map((item) => ({
-        name: item.name,
-        kind: item.kind,
-        startLine: item.startLine,
-        endLine: item.endLine,
-      }));
-    }
-
-    const importsResult = await provider.imports(relPath);
-    if (importsResult.kind === "success") {
-      imports = importsResult.data;
-    }
-
-    const exportsResult = await provider.exports(relPath);
-    if (exportsResult.kind === "success") {
-      exports = exportsResult.data.map((item) => ({
-        name: item.name,
-        kind: item.kind,
-      }));
-    }
-  } catch {
-    // Provider not available
-  }
-
-  return { nodeInfo, outline, imports, exports };
-}
-
 function noModelResult(): BriefUseCaseResult {
   return {
     content:
@@ -318,7 +241,7 @@ function noModelResult(): BriefUseCaseResult {
 
 function formatDisambiguation(
   symbol: string,
-  result: Extract<TargetResolutionResult, { kind: "disambiguation" }>,
+  result: Extract<TargetOutcome, { kind: "disambiguation" }>,
 ): string {
   const lines: string[] = [];
   lines.push(`# Disambiguation needed for \`${symbol}\``);