@voiden/runner 2.3.0-beta.14 → 2.3.0-beta.16

package/dist/envProfiles.js

@@ -0,0 +1,209 @@
+/**
+ * Headless env-profile discovery/resolution for the `list_environments`/
+ * `select_environment` fixed MCP tools (mcpServing.ts). A deliberately
+ * simplified port of apps/electron/src/main/env.ts's profile logic — same
+ * precedent as plugins/voiden-mcp-tool/src/lib/toolCapability.ts's
+ * loadProjectEnvironmentVars, which already does this for its own narrower
+ * needs. No Electron dependency (this package is a standalone CLI/library),
+ * no UI "active profile" state, no nested sub-project scanning, no legacy
+ * dotted `.env.foo.bar` hierarchy chain — see mcpServing.ts's callers for
+ * what's actually needed here.
+ */
+import { existsSync, readdirSync, readFileSync } from 'fs';
+import { join, resolve, extname } from 'path';
+import { parseYamlEnv, listYamlEnvironmentNames, mergeYamlEnvTrees, findEnvironmentByPath, loadEnvFile } from './envFile.js';
+import YAML from 'yaml';
+const VOIDEN_DIR = '.voiden';
+const PROFILE_FILE_PATTERN = /^env-([a-z0-9-]+)-(public|private)\.yaml$/;
+function profileFileNames(projectRoot, profile) {
+    const dir = join(projectRoot, VOIDEN_DIR);
+    if (profile === 'default') {
+        return { publicFile: join(dir, 'env-public.yaml'), privateFile: join(dir, 'env-private.yaml') };
+    }
+    return { publicFile: join(dir, `env-${profile}-public.yaml`), privateFile: join(dir, `env-${profile}-private.yaml`) };
+}
+/** Mirrors env.ts's discoverProfiles — scan .voiden/ for named profile
+ *  files, "default" always included even with no files on disk yet. */
+function discoverProfileNames(projectRoot) {
+    const names = new Set(['default']);
+    const dir = join(projectRoot, VOIDEN_DIR);
+    let entries;
+    try {
+        entries = readdirSync(dir);
+    }
+    catch {
+        return Array.from(names);
+    }
+    for (const entry of entries) {
+        const match = PROFILE_FILE_PATTERN.exec(entry);
+        if (match)
+            names.add(match[1]);
+    }
+    return Array.from(names);
+}
+function readIfExists(path) {
+    return existsSync(path) ? readFileSync(path, 'utf-8') : undefined;
+}
+/** project root + .voiden/, non-recursive — same scope as env.ts's
+ *  loadProjectEnv fallback, minus the dotted-chain hierarchy machinery
+ *  (out of scope here, see the plan's "Not doing" section). */
+function discoverDotEnvFiles(projectRoot) {
+    const dirs = [projectRoot, join(projectRoot, VOIDEN_DIR)];
+    const found = [];
+    for (const dir of dirs) {
+        let entries;
+        try {
+            entries = readdirSync(dir);
+        }
+        catch {
+            continue;
+        }
+        for (const entry of entries) {
+            if (entry.startsWith('.env'))
+                found.push(join(dir, entry));
+        }
+    }
+    return found;
+}
+export function discoverEnvProfiles(projectRoot) {
+    return discoverProfileNames(projectRoot).map((name) => {
+        const { publicFile, privateFile } = profileFileNames(projectRoot, name);
+        const publicContent = readIfExists(publicFile);
+        const privateContent = readIfExists(privateFile);
+        if (publicContent || privateContent) {
+            const merged = mergeYamlEnvTrees(publicContent ? YAML.parse(publicContent) : {}, privateContent ? YAML.parse(privateContent) : {});
+            const environments = listYamlEnvironmentNames(YAML.stringify(merged));
+            if (environments.length > 0) {
+                return {
+                    name,
+                    source: 'yaml',
+                    ...(publicContent ? { publicFile } : {}),
+                    ...(privateContent ? { privateFile } : {}),
+                    environments,
+                };
+            }
+        }
+        return { name, source: 'legacy-dotenv', dotEnvFiles: discoverDotEnvFiles(projectRoot) };
+    });
+}
+/** Resolves the final variable map for one profile (+ optional named
+ *  environment within it). Throws if the profile doesn't exist or the
+ *  named environment isn't found in it (same "available: ..." style error
+ *  envFile.ts's own parseYamlEnv already throws for an unknown name). */
+export function resolveEnvProfile(projectRoot, profile, environmentName) {
+    const profiles = discoverEnvProfiles(projectRoot);
+    const info = profiles.find((p) => p.name === profile);
+    if (!info) {
+        throw new Error(`Unknown profile "${profile}". Available: ${profiles.map((p) => p.name).join(', ')}`);
+    }
+    if (info.source === 'legacy-dotenv') {
+        const env = {};
+        for (const path of info.dotEnvFiles ?? []) {
+            try {
+                Object.assign(env, parseDotEnvLoose(readFileSync(path, 'utf-8')));
+            }
+            catch {
+                // A malformed .env* file shouldn't block resolving the others —
+                // select_environment's job is "best available", not strict parsing.
+            }
+        }
+        return env;
+    }
+    const { publicFile, privateFile } = profileFileNames(projectRoot, profile);
+    const publicContent = readIfExists(publicFile) ?? '';
+    const privateContent = readIfExists(privateFile) ?? '';
+    const merged = mergeYamlEnvTrees(publicContent ? YAML.parse(publicContent) : {}, privateContent ? YAML.parse(privateContent) : {});
+    if (environmentName) {
+        // Path-based, not envFile.ts's own bare-name findEnvironment — that one
+        // searches for a matching key ANYWHERE in the tree (fine for the CLI's
+        // simpler --environment <name> flag), but list_environments returns
+        // full dotted paths specifically to disambiguate same-named children
+        // under different parents (e.g. "staging.eu" vs "prod.eu") — only a
+        // full-path walk resolves the right one.
+        const resolved = findEnvironmentByPath(merged, environmentName);
+        if (!resolved) {
+            const available = listYamlEnvironmentNames(YAML.stringify(merged));
+            throw new Error(`Environment "${environmentName}" not found in profile "${profile}". Available: ${available.join(', ')}`);
+        }
+        return resolved;
+    }
+    return parseYamlEnv(YAML.stringify(merged));
+}
+/** Thrown by resolveCliEnv for a usage mistake (not found, ambiguous
+ *  flags) — callers already wrap their existing --env loading in a
+ *  try/catch that prints the message and exits with EXIT_USAGE_ERROR; this
+ *  just gives that same catch something to catch for the --profile path
+ *  too, instead of duplicating that error-reporting shape here. */
+export class EnvCliOptsError extends Error {
+}
+/**
+ * Resolves the env-selection flags shared across voiden-runner's
+ * run/mcp serve/tool verify commands into a merged variable map, layered on
+ * top of whatever base env the caller already has (typically process.env).
+ *
+ * Two independent ways to point at variables — --profile and --env — are
+ * deliberately mutually exclusive: mixing "use the profile system" and
+ * "use this one specific file instead" has no obvious shared meaning, so
+ * this throws rather than silently picking one. Passing neither is
+ * unchanged from before this existed: nothing gets loaded, only baseEnv
+ * comes back — an existing invocation with no env flags at all keeps
+ * working exactly as it did.
+ */
+export function resolveCliEnv(opts, projectRoot, baseEnv) {
+    if (opts.env && opts.profile) {
+        throw new EnvCliOptsError('--env and --profile are mutually exclusive — pick one way to point at variables.');
+    }
+    const env = { ...baseEnv };
+    if (opts.profile !== undefined) {
+        const profileName = opts.profile === true ? 'default' : opts.profile;
+        try {
+            Object.assign(env, resolveEnvProfile(projectRoot, profileName, opts.environment));
+        }
+        catch (err) {
+            throw new EnvCliOptsError(err?.message ?? String(err));
+        }
+        return env;
+    }
+    if (opts.env) {
+        const envPath = resolve(opts.env);
+        if (!existsSync(envPath)) {
+            throw new EnvCliOptsError(`Env file not found: ${envPath}`);
+        }
+        const ext = extname(envPath).toLowerCase();
+        if (ext === '.yaml' || ext === '.yml') {
+            throw new EnvCliOptsError('--env only accepts a plain .env file now. A YAML profile is always a pair of files ' +
+                '(env-<profile>-public.yaml + -private.yaml, merged) — a single --env path can\'t represent ' +
+                'that correctly. Use --profile <name> instead (bare --profile means "default").');
+        }
+        if (opts.environment) {
+            throw new EnvCliOptsError('--environment only applies with --profile — a plain .env file has no named-environment concept to scope to.');
+        }
+        try {
+            Object.assign(env, loadEnvFile(envPath));
+        }
+        catch (err) {
+            throw new EnvCliOptsError(err?.message ?? String(err));
+        }
+    }
+    return env;
+}
+/** Same shape as envFile.ts's private parseDotEnv, duplicated rather than
+ *  exported from there since that one throws on a malformed line (correct
+ *  for an explicit --env <path>) where discovery here wants best-effort. */
+function parseDotEnvLoose(content) {
+    const env = {};
+    for (const rawLine of content.split('\n')) {
+        const line = rawLine.trim();
+        if (!line || line.startsWith('#'))
+            continue;
+        const eq = line.indexOf('=');
+        if (eq === -1)
+            continue;
+        const key = line.slice(0, eq).trim();
+        if (!key)
+            continue;
+        env[key] = line.slice(eq + 1).trim().replace(/^["']|["']$/g, '');
+    }
+    return env;
+}
+//# sourceMappingURL=envProfiles.js.map

package/dist/envProfiles.js.map

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

package/dist/index.js

@@ -23,6 +23,7 @@ import { checkForPluginUpdates } from './plugins/updateCheck.js';
 import { getInstalledPluginInfo } from './plugins/versionInfo.js';
 import { classifyBlockVersion, parseVoidFile, installMcpIntegration, uninstallMcpIntegration, getMcpStatus, MCP_SKILL_MARKDOWN, } from '@voiden/executors';
 import { loadEnvFile } from './envFile.js';
+import { resolveCliEnv } from './envProfiles.js';
 import { appendSessionResults, loadSessionResults, clearSession, } from './session.js';
 // ─────────────────────────────────────────────────────────────────────────────
 // Exit codes — a stable, documented contract CI pipelines can branch on.
@@ -436,9 +437,10 @@ program
     '    voiden-runner run ./requests/\n' +
     '    voiden-runner run auth.void users.void ./smoke/\n' +
     '    voiden-runner run ./ --env .env.staging --bail\n' +
-    '    voiden-runner run ./ --env .voiden/env-public.yaml --environment staging\n')
-    .option('-e, --env <path>', 'Path to .env or .yaml file for variable substitution')
-    .option('--environment <name>', 'Scope --env to one named environment in a multi-environment YAML file (e.g. "dev") instead of merging every environment in it together')
+    '    voiden-runner run ./ --profile staging --environment staging.eu\n')
+    .option('-e, --env <path>', 'Path to one plain .env file for variable substitution — for a file outside the project\'s profile convention (e.g. a CI-provided secrets path). Mutually exclusive with --profile.')
+    .option('--profile [name]', 'Use a project env profile (.voiden/env-<profile>-{public,private}.yaml, or that profile\'s legacy .env* fallback) — the same profile system the MCP select_environment tool exposes to an agent, now reachable from the command line too. Bare --profile (no name) means "default". Mutually exclusive with --env.')
+    .option('--environment <name>', 'Scope --env or --profile to one named environment within it (e.g. "dev", or a dotted child like "staging.eu") instead of merging every environment together')
     .option('--env-var <key=value>', 'Individual environment variable override (can be used multiple times)', (val, memo) => {
     memo.push(val);
     return memo;
@@ -470,20 +472,13 @@ program
     // and any CI/CD platform vars are automatically available as {{KEY}}
     // without needing an --env file.
     const env = Object.fromEntries(Object.entries(process.env).filter(([, v]) => v !== undefined));
-    // 1. Load --env file (overrides system)
-    if (opts.env) {
-        const envPath = resolve(opts.env);
-        if (!existsSync(envPath)) {
-            console.error(chalk.red(`Env file not found: ${envPath}`));
-            process.exit(EXIT_USAGE_ERROR);
-        }
-        try {
-            Object.assign(env, loadEnvFile(envPath, opts.environment));
-        }
-        catch (err) {
-            console.error(chalk.red(`  ✗  ${err.message}`));
-            process.exit(EXIT_USAGE_ERROR);
-        }
+    // 1. Load --env file or --profile (overrides system)
+    try {
+        Object.assign(env, resolveCliEnv(opts, process.cwd(), env));
+    }
+    catch (err) {
+        console.error(chalk.red(`  ✗  ${err.message}`));
+        process.exit(EXIT_USAGE_ERROR);
     }
     // 2. Individual --env-var overrides
     if (opts.envVar && Array.isArray(opts.envVar)) {
@@ -1307,12 +1302,24 @@ mcpCmd
     .option('--claude', 'Install for Claude Code only')
     .option('--codex', 'Install for Codex only')
     .option('-p, --project <path>', 'Project directory to register the MCP server against', '.')
-    .option('--local-server <path>', 'Use `node <path> mcp serve` instead of `npx -y @voiden/runner mcp serve` — for testing against a local build')
+    .option('--local-server <path>', 'Use `node <path> mcp serve` instead of `npx -y @voiden/runner@<this version> mcp serve` — for testing against a local build')
     .action((opts) => {
     const targets = resolveMcpTargets(opts);
+    // Pin to the exact version of this CLI the user is running `mcp install`
+    // from — never a bare, unpinned `npx -y @voiden/runner`. Unpinned resolves
+    // to whatever npm's "latest" dist-tag happens to point at, which can sit
+    // far behind the actively-developed prerelease line this MCP tooling
+    // actually lives on (e.g. "latest" stuck on a stable 2.2.0 cut from
+    // before write_result/list_requests/the plugin registry existed, while
+    // real fixes ship under the "beta" tag) — every agent session would
+    // silently run that stale version forever, with no way to notice short of
+    // diffing tool output against what this CLI's own docs say it does.
+    // Pinning to what's actually installed right now is deterministic: it's
+    // exactly what was tested when `mcp install` ran, and picks up newer
+    // fixes the moment the user updates this CLI and re-runs `mcp install`.
     const serverCommand = opts.localServer
         ? { command: 'node', args: [resolve(opts.localServer), 'mcp', 'serve', resolve(opts.project)] }
-        : undefined;
+        : { command: 'npx', args: ['-y', `@voiden/runner@${pkg.version}`, 'mcp', 'serve', resolve(opts.project)] };
     const installed = installMcpIntegration(opts.project, targets, MCP_SKILL_MARKDOWN, serverCommand);
     if (installed.length === 0) {
         console.log(chalk.yellow('  Nothing to install.'));
@@ -1322,9 +1329,12 @@ mcpCmd
     for (const target of installed) {
         console.log(chalk.green(`  ✓  ${target === 'claude' ? 'Claude Code' : 'Codex'}`) + chalk.gray(`  —  skill installed, fixed-tools MCP server registered for ${resolve(opts.project)}`));
     }
-    if (serverCommand) {
+    if (opts.localServer) {
         console.log(chalk.gray(`  Using local build: node ${serverCommand.args[0]}`));
     }
+    else {
+        console.log(chalk.gray(`  Pinned to this CLI's version: @voiden/runner@${pkg.version}`));
+    }
     console.log();
     console.log(chalk.gray('  Restart Claude Code / Codex (or run /mcp) to pick up the new server.'));
 });
@@ -1373,25 +1383,19 @@ mcpCmd
     .option('--http', 'Serve over streamable HTTP instead of stdio')
     .option('-p, --port <port>', 'HTTP port (only with --http)', '3000')
     .option('--host <host>', 'HTTP bind address (only with --http) — binding beyond 127.0.0.1 is a real exposure risk', '127.0.0.1')
-    .option('-e, --env <path>', 'Path to .env or .yaml file for variable substitution')
-    .option('--environment <name>', 'Scope --env to one named environment in a multi-environment YAML file (e.g. "dev") instead of merging every environment in it together')
+    .option('-e, --env <path>', 'Path to one plain .env file for variable substitution — for a file outside the project\'s profile convention. Mutually exclusive with --profile.')
+    .option('--profile [name]', 'Use a project env profile (.voiden/env-<profile>-{public,private}.yaml, or its legacy .env* fallback) — same profile system the select_environment tool exposes to an agent, as the server\'s initial env before any select_environment call. Bare --profile means "default". Mutually exclusive with --env.')
+    .option('--environment <name>', 'Scope --env or --profile to one named environment within it (e.g. "dev", or a dotted child like "staging.eu")')
     .option('--check', 'Print what would be served and exit, without starting a live server')
     .action(async (path, opts) => {
     const projectRoot = resolve(path ?? '.');
     const env = Object.fromEntries(Object.entries(process.env).filter(([, v]) => v !== undefined));
-    if (opts.env) {
-        const envPath = resolve(opts.env);
-        if (!existsSync(envPath)) {
-            console.error(chalk.red(`Env file not found: ${envPath}`));
-            process.exit(EXIT_USAGE_ERROR);
-        }
-        try {
-            Object.assign(env, loadEnvFile(envPath, opts.environment));
-        }
-        catch (err) {
-            console.error(chalk.red(`  ✗  ${err.message}`));
-            process.exit(EXIT_USAGE_ERROR);
-        }
+    try {
+        Object.assign(env, resolveCliEnv(opts, projectRoot, env));
+    }
+    catch (err) {
+        console.error(chalk.red(`  ✗  ${err.message}`));
+        process.exit(EXIT_USAGE_ERROR);
     }
     if (opts.check) {
         // Dry run — no live server. Same underlying decision function real
@@ -1424,6 +1428,9 @@ mcpCmd
     // Shared across calls so {{process.xxx}} runtime variables chain the
     // same way they do for the stdio path and for @voiden/mcp.
     const runtimeVars = {};
+    // Set by select_environment, read by run_request as its base env layer
+    // — shared by reference across calls the same way runtimeVars is.
+    const selectedEnv = { vars: {} };
     if (opts.http) {
         const port = Number(opts.port);
         const host = opts.host;
@@ -1435,7 +1442,7 @@ mcpCmd
         const httpServer = createHttpServer(async (req, res) => {
             try {
                 const requestServer = new McpServer({ name: 'voiden-runner', version: '1.0.0' });
-                registerFixedTools(requestServer, projectRoot, runtimeVars, activePlugins);
+                registerFixedTools(requestServer, projectRoot, runtimeVars, activePlugins, selectedEnv);
                 registerToolsFromDecisions(requestServer, decisions, env, runtimeVars, activePlugins, commitSha, projectRoot);
                 const transport = new StreamableHTTPServerTransport({ sessionIdGenerator: undefined });
                 await requestServer.connect(transport);
@@ -1456,7 +1463,7 @@ mcpCmd
         });
         httpServer.listen(port, host, () => {
             console.error(chalk.green(`  ✓  voiden-runner mcp serve — listening on http://${host}:${port}/mcp`));
-            console.error(chalk.gray(`     ${servedCount} tool(s) served (plus list_void_files, list_requests, run_request, write_result)`));
+            console.error(chalk.gray(`     ${servedCount} tool(s) served (plus list_void_files, list_requests, run_request, write_result, list_environments, select_environment)`));
             if (host !== '127.0.0.1' && host !== 'localhost') {
                 console.error(chalk.red(`  ⚠  Bound to ${host} — reachable beyond this machine. Make sure that's intended.`));
             }
@@ -1469,7 +1476,7 @@ mcpCmd
         // Startup info goes to stderr only, same discipline @voiden/mcp's
         // own entrypoint already follows (it prints nothing).
         const server = new McpServer({ name: 'voiden-runner', version: '1.0.0' });
-        registerFixedTools(server, projectRoot, runtimeVars, activePlugins);
+        registerFixedTools(server, projectRoot, runtimeVars, activePlugins, selectedEnv);
         registerToolsFromDecisions(server, decisions, env, runtimeVars, activePlugins, commitSha, projectRoot);
         await server.connect(new StdioServerTransport());
     }
@@ -1527,24 +1534,18 @@ toolCmd
     .option('--cadence <tag>', 'Only run verification requests tagged with this cadence — omit to run every entry regardless of tag')
     .option('--json', 'Output as JSON (suppresses normal output — useful for CI)')
     .option('--write', 'Write the computed status back into each /tool block. Off by default — verification always recomputes fresh and never trusts a stale write-back')
-    .option('-e, --env <path>', 'Path to .env or .yaml file for variable substitution')
-    .option('--environment <name>', 'Scope --env to one named environment in a multi-environment YAML file (e.g. "dev") instead of merging every environment in it together')
+    .option('-e, --env <path>', 'Path to one plain .env file for variable substitution — for a file outside the project\'s profile convention. Mutually exclusive with --profile.')
+    .option('--profile [name]', 'Use a project env profile (.voiden/env-<profile>-{public,private}.yaml, or its legacy .env* fallback). Bare --profile means "default". Mutually exclusive with --env.')
+    .option('--environment <name>', 'Scope --env or --profile to one named environment within it (e.g. "dev", or a dotted child like "staging.eu")')
     .action(async (paths, opts) => {
     const targets = paths.length > 0 ? paths : ['.'];
     const env = Object.fromEntries(Object.entries(process.env).filter(([, v]) => v !== undefined));
-    if (opts.env) {
-        const envPath = resolve(opts.env);
-        if (!existsSync(envPath)) {
-            console.error(chalk.red(`Env file not found: ${envPath}`));
-            process.exit(EXIT_USAGE_ERROR);
-        }
-        try {
-            Object.assign(env, loadEnvFile(envPath, opts.environment));
-        }
-        catch (err) {
-            console.error(chalk.red(`  ✗  ${err.message}`));
-            process.exit(EXIT_USAGE_ERROR);
-        }
+    try {
+        Object.assign(env, resolveCliEnv(opts, process.cwd(), env));
+    }
+    catch (err) {
+        console.error(chalk.red(`  ✗  ${err.message}`));
+        process.exit(EXIT_USAGE_ERROR);
     }
     const activePlugins = await loadEnabledPlugins();
     const allTools = [];