@mastra/code-sdk 1.0.3-alpha.0 → 1.1.0-alpha.2

package/dist/lsp/server.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lsp/server.ts"],"sourcesContent":["import type { ChildProcess } from 'node:child_process';\nimport { spawn } from 'node:child_process';\nimport { existsSync } from 'node:fs';\nimport { createRequire } from 'node:module';\nimport path, { join } from 'node:path';\nimport { pathToFileURL } from 'node:url';\nimport { getLanguageId } from './language.js';\n\n/**\n * LSP Server definition and spawning logic\n */\nexport interface LSPServerInfo {\n  id: string;\n  name: string;\n  languageIds: string[];\n  root: (cwd: string) => string | null;\n  spawn: (root: string) => ChildProcess | Promise<{ process: ChildProcess; initialization?: any } | undefined>;\n}\n\n/**\n * Find the nearest project root directory\n */\nexport function findNearestRoot(cwd: string, markers: string[]): string | null {\n  let current = cwd;\n\n  while (current !== '/') {\n    for (const marker of markers) {\n      if (existsSync(join(current, marker))) {\n        return current;\n      }\n    }\n\n    const parent = join(current, '..');\n    if (parent === current) break;\n    current = parent;\n  }\n\n  return null;\n}\n\n/**\n * Built-in LSP server definitions\n */\nexport const BUILTIN_SERVERS: Record<string, LSPServerInfo> = {\n  typescript: {\n    id: 'typescript',\n    name: 'TypeScript Language Server',\n    languageIds: ['typescript', 'typescriptreact', 'javascript', 'javascriptreact'],\n    root: (cwd: string) => findNearestRoot(cwd, ['tsconfig.json', 'package.json']),\n    spawn: async (root: string) => {\n      // Try to resolve TypeScript from the project directory\n      const requireFromRoot = createRequire(pathToFileURL(path.join(root, 'package.json')));\n      let tsserver: string | undefined;\n      try {\n        tsserver = requireFromRoot.resolve('typescript/lib/tsserver.js');\n      } catch {\n        tsserver = undefined;\n      }\n      if (!tsserver) {\n        return undefined;\n      }\n\n      // Resolve typescript-language-server binary directly to avoid npx hangs\n      // (npx can hang indefinitely in projects with pnpm links)\n      const localBin = join(root, 'node_modules', '.bin', 'typescript-language-server');\n      const cwdBin = join(process.cwd(), 'node_modules', '.bin', 'typescript-language-server');\n      let tslsBinary: string;\n      if (existsSync(localBin)) {\n        tslsBinary = localBin;\n      } else if (existsSync(cwdBin)) {\n        tslsBinary = cwdBin;\n      } else {\n        // Fall back to npx as last resort, but this may hang with pnpm links\n        tslsBinary = 'npx';\n      }\n\n      const args = tslsBinary === 'npx' ? ['typescript-language-server', '--stdio'] : ['--stdio'];\n\n      const proc = spawn(tslsBinary, args, {\n        cwd: root,\n        stdio: ['pipe', 'pipe', 'pipe'],\n      });\n\n      return {\n        process: proc,\n        initialization: {\n          tsserver: {\n            path: tsserver,\n            logVerbosity: 'off',\n          },\n        },\n      };\n    },\n  },\n\n  eslint: {\n    id: 'eslint',\n    name: 'ESLint Language Server',\n    languageIds: ['typescript', 'typescriptreact', 'javascript', 'javascriptreact'],\n    root: (cwd: string) =>\n      findNearestRoot(cwd, ['package.json', '.eslintrc.js', '.eslintrc.json', '.eslintrc.yml', '.eslintrc.yaml']),\n    spawn: (root: string) => {\n      const binaryPath = join(process.cwd(), 'node_modules', '.bin', 'eslint-lsp');\n      return spawn(binaryPath, ['--stdio'], {\n        cwd: root,\n        stdio: ['pipe', 'pipe', 'pipe'],\n      });\n    },\n  },\n\n  python: {\n    id: 'python',\n    name: 'Python Language Server (Pyright)',\n    languageIds: ['python'],\n    root: (cwd: string) => findNearestRoot(cwd, ['pyproject.toml', 'setup.py', 'requirements.txt', '.git']),\n    spawn: (root: string) => {\n      // Try node_modules first, then fall back to system PATH\n      const localPath = join(process.cwd(), 'node_modules', '.bin', 'pyright-langserver');\n      const binaryPath = existsSync(localPath) ? localPath : 'pyright-langserver';\n      return spawn(binaryPath, ['--stdio'], {\n        cwd: root,\n        stdio: ['pipe', 'pipe', 'pipe'],\n      });\n    },\n  },\n\n  go: {\n    id: 'go',\n    name: 'Go Language Server (gopls)',\n    languageIds: ['go'],\n    root: (cwd: string) => findNearestRoot(cwd, ['go.mod', '.git']),\n    spawn: (root: string) => {\n      return spawn('gopls', ['serve'], {\n        cwd: root,\n        stdio: ['pipe', 'pipe', 'pipe'],\n      });\n    },\n  },\n\n  rust: {\n    id: 'rust',\n    name: 'Rust Language Server (rust-analyzer)',\n    languageIds: ['rust'],\n    root: (cwd: string) => findNearestRoot(cwd, ['Cargo.toml', '.git']),\n    spawn: (root: string) => {\n      return spawn('rust-analyzer', ['--stdio'], {\n        cwd: root,\n        stdio: ['pipe', 'pipe', 'pipe'],\n      });\n    },\n  },\n};\n\n/**\n * Get all servers that can handle a file\n */\nexport function getServersForFile(filePath: string, cwd: string): LSPServerInfo[] {\n  const languageId = getLanguageId(filePath);\n  if (!languageId) return [];\n\n  return Object.values(BUILTIN_SERVERS).filter(\n    server => server.languageIds.includes(languageId) && server.root(cwd) !== null,\n  );\n}\n"],"mappings":"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","names":[]}
+{"version":3,"file":"server.js","names":[],"sources":["../../src/lsp/server.ts"],"sourcesContent":["import type { ChildProcess } from 'node:child_process';\nimport { spawn } from 'node:child_process';\nimport { existsSync } from 'node:fs';\nimport { createRequire } from 'node:module';\nimport path, { join } from 'node:path';\nimport { pathToFileURL } from 'node:url';\nimport { getLanguageId } from './language.js';\n\n/**\n * LSP Server definition and spawning logic\n */\nexport interface LSPServerInfo {\n  id: string;\n  name: string;\n  languageIds: string[];\n  root: (cwd: string) => string | null;\n  spawn: (root: string) => ChildProcess | Promise<{ process: ChildProcess; initialization?: any } | undefined>;\n}\n\n/**\n * Find the nearest project root directory\n */\nexport function findNearestRoot(cwd: string, markers: string[]): string | null {\n  let current = cwd;\n\n  while (current !== '/') {\n    for (const marker of markers) {\n      if (existsSync(join(current, marker))) {\n        return current;\n      }\n    }\n\n    const parent = join(current, '..');\n    if (parent === current) break;\n    current = parent;\n  }\n\n  return null;\n}\n\n/**\n * Built-in LSP server definitions\n */\nexport const BUILTIN_SERVERS: Record<string, LSPServerInfo> = {\n  typescript: {\n    id: 'typescript',\n    name: 'TypeScript Language Server',\n    languageIds: ['typescript', 'typescriptreact', 'javascript', 'javascriptreact'],\n    root: (cwd: string) => findNearestRoot(cwd, ['tsconfig.json', 'package.json']),\n    spawn: async (root: string) => {\n      // Try to resolve TypeScript from the project directory\n      const requireFromRoot = createRequire(pathToFileURL(path.join(root, 'package.json')));\n      let tsserver: string | undefined;\n      try {\n        tsserver = requireFromRoot.resolve('typescript/lib/tsserver.js');\n      } catch {\n        tsserver = undefined;\n      }\n      if (!tsserver) {\n        return undefined;\n      }\n\n      // Resolve typescript-language-server binary directly to avoid npx hangs\n      // (npx can hang indefinitely in projects with pnpm links)\n      const localBin = join(root, 'node_modules', '.bin', 'typescript-language-server');\n      const cwdBin = join(process.cwd(), 'node_modules', '.bin', 'typescript-language-server');\n      let tslsBinary: string;\n      if (existsSync(localBin)) {\n        tslsBinary = localBin;\n      } else if (existsSync(cwdBin)) {\n        tslsBinary = cwdBin;\n      } else {\n        // Fall back to npx as last resort, but this may hang with pnpm links\n        tslsBinary = 'npx';\n      }\n\n      const args = tslsBinary === 'npx' ? ['typescript-language-server', '--stdio'] : ['--stdio'];\n\n      const proc = spawn(tslsBinary, args, {\n        cwd: root,\n        stdio: ['pipe', 'pipe', 'pipe'],\n      });\n\n      return {\n        process: proc,\n        initialization: {\n          tsserver: {\n            path: tsserver,\n            logVerbosity: 'off',\n          },\n        },\n      };\n    },\n  },\n\n  eslint: {\n    id: 'eslint',\n    name: 'ESLint Language Server',\n    languageIds: ['typescript', 'typescriptreact', 'javascript', 'javascriptreact'],\n    root: (cwd: string) =>\n      findNearestRoot(cwd, ['package.json', '.eslintrc.js', '.eslintrc.json', '.eslintrc.yml', '.eslintrc.yaml']),\n    spawn: (root: string) => {\n      const binaryPath = join(process.cwd(), 'node_modules', '.bin', 'eslint-lsp');\n      return spawn(binaryPath, ['--stdio'], {\n        cwd: root,\n        stdio: ['pipe', 'pipe', 'pipe'],\n      });\n    },\n  },\n\n  python: {\n    id: 'python',\n    name: 'Python Language Server (Pyright)',\n    languageIds: ['python'],\n    root: (cwd: string) => findNearestRoot(cwd, ['pyproject.toml', 'setup.py', 'requirements.txt', '.git']),\n    spawn: (root: string) => {\n      // Try node_modules first, then fall back to system PATH\n      const localPath = join(process.cwd(), 'node_modules', '.bin', 'pyright-langserver');\n      const binaryPath = existsSync(localPath) ? localPath : 'pyright-langserver';\n      return spawn(binaryPath, ['--stdio'], {\n        cwd: root,\n        stdio: ['pipe', 'pipe', 'pipe'],\n      });\n    },\n  },\n\n  go: {\n    id: 'go',\n    name: 'Go Language Server (gopls)',\n    languageIds: ['go'],\n    root: (cwd: string) => findNearestRoot(cwd, ['go.mod', '.git']),\n    spawn: (root: string) => {\n      return spawn('gopls', ['serve'], {\n        cwd: root,\n        stdio: ['pipe', 'pipe', 'pipe'],\n      });\n    },\n  },\n\n  rust: {\n    id: 'rust',\n    name: 'Rust Language Server (rust-analyzer)',\n    languageIds: ['rust'],\n    root: (cwd: string) => findNearestRoot(cwd, ['Cargo.toml', '.git']),\n    spawn: (root: string) => {\n      return spawn('rust-analyzer', ['--stdio'], {\n        cwd: root,\n        stdio: ['pipe', 'pipe', 'pipe'],\n      });\n    },\n  },\n};\n\n/**\n * Get all servers that can handle a file\n */\nexport function getServersForFile(filePath: string, cwd: string): LSPServerInfo[] {\n  const languageId = getLanguageId(filePath);\n  if (!languageId) return [];\n\n  return Object.values(BUILTIN_SERVERS).filter(\n    server => server.languageIds.includes(languageId) && server.root(cwd) !== null,\n  );\n}\n"],"mappings":";;;;;;;;;;AAsBA,SAAgB,gBAAgB,KAAa,SAAkC;CAC7E,IAAI,UAAU;CAEd,OAAO,YAAY,KAAK;EACtB,KAAK,MAAM,UAAU,SACnB,IAAI,WAAW,KAAK,SAAS,MAAM,CAAC,GAClC,OAAO;EAIX,MAAM,SAAS,KAAK,SAAS,IAAI;EACjC,IAAI,WAAW,SAAS;EACxB,UAAU;CACZ;CAEA,OAAO;AACT;;;;AAKA,MAAa,kBAAiD;CAC5D,YAAY;EACV,IAAI;EACJ,MAAM;EACN,aAAa;GAAC;GAAc;GAAmB;GAAc;EAAiB;EAC9E,OAAO,QAAgB,gBAAgB,KAAK,CAAC,iBAAiB,cAAc,CAAC;EAC7E,OAAO,OAAO,SAAiB;GAE7B,MAAM,kBAAkB,cAAc,cAAc,KAAK,KAAK,MAAM,cAAc,CAAC,CAAC;GACpF,IAAI;GACJ,IAAI;IACF,WAAW,gBAAgB,QAAQ,4BAA4B;GACjE,QAAQ;IACN,WAAW,KAAA;GACb;GACA,IAAI,CAAC,UACH;GAKF,MAAM,WAAW,KAAK,MAAM,gBAAgB,QAAQ,4BAA4B;GAChF,MAAM,SAAS,KAAK,QAAQ,IAAI,GAAG,gBAAgB,QAAQ,4BAA4B;GACvF,IAAI;GACJ,IAAI,WAAW,QAAQ,GACrB,aAAa;QACR,IAAI,WAAW,MAAM,GAC1B,aAAa;QAGb,aAAa;GAUf,OAAO;IACL,SANW,MAAM,YAFN,eAAe,QAAQ,CAAC,8BAA8B,SAAS,IAAI,CAAC,SAAS,GAErD;KACnC,KAAK;KACL,OAAO;MAAC;MAAQ;MAAQ;KAAM;IAChC,CAGc;IACZ,gBAAgB,EACd,UAAU;KACR,MAAM;KACN,cAAc;IAChB,EACF;GACF;EACF;CACF;CAEA,QAAQ;EACN,IAAI;EACJ,MAAM;EACN,aAAa;GAAC;GAAc;GAAmB;GAAc;EAAiB;EAC9E,OAAO,QACL,gBAAgB,KAAK;GAAC;GAAgB;GAAgB;GAAkB;GAAiB;EAAgB,CAAC;EAC5G,QAAQ,SAAiB;GAEvB,OAAO,MADY,KAAK,QAAQ,IAAI,GAAG,gBAAgB,QAAQ,YACzC,GAAG,CAAC,SAAS,GAAG;IACpC,KAAK;IACL,OAAO;KAAC;KAAQ;KAAQ;IAAM;GAChC,CAAC;EACH;CACF;CAEA,QAAQ;EACN,IAAI;EACJ,MAAM;EACN,aAAa,CAAC,QAAQ;EACtB,OAAO,QAAgB,gBAAgB,KAAK;GAAC;GAAkB;GAAY;GAAoB;EAAM,CAAC;EACtG,QAAQ,SAAiB;GAEvB,MAAM,YAAY,KAAK,QAAQ,IAAI,GAAG,gBAAgB,QAAQ,oBAAoB;GAElF,OAAO,MADY,WAAW,SAAS,IAAI,YAAY,sBAC9B,CAAC,SAAS,GAAG;IACpC,KAAK;IACL,OAAO;KAAC;KAAQ;KAAQ;IAAM;GAChC,CAAC;EACH;CACF;CAEA,IAAI;EACF,IAAI;EACJ,MAAM;EACN,aAAa,CAAC,IAAI;EAClB,OAAO,QAAgB,gBAAgB,KAAK,CAAC,UAAU,MAAM,CAAC;EAC9D,QAAQ,SAAiB;GACvB,OAAO,MAAM,SAAS,CAAC,OAAO,GAAG;IAC/B,KAAK;IACL,OAAO;KAAC;KAAQ;KAAQ;IAAM;GAChC,CAAC;EACH;CACF;CAEA,MAAM;EACJ,IAAI;EACJ,MAAM;EACN,aAAa,CAAC,MAAM;EACpB,OAAO,QAAgB,gBAAgB,KAAK,CAAC,cAAc,MAAM,CAAC;EAClE,QAAQ,SAAiB;GACvB,OAAO,MAAM,iBAAiB,CAAC,SAAS,GAAG;IACzC,KAAK;IACL,OAAO;KAAC;KAAQ;KAAQ;IAAM;GAChC,CAAC;EACH;CACF;AACF;;;;AAKA,SAAgB,kBAAkB,UAAkB,KAA8B;CAChF,MAAM,aAAa,cAAc,QAAQ;CACzC,IAAI,CAAC,YAAY,OAAO,CAAC;CAEzB,OAAO,OAAO,OAAO,eAAe,CAAC,CAAC,QACpC,WAAU,OAAO,YAAY,SAAS,UAAU,KAAK,OAAO,KAAK,GAAG,MAAM,IAC5E;AACF"}

package/dist/lsp/workspace.js

@@ -1,52 +1,55 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
+import * as fs$1 from "fs";
+import * as path$1 from "path";
+//#region src/lsp/workspace.ts
+/**
+* Workspace markers that indicate the root of a project
+*/
 const WORKSPACE_MARKERS = [
-  "package.json",
-  "tsconfig.json",
-  "pyproject.toml",
-  "go.mod",
-  ".git",
-  "Cargo.toml",
-  "composer.json"
+	"package.json",
+	"tsconfig.json",
+	"pyproject.toml",
+	"go.mod",
+	".git",
+	"Cargo.toml",
+	"composer.json"
 ];
+/**
+* Find the workspace root by walking up from the file path
+* looking for common workspace markers.
+*
+* For monorepos, this prioritizes the closest package/project root
+* (e.g., packages/core) over the monorepo root.
+*/
 function findWorkspaceRoot(filePath) {
-  let currentDir = path.dirname(path.resolve(filePath));
-  const root = path.parse(currentDir).root;
-  let closestProjectRoot = null;
-  let searchDir = currentDir;
-  while (searchDir !== root) {
-    const hasTsConfig = fs.existsSync(path.join(searchDir, "tsconfig.json"));
-    const hasPackageJson = fs.existsSync(path.join(searchDir, "package.json"));
-    if (hasTsConfig || hasPackageJson) {
-      closestProjectRoot = searchDir;
-      break;
-    }
-    const parentDir = path.dirname(searchDir);
-    if (parentDir === searchDir) {
-      break;
-    }
-    searchDir = parentDir;
-  }
-  if (closestProjectRoot) {
-    return closestProjectRoot;
-  }
-  currentDir = path.dirname(path.resolve(filePath));
-  while (currentDir !== root) {
-    for (const marker of WORKSPACE_MARKERS) {
-      const markerPath = path.join(currentDir, marker);
-      if (fs.existsSync(markerPath)) {
-        return currentDir;
-      }
-    }
-    const parentDir = path.dirname(currentDir);
-    if (parentDir === currentDir) {
-      break;
-    }
-    currentDir = parentDir;
-  }
-  return path.dirname(path.resolve(filePath));
+	let currentDir = path$1.dirname(path$1.resolve(filePath));
+	const root = path$1.parse(currentDir).root;
+	let closestProjectRoot = null;
+	let searchDir = currentDir;
+	while (searchDir !== root) {
+		const hasTsConfig = fs$1.existsSync(path$1.join(searchDir, "tsconfig.json"));
+		const hasPackageJson = fs$1.existsSync(path$1.join(searchDir, "package.json"));
+		if (hasTsConfig || hasPackageJson) {
+			closestProjectRoot = searchDir;
+			break;
+		}
+		const parentDir = path$1.dirname(searchDir);
+		if (parentDir === searchDir) break;
+		searchDir = parentDir;
+	}
+	if (closestProjectRoot) return closestProjectRoot;
+	currentDir = path$1.dirname(path$1.resolve(filePath));
+	while (currentDir !== root) {
+		for (const marker of WORKSPACE_MARKERS) {
+			const markerPath = path$1.join(currentDir, marker);
+			if (fs$1.existsSync(markerPath)) return currentDir;
+		}
+		const parentDir = path$1.dirname(currentDir);
+		if (parentDir === currentDir) break;
+		currentDir = parentDir;
+	}
+	return path$1.dirname(path$1.resolve(filePath));
 }
-export {
-  findWorkspaceRoot
-};
+//#endregion
+export { findWorkspaceRoot };
+
 //# sourceMappingURL=workspace.js.map

package/dist/lsp/workspace.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lsp/workspace.ts"],"sourcesContent":["import * as fs from 'node:fs';\nimport * as path from 'node:path';\n\n/**\n * Workspace markers that indicate the root of a project\n */\nconst WORKSPACE_MARKERS = [\n  'package.json',\n  'tsconfig.json',\n  'pyproject.toml',\n  'go.mod',\n  '.git',\n  'Cargo.toml',\n  'composer.json',\n];\n\n/**\n * Find the workspace root by walking up from the file path\n * looking for common workspace markers.\n *\n * For monorepos, this prioritizes the closest package/project root\n * (e.g., packages/core) over the monorepo root.\n */\nexport function findWorkspaceRoot(filePath: string): string {\n  let currentDir = path.dirname(path.resolve(filePath));\n  const root = path.parse(currentDir).root;\n\n  // First, find the closest tsconfig.json or package.json\n  // This handles monorepos where the actual project is in a subdirectory\n  let closestProjectRoot: string | null = null;\n  let searchDir = currentDir;\n\n  while (searchDir !== root) {\n    const hasTsConfig = fs.existsSync(path.join(searchDir, 'tsconfig.json'));\n    const hasPackageJson = fs.existsSync(path.join(searchDir, 'package.json'));\n\n    if (hasTsConfig || hasPackageJson) {\n      closestProjectRoot = searchDir;\n      break;\n    }\n\n    const parentDir = path.dirname(searchDir);\n    if (parentDir === searchDir) {\n      break;\n    }\n    searchDir = parentDir;\n  }\n\n  // If we found a project root, return it\n  if (closestProjectRoot) {\n    return closestProjectRoot;\n  }\n\n  // Otherwise, fall back to looking for any workspace marker\n  currentDir = path.dirname(path.resolve(filePath));\n  while (currentDir !== root) {\n    for (const marker of WORKSPACE_MARKERS) {\n      const markerPath = path.join(currentDir, marker);\n      if (fs.existsSync(markerPath)) {\n        return currentDir;\n      }\n    }\n\n    const parentDir = path.dirname(currentDir);\n    if (parentDir === currentDir) {\n      break;\n    }\n    currentDir = parentDir;\n  }\n\n  // Fallback to the directory containing the file\n  return path.dirname(path.resolve(filePath));\n}\n"],"mappings":"AAAA,YAAY,QAAQ;AACpB,YAAY,UAAU;AAKtB,MAAM,oBAAoB;AAAA,EACxB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AASO,SAAS,kBAAkB,UAA0B;AAC1D,MAAI,aAAa,KAAK,QAAQ,KAAK,QAAQ,QAAQ,CAAC;AACpD,QAAM,OAAO,KAAK,MAAM,UAAU,EAAE;AAIpC,MAAI,qBAAoC;AACxC,MAAI,YAAY;AAEhB,SAAO,cAAc,MAAM;AACzB,UAAM,cAAc,GAAG,WAAW,KAAK,KAAK,WAAW,eAAe,CAAC;AACvE,UAAM,iBAAiB,GAAG,WAAW,KAAK,KAAK,WAAW,cAAc,CAAC;AAEzE,QAAI,eAAe,gBAAgB;AACjC,2BAAqB;AACrB;AAAA,IACF;AAEA,UAAM,YAAY,KAAK,QAAQ,SAAS;AACxC,QAAI,cAAc,WAAW;AAC3B;AAAA,IACF;AACA,gBAAY;AAAA,EACd;AAGA,MAAI,oBAAoB;AACtB,WAAO;AAAA,EACT;AAGA,eAAa,KAAK,QAAQ,KAAK,QAAQ,QAAQ,CAAC;AAChD,SAAO,eAAe,MAAM;AAC1B,eAAW,UAAU,mBAAmB;AACtC,YAAM,aAAa,KAAK,KAAK,YAAY,MAAM;AAC/C,UAAI,GAAG,WAAW,UAAU,GAAG;AAC7B,eAAO;AAAA,MACT;AAAA,IACF;AAEA,UAAM,YAAY,KAAK,QAAQ,UAAU;AACzC,QAAI,cAAc,YAAY;AAC5B;AAAA,IACF;AACA,iBAAa;AAAA,EACf;AAGA,SAAO,KAAK,QAAQ,KAAK,QAAQ,QAAQ,CAAC;AAC5C;","names":[]}
+{"version":3,"file":"workspace.js","names":["path","fs"],"sources":["../../src/lsp/workspace.ts"],"sourcesContent":["import * as fs from 'node:fs';\nimport * as path from 'node:path';\n\n/**\n * Workspace markers that indicate the root of a project\n */\nconst WORKSPACE_MARKERS = [\n  'package.json',\n  'tsconfig.json',\n  'pyproject.toml',\n  'go.mod',\n  '.git',\n  'Cargo.toml',\n  'composer.json',\n];\n\n/**\n * Find the workspace root by walking up from the file path\n * looking for common workspace markers.\n *\n * For monorepos, this prioritizes the closest package/project root\n * (e.g., packages/core) over the monorepo root.\n */\nexport function findWorkspaceRoot(filePath: string): string {\n  let currentDir = path.dirname(path.resolve(filePath));\n  const root = path.parse(currentDir).root;\n\n  // First, find the closest tsconfig.json or package.json\n  // This handles monorepos where the actual project is in a subdirectory\n  let closestProjectRoot: string | null = null;\n  let searchDir = currentDir;\n\n  while (searchDir !== root) {\n    const hasTsConfig = fs.existsSync(path.join(searchDir, 'tsconfig.json'));\n    const hasPackageJson = fs.existsSync(path.join(searchDir, 'package.json'));\n\n    if (hasTsConfig || hasPackageJson) {\n      closestProjectRoot = searchDir;\n      break;\n    }\n\n    const parentDir = path.dirname(searchDir);\n    if (parentDir === searchDir) {\n      break;\n    }\n    searchDir = parentDir;\n  }\n\n  // If we found a project root, return it\n  if (closestProjectRoot) {\n    return closestProjectRoot;\n  }\n\n  // Otherwise, fall back to looking for any workspace marker\n  currentDir = path.dirname(path.resolve(filePath));\n  while (currentDir !== root) {\n    for (const marker of WORKSPACE_MARKERS) {\n      const markerPath = path.join(currentDir, marker);\n      if (fs.existsSync(markerPath)) {\n        return currentDir;\n      }\n    }\n\n    const parentDir = path.dirname(currentDir);\n    if (parentDir === currentDir) {\n      break;\n    }\n    currentDir = parentDir;\n  }\n\n  // Fallback to the directory containing the file\n  return path.dirname(path.resolve(filePath));\n}\n"],"mappings":";;;;;;AAMA,MAAM,oBAAoB;CACxB;CACA;CACA;CACA;CACA;CACA;CACA;AACF;;;;;;;;AASA,SAAgB,kBAAkB,UAA0B;CAC1D,IAAI,aAAaA,OAAK,QAAQA,OAAK,QAAQ,QAAQ,CAAC;CACpD,MAAM,OAAOA,OAAK,MAAM,UAAU,CAAC,CAAC;CAIpC,IAAI,qBAAoC;CACxC,IAAI,YAAY;CAEhB,OAAO,cAAc,MAAM;EACzB,MAAM,cAAcC,KAAG,WAAWD,OAAK,KAAK,WAAW,eAAe,CAAC;EACvE,MAAM,iBAAiBC,KAAG,WAAWD,OAAK,KAAK,WAAW,cAAc,CAAC;EAEzE,IAAI,eAAe,gBAAgB;GACjC,qBAAqB;GACrB;EACF;EAEA,MAAM,YAAYA,OAAK,QAAQ,SAAS;EACxC,IAAI,cAAc,WAChB;EAEF,YAAY;CACd;CAGA,IAAI,oBACF,OAAO;CAIT,aAAaA,OAAK,QAAQA,OAAK,QAAQ,QAAQ,CAAC;CAChD,OAAO,eAAe,MAAM;EAC1B,KAAK,MAAM,UAAU,mBAAmB;GACtC,MAAM,aAAaA,OAAK,KAAK,YAAY,MAAM;GAC/C,IAAIC,KAAG,WAAW,UAAU,GAC1B,OAAO;EAEX;EAEA,MAAM,YAAYD,OAAK,QAAQ,UAAU;EACzC,IAAI,cAAc,YAChB;EAEF,aAAa;CACf;CAGA,OAAOA,OAAK,QAAQA,OAAK,QAAQ,QAAQ,CAAC;AAC5C"}

package/dist/mcp/config.js

@@ -1,229 +1,240 @@
-import * as fs from "node:fs";
-import * as os from "node:os";
-import * as path from "node:path";
 import { DEFAULT_CONFIG_DIR } from "../constants.js";
+import * as fs$1 from "fs";
+import * as os$1 from "os";
+import * as path$1 from "path";
+//#region src/mcp/config.ts
+/**
+* MCP server configuration loading from filesystem.
+* Loads from:
+*   1. .claude/settings.local.json  (Claude Code compat — lowest priority)
+*   2. ~/.mastracode/mcp.json       (global)
+*   3. .mcp.json                    (project root — Claude Code compatible)
+*   4. .mastracode/mcp.json         (project — highest priority)
+*
+* Higher-priority configs override lower ones by server name. The project root
+* `.mcp.json` is read so a project that already keeps MCP servers there for
+* Claude Code does not need to duplicate them under `.mastracode/`.
+*/
+/**
+* Default OAuth redirect URL for servers that do not configure one.
+* Port 1458 is stable across sessions so persisted tokens keep the same
+* storage fingerprint; it sits clear of the ports the Codex login flow
+* reserves (1455/1457). When 1458 is busy the callback server falls back
+* to the next sequential port, which stays covered by the client
+* registration (see `@mastra/mcp`'s `getCallbackUrlCandidates`).
+*/
 const DEFAULT_OAUTH_REDIRECT_URL = "http://127.0.0.1:1458/oauth/callback";
 const LOOPBACK_IPV4 = /^127\.(?:\d{1,3})\.(?:\d{1,3})\.(?:\d{1,3})$/;
 function isLoopbackHostname(hostname) {
-  return hostname === "localhost" || hostname === "[::1]" || hostname === "::1" || LOOPBACK_IPV4.test(hostname);
-}
+	return hostname === "localhost" || hostname === "[::1]" || hostname === "::1" || LOOPBACK_IPV4.test(hostname);
+}
+/**
+* Resolve the effective OAuth redirect URL for a server config.
+*
+* `callbackPort` (the Claude Code / Codex convention) takes precedence and
+* synthesizes `http://localhost:<port>/callback`. Config-file entries are
+* normalized by `parseOAuthConfig` (which also enforces that `callbackPort`
+* and `redirectUrl` are mutually exclusive), but programmatically registered
+* servers bypass the parser, so every consumer of the redirect URL must
+* resolve it through this helper rather than reading `redirectUrl` directly.
+*/
 function resolveOAuthRedirectUrl(oauth) {
-  if (oauth?.callbackPort !== void 0) {
-    return `http://localhost:${oauth.callbackPort}/callback`;
-  }
-  return oauth?.redirectUrl ?? DEFAULT_OAUTH_REDIRECT_URL;
+	if (oauth?.callbackPort !== void 0) return `http://localhost:${oauth.callbackPort}/callback`;
+	return oauth?.redirectUrl ?? "http://127.0.0.1:1458/oauth/callback";
 }
 function loadMcpConfig(projectDir, configDirName = DEFAULT_CONFIG_DIR) {
-  const claudeConfig = loadClaudeSettings(projectDir);
-  const globalConfig = loadSingleConfig(getGlobalMcpPath(configDirName));
-  const rootConfig = loadSingleConfig(getRootMcpPath(projectDir));
-  const projectConfig = loadSingleConfig(getProjectMcpPath(projectDir, configDirName));
-  return mergeConfigs(claudeConfig, globalConfig, rootConfig, projectConfig);
+	return mergeConfigs(loadClaudeSettings(projectDir), loadSingleConfig(getGlobalMcpPath(configDirName)), loadSingleConfig(getRootMcpPath(projectDir)), loadSingleConfig(getProjectMcpPath(projectDir, configDirName)));
 }
 function getProjectMcpPath(projectDir, configDirName = DEFAULT_CONFIG_DIR) {
-  return path.join(projectDir, configDirName, "mcp.json");
+	return path$1.join(projectDir, configDirName, "mcp.json");
 }
 function getRootMcpPath(projectDir) {
-  return path.join(projectDir, ".mcp.json");
+	return path$1.join(projectDir, ".mcp.json");
 }
 function getGlobalMcpPath(configDirName = DEFAULT_CONFIG_DIR) {
-  return path.join(os.homedir(), configDirName, "mcp.json");
+	return path$1.join(os$1.homedir(), configDirName, "mcp.json");
 }
 function getClaudeSettingsPath(projectDir) {
-  return path.join(projectDir, ".claude", "settings.local.json");
+	return path$1.join(projectDir, ".claude", "settings.local.json");
 }
 function loadSingleConfig(filePath) {
-  try {
-    if (!fs.existsSync(filePath)) return {};
-    const raw = fs.readFileSync(filePath, "utf-8");
-    return validateConfig(JSON.parse(raw));
-  } catch {
-    return {};
-  }
+	try {
+		if (!fs$1.existsSync(filePath)) return {};
+		const raw = fs$1.readFileSync(filePath, "utf-8");
+		return validateConfig(JSON.parse(raw));
+	} catch {
+		return {};
+	}
 }
 function loadClaudeSettings(projectDir) {
-  try {
-    const filePath = getClaudeSettingsPath(projectDir);
-    if (!fs.existsSync(filePath)) return {};
-    const raw = fs.readFileSync(filePath, "utf-8");
-    const parsed = JSON.parse(raw);
-    if (parsed?.mcpServers && typeof parsed.mcpServers === "object") {
-      return validateConfig({ mcpServers: parsed.mcpServers });
-    }
-    return {};
-  } catch {
-    return {};
-  }
-}
+	try {
+		const filePath = getClaudeSettingsPath(projectDir);
+		if (!fs$1.existsSync(filePath)) return {};
+		const raw = fs$1.readFileSync(filePath, "utf-8");
+		const parsed = JSON.parse(raw);
+		if (parsed?.mcpServers && typeof parsed.mcpServers === "object") return validateConfig({ mcpServers: parsed.mcpServers });
+		return {};
+	} catch {
+		return {};
+	}
+}
+/**
+* Expand `${VAR}` and `${VAR:-default}` references in a string from the
+* environment, matching how Claude Code resolves values in `.mcp.json`.
+* A referenced variable that is unset or empty falls back to its default,
+* or to an empty string when no default is given.
+*/
 function expandEnvVars(value, env = process.env) {
-  return value.replace(
-    /\$\{([A-Za-z_][A-Za-z0-9_]*)(?::-([^}]*))?\}|\$([A-Za-z_][A-Za-z0-9_]*)/g,
-    (_match, bracedName, fallback, bareName) => {
-      const name = bracedName ?? bareName;
-      const resolved = env[name];
-      if (resolved !== void 0 && resolved !== "") return resolved;
-      return fallback ?? "";
-    }
-  );
-}
+	return value.replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)(?::-([^}]*))?\}|\$([A-Za-z_][A-Za-z0-9_]*)/g, (_match, bracedName, fallback, bareName) => {
+		const resolved = env[bracedName ?? bareName];
+		if (resolved !== void 0 && resolved !== "") return resolved;
+		return fallback ?? "";
+	});
+}
+/**
+* Expand `${VAR}` and `$VAR` references in every string-valued HTTP header so that
+* secrets like API keys can be referenced from the environment instead of
+* being hardcoded in `mcp.json`.
+*/
 function expandHeaderEnvVars(headers) {
-  const expanded = {};
-  for (const [key, value] of Object.entries(headers)) {
-    if (typeof value === "string") expanded[key] = expandEnvVars(value);
-  }
-  return expanded;
-}
+	const expanded = {};
+	for (const [key, value] of Object.entries(headers)) if (typeof value === "string") expanded[key] = expandEnvVars(value);
+	return expanded;
+}
+/**
+* Expand `${VAR}` and `$VAR` references in every string-valued environment
+* variable passed to a stdio server, so that secrets can be referenced from the
+* host environment instead of being hardcoded in `mcp.json`.
+*/
 function expandEnvValues(env) {
-  const expanded = {};
-  for (const [key, value] of Object.entries(env)) {
-    if (typeof value === "string") expanded[key] = expandEnvVars(value);
-  }
-  return expanded;
+	const expanded = {};
+	for (const [key, value] of Object.entries(env)) if (typeof value === "string") expanded[key] = expandEnvVars(value);
+	return expanded;
 }
