decorated-pi 0.7.1 → 0.7.3

package/tools/lsp/servers.ts

@@ -2,9 +2,9 @@
  * LSP Server Config — language detection, server commands, workspace roots.
  */
 import { existsSync, readdirSync, type Dirent } from "node:fs";
-import { spawnSync } from "node:child_process";
 import { dirname, extname, isAbsolute, join, resolve } from "node:path";
 import type { DependencyStatus } from "../../hooks/skeleton.js";
+import { getDependencyPath, resolveDependency } from "../../settings.js";
 
 // ─── File extension → language mapping ────────────────────────────────────
 
@@ -97,6 +97,16 @@ export function listSupportedLanguages(): string[] {
   return Object.keys(LANGUAGE_SERVERS).sort();
 }
 
+/** Unique binary names used by builtin LSP servers. Used by the
+ *  /dp-settings Dependencies UI to know which binaries are configurable. */
+export function listLspBinaryNames(): string[] {
+  const seen = new Set<string>();
+  for (const lang of Object.keys(LANGUAGE_SERVERS)) {
+    seen.add(LANGUAGE_SERVERS[lang].command);
+  }
+  return [...seen].sort();
+}
+
 export function getServerConfig(
   language: string,
   cwd = process.cwd(),
@@ -104,6 +114,12 @@ export function getServerConfig(
   const base = LANGUAGE_SERVERS[language];
   if (!base) return undefined;
 
+  const override = getDependencyPath(base.command);
+  if (override) {
+    const resolvedOverride = resolveDependency(base.command, { extendPath: [] });
+    return { ...base, command: resolvedOverride ?? override, is_project_local: false };
+  }
+
   const resolved = resolveLocalBinary(base.command, cwd);
   return { ...base, command: resolved.command, is_project_local: resolved.is_project_local };
 }
@@ -147,14 +163,16 @@ export function collectLspDependencyStatuses(cwd: string): DependencyStatus[] {
   const statuses: DependencyStatus[] = [];
   const seen = new Set<string>();
   for (const language of listSupportedLanguages()) {
-    const cfg = getServerConfig(language, cwd);
-    if (!cfg || seen.has(cfg.command)) continue;
-    seen.add(cfg.command);
+    const base = LANGUAGE_SERVERS[language];
+    if (!base || seen.has(base.command)) continue;
+    seen.add(base.command);
+    const path = resolveLspBinary(base.command, cwd);
     statuses.push({
       module: "lsp",
-      label: cfg.command,
-      state: commandExists(cfg.command) ? "ok" : "missing",
-      detail: cfg.install_hint,
+      label: base.command,
+      state: path ? "ok" : "missing",
+      detail: base.install_hint,
+      path: path ?? undefined,
     });
   }
   return statuses;
@@ -174,14 +192,12 @@ export function findWorkspaceRoot(
 
 // ─── Internal helpers ─────────────────────────────────────────────────────
 
-function commandExists(command: string): boolean {
-  if (isAbsolute(command) || command.includes("/") || command.includes("\\")) {
-    return existsSync(command);
-  }
-  const result = process.platform === "win32"
-    ? spawnSync("where", [command], { encoding: "utf-8" })
-    : spawnSync(process.env.SHELL || "sh", ["-lc", `command -v '${command.replace(/'/g, `'"'"'`)}'`], { encoding: "utf-8" });
-  return result.status === 0;
+export function lspDependencyExtendPath(cwd = process.cwd()): string[] {
+  return [...ancestorDirs(cwd)].map((dir) => join(dir, "node_modules", ".bin"));
+}
+
+export function resolveLspBinary(command: string, cwd = process.cwd()): string | null {
+  return resolveDependency(command, { extendPath: lspDependencyExtendPath(cwd) });
 }
 
 function resolveLocalBinary(

package/tools/lsp/tools.ts

@@ -69,7 +69,6 @@ function severityLabel(s: number): string {
 // ─── Register tools ───────────────────────────────────────────────────────
 
 export function registerLspTools(pi: ExtensionAPI, manager: LspServerManager) {
-
   // ── lsp_diagnostics ────────────────────────────────────────────────────
   pi.registerTool({
     name: "lsp_diagnostics",

package/tools/mcp/builtin/codegraph.ts

@@ -14,7 +14,7 @@ export const CODEGRAPH_BUILTIN: Omit<McpServerConfig, "source"> = {
     name: "codegraph",
     command: "codegraph",
     args: ["serve", "--mcp"],
-    enabled: false,
+    enabled: true,
     description:
         "Local code knowledge graph (colbymchenry/codegraph). Enable via /mcp.",
     canUseInProject: (cwd: string) => fs.existsSync(path.join(cwd, ".codegraph")),

package/tools/mcp/client.ts

@@ -16,7 +16,7 @@ export class McpConnection {
   client: Client;
   transport: StreamableHTTPClientTransport | SSEClientTransport | StdioClientTransport | undefined;
   tools: McpToolSpec[] = [];
-  private connected = false;
+  connected = false;
 
   source: string = "unknown";
 

package/tools/mcp/config.ts

@@ -15,11 +15,11 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { spawnSync } from "node:child_process";
-import { isModuleEnabled } from "../../settings.js";
+import { isModuleEnabled, resolveDependency } from "../../settings.js";
 import type { DependencyStatus } from "../../hooks/skeleton.js";
 import { BUILTIN_MCP_SERVERS } from "./builtin/index.js";
 
+
 export { BUILTIN_MCP_SERVERS } from "./builtin/index.js";
 
 export interface McpServerConfig {
@@ -33,6 +33,8 @@ export interface McpServerConfig {
   source: "builtin" | "global" | "project";
   /** Optional predicate: return false if this server cannot be used in the given project. */
   canUseInProject?: (cwd: string) => boolean;
+  /** Binary/config key before dependency path resolution. */
+  dependencyName?: string;
 }
 
 function globalMcpJsonPath(): string {
@@ -217,33 +219,50 @@ export function resolveMcpConfigs(cwd: string): McpServerConfig[] {
     }
   }
 
-  return [...byName.values()].filter((s) => s.url || s.command);
+  return [...byName.values()]
+    .filter((s) => s.url || s.command)
+    .map((s) => {
+      // Apply user-configured binary path override (dependencies[cmd].path)
+      // last, so it wins over builtin/global/project configs. Only applies
+      // to servers that use a command (not URL-based servers).
+      if (!s.command) return s;
+      const dependencyName = s.command;
+      const resolved = resolveMcpBinary(dependencyName);
+      return { ...s, dependencyName, command: resolved ?? s.command };
+    });
+}
+
+/** Unique binary names used by builtin MCP servers that have a `command`
+ *  (URL-based servers are excluded — they don't need a binary). */
+export function listMcpBinaryNames(): string[] {
+  const seen = new Set<string>();
+  for (const s of BUILTIN_MCP_SERVERS) {
+    if (s.command) seen.add(s.command);
+  }
+  return [...seen].sort();
 }
 
 export function collectMcpDependencyStatuses(cwd: string): DependencyStatus[] {
   const seen = new Set<string>();
   const statuses: DependencyStatus[] = [];
   for (const cfg of resolveMcpConfigs(cwd)) {
-    if (!cfg.enabled || !cfg.command || seen.has(cfg.command)) continue;
-    seen.add(cfg.command);
+    const depName = cfg.dependencyName ?? cfg.command;
+    if (!cfg.enabled || !cfg.command || !depName || seen.has(depName)) continue;
+    seen.add(depName);
+    const resolved = resolveMcpBinary(depName);
     statuses.push({
       module: `mcp:${cfg.name}`,
-      label: cfg.command,
-      state: commandExists(cfg.command) ? "ok" : "missing",
+      label: depName,
+      state: resolved ? "ok" : "missing",
       detail: `Install the MCP server command for \"${cfg.name}\" or update its config.`,
+      path: resolved ?? undefined,
     });
   }
   return statuses;
 }
 
-function commandExists(command: string): boolean {
-  if (path.isAbsolute(command) || command.includes("/") || command.includes("\\")) {
-    return fs.existsSync(command);
-  }
-  const result = process.platform === "win32"
-    ? spawnSync("where", [command], { encoding: "utf-8" })
-    : spawnSync(process.env.SHELL || "sh", ["-lc", `command -v '${command.replace(/'/g, `'"'"'`)}'`], { encoding: "utf-8" });
-  return result.status === 0;
+export function resolveMcpBinary(command: string): string | null {
+  return resolveDependency(command);
 }
 
 function readMcpJsonSafe(filePath: string): Record<string, any> | null {

package/tools/patch/core.ts

@@ -1521,3 +1521,13 @@ function truncate(s: string, maxLen = 60): string {
   if (firstLine.length <= maxLen) return firstLine;
   return firstLine.slice(0, maxLen - 3) + "...";
 }
+
+// Test exports
+export const __patchCoreTest = {
+  charOffsetToLine,
+  detectTabWidth,
+  normalizeIndentForFuzzy,
+  truncate,
+  collapseSequentialReplacements,
+  generateReplacementDiff,
+};