@indy2kro/agentenv 0.4.1 → 1.0.0

package/dist/toolchain/fallbacks.js

@@ -1,38 +1,14 @@
 /**
- * Platform-specific Fallback Installations
- * Handles tools that cannot be installed via mise (tokei)
- * Implements platform-specific fallback paths as documented in phase0-findings.md
+ * Toolchain Fallbacks
+ * Marks tools that cannot be installed via mise (tokei) and tools whose only
+ * mise backend refuses to resolve on certain platforms, as documented in
+ * phase0-windows-findings.md. The old per-platform install/verify/advice
+ * helpers were dead public surface and were removed — tool installation is
+ * delegated to mise or handled through `[[custom_tools]]`.
  */
-import * as child_process from 'child_process';
-/**
- * Fallback tools that cannot be installed via mise
- * Based on Phase 0 findings:
- * - tokei: aqua:XAMPPRocky/tokei doesn't work, needs cargo:tokei (requires Rust)
- */
-export const FALLBACK_TOOLS = {
-    tokei: {
-        name: 'tokei',
-        description: 'Fast LOC/code-statistics tool',
-        install: {
-            macos: ['brew install --quiet tokei'],
-            linux: ['cargo install --quiet tokei', 'sudo apt-get install -y tokei'],
-            windows: ['cargo install --quiet tokei', 'choco install tokei'],
-        },
-        verify: {
-            macos: ['command -v tokei', 'tokei --version'],
-            linux: ['command -v tokei', 'tokei --version'],
-            windows: ['where tokei', 'tokei --version'],
-        },
-        paths: {
-            macos: '/usr/local/bin/tokei',
-            linux: '~/.cargo/bin/tokei',
-            windows: '%USERPROFILE%\\.cargo\\bin\\tokei.exe',
-        },
-    },
-};
 /**
  * Tools that have special installation requirements
- * These are marked as "Fallback required" in phase0-findings.md
+ * These are marked as "Fallback required" in phase0-windows-findings.md
  */
 export const FALLBACK_REQUIRED_TOOLS = ['tokei'];
 /**
@@ -57,183 +33,4 @@ export const PLATFORM_UNSUPPORTED_TOOLS = {
 export function isPlatformUnsupported(toolName, platform = process.platform) {
     return PLATFORM_UNSUPPORTED_TOOLS[toolName]?.includes(platform) ?? false;
 }
-/**
- * Get the platform-specific installation command for a fallback tool
- */
-export function getInstallCommand(toolName) {
-    const platform = process.platform;
-    const fallbackTool = FALLBACK_TOOLS[toolName];
-    if (!fallbackTool) {
-        return undefined;
-    }
-    if (platform === 'darwin') {
-        return fallbackTool.install.macos;
-    }
-    else if (platform === 'linux') {
-        return fallbackTool.install.linux;
-    }
-    else if (platform === 'win32') {
-        return fallbackTool.install.windows;
-    }
-    return undefined;
-}
-/**
- * Get the platform-specific verification command for a fallback tool
- */
-export function getVerifyCommand(toolName) {
-    const platform = process.platform;
-    const fallbackTool = FALLBACK_TOOLS[toolName];
-    if (!fallbackTool) {
-        return undefined;
-    }
-    if (platform === 'darwin') {
-        return fallbackTool.verify.macos;
-    }
-    else if (platform === 'linux') {
-        return fallbackTool.verify.linux;
-    }
-    else if (platform === 'win32') {
-        return fallbackTool.verify.windows;
-    }
-    return undefined;
-}
-/**
- * Check if a fallback tool is installed on the current platform
- */
-export function isFallbackToolInstalled(toolName) {
-    const verifyCommands = getVerifyCommand(toolName);
-    if (!verifyCommands || verifyCommands.length === 0) {
-        return false;
-    }
-    try {
-        // Try each verification command until one succeeds
-        for (const cmd of verifyCommands) {
-            const shell = process.platform === 'win32' ? 'cmd.exe' : 'sh';
-            const shellArgs = process.platform === 'win32' ? ['/c', cmd] : ['-c', cmd];
-            const result = child_process.spawnSync(shell, shellArgs, { stdio: 'ignore', shell: true });
-            if (result.status === 0)
-                return true;
-        }
-        return false;
-    }
-    catch {
-        return false;
-    }
-}
-/**
- * Install a fallback tool on the current platform
- * Returns success status and any error message
- */
-export function installFallbackTool(toolName) {
-    const installCommands = getInstallCommand(toolName);
-    if (!installCommands || installCommands.length === 0) {
-        return {
-            success: false,
-            message: `No installation commands defined for ${toolName} on ${process.platform}`,
-        };
-    }
-    const fallbackTool = FALLBACK_TOOLS[toolName];
-    try {
-        // Try each installation command until one succeeds
-        for (const cmd of installCommands) {
-            try {
-                const shell = process.platform === 'win32' ? 'cmd.exe' : 'sh';
-                const shellArgs = process.platform === 'win32' ? ['/c', cmd] : ['-c', cmd];
-                child_process.spawnSync(shell, shellArgs, { stdio: 'inherit', shell: true });
-                // Verify installation was successful
-                if (isFallbackToolInstalled(toolName)) {
-                    return {
-                        success: true,
-                        message: `Successfully installed ${fallbackTool?.description || toolName} via: ${cmd}`,
-                    };
-                }
-            }
-            catch {
-                // Try the next command
-                continue;
-            }
-        }
-        return {
-            success: false,
-            message: `Failed to install ${fallbackTool?.description || toolName}. Tried all available installation methods.`,
-        };
-    }
-    catch (err) {
-        return {
-            success: false,
-            message: `Error installing ${fallbackTool?.description || toolName}: ${err}`,
-        };
-    }
-}
-/**
- * Get the expected path for a fallback tool on the current platform
- */
-export function getFallbackToolPath(toolName) {
-    const platform = process.platform;
-    const fallbackTool = FALLBACK_TOOLS[toolName];
-    if (!fallbackTool || !fallbackTool.paths) {
-        return undefined;
-    }
-    if (platform === 'darwin' && fallbackTool.paths.macos) {
-        return fallbackTool.paths.macos;
-    }
-    else if (platform === 'linux' && fallbackTool.paths.linux) {
-        return fallbackTool.paths.linux;
-    }
-    else if (platform === 'win32' && fallbackTool.paths.windows) {
-        return fallbackTool.paths.windows;
-    }
-    return undefined;
-}
-/**
- * Generate platform-specific advice for installing a fallback tool
- */
-export function getFallbackInstallationAdvice(toolName) {
-    const platform = process.platform;
-    const fallbackTool = FALLBACK_TOOLS[toolName];
-    if (!fallbackTool) {
-        return `Tool ${toolName} requires manual installation. Please install it according to your platform's package manager.`;
-    }
-    const installCommands = getInstallCommand(toolName);
-    if (platform === 'darwin') {
-        return `To install ${fallbackTool.description} on macOS, run: ${installCommands?.join(' or ')}`;
-    }
-    else if (platform === 'linux') {
-        return `To install ${fallbackTool.description} on Linux, run: ${installCommands?.join(' or ')}`;
-    }
-    else if (platform === 'win32') {
-        return `To install ${fallbackTool.description} on Windows, run: ${installCommands?.join(' or ')}`;
-    }
-    return `Tool ${toolName} requires manual installation.`;
-}
-/**
- * Generate custom tool configuration for fallback tools
- * This can be used when generating agentenv.toml for tools that need fallbacks
- */
-export function generateFallbackCustomToolConfig(toolName) {
-    const fallbackTool = FALLBACK_TOOLS[toolName];
-    if (!fallbackTool) {
-        return '';
-    }
-    const lines = [];
-    lines.push(`# ${fallbackTool.description}`);
-    lines.push(`# Platform-specific fallback installation required`);
-    lines.push(`# macOS: ${fallbackTool.install.macos.join(' or ')}`);
-    lines.push(`# Linux: ${fallbackTool.install.linux.join(' or ')}`);
-    lines.push(`# Windows: ${fallbackTool.install.windows.join(' or ')}`);
-    lines.push(`[[custom_tools]]`);
-    lines.push(`name = "${toolName}"`);
-    lines.push(`description = "${fallbackTool.description}"`);
-    lines.push(`already_installed = true`);
-    if (fallbackTool.paths.macos) {
-        lines.push(`path.macos = "${fallbackTool.paths.macos}"`);
-    }
-    if (fallbackTool.paths.linux) {
-        lines.push(`path.linux = "${fallbackTool.paths.linux}"`);
-    }
-    if (fallbackTool.paths.windows) {
-        lines.push(`path.windows = "${fallbackTool.paths.windows}"`);
-    }
-    return lines.join('\n');
-}
 //# sourceMappingURL=fallbacks.js.map