+/**
+* Classify a raw server entry as stdio, http, or skip (with reason).
+*/
 function classifyServerEntry(raw) {
-  if (!raw || typeof raw !== "object") {
-    return { kind: "skip", reason: "Invalid entry: expected an object" };
-  }
-  const obj = raw;
-  const hasCommand = typeof obj.command === "string";
-  const hasUrl = typeof obj.url === "string";
-  if (hasCommand && hasUrl) {
-    return { kind: "skip", reason: 'Cannot specify both "command" and "url"' };
-  }
-  if (hasCommand) {
-    return { kind: "stdio" };
-  }
-  if (hasUrl) {
-    try {
-      new URL(expandEnvVars(obj.url));
-    } catch {
-      return { kind: "skip", reason: `Invalid URL: "${obj.url}"` };
-    }
-    return { kind: "http" };
-  }
-  return { kind: "skip", reason: 'Missing required field: "command" (stdio) or "url" (http)' };
+	if (!raw || typeof raw !== "object") return {
+		kind: "skip",
+		reason: "Invalid entry: expected an object"
+	};
+	const obj = raw;
+	const hasCommand = typeof obj.command === "string";
+	const hasUrl = typeof obj.url === "string";
+	if (hasCommand && hasUrl) return {
+		kind: "skip",
+		reason: "Cannot specify both \"command\" and \"url\""
+	};
+	if (hasCommand) return { kind: "stdio" };
+	if (hasUrl) {
+		try {
+			new URL(expandEnvVars(obj.url));
+		} catch {
+			return {
+				kind: "skip",
+				reason: `Invalid URL: "${obj.url}"`
+			};
+		}
+		return { kind: "http" };
+	}
+	return {
+		kind: "skip",
+		reason: "Missing required field: \"command\" (stdio) or \"url\" (http)"
+	};
 }
 function validateConfig(raw) {
-  if (!raw || typeof raw !== "object") return {};
-  const obj = raw;
-  if (!obj.mcpServers || typeof obj.mcpServers !== "object") return {};
-  const servers = {};
-  const skippedServers = [];
-  const rawServers = obj.mcpServers;
-  for (const [name, entry] of Object.entries(rawServers)) {
-    const classification = classifyServerEntry(entry);
-    if (classification.kind === "stdio") {
-      const e = entry;
-      servers[name] = {
-        command: e.command,
-        args: Array.isArray(e.args) ? e.args : void 0,
-        env: typeof e.env === "object" && e.env !== null ? expandEnvValues(e.env) : void 0
-      };
-    } else if (classification.kind === "http") {
-      const e = entry;
-      const oauthResult = parseOAuthConfig(e.oauth);
-      if (oauthResult.reason) {
-        skippedServers.push({ name, reason: oauthResult.reason });
-        continue;
-      }
-      servers[name] = {
-        url: expandEnvVars(e.url),
-        headers: typeof e.headers === "object" && e.headers !== null ? expandHeaderEnvVars(e.headers) : void 0,
-        oauth: oauthResult.config
-      };
-    } else {
-      skippedServers.push({ name, reason: classification.reason });
-    }
-  }
-  const result = {};
-  if (Object.keys(servers).length > 0) {
-    result.mcpServers = servers;
-  }
-  if (skippedServers.length > 0) {
-    result.skippedServers = skippedServers;
-  }
-  return result;
+	if (!raw || typeof raw !== "object") return {};
+	const obj = raw;
+	if (!obj.mcpServers || typeof obj.mcpServers !== "object") return {};
+	const servers = {};
+	const skippedServers = [];
+	const rawServers = obj.mcpServers;
+	for (const [name, entry] of Object.entries(rawServers)) {
+		const classification = classifyServerEntry(entry);
+		if (classification.kind === "stdio") {
+			const e = entry;
+			servers[name] = {
+				command: e.command,
+				args: Array.isArray(e.args) ? e.args : void 0,
+				env: typeof e.env === "object" && e.env !== null ? expandEnvValues(e.env) : void 0
+			};
+		} else if (classification.kind === "http") {
+			const e = entry;
+			const oauthResult = parseOAuthConfig(e.oauth);
+			if (oauthResult.reason) {
+				skippedServers.push({
+					name,
+					reason: oauthResult.reason
+				});
+				continue;
+			}
+			servers[name] = {
+				url: expandEnvVars(e.url),
+				headers: typeof e.headers === "object" && e.headers !== null ? expandHeaderEnvVars(e.headers) : void 0,
+				oauth: oauthResult.config
+			};
+		} else skippedServers.push({
+			name,
+			reason: classification.reason
+		});
+	}
+	const result = {};
+	if (Object.keys(servers).length > 0) result.mcpServers = servers;
+	if (skippedServers.length > 0) result.skippedServers = skippedServers;
+	return result;
 }
 function parseOAuthConfig(raw) {
-  if (raw === void 0) return {};
-  if (!raw || typeof raw !== "object") {
-    return { reason: "Invalid OAuth config: expected an object" };
-  }
-  const obj = raw;
-  if (obj.redirectUrl !== void 0 && typeof obj.redirectUrl !== "string") {
-    return { reason: 'Invalid OAuth config: "redirectUrl" must be a string' };
-  }
-  let callbackPortRedirectUrl;
-  if (obj.callbackPort !== void 0) {
-    if (obj.redirectUrl !== void 0) {
-      return { reason: 'Invalid OAuth config: set either "redirectUrl" or "callbackPort", not both' };
-    }
-    if (typeof obj.callbackPort !== "number" || !Number.isInteger(obj.callbackPort) || obj.callbackPort < 1 || obj.callbackPort > 65535) {
-      return { reason: 'Invalid OAuth config: "callbackPort" must be an integer between 1 and 65535' };
-    }
-    callbackPortRedirectUrl = resolveOAuthRedirectUrl({ callbackPort: obj.callbackPort });
-  }
-  const rawRedirectUrl = callbackPortRedirectUrl ?? obj.redirectUrl ?? DEFAULT_OAUTH_REDIRECT_URL;
-  try {
-    const redirectUrl = new URL(rawRedirectUrl);
-    const isLoopback = isLoopbackHostname(redirectUrl.hostname);
-    if (redirectUrl.protocol !== "https:" && !(redirectUrl.protocol === "http:" && isLoopback)) {
-      return { reason: "Invalid OAuth redirectUrl: must use HTTPS unless it is a loopback HTTP URL" };
-    }
-  } catch {
-    return { reason: `Invalid OAuth redirectUrl: "${rawRedirectUrl}"` };
-  }
-  if (obj.scopes !== void 0 && (!Array.isArray(obj.scopes) || obj.scopes.some((scope) => typeof scope !== "string"))) {
-    return { reason: 'Invalid OAuth config: "scopes" must be an array of strings' };
-  }
-  return {
-    config: {
-      redirectUrl: rawRedirectUrl,
-      clientName: typeof obj.clientName === "string" ? obj.clientName : void 0,
-      scopes: obj.scopes,
-      clientId: typeof obj.clientId === "string" ? obj.clientId : void 0,
-      clientSecret: typeof obj.clientSecret === "string" ? obj.clientSecret : void 0
-    }
-  };
-}
+	if (raw === void 0) return {};
+	if (!raw || typeof raw !== "object") return { reason: "Invalid OAuth config: expected an object" };
+	const obj = raw;
+	if (obj.redirectUrl !== void 0 && typeof obj.redirectUrl !== "string") return { reason: "Invalid OAuth config: \"redirectUrl\" must be a string" };
+	let callbackPortRedirectUrl;
+	if (obj.callbackPort !== void 0) {
+		if (obj.redirectUrl !== void 0) return { reason: "Invalid OAuth config: set either \"redirectUrl\" or \"callbackPort\", not both" };
+		if (typeof obj.callbackPort !== "number" || !Number.isInteger(obj.callbackPort) || obj.callbackPort < 1 || obj.callbackPort > 65535) return { reason: "Invalid OAuth config: \"callbackPort\" must be an integer between 1 and 65535" };
+		callbackPortRedirectUrl = resolveOAuthRedirectUrl({ callbackPort: obj.callbackPort });
+	}
+	const rawRedirectUrl = callbackPortRedirectUrl ?? obj.redirectUrl ?? "http://127.0.0.1:1458/oauth/callback";
+	try {
+		const redirectUrl = new URL(rawRedirectUrl);
+		const isLoopback = isLoopbackHostname(redirectUrl.hostname);
+		if (redirectUrl.protocol !== "https:" && !(redirectUrl.protocol === "http:" && isLoopback)) return { reason: "Invalid OAuth redirectUrl: must use HTTPS unless it is a loopback HTTP URL" };
+	} catch {
+		return { reason: `Invalid OAuth redirectUrl: "${rawRedirectUrl}"` };
+	}
+	if (obj.scopes !== void 0 && (!Array.isArray(obj.scopes) || obj.scopes.some((scope) => typeof scope !== "string"))) return { reason: "Invalid OAuth config: \"scopes\" must be an array of strings" };
+	return { config: {
+		redirectUrl: rawRedirectUrl,
+		clientName: typeof obj.clientName === "string" ? obj.clientName : void 0,
+		scopes: obj.scopes,
+		clientId: typeof obj.clientId === "string" ? obj.clientId : void 0,
+		clientSecret: typeof obj.clientSecret === "string" ? obj.clientSecret : void 0
+	} };
+}
+/**
+* Merge configs: claude (lowest priority) < global < project (highest).
+* Later configs override earlier by server name.
+* Skipped entries are accumulated, but if a higher-priority config provides
+* a valid entry for a skipped name, the skip is removed.
+*/
 function mergeConfigs(...configs) {
-  const merged = {};
-  const allSkipped = [];
-  for (const config of configs) {
-    if (config.mcpServers) {
-      for (const [name, server] of Object.entries(config.mcpServers)) {
-        merged[name] = server;
-      }
-    }
-    if (config.skippedServers) {
-      allSkipped.push(...config.skippedServers);
-    }
-  }
-  const validNames = new Set(Object.keys(merged));
-  const filteredSkipped = allSkipped.filter((s) => !validNames.has(s.name));
-  const skippedMap = /* @__PURE__ */ new Map();
-  for (const s of filteredSkipped) {
-    skippedMap.set(s.name, s);
-  }
-  const result = {};
-  if (Object.keys(merged).length > 0) {
-    result.mcpServers = merged;
-  }
-  if (skippedMap.size > 0) {
-    result.skippedServers = Array.from(skippedMap.values());
-  }
-  return result;
-}
-export {
-  DEFAULT_OAUTH_REDIRECT_URL,
-  classifyServerEntry,
-  expandEnvVars,
-  getClaudeSettingsPath,
-  getGlobalMcpPath,
-  getProjectMcpPath,
-  getRootMcpPath,
-  loadMcpConfig,
-  resolveOAuthRedirectUrl,
-  validateConfig
-};
+	const merged = {};
+	const allSkipped = [];
+	for (const config of configs) {
+		if (config.mcpServers) for (const [name, server] of Object.entries(config.mcpServers)) merged[name] = server;
+		if (config.skippedServers) allSkipped.push(...config.skippedServers);
+	}
+	const validNames = new Set(Object.keys(merged));
+	const filteredSkipped = allSkipped.filter((s) => !validNames.has(s.name));
+	const skippedMap = /* @__PURE__ */ new Map();
+	for (const s of filteredSkipped) skippedMap.set(s.name, s);
+	const result = {};
+	if (Object.keys(merged).length > 0) result.mcpServers = merged;
+	if (skippedMap.size > 0) result.skippedServers = Array.from(skippedMap.values());
+	return result;
+}
+//#endregion
+export { DEFAULT_OAUTH_REDIRECT_URL, classifyServerEntry, expandEnvVars, getClaudeSettingsPath, getGlobalMcpPath, getProjectMcpPath, getRootMcpPath, loadMcpConfig, resolveOAuthRedirectUrl, validateConfig };
+
 //# sourceMappingURL=config.js.map