@nudojs/lsp 0.4.0 → 0.4.1

package/src/__tests__/nudo-dep-evict.test.ts

@@ -1,103 +0,0 @@
-import { describe, it, expect, beforeEach } from "vitest";
-import { mkdtempSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join, resolve } from "node:path";
-import {
-  clearValidationState,
-  handleNudoDepFileChanged,
-  nudoDepParents,
-  registerNudoImportDeps,
-  validateText,
-  type ValidateTextDeps,
-} from "../validation.ts";
-import { generalizeFromAst, getGeneralizeMemoSize, resetGeneralizeMemo } from "@nudojs/core";
-
-describe("*.nudo.js watched-file → targeted eviction + parent revalidate", () => {
-  beforeEach(() => {
-    clearValidationState();
-  });
-
-  it("registerNudoImportDeps records parent → dep edges", () => {
-    const dir = mkdtempSync(join(tmpdir(), "nudo-dep-idx-"));
-    const parent = join(dir, "a.js");
-    const dep = join(dir, "shapes.nudo.js");
-    registerNudoImportDeps(
-      parent,
-      `/// @nudo:import { positive } from "./shapes.nudo.js"\nfunction f(x){return x;}\n`,
-    );
-    expect(nudoDepParents.get(resolve(dep).replace(/\\/g, "/"))).toContain(
-      resolve(parent).replace(/\\/g, "/"),
-    );
-  });
-
-  it("handleNudoDepFileChanged revalidates open parent and evicts memo deps", async () => {
-    const dir = mkdtempSync(join(tmpdir(), "nudo-dep-chg-"));
-    const parent = join(dir, "a.js");
-    const dep = join(dir, "shapes.nudo.js");
-    writeFileSync(dep, "export const positive = number().gt(0);\n");
-    const parentSrc = `/// @nudo:import { positive } from "./shapes.nudo.js"
-/**
- * @nudo:refine x positive
- */
-function needsPositive(x) {
-  return x;
-}
-needsPositive(-1);
-`;
-    writeFileSync(parent, parentSrc);
-    // 模拟已验证会话：登记 @nudo:import 边
-    registerNudoImportDeps(parent, parentSrc);
-
-    // 建立 generalize 缓存（含 dep 路径索引）
-    const loadModule = (spec: string, fromFile: string) => {
-      if (spec.includes("shapes")) return "export const positive = number().gt(0);\n";
-      return undefined;
-    };
-    const g1 = generalizeFromAst("needsPositive", parentSrc, {
-      refine: { loadModule, fromFile: parent },
-    });
-    expect(g1).toBeDefined();
-    expect(getGeneralizeMemoSize()).toBeGreaterThan(0);
-
-    let revalidated = 0;
-    const sent = new Map<string, unknown[]>();
-    const openDocs = new Map([
-      [
-        resolve(parent).replace(/\\/g, "/"),
-        {
-          uri: `file://${parent}`,
-          version: 2,
-          getText: () => parentSrc,
-        },
-      ],
-    ]);
-    const deps: ValidateTextDeps = {
-      sendDiagnostics: (p) => {
-        sent.set(p.uri, p.diagnostics);
-        revalidated++;
-      },
-      getOpenDocumentByPath: (p) => openDocs.get(p.replace(/\\/g, "/")),
-    };
-
-    await handleNudoDepFileChanged(dep, deps);
-
-    // 定向逐出后，同参 generalize 得新实例
-    const g2 = generalizeFromAst("needsPositive", parentSrc, {
-      refine: { loadModule, fromFile: parent },
-    });
-    expect(g2).toBeDefined();
-    expect(g2).not.toBe(g1);
-    // 打开中的父文件被重检
-    expect(revalidated).toBeGreaterThan(0);
-    expect(sent.has(`file://${parent}`)).toBe(true);
-  });
-
-  it("does nothing when no parent depends on the path", async () => {
-    resetGeneralizeMemo();
-    const before = getGeneralizeMemoSize();
-    await handleNudoDepFileChanged("/nope/x.nudo.js", {
-      sendDiagnostics: () => {},
-    });
-    expect(getGeneralizeMemoSize()).toBe(before);
-  });
-});