package/dist/toolchain/fallbacks.js.map

@@ -1 +1 @@
-{"version":3,"file":"fallbacks.js","sourceRoot":"","sources":["../../src/toolchain/fallbacks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fallbacks.js","sourceRoot":"","sources":["../../src/toolchain/fallbacks.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH;;;GAGG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,OAAO,CAAC,CAAC;AAEjD;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,QAAgB;IAC/C,OAAO,uBAAuB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACpD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAsC;IAC3E,WAAW,EAAE,CAAC,OAAO,CAAC;IACtB,KAAK,EAAE,CAAC,OAAO,CAAC;CACjB,CAAC;AAEF,0EAA0E;AAC1E,MAAM,UAAU,qBAAqB,CACnC,QAAgB,EAChB,WAA4B,OAAO,CAAC,QAAQ;IAE5C,OAAO,0BAA0B,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC;AAC3E,CAAC"}

package/dist/toolchain/mise.d.ts

@@ -13,16 +13,14 @@ export interface MiseTool {
     tier: number;
     category: string;
 }
-export interface MiseConfig {
-    tools: Record<string, string>;
-    env?: Record<string, string>;
-    settings?: Record<string, any>;
-}
 /**
  * Tools agentenv invokes directly are pinned to versions we have verified;
  * everything else resolves to latest. rtk is invoked by agentenv's delegation
  * (its `init` flags are the hook contract), moves fast, and must stay pinned —
- * bump deliberately per plan §10.
+ * bump deliberately per plan §10. A catalog tool is also pinned when its
+ * `latest` release is currently broken upstream (mise's aqua backend cannot
+ * install it), so the generated mise.toml ships a known-good version instead
+ * of reproducing the upstream failure on every user machine.
  */
 export declare const PINNED_TOOL_VERSIONS: Record<string, string>;
 /**
@@ -77,11 +75,25 @@ export declare function upsertShimsDir(content: string, dir: string): string;
  * config, or null when it is absent. Used by `agentenv doctor`.
  */
 export declare function getShimsDirValue(content: string): string | null;
+/**
+ * Remove the `shims_dir` line that upsertShimsDir writes and, if that leaves
+ * the `[settings]` section with no other keys, the section header too ("other
+ * keys" means any non-empty line between the header and the next section).
+ * Returns the content unchanged when no `shims_dir` line is present. Surgical
+ * counterpart to upsertShimsDir, used by `shell-fix --revert`.
+ */
+export declare function removeShimsDirValue(content: string): string;
 /**
  * Ensure mise's GLOBAL config declares the shims_dir agentenv relies on, and
  * tell the user whether the shims dir is actually on PATH. Idempotent.
+ *
+ * When `statePath` is given, a change made here is recorded in the shell-fix
+ * manifest (agent `mise`) so `agentenv shell-fix --revert` can undo it. The
+ * existing manifest's bashExe is preserved when merging so a Tier 0 entry and
+ * the mise entry coexist in one apply run without clobbering each other's
+ * revert comparison value.
  */
-export declare function ensureGlobalShimsDir(): {
+export declare function ensureGlobalShimsDir(statePath?: string): {
     success: boolean;
     message: string;
 };
@@ -169,7 +181,6 @@ export interface MiseCapturedOutput {
     status: number | null;
     stdout: string;
     stderr: string;
-    blockedWarn: boolean;
 }
 /**
  * Run a single mise command with args passed as an array (never a
@@ -190,8 +201,6 @@ export declare function isMiseInstalled(): boolean;
  * installed version, so it is dropped here).
  */
 export declare function getMiseVersion(): string;
-/** Alias used by prereq/status/doctor so version probes never surface mise WARN. */
-export declare function getMiseVersionSilent(): string;
 /**
  * Check if a specific tool is installed via mise
  */
@@ -276,6 +285,10 @@ export interface VerifyToolOptions {
     /** cwd / mise.toml for the lazy `mise ls --json` probe (scope-aware). */
     cwd?: string;
     miseTomlPath?: string;
+    /** Injectable PATH resolver; defaults to the real `resolveBinary`. */
+    resolveFn?: (binary: string) => string | null;
+    /** Injectable shim check; defaults to the real `shimExists`. */
+    shimCheck?: (binary: string) => boolean;
 }
 /**
  * After `mise install`, check which enabled tools actually resolve on PATH so
@@ -382,13 +395,4 @@ export declare function parseInstalledToolState(raw: string): Record<string, Ins
  * output (or an absent mise) yields an empty map rather than `null`.
  */
 export declare function getInstalledToolState(raw?: string, opts?: RunMiseCapturedOptions): Record<string, InstalledToolState>;
-/**
- * Parse existing mise.toml file
- */
-export declare function parseMiseToml(filePath: string): MiseConfig | null;
-/**
- * Merge existing mise.toml with new tools
- * Preserves existing tools that are not in the new config
- */
-export declare function mergeMiseConfigs(existing: MiseConfig | null, newConfig: MiseConfig): MiseConfig;
 //# sourceMappingURL=mise.d.ts.map

package/dist/toolchain/mise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mise.d.ts","sourceRoot":"","sources":["../../src/toolchain/mise.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mise.d.ts","sourceRoot":"","sources":["../../src/toolchain/mise.ts"],"names":[],"mappings":"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"}

package/dist/toolchain/mise.js

@@ -10,6 +10,7 @@ import { BINARY_MAP, TOOL_KEYS, TOOL_TIERS } from '../config/schema.js';
 import { resolveBinary } from '../adapters/detect.js';
 import { writeFileWithVerify } from '../utils/fs-retry.js';
 import { FALLBACK_REQUIRED_TOOLS, isPlatformUnsupported, requiresFallback } from './fallbacks.js';
+import { mergeShellFixEntries, readShellFixState, writeShellFixState, } from '../shell/shell-fix-state.js';
 // Tool to mise name mappings
 export const MISE_TOOL_NAMES = {
     ripgrep: 'ripgrep',
@@ -53,10 +54,20 @@ export { FALLBACK_REQUIRED_TOOLS, isPlatformUnsupported, requiresFallback };
  * Tools agentenv invokes directly are pinned to versions we have verified;
  * everything else resolves to latest. rtk is invoked by agentenv's delegation
  * (its `init` flags are the hook contract), moves fast, and must stay pinned —
- * bump deliberately per plan §10.
+ * bump deliberately per plan §10. A catalog tool is also pinned when its
+ * `latest` release is currently broken upstream (mise's aqua backend cannot
+ * install it), so the generated mise.toml ships a known-good version instead
+ * of reproducing the upstream failure on every user machine.
  */
 export const PINNED_TOOL_VERSIONS = {
     rtk: '0.49.0',
+    // difftastic 0.71.0+ renamed its release assets to `difft-<version>-…`
+    // (unversioned before), which the aqua registry's asset template does not
+    // match on any platform — `mise install` fails with "no asset found:
+    // difft-x86_64-unknown-linux-musl.tar.gz". 0.70.0 is the last verified
+    // installable release (phase0 research docs). Unpin when upstream fixes
+    // the asset naming or mise resolves it for us.
+    difftastic: '0.70.0',
 };
 /**
  * Generate mise.toml content from agentenv config
@@ -219,19 +230,64 @@ export function getShimsDirValue(content) {
     }
     return null;
 }
+/**
+ * Remove the `shims_dir` line that upsertShimsDir writes and, if that leaves
+ * the `[settings]` section with no other keys, the section header too ("other
+ * keys" means any non-empty line between the header and the next section).
+ * Returns the content unchanged when no `shims_dir` line is present. Surgical
+ * counterpart to upsertShimsDir, used by `shell-fix --revert`.
+ */
+export function removeShimsDirValue(content) {
+    const lines = content.split(/\r?\n/);
+    const shimsIdx = lines.findIndex((line) => /^\s*shims_dir\s*=/.test(line.trim()));
+    if (shimsIdx === -1)
+        return content;
+    lines.splice(shimsIdx, 1);
+    const headerIdx = lines.findIndex((line) => /^\s*\[settings\]\s*$/.test(line.trim()));
+    if (headerIdx !== -1) {
+        let empty = true;
+        for (let i = headerIdx + 1; i < lines.length; i++) {
+            const trimmed = lines[i].trim();
+            if (/^\s*\[.*\]$/.test(trimmed))
+                break;
+            if (trimmed !== '') {
+                empty = false;
+                break;
+            }
+        }
+        if (empty) {
+            lines.splice(headerIdx, 1);
+            if (lines[headerIdx]?.trim() === '')
+                lines.splice(headerIdx, 1);
+        }
+    }
+    while (lines.length > 0 && lines[lines.length - 1].trim() === '')
+        lines.pop();
+    return lines.length > 0 ? `${lines.join('\n')}\n` : '';
+}
 /**
  * Ensure mise's GLOBAL config declares the shims_dir agentenv relies on, and
  * tell the user whether the shims dir is actually on PATH. Idempotent.
+ *
+ * When `statePath` is given, a change made here is recorded in the shell-fix
+ * manifest (agent `mise`) so `agentenv shell-fix --revert` can undo it. The
+ * existing manifest's bashExe is preserved when merging so a Tier 0 entry and
+ * the mise entry coexist in one apply run without clobbering each other's
+ * revert comparison value.
  */
-export function ensureGlobalShimsDir() {
+export function ensureGlobalShimsDir(statePath) {
     const dir = shimsDir();
     const configPath = miseGlobalConfigPath();
     try {
         fs.mkdirSync(miseGlobalConfigDir(), { recursive: true });
         const existing = fs.existsSync(configPath) ? fs.readFileSync(configPath, 'utf-8') : '';
         const updated = upsertShimsDir(existing, dir);
-        if (updated !== existing)
+        if (updated !== existing) {
             fs.writeFileSync(configPath, updated);
+            if (statePath) {
+                recordShimsDirState(configPath, existing, tomlPath(dir), statePath);
+            }
+        }
         const pathLine = shimsDirOnPath()
             ? `${dir} is on PATH`
             : `Add ${dir} to PATH so the shims resolve (Windows: System Properties > Environment Variables > Path)`;
@@ -257,6 +313,28 @@ export function ensureGlobalShimsDir() {
 function tomlPath(p) {
     return p.replace(/\\/g, '/');
 }
+/**
+ * Record a mise shims_dir write in the shell-fix manifest, preserving the
+ * existing manifest's bashExe so Tier 0 entries keep comparing against the
+ * git-bash path they were written with. Advisory: a recording failure must
+ * never fail the (already-successful) shims config itself.
+ */
+function recordShimsDirState(configPath, existing, setValue, statePath) {
+    try {
+        const existingState = readShellFixState(statePath);
+        writeShellFixState(mergeShellFixEntries(existingState, [
+            {
+                agent: 'mise',
+                file: configPath,
+                createdFile: existing === '',
+                fields: [{ key: 'shims_dir', previous: getShimsDirValue(existing), set: setValue }],
+            },
+        ], existingState?.bashExe ?? setValue), statePath);
+    }
+    catch {
+        // Recording is advisory; the fix itself already succeeded.
+    }
+}
 /**
  * Save mise.toml to a file
  */
@@ -412,7 +490,6 @@ export function runMiseCaptured(args, opts = {}) {
             status: null,
             stdout: '',
             stderr: err instanceof Error ? err.message : String(err),
-            blockedWarn: false,
         };
     }
     const stderr = result.error ? result.error.message : (result.stderr ?? '');
@@ -420,7 +497,6 @@ export function runMiseCaptured(args, opts = {}) {
         status: result.status,
         stdout: result.stdout ?? '',
         stderr,
-        blockedWarn: /warn|self-update|version .* available/i.test(stderr),
     };
 }
 /**
@@ -440,10 +516,6 @@ export function getMiseVersion() {
     const version = result.stdout.trim();
     return result.status === 0 && version !== '' ? version : 'unknown';
 }
-/** Alias used by prereq/status/doctor so version probes never surface mise WARN. */
-export function getMiseVersionSilent() {
-    return getMiseVersion();
-}
 /**
  * Check if a specific tool is installed via mise
  */
@@ -593,8 +665,13 @@ export function toolResolvability(binary) {
  * tests so a result cannot depend on the machine the test runs on.
  */
 export function toolAvailabilityClassification(key, binary, installedState, resolveFn = resolveBinary, shimCheck = shimExists) {
-    if (requiresFallback(key) || isPlatformUnsupported(key))
-        return 'manual';
+    if (requiresFallback(key) || isPlatformUnsupported(key)) {
+        // A tool agentenv never hands to mise (tokei) or can't install on this
+        // platform (jless/rga on Windows) may still be present on PATH: e.g.
+        // `apt install tokei` → /usr/bin/tokei on Linux. Report it as installed
+        // then; only absent ones are "manual / install manually", never drift.
+        return resolveFn(binary) !== null ? 'resolvable' : 'manual';
+    }
     const miseName = MISE_TOOL_NAMES[key] ?? key;
     const onPath = resolveFn(binary) !== null;
     return classifyToolResolvability(onPath, shimCheck(binary), undefined, installedState[miseName]?.installed === true);
@@ -612,6 +689,8 @@ export function verifyToolAvailability(config, options = {}) {
         getInstalledToolState(undefined, { cwd: options.cwd, miseTomlPath: options.miseTomlPath });
     const tools = config.tools || {};
     const result = [];
+    const resolveFn = options.resolveFn ?? resolveBinary;
+    const shimCheck = options.shimCheck ?? shimExists;
     for (const key of TOOL_KEYS) {
         if (tools[key] !== true)
             continue;
@@ -619,8 +698,8 @@ export function verifyToolAvailability(config, options = {}) {
         result.push({
             key,
             binary,
-            onPath: resolveBinary(binary) !== null,
-            status: toolAvailabilityClassification(key, binary, installedState),
+            onPath: resolveFn(binary) !== null,
+            status: toolAvailabilityClassification(key, binary, installedState, resolveFn, shimCheck),
         });
     }
     return result;
@@ -866,124 +945,4 @@ export function parseInstalledToolState(raw) {
 export function getInstalledToolState(raw, opts = {}) {
     return parseInstalledToolState(raw ?? runMiseCaptured(['ls', '--json'], opts).stdout) ?? {};
 }
-/**
- * Parse existing mise.toml file
- */
-export function parseMiseToml(filePath) {
-    try {
-        if (!fs.existsSync(filePath)) {
-            return null;
-        }
-        const content = fs.readFileSync(filePath, 'utf-8');
-        return parseToml(content);
-    }
-    catch {
-        return null;
-    }
-}
-/**
- * Simple TOML parser helper
- */
-function parseToml(content) {
-    const result = {};
-    let currentTable = result;
-    const lines = content.split('\n');
-    for (const line of lines) {
-        const trimmed = line.trim();
-        // Skip comments and empty lines
-        if (trimmed === '' || trimmed.startsWith('#')) {
-            continue;
-        }
-        // Section header
-        if (trimmed.startsWith('[') && trimmed.endsWith(']')) {
-            const section = trimmed.slice(1, -1);
-            if (section.includes('.')) {
-                // Nested section
-                const parts = section.split('.');
-                let parent = result;
-                for (let i = 0; i < parts.length - 1; i++) {
-                    if (!parent[parts[i]]) {
-                        parent[parts[i]] = {};
-                    }
-                    parent = parent[parts[i]];
-                }
-                currentTable = parent;
-            }
-            else {
-                if (!result[section]) {
-                    result[section] = {};
-                }
-                currentTable = result[section];
-            }
-            continue;
-        }
-        // Key-value pair
-        const equalsIndex = trimmed.indexOf('=');
-        if (equalsIndex > 0) {
-            const key = trimmed.slice(0, equalsIndex).trim();
-            const value = trimmed.slice(equalsIndex + 1).trim();
-            // Remove quotes if present
-            let cleanValue = value;
-            if ((value.startsWith('"') && value.endsWith('"')) ||
-                (value.startsWith("'") && value.endsWith("'"))) {
-                cleanValue = value.slice(1, -1);
-            }
-            // Parse boolean
-            if (cleanValue.toLowerCase() === 'true') {
-                cleanValue = true;
-            }
-            else if (cleanValue.toLowerCase() === 'false') {
-                cleanValue = false;
-            }
-            // Parse number
-            if (!isNaN(Number(cleanValue))) {
-                cleanValue = Number(cleanValue);
-            }
-            currentTable[key] = cleanValue;
-        }
-    }
-    return result;
-}
-/**
- * Merge existing mise.toml with new tools
- * Preserves existing tools that are not in the new config
- */
-export function mergeMiseConfigs(existing, newConfig) {
-    const result = {
-        tools: { ...newConfig.tools },
-        env: { ...newConfig.env },
-        settings: { ...newConfig.settings },
-    };
-    if (existing) {
-        // Merge tools - preserve existing versions if not in new config
-        for (const [tool, version] of Object.entries(existing.tools || {})) {
-            if (!result.tools[tool]) {
-                result.tools[tool] = version;
-            }
-        }
-        // Merge env
-        if (existing.env) {
-            for (const [key, value] of Object.entries(existing.env)) {
-                if (!result.env || !result.env[key]) {
-                    if (!result.env) {
-                        result.env = {};
-                    }
-                    result.env[key] = value;
-                }
-            }
-        }
-        // Merge settings
-        if (existing.settings) {
-            for (const [key, value] of Object.entries(existing.settings)) {
-                if (!result.settings || result.settings[key] === undefined) {
-                    if (!result.settings) {
-                        result.settings = {};
-                    }
-                    result.settings[key] = value;
-                }
-            }
-        }
-    }
-    return result;
-}
 //# sourceMappingURL=mise.js.map