fix(dbt-tools): address code review findings for config auto-discovery

- Add `ALTIMATE_CODE_PYTHON_PATH` as highest priority in `discoverPython()`
  so VS Code's explicit Python selection is not silently ignored
- Align `ALTIMATE_CODE_VIRTUAL_ENV` priority: move to tier 4 in `resolveDbt()`
  (before project-local `.venv`) to match `discoverPython()` priority and
  prevent Python/dbt resolving from different environments
- Add `JSON.parse` error handling in `read()` — malformed config file now
  falls back to auto-discovery instead of crashing
- Fix stale inline comment numbering in `dbt-resolve.ts` (1-11)
- Fix environment-dependent `read returns null` test by setting CWD to temp dir
- Add tests: `ALTIMATE_CODE_PYTHON_PATH` priority, malformed config fallback
- Run prettier on `dbt-resolve.ts` and `dbt-resolve.test.ts`

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: anandgupta42

packages/dbt-tools/src/config.ts

@@ -35,9 +35,13 @@ export function findProjectRoot(start = process.cwd()): string | null {
 
 /**
  * Discover the Python binary for a given project root.
- * Priority: ALTIMATE_CODE_VIRTUAL_ENV → project-local .venv → VIRTUAL_ENV → CONDA_PREFIX → which python3
+ * Priority: ALTIMATE_CODE_PYTHON_PATH → ALTIMATE_CODE_VIRTUAL_ENV → project-local .venv → VIRTUAL_ENV → CONDA_PREFIX → which python3
  */
 export function discoverPython(projectRoot: string): string {
+  // ALTIMATE_CODE_PYTHON_PATH (explicit selection from vscode-altimate-mcp-server — highest priority)
+  const altPython = process.env.ALTIMATE_CODE_PYTHON_PATH
+  if (altPython && existsSync(altPython)) return altPython
+
   // ALTIMATE_CODE_VIRTUAL_ENV (injected by vscode-altimate-mcp-server — explicit user selection wins)
   const altVenv = process.env.ALTIMATE_CODE_VIRTUAL_ENV
   if (altVenv) {
@@ -85,8 +89,12 @@ export function discoverPython(projectRoot: string): string {
 async function read(): Promise<Config | null> {
   const p = configPath()
   if (existsSync(p)) {
-    const raw = await readFile(p, "utf-8")
-    return JSON.parse(raw) as Config
+    try {
+      const raw = await readFile(p, "utf-8")
+      return JSON.parse(raw) as Config
+    } catch {
+      // Malformed config — fall through to auto-discovery
+    }
   }
   // No config file — auto-discover from cwd so `altimate-dbt init` isn't required
   const projectRoot = findProjectRoot()

packages/dbt-tools/src/dbt-resolve.ts

@@ -45,13 +45,14 @@ export interface ResolvedDbt {
  *  1. ALTIMATE_DBT_PATH env var (explicit user override)
  *  2. Sibling of ALTIMATE_CODE_PYTHON_PATH (set by vscode-altimate-mcp-server)
  *  3. Sibling of configured pythonPath (same venv/bin)
- *  4. Project-local .venv/bin/dbt (uv, pdm, venv, rye, poetry in-project)
- *  5. CONDA_PREFIX/bin/dbt (conda environments)
- *  6. ALTIMATE_CODE_VIRTUAL_ENV/bin/dbt (set by vscode-altimate-mcp-server)
+ *  4. ALTIMATE_CODE_VIRTUAL_ENV/bin/dbt (set by vscode-altimate-mcp-server)
+ *  5. Project-local .venv/bin/dbt (uv, pdm, venv, rye, poetry in-project)
+ *  6. CONDA_PREFIX/bin/dbt (conda environments)
  *  7. VIRTUAL_ENV/bin/dbt (activated venv)
  *  8. Pyenv real path resolution (follow shims)
- *  9. `which dbt` on current PATH
- * 10. Common known locations (~/.local/bin/dbt for pipx, etc.)
+ *  9. asdf/mise shim resolution
+ * 10. `which dbt` on current PATH
+ * 11. Common known locations (~/.local/bin/dbt for pipx, etc.)
  *
  * Each candidate is validated by checking it exists and is executable.
  */
@@ -88,15 +89,29 @@ export function resolveDbt(pythonPath?: string, projectRoot?: string): ResolvedD
     } catch {}
   }
 
-  // 3. Project-local .venv/bin/dbt (uv, pdm, venv, poetry in-project, rye)
+  // 4. ALTIMATE_CODE_VIRTUAL_ENV (injected by vscode-altimate-mcp-server, avoids conflicts with user's VIRTUAL_ENV)
+  const altVenv = process.env.ALTIMATE_CODE_VIRTUAL_ENV
+  if (altVenv) {
+    candidates.push({
+      path: join(altVenv, "bin", "dbt"),
+      source: `ALTIMATE_CODE_VIRTUAL_ENV (${altVenv})`,
+      binDir: join(altVenv, "bin"),
+    })
+  }
+
+  // 5. Project-local .venv/bin/dbt (uv, pdm, venv, poetry in-project, rye)
   if (projectRoot) {
     for (const venvDir of [".venv", "venv", "env"]) {
       const localDbt = join(projectRoot, venvDir, "bin", "dbt")
-      candidates.push({ path: localDbt, source: `${venvDir}/ in project root`, binDir: join(projectRoot, venvDir, "bin") })
+      candidates.push({
+        path: localDbt,
+        source: `${venvDir}/ in project root`,
+        binDir: join(projectRoot, venvDir, "bin"),
+      })
     }
   }
 
-  // 5. CONDA_PREFIX (conda/mamba/micromamba — set after `conda activate`)
+  // 6. CONDA_PREFIX (conda/mamba/micromamba — set after `conda activate`)
   const condaPrefix = process.env.CONDA_PREFIX
   if (condaPrefix) {
     candidates.push({
@@ -106,16 +121,6 @@ export function resolveDbt(pythonPath?: string, projectRoot?: string): ResolvedD
     })
   }
 
-  // 6. ALTIMATE_CODE_VIRTUAL_ENV (injected by vscode-altimate-mcp-server, avoids conflicts with user's VIRTUAL_ENV)
-  const altVenv = process.env.ALTIMATE_CODE_VIRTUAL_ENV
-  if (altVenv) {
-    candidates.push({
-      path: join(altVenv, "bin", "dbt"),
-      source: `ALTIMATE_CODE_VIRTUAL_ENV (${altVenv})`,
-      binDir: join(altVenv, "bin"),
-    })
-  }
-
   // 7. VIRTUAL_ENV (set by venv/virtualenv activate scripts)
   const virtualEnv = process.env.VIRTUAL_ENV
   if (virtualEnv) {
@@ -162,7 +167,7 @@ export function resolveDbt(pythonPath?: string, projectRoot?: string): ResolvedD
     } catch {}
   }
 
-  // 8. `which dbt` on current PATH (catches pipx ~/.local/bin, system pip, homebrew, etc.)
+  // 10. `which dbt` on current PATH (catches pipx ~/.local/bin, system pip, homebrew, etc.)
   try {
     const whichDbt = execFileSync("which", ["dbt"], {
       encoding: "utf-8",
@@ -174,7 +179,7 @@ export function resolveDbt(pythonPath?: string, projectRoot?: string): ResolvedD
     }
   } catch {}
 
-  // 9. Common known locations (last resort)
+  // 11. Common known locations (last resort)
   const home = process.env.HOME ?? ""
   const knownPaths = [
     { path: join(home, ".local", "bin", "dbt"), source: "~/.local/bin/dbt (pipx/user pip)" },
@@ -202,9 +207,7 @@ export function resolveDbt(pythonPath?: string, projectRoot?: string): ResolvedD
  */
 export function validateDbt(resolved: ResolvedDbt): { version: string; isFusion: boolean } | null {
   try {
-    const env = resolved.binDir
-      ? { ...process.env, PATH: `${resolved.binDir}:${process.env.PATH}` }
-      : process.env
+    const env = resolved.binDir ? { ...process.env, PATH: `${resolved.binDir}:${process.env.PATH}` } : process.env
 
     const out = execFileSync(resolved.path, ["--version"], {
       encoding: "utf-8",

packages/dbt-tools/test/config.test.ts

@@ -20,9 +20,15 @@ describe("config", () => {
   })
 
   test("read returns null for missing file", async () => {
-    const { read } = await import("../src/config")
-    const result = await read()
-    expect(result).toBeNull()
+    const origCwd = process.cwd()
+    process.chdir(dir)
+    try {
+      const { read } = await import("../src/config")
+      const result = await read()
+      expect(result).toBeNull()
+    } finally {
+      process.chdir(origCwd)
+    }
   })
 
   test("write and read round-trip", async () => {
@@ -76,6 +82,31 @@ describe("config", () => {
     }
   })
 
+  test("read falls back to auto-discovery on malformed config file", async () => {
+    const { read } = await import("../src/config")
+    // Write a malformed JSON config file
+    const configDir = join(dir, ".altimate-code")
+    await mkdir(configDir, { recursive: true })
+    await writeFile(join(configDir, "dbt.json"), "{ invalid json !!!")
+
+    // Create a dbt project so auto-discovery has something to find
+    await writeFile(join(dir, "dbt_project.yml"), "name: test")
+    const binDir = join(dir, ".venv", "bin")
+    await mkdir(binDir, { recursive: true })
+    await writeFile(join(binDir, "python3"), "#!/bin/sh")
+
+    const origCwd = process.cwd()
+    process.chdir(dir)
+    try {
+      const result = await read()
+      // Should fall through to auto-discovery instead of crashing
+      expect(result).not.toBeNull()
+      expect(result!.dbtIntegration).toBe("corecommand")
+    } finally {
+      process.chdir(origCwd)
+    }
+  })
+
   test("read returns null when no config file and no dbt_project.yml in cwd", async () => {
     // dir has no dbt_project.yml and HOME has no config file
     const origCwd = process.cwd()
@@ -138,6 +169,32 @@ describe("discoverPython", () => {
     await rm(dir, { recursive: true, force: true })
   })
 
+  test("ALTIMATE_CODE_PYTHON_PATH takes highest priority", async () => {
+    const { discoverPython } = await import("../src/config")
+
+    const altPythonBin = join(dir, "alt-python", "bin")
+    await mkdir(altPythonBin, { recursive: true })
+    await writeFile(join(altPythonBin, "python3"), "#!/bin/sh")
+
+    const localBin = join(dir, "project", ".venv", "bin")
+    await mkdir(localBin, { recursive: true })
+    await writeFile(join(localBin, "python3"), "#!/bin/sh")
+
+    const origPython = process.env.ALTIMATE_CODE_PYTHON_PATH
+    const origVenv = process.env.ALTIMATE_CODE_VIRTUAL_ENV
+    process.env.ALTIMATE_CODE_PYTHON_PATH = join(altPythonBin, "python3")
+    process.env.ALTIMATE_CODE_VIRTUAL_ENV = join(dir, "project", ".venv")
+    try {
+      const result = discoverPython(join(dir, "project"))
+      expect(result).toBe(join(altPythonBin, "python3"))
+    } finally {
+      if (origPython !== undefined) process.env.ALTIMATE_CODE_PYTHON_PATH = origPython
+      else delete process.env.ALTIMATE_CODE_PYTHON_PATH
+      if (origVenv !== undefined) process.env.ALTIMATE_CODE_VIRTUAL_ENV = origVenv
+      else delete process.env.ALTIMATE_CODE_VIRTUAL_ENV
+    }
+  })
+
   test("ALTIMATE_CODE_VIRTUAL_ENV takes priority over project-local .venv", async () => {
     const { discoverPython } = await import("../src/config")
 
@@ -163,8 +220,10 @@ describe("discoverPython", () => {
   test("falls back to project-local .venv/bin/python3", async () => {
     const { discoverPython } = await import("../src/config")
 
-    const orig = process.env.ALTIMATE_CODE_VIRTUAL_ENV
+    const origVenv = process.env.ALTIMATE_CODE_VIRTUAL_ENV
+    const origPython = process.env.ALTIMATE_CODE_PYTHON_PATH
     delete process.env.ALTIMATE_CODE_VIRTUAL_ENV
+    delete process.env.ALTIMATE_CODE_PYTHON_PATH
 
     const binDir = join(dir, ".venv", "bin")
     await mkdir(binDir, { recursive: true })
@@ -174,15 +233,18 @@ describe("discoverPython", () => {
       const result = discoverPython(dir)
       expect(result).toBe(join(binDir, "python3"))
     } finally {
-      if (orig !== undefined) process.env.ALTIMATE_CODE_VIRTUAL_ENV = orig
+      if (origVenv !== undefined) process.env.ALTIMATE_CODE_VIRTUAL_ENV = origVenv
+      if (origPython !== undefined) process.env.ALTIMATE_CODE_PYTHON_PATH = origPython
     }
   })
 
   test("tries python3 before python in each location", async () => {
     const { discoverPython } = await import("../src/config")
 
-    const orig = process.env.ALTIMATE_CODE_VIRTUAL_ENV
+    const origVenv = process.env.ALTIMATE_CODE_VIRTUAL_ENV
+    const origPython = process.env.ALTIMATE_CODE_PYTHON_PATH
     delete process.env.ALTIMATE_CODE_VIRTUAL_ENV
+    delete process.env.ALTIMATE_CODE_PYTHON_PATH
 
     const binDir = join(dir, ".venv", "bin")
     await mkdir(binDir, { recursive: true })
@@ -193,7 +255,8 @@ describe("discoverPython", () => {
       const result = discoverPython(dir)
       expect(result).toBe(join(binDir, "python3"))
     } finally {
-      if (orig !== undefined) process.env.ALTIMATE_CODE_VIRTUAL_ENV = orig
+      if (origVenv !== undefined) process.env.ALTIMATE_CODE_VIRTUAL_ENV = origVenv
+      if (origPython !== undefined) process.env.ALTIMATE_CODE_PYTHON_PATH = origPython
     }
   })
 })

packages/dbt-tools/test/dbt-resolve.test.ts

@@ -27,7 +27,9 @@ function fakePython(dir: string): string {
   chmodSync(p, 0o755)
   // Also create python3 symlink
   const p3 = join(dir, "python3")
-  try { symlinkSync(p, p3) } catch {}
+  try {
+    symlinkSync(p, p3)
+  } catch {}
   return p
 }
 
@@ -38,7 +40,9 @@ beforeEach(() => {
 })
 
 afterEach(() => {
-  try { rmSync(tempDir, { recursive: true, force: true }) } catch {}
+  try {
+    rmSync(tempDir, { recursive: true, force: true })
+  } catch {}
 })
 
 // ---------------------------------------------------------------------------