package/src/agent-tools.ts

@@ -1,486 +0,0 @@
-/**
- * Agent-facing tool implementations (`nudo.whatIf` / `nudo.suggestCase` /
- * `nudo.trace`), ported from the MCP server (packages/mcp/src/tools.ts) and
- * wired into both LSP channels in server.ts: executeCommand commands
- * (`nudo.*`) and custom requests (`nudo/…`). Like validation.ts, this module
- * holds pure logic with injected readers so tests exercise it without a live
- * connection; server.ts supplies the document/disk readers.
- *
- * Unlike the MCP original, whatIf really applies its bindings: each binding
- * becomes a `// @nudo:as <type>` comment inserted above the declaring
- * statement (source-level injection). The evaluator already honors `as` for
- * variable declarations, expression statements and returns, so the assumed
- * type flows through the whole program like any other directive.
- */
-import { readFileSync } from "node:fs";
-import { resolve } from "node:path";
-import {
-  analyzeFile,
-  buildCaseDirective,
-  getHoverAtPosition,
-  collectAbsInlays,
-  serializeInferJson,
-} from "@nudojs/service";
-import { parse } from "@nudojs/parser";
-import { T, typeValueToString, checkSource, serializeCheckJson, pTrue } from "@nudojs/core";
-import type { TypeValue, CheckJson } from "@nudojs/core";
-import { lspLoadModule } from "./validation.ts";
-
-export type TypeBinding = { name: string; type: string };
-
-/** MCP-compatible tool result shape — keeps bridge layers zero-rewrite. */
-export type AgentToolResult = { content: [{ type: "text"; text: string }] };
-
-export type AgentToolDeps = {
-  /** Disk reader for files not open in the editor; defaults to readFileSync. */
-  readFile?: (filePath: string) => string;
-  /** Open-document lookup by absolute file path; the editor buffer wins over disk. */
-  getOpenText?: (filePath: string) => { text: string } | undefined;
-};
-
-export function textResult(text: string): AgentToolResult {
-  return { content: [{ type: "text", text }] };
-}
-
-/**
- * Parse an agent-facing type expression into a TypeValue.
- * Ported from packages/mcp/src/tools.ts: primitive names, `|` unions,
- * everything else unknown.
- */
-export function parseTypeExpr(expr: string): TypeValue {
-  const trimmed = expr.trim();
-  if (trimmed === "number") return T.number;
-  if (trimmed === "string") return T.string;
-  if (trimmed === "boolean") return T.boolean;
-  if (trimmed === "null") return T.null;
-  if (trimmed === "undefined") return T.undefined;
-  if (trimmed === "bigint") return T.bigint;
-  if (trimmed === "symbol") return T.symbol;
-  if (trimmed.includes("|")) {
-    const members = trimmed.split("|").map(parseTypeExpr);
-    return T.union(...members);
-  }
-  return T.unknown;
-}
-
-/**
- * Normalize a `file` parameter: strips and percent-decodes a `file://` prefix
- * (mirrors validation.ts uriToFilePath), then resolves to an absolute path.
- */
-export function normalizeFilePath(file: string): string {
-  const path = file.startsWith("file://") ? decodeURIComponent(file.slice(7)) : file;
-  return resolve(path);
-}
-
-const BARE_PRIMITIVES = new Set(["number", "string", "boolean", "bigint", "symbol"]);
-
-/** Split a type expression on top-level `|`, respecting nesting and strings. */
-function splitTopLevelUnion(expr: string): string[] {
-  const members: string[] = [];
-  let depth = 0;
-  let inString: string | null = null;
-  let start = 0;
-  for (let i = 0; i < expr.length; i++) {
-    const ch = expr[i];
-    if (inString) {
-      if (ch === inString && expr[i - 1] !== "\\") inString = null;
-      continue;
-    }
-    if (ch === '"' || ch === "'") {
-      inString = ch;
-      continue;
-    }
-    if (ch === "(" || ch === "[" || ch === "{") {
-      depth++;
-      continue;
-    }
-    if (ch === ")" || ch === "]" || ch === "}") {
-      depth--;
-      continue;
-    }
-    if (ch === "|" && depth === 0) {
-      members.push(expr.slice(start, i));
-      start = i + 1;
-    }
-  }
-  members.push(expr.slice(start));
-  return members.map((m) => m.trim()).filter(Boolean);
-}
-
-/**
- * Translate an agent-facing type expression into `@nudo:as` directive syntax
- * (parser's parseTypeValueExpr language). Bare primitives gain a `T.` prefix;
- * unions become `T.union(...)`; structural forms pass through untouched.
- */
-export function typeExprToDirective(expr: string): string {
-  const members = splitTopLevelUnion(expr);
-  if (members.length === 0) return "T.unknown";
-  const mapped = members.map((m) => {
-    if (m.startsWith("T.")) return m;
-    if (BARE_PRIMITIVES.has(m)) return `T.${m}`;
-    if (m === "null" || m === "undefined" || m === "true" || m === "false") return m;
-    if (/^-?\d+(\.\d+)?$/.test(m)) return m;
-    if (/^["']/.test(m)) return m;
-    if (/[([{]|=>/.test(m)) return m;
-    return "T.unknown";
-  });
-  return mapped.length === 1 ? mapped[0] : `T.union(${mapped.join(", ")})`;
-}
-
-/** Collect the names a top-level statement declares (descends into exports). */
-function declaredNames(stmt: any, out: Set<string>): void {
-  if (stmt.type === "FunctionDeclaration" && stmt.id) {
-    out.add(stmt.id.name);
-  } else if (stmt.type === "ClassDeclaration" && stmt.id) {
-    out.add(stmt.id.name);
-  } else if (stmt.type === "VariableDeclaration") {
-    for (const decl of stmt.declarations) {
-      if (decl.id?.type === "Identifier") out.add(decl.id.name);
-    }
-  } else if (stmt.type === "ExportNamedDeclaration" && stmt.declaration) {
-    declaredNames(stmt.declaration, out);
-  }
-}
-
-/**
- * Inject each binding as a `// @nudo:as <type>` line above the statement that
- * declares its name. The comment is placed above any existing leading
- * comments, so the assumption takes priority over source-level directives
- * (only the first `as` on a statement wins — hence one binding per statement;
- * siblings of multi-declarator statements share the override, a known
- * limitation of statement-granular `as`).
- */
-export function injectBindings(
-  source: string,
-  bindings: TypeBinding[],
-): { source: string; applied: string[]; unapplied: string[] } {
-  const applied: string[] = [];
-  const unapplied: string[] = [];
-  if (bindings.length === 0) return { source, applied, unapplied };
-
-  const ast = parse(source);
-  const declLines = new Map<string, number>();
-  for (const stmt of ast.program.body as any[]) {
-    const names = new Set<string>();
-    declaredNames(stmt, names);
-    if (names.size === 0 || !stmt.loc) continue;
-    // anchor above existing leading comments so the injected `as` wins
-    const anchorLine = stmt.leadingComments?.[0]?.loc?.start.line ?? stmt.loc.start.line;
-    for (const name of names) {
-      if (!declLines.has(name)) declLines.set(name, anchorLine);
-    }
-  }
-
-  const byLine = new Map<number, TypeBinding[]>();
-  for (const binding of bindings) {
-    const line = declLines.get(binding.name);
-    if (line === undefined) {
-      unapplied.push(binding.name);
-      continue;
-    }
-    const group = byLine.get(line) ?? [];
-    group.push(binding);
-    byLine.set(line, group);
-  }
-
-  const insertions: Array<{ index: number; text: string }> = [];
-  for (const [line, group] of byLine) {
-    insertions.push({
-      index: line - 1,
-      text: `// @nudo:as ${typeExprToDirective(group[0].type)}`,
-    });
-    applied.push(`${group[0].name}: ${group[0].type}`);
-    for (const shadowed of group.slice(1)) unapplied.push(shadowed.name);
-  }
-  // bottom-up so earlier indices stay valid
-  insertions.sort((a, b) => b.index - a.index);
-  const lines = source.split("\n");
-  for (const ins of insertions) lines.splice(ins.index, 0, ins.text);
-
-  return { source: lines.join("\n"), applied, unapplied };
-}
-
-/**
- * Source resolution for agent tools: open editor buffer first, disk fallback
- * (readFileSync) for files the agent changed without didOpen.
- */
-export function readSource(filePath: string, deps: AgentToolDeps = {}): string {
-  const open = deps.getOpenText?.(filePath);
-  if (open) return open.text;
-  return (deps.readFile ?? ((p: string) => readFileSync(p, "utf-8")))(filePath);
-}
-
-function analysisError(err: unknown): AgentToolResult {
-  return textResult(`Error: ${(err as Error).message}`);
-}
-
-export type CheckToolParams = {
-  file: string;
-  source?: string;
-  /** "json" → CheckJson only；缺省人类可读摘要 + JSON */
-  format?: "text" | "json";
-  /** 解析 @nudo:import 的相对 .nudo.js（测试可注入） */
-  loadModule?: (spec: string, fromFile: string) => string | undefined;
-};
-
-/**
- * Agent 门禁工具：返回 CheckJson v1 契约（与 CLI --json 同构）。
- */
-export function checkTool(
-  params: CheckToolParams,
-  deps: AgentToolDeps = {},
-): AgentToolResult {
-  try {
-    const filePath = normalizeFilePath(params.file);
-    const source = params.source ?? readSource(filePath, deps);
-    const report = checkSource(filePath, source, pTrue, {
-      loadModule: params.loadModule ?? lspLoadModule,
-      fromFile: filePath,
-    });
-    const json = serializeCheckJson(report);
-    if (params.format === "json") {
-      return textResult(JSON.stringify(json, null, 2));
-    }
-    const lines: string[] = [
-      json.ok ? "nudo check OK" : "nudo check FAILED",
-      `${json.summary.errors} error · ${json.summary.warnings} warning · ${json.summary.functions} fn`,
-    ];
-    for (const i of json.issues) {
-      if (i.severity === "info") continue;
-      const loc = i.line != null ? ` L${i.line}` : "";
-      lines.push(`[${i.severity}]${loc} ${i.message}`);
-      if (i.actual) lines.push(`  actual:   ${i.actual}`);
-      if (i.expected) lines.push(`  expected: ${i.expected}`);
-    }
-    lines.push("");
-    lines.push(JSON.stringify(json, null, 2));
-    return textResult(lines.join("\n"));
-  } catch (err) {
-    return analysisError(err);
-  }
-}
-
-export type HoverToolParams = {
-  file: string;
-  /** 1-based 行 */
-  line: number;
-  /** 0-based 列 */
-  column: number;
-  source?: string;
-  /** true 时同时返回该文件全部 Abs inlay */
-  includeInlays?: boolean;
-  /** 可选：*.nudo.js 加载（契约进 inlay） */
-  loadModule?: (spec: string, fromFile: string) => string | undefined;
-};
-
-/**
- * Agent hover：无损 Abs（不经 TypeValue bridge）。
- * 与 LSP hover 同一信息源。
- */
-export function hoverTool(
-  params: HoverToolParams,
-  deps: AgentToolDeps = {},
-): AgentToolResult {
-  try {
-    const filePath = normalizeFilePath(params.file);
-    const source = params.source ?? readSource(filePath, deps);
-    const hover = getHoverAtPosition(filePath, source, params.line, params.column);
-    const payload: Record<string, unknown> = {
-      file: filePath,
-      line: params.line,
-      column: params.column,
-      abs: hover?.abs ?? null,
-      absMultiline: hover?.absMultiline ?? null,
-      intension: hover?.intension ?? null,
-      /** 有损外延，仅对照 */
-      ext: hover?.typeText ?? null,
-    };
-    if (params.includeInlays) {
-      payload.inlays = collectAbsInlays(source, {
-        loadModule: params.loadModule ?? lspLoadModule,
-        fromFile: filePath,
-      });
-    }
-    return textResult(JSON.stringify(payload, null, 2));
-  } catch (err) {
-    return analysisError(err);
-  }
-}
-
-export type InferToolParams = {
-  file: string;
-  source?: string;
-  /** "json" → InferJson only；缺省摘要 + JSON */
-  format?: "text" | "json";
-  /** 只返回这些函数名（可选过滤） */
-  functions?: string[];
-};
-
-/**
- * Agent infer：InferJson v1 契约（与 CLI infer --json 同构）。
- * intension 携带无损 Abs；args/result 为 TypeValue 投影。
- */
-export function inferTool(
-  params: InferToolParams,
-  deps: AgentToolDeps = {},
-): AgentToolResult {
-  try {
-    const filePath = normalizeFilePath(params.file);
-    const source = params.source ?? readSource(filePath, deps);
-    const result = analyzeFile(filePath, source);
-    let json = serializeInferJson(result, filePath);
-    if (params.functions && params.functions.length > 0) {
-      const keep = new Set(params.functions);
-      const filtered = json.functions.filter((f) => keep.has(f.name));
-      let cases = 0;
-      for (const f of filtered) {
-        cases += (f as { cases?: unknown[] }).cases?.length ?? 0;
-      }
-      const summary = {
-        ...json.summary,
-        functions: filtered.length,
-        cases,
-      };
-      json = { ...json, functions: filtered, summary } as typeof json;
-    }
-    if (params.format === "json") {
-      return textResult(JSON.stringify(json, null, 2));
-    }
-    const lines: string[] = [
-      `nudo infer  ${json.file}`,
-      `${json.summary.functions} fn · ${json.summary.cases} case · ${json.summary.diagnostics} diag`,
-    ];
-    for (const f of json.functions) {
-      lines.push("");
-      lines.push(`${f.name}${f.entryOnly ? "  [entry-only]" : ""}`);
-      for (const c of f.cases) {
-        const args = c.args.join(", ");
-        lines.push(`  ${c.name}: (${args}) => ${c.result}`);
-        if (c.intension?.abs) lines.push(`    abs: ${c.intension.abs}`);
-        else if (c.intension?.display) lines.push(`    intension: ${c.intension.display}`);
-      }
-    }
-    lines.push("");
-    lines.push(JSON.stringify(json, null, 2));
-    return textResult(lines.join("\n"));
-  } catch (err) {
-    return analysisError(err);
-  }
-}
-
-export type WhatIfParams = {
-  file: string;
-  bindings?: TypeBinding[];
-  target: string;
-  /** Pre-read source (tests / callers that already hold the text). */
-  source?: string;
-};
-
-/**
- * Set type assumptions and observe the inferred type of `target`. Bindings
- * are genuinely injected via `@nudo:as` before analysis — the inference gap
- * of the original MCP tool.
- */
-export function whatIf(params: WhatIfParams, deps: AgentToolDeps = {}): AgentToolResult {
-  try {
-    const filePath = normalizeFilePath(params.file);
-    const original = params.source ?? readSource(filePath, deps);
-    const { source, applied, unapplied } = injectBindings(original, params.bindings ?? []);
-    // Direct analysis: the injected source never matches the version-keyed
-    // editor cache, so bypass it entirely.
-    const result = analyzeFile(filePath, source);
-    const typeStr = result.bindings.has(params.target)
-      ? typeValueToString(result.bindings.get(params.target)!.type)
-      : "unknown";
-
-    const notes: string[] = [];
-    if (applied.length > 0) notes.push(`Bindings applied: ${applied.join(", ")}`);
-    if (unapplied.length > 0) {
-      notes.push(`Bindings not applied (no top-level declaration found): ${unapplied.join(", ")}`);
-    }
-    return textResult(
-      `Type of "${params.target}": ${typeStr}${notes.length > 0 ? `\n${notes.join("\n")}` : ""}`,
-    );
-  } catch (err) {
-    return analysisError(err);
-  }
-}
-
-export type FunctionToolParams = {
-  file: string;
-  functionName: string;
-  /** Pre-read source (tests / callers that already hold the text). */
-  source?: string;
-};
-
-/** Suggest @nudo:case directives for a function (ported from MCP). */
-export function suggestCase(params: FunctionToolParams, deps: AgentToolDeps = {}): AgentToolResult {
-  try {
-    const filePath = normalizeFilePath(params.file);
-    const source = params.source ?? readSource(filePath, deps);
-    const result = analyzeFile(filePath, source);
-    const fn = result.functions.find((f) => f.name === params.functionName);
-
-    if (!fn) {
-      return textResult(`Function "${params.functionName}" not found`);
-    }
-
-    if (fn.cases.length > 0) {
-      // 手写指令 case 的 source 未标记，合成 case 才带 "callsite"；
-      // 全部为合成 case 时可产出直接粘贴回源码的指令文本
-      if (fn.cases.every((c) => c.source === "callsite")) {
-        const directives = fn.cases
-          .map((c) => buildCaseDirective(c.name, c.args))
-          .filter((d): d is string => d !== null);
-        if (directives.length > 0) {
-          const skipped = fn.cases.length - directives.length;
-          const lines = [
-            `Function "${params.functionName}" has ${fn.cases.length} synthesized case(s); suggested directives:`,
-            "/**",
-            ...directives,
-            "*/",
-          ];
-          if (skipped > 0) {
-            lines.push(`(${skipped} case(s) skipped: not serializable as directives)`);
-          }
-          return textResult(lines.join("\n"));
-        }
-        return textResult(
-          `Function "${params.functionName}" already has ${fn.cases.length} case(s) (none serializable as directives)`,
-        );
-      }
-      return textResult(`Function "${params.functionName}" already has ${fn.cases.length} case(s)`);
-    }
-
-    return textResult(`Suggested: /** @nudo:case */\nfunction ${params.functionName}(...) { ... }`);
-  } catch (err) {
-    return analysisError(err);
-  }
-}
-
-/** Trace how a type transforms from input to output across a function's cases (ported from MCP). */
-export function trace(params: FunctionToolParams, deps: AgentToolDeps = {}): AgentToolResult {
-  try {
-    const filePath = normalizeFilePath(params.file);
-    const source = params.source ?? readSource(filePath, deps);
-    const result = analyzeFile(filePath, source);
-    const fn = result.functions.find((f) => f.name === params.functionName);
-
-    if (!fn) {
-      return textResult(`Function "${params.functionName}" not found`);
-    }
-
-    if (fn.cases.length === 0) {
-      return textResult(`No cases found for "${params.functionName}"`);
-    }
-
-    const traces = fn.cases.map((c) => {
-      const args = c.args.map(typeValueToString).join(", ");
-      return `Input: (${args}) => Output: ${typeValueToString(c.result)}`;
-    }).join("\n");
-
-    return textResult(traces);
-  } catch (err) {
-    return analysisError(err);
-  }
-}

package/src/semantic-tokens.ts

@@ -1,9 +0,0 @@
-// Semantic tokens 的图例与编码单一来源在 @nudojs/service（提取器
-// buildSemanticTokens 与图例同处一模块，tokenType 索引不可能与图例漂移）。
-// 此处仅按 server.ts 原引用名（TOKEN_TYPES/TOKEN_MODIFIERS）再导出。
-export {
-  SEMANTIC_TOKEN_TYPES as TOKEN_TYPES,
-  SEMANTIC_TOKEN_MODIFIERS as TOKEN_MODIFIERS,
-  encodeSemanticTokens,
-  type SemanticToken,
-} from "@nudojs/service";