@voiden/runner 2.2.0 → 2.3.0-beta.10

package/dist/index.js

@@ -6,6 +6,12 @@ import { fileURLToPath } from 'url';
 import chalk from 'chalk';
 import { runVoidFile } from './runner.js';
 import { resolveFiles } from './discovery.js';
+import { discoverTools, verifyTools, validateTools, upsertToolStatus, registerToolsFromDecisions, planServedTools, getCommitSha } from './mcpToolCapability.js';
+import { registerFixedTools } from './mcpServing.js';
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
+import { createServer as createHttpServer } from 'node:http';
 import { loadEnabledPlugins } from './plugins/loader.js';
 import { exportToCsv } from './report/csv.js';
 import { sendMailReport } from './report/mail.js';
@@ -15,10 +21,8 @@ import { fetchCommunityPlugins, findCommunityPlugin, hasCommunityRunner, install
 import { installPlugin, uninstallPlugin, setPluginEnabled, setPluginVersion, getAllInstalledPlugins, readStore, STORE_DIR, } from './plugins/store.js';
 import { checkForPluginUpdates } from './plugins/updateCheck.js';
 import { getInstalledPluginInfo } from './plugins/versionInfo.js';
-import { parseVoidFile } from './parser.js';
-import { classifyBlockVersion } from '@voiden/executors';
-import { installMcpIntegration, uninstallMcpIntegration, getMcpStatus } from './mcpInstall.js';
-import { RUNNER_SKILL_MARKDOWN } from './skillContent.js';
+import { classifyBlockVersion, parseVoidFile, installMcpIntegration, uninstallMcpIntegration, getMcpStatus, MCP_SKILL_MARKDOWN, } from '@voiden/executors';
+import { loadEnvFile } from './envFile.js';
 import { appendSessionResults, loadSessionResults, clearSession, } from './session.js';
 // ─────────────────────────────────────────────────────────────────────────────
 // Exit codes — a stable, documented contract CI pipelines can branch on.
@@ -41,25 +45,6 @@ const JSON_SCHEMA_VERSION = '1';
 // ─────────────────────────────────────────────────────────────────────────────
 // Helpers
 // ─────────────────────────────────────────────────────────────────────────────
-function loadEnvFile(envPath) {
-    const content = readFileSync(envPath, 'utf-8');
-    const env = {};
-    const lines = content.split('\n');
-    for (let i = 0; i < lines.length; i++) {
-        const line = lines[i].trim();
-        if (!line || line.startsWith('#'))
-            continue;
-        const eq = line.indexOf('=');
-        if (eq === -1)
-            throw new Error(`Malformed line ${i + 1} in .env file: missing "="`);
-        const key = line.slice(0, eq).trim();
-        const val = line.slice(eq + 1).trim().replace(/^["']|["']$/g, '');
-        if (!key)
-            throw new Error(`Malformed line ${i + 1} in .env file: empty key`);
-        env[key] = val;
-    }
-    return env;
-}
 function formatBytes(bytes) {
     if (bytes < 1024)
         return `${bytes}B`;
@@ -450,8 +435,10 @@ program
     '    voiden-runner run auth.void\n' +
     '    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 .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')
     .option('--env-var <key=value>', 'Individual environment variable override (can be used multiple times)', (val, memo) => {
     memo.push(val);
     return memo;
@@ -491,7 +478,7 @@ program
             process.exit(EXIT_USAGE_ERROR);
         }
         try {
-            Object.assign(env, loadEnvFile(envPath));
+            Object.assign(env, loadEnvFile(envPath, opts.environment));
         }
         catch (err) {
             console.error(chalk.red(`  ✗  ${err.message}`));
@@ -1284,7 +1271,7 @@ pluginCmd
 // ── voiden-runner mcp ─────────────────────────────────────────────────────────
 //
 // Enables the AI-agent loop for CLI-only users (no Voiden app installed):
-// registers @voiden/mcp-server with Claude Code / Codex, and installs a
+// registers @voiden/mcp with Claude Code / Codex, and installs a
 // standalone skill teaching the run/verify/write-back workflow. The Voiden
 // app's own Settings toggle does the equivalent for desktop users, reusing
 // the same registration helpers from mcpInstall.ts.
@@ -1297,32 +1284,34 @@ function resolveMcpTargets(opts) {
 }
 const mcpCmd = program
     .command('mcp')
-    .description('Enable AI-agent integration — registers @voiden/mcp-server and installs a run/verify skill');
+    .description('Enable AI-agent integration — registers this project\'s fixed-tools MCP server and installs a run/verify skill');
 mcpCmd
     .command('install')
-    .description('Register @voiden/mcp-server with Claude Code and/or Codex, and install a skill teaching the run/verify/write-back loop.\n\n' +
+    .description('Register this project with Claude Code and/or Codex — points .mcp.json / config.toml at ' +
+    '`voiden-runner mcp serve` (the same 4 fixed tools, standalone, no other Voiden package ' +
+    'required), and installs a skill teaching the run/verify/write-back loop.\n\n' +
     '  Examples:\n' +
     '    voiden-runner mcp install                                    # both Claude Code and Codex\n' +
     '    voiden-runner mcp install --claude                           # Claude Code only\n' +
     '    voiden-runner mcp install -p ./my-project                    # register against a specific project dir (default: cwd)\n' +
-    '    voiden-runner mcp install --local-server ./dist/index.js     # before publishing: point at a local build instead of npx\n')
+    '    voiden-runner mcp install --local-server ./dist/index.js     # point at a local build instead of npx\n')
     .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>` instead of `npx -y @voiden/mcp-server` — for testing against a local build before it\'s published')
+    .option('--local-server <path>', 'Use `node <path> mcp serve` instead of `npx -y @voiden/runner mcp serve` — for testing against a local build')
     .action((opts) => {
     const targets = resolveMcpTargets(opts);
     const serverCommand = opts.localServer
-        ? { command: 'node', args: [resolve(opts.localServer), resolve(opts.project)] }
+        ? { command: 'node', args: [resolve(opts.localServer), 'mcp', 'serve', resolve(opts.project)] }
         : undefined;
-    const installed = installMcpIntegration(opts.project, targets, RUNNER_SKILL_MARKDOWN, serverCommand);
+    const installed = installMcpIntegration(opts.project, targets, MCP_SKILL_MARKDOWN, serverCommand);
     if (installed.length === 0) {
         console.log(chalk.yellow('  Nothing to install.'));
         return;
     }
     console.log();
     for (const target of installed) {
-        console.log(chalk.green(`  ✓  ${target === 'claude' ? 'Claude Code' : 'Codex'}`) + chalk.gray(`  —  skill installed, @voiden/mcp-server registered for ${resolve(opts.project)}`));
+        console.log(chalk.green(`  ✓  ${target === 'claude' ? 'Claude Code' : 'Codex'}`) + chalk.gray(`  —  skill installed, fixed-tools MCP server registered for ${resolve(opts.project)}`));
     }
     if (serverCommand) {
         console.log(chalk.gray(`  Using local build: node ${serverCommand.args[0]}`));
@@ -1363,5 +1352,254 @@ mcpCmd
     console.log(`    server registered:   ${status.codex.serverRegistered ? chalk.green('yes') : chalk.gray('no')}`);
     console.log();
 });
+mcpCmd
+    .command('serve [path]')
+    .description('Serve this project as an MCP server — the same tools @voiden/mcp exposes ' +
+    '(list/run/write plus declared /tool capabilities), over stdio (default) or HTTP.\n\n' +
+    '  Examples:\n' +
+    '    voiden-runner mcp serve                          # stdio, current directory\n' +
+    '    voiden-runner mcp serve ./api                     # stdio, specific project\n' +
+    '    voiden-runner mcp serve --http --port 3900         # HTTP on 127.0.0.1:3900\n' +
+    '    voiden-runner mcp serve --check                   # dry run — print what would be served, no live server\n')
+    .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('--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);
+        }
+    }
+    if (opts.check) {
+        // Dry run — no live server. Same underlying decision function real
+        // serving uses, so this can never disagree with what actually gets
+        // registered.
+        const activePlugins = await loadEnabledPlugins();
+        const decisions = await planServedTools(projectRoot, env, activePlugins);
+        console.log(`\n${decisions.length} /tool block(s) found in ${projectRoot}\n`);
+        for (const d of decisions) {
+            if (d.excluded) {
+                console.log(`  [EXCLUDED] ${d.tool.name}`);
+                for (const reason of d.excludedReasons ?? [])
+                    console.log(`      ${reason}`);
+                continue;
+            }
+            const label = d.served ? (d.descriptionNote ? `SERVED (${d.status.state})` : 'SERVED') : 'WITHDRAWN';
+            console.log(`  [${label}] ${d.tool.name} — ${d.status.state}${d.status.note ? `: ${d.status.note}` : ''}`);
+        }
+        console.log(chalk.gray(`  (plus the 4 fixed tools: list_void_files, list_requests, run_request, write_result)`));
+        console.log();
+        const anyFailing = decisions.some((d) => d.excluded || d.status?.state === 'failing');
+        process.exit(anyFailing ? EXIT_RUN_FAILURE : EXIT_SUCCESS);
+    }
+    // Verification (real network calls) runs exactly once here, regardless
+    // of transport — never repeated per HTTP request below.
+    const activePlugins = await loadEnabledPlugins();
+    const decisions = await planServedTools(projectRoot, env, activePlugins);
+    const commitSha = getCommitSha(projectRoot);
+    const servedCount = decisions.filter((d) => d.served).length;
+    // Shared across calls so {{process.xxx}} runtime variables chain the
+    // same way they do for the stdio path and for @voiden/mcp.
+    const runtimeVars = {};
+    if (opts.http) {
+        const port = Number(opts.port);
+        const host = opts.host;
+        // A fresh McpServer + transport per HTTP request — this is how the
+        // SDK's own stateless example (examples/server/simpleStatelessStreamableHttp.js)
+        // does it, not an arbitrary choice: reusing one transport across
+        // requests returns 500s. Cheap: registration is just schema/handler
+        // wiring against the already-computed `decisions`, no re-verification.
+        const httpServer = createHttpServer(async (req, res) => {
+            try {
+                const requestServer = new McpServer({ name: 'voiden-runner', version: '1.0.0' });
+                registerFixedTools(requestServer, projectRoot, runtimeVars, activePlugins);
+                registerToolsFromDecisions(requestServer, decisions, env, runtimeVars, activePlugins, commitSha, projectRoot);
+                const transport = new StreamableHTTPServerTransport({ sessionIdGenerator: undefined });
+                await requestServer.connect(transport);
+                res.on('close', () => {
+                    transport.close();
+                    requestServer.close();
+                });
+                await transport.handleRequest(req, res);
+            }
+            catch (err) {
+                console.error(chalk.red(`  ✗  Error handling MCP request: ${err?.message ?? String(err)}`));
+                if (!res.headersSent) {
+                    res.writeHead(500, { 'content-type': 'application/json' }).end(JSON.stringify({
+                        jsonrpc: '2.0', error: { code: -32603, message: 'Internal server error' }, id: null,
+                    }));
+                }
+            }
+        });
+        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)`));
+            if (host !== '127.0.0.1' && host !== 'localhost') {
+                console.error(chalk.red(`  ⚠  Bound to ${host} — reachable beyond this machine. Make sure that's intended.`));
+            }
+        });
+        // No process.exit() — stays alive until Ctrl-C, same as the stdio path below.
+    }
+    else {
+        // stdio: one persistent server for the process lifetime — stdout is
+        // reserved for the JSON-RPC stream, so nothing gets printed there.
+        // 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);
+        registerToolsFromDecisions(server, decisions, env, runtimeVars, activePlugins, commitSha, projectRoot);
+        await server.connect(new StdioServerTransport());
+    }
+});
+// ── voiden-runner tool ────────────────────────────────────────────────────────
+//
+// Discovery + verification for /tool blocks (voiden-mcp-tool plugin) — the
+// standalone CLI surface for the same discoverTools/verifyTools functions
+// @voiden/mcp will use for live agent-serving. No scheduling here:
+// `cadence` on a verify entry is a tag `--cadence` filters by, not something
+// this command enforces timing for — that's a human/CI decision, same as
+// deciding when to run `voiden-runner run` at all.
+const toolCmd = program
+    .command('tool')
+    .description('Discover and verify /tool blocks — capabilities declared for AI agents');
+toolCmd
+    .command('list [paths...]')
+    .description('List every /tool block found under the given path(s) (default: current directory) — does not execute anything')
+    .option('--json', 'Output as JSON')
+    .action(async (paths, opts) => {
+    const targets = paths.length > 0 ? paths : ['.'];
+    const allTools = [];
+    const activePlugins = await loadEnabledPlugins();
+    for (const p of targets) {
+        allTools.push(...await discoverTools(resolve(p), { activePlugins }));
+    }
+    if (opts.json) {
+        console.log(JSON.stringify(allTools, null, 2));
+        return;
+    }
+    if (allTools.length === 0) {
+        console.log(chalk.yellow('  No /tool blocks found.'));
+        return;
+    }
+    console.log();
+    for (const tool of allTools) {
+        console.log(chalk.bold(`  ${tool.name}`) + chalk.gray(`  —  ${relative(process.cwd(), tool.filePath)}${tool.sectionLabel ? ` [${tool.sectionLabel}]` : ''}`));
+        if (tool.description)
+            console.log(chalk.gray(`    ${tool.description}`));
+        // onFailure is per verify-entry now, not one tool-wide setting —
+        // summarize instead of showing a single (no-longer-existing) value.
+        const onFailureValues = new Set(tool.verifies.map((v) => v.onFailure || 'withdraw'));
+        const onFailureSummary = tool.verifies.length === 0 ? '—' : onFailureValues.size === 1 ? [...onFailureValues][0] : 'mixed';
+        console.log(chalk.gray(`    params: ${tool.params.length}   verifies: ${tool.verifies.length}   on-failure: ${onFailureSummary}`));
+        console.log();
+    }
+});
+toolCmd
+    .command('verify [paths...]')
+    .description("Run each /tool block's verification requests and report verified / unverified / failing.\n\n" +
+    '  Examples:\n' +
+    '    voiden-runner tool verify\n' +
+    '    voiden-runner tool verify ./api/ --cadence nightly\n' +
+    '    voiden-runner tool verify --json --write\n')
+    .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')
+    .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);
+        }
+    }
+    const activePlugins = await loadEnabledPlugins();
+    const allTools = [];
+    for (const p of targets) {
+        allTools.push(...await discoverTools(resolve(p), { activePlugins }));
+    }
+    if (allTools.length === 0) {
+        if (opts.json)
+            console.log(JSON.stringify({ tools: [], issues: [] }, null, 2));
+        else
+            console.log(chalk.yellow('  No /tool blocks found.'));
+        process.exit(EXIT_SUCCESS);
+    }
+    const { validTools, issues } = await validateTools(resolve(targets[0]), allTools);
+    const statuses = await verifyTools(validTools, { cadence: opts.cadence, env, activePlugins, projectRoot: resolve(targets[0]) });
+    if (opts.write) {
+        for (const status of statuses) {
+            try {
+                upsertToolStatus(status.tool.filePath, status.tool.toolBlockUid, { state: status.state, note: status.note });
+            }
+            catch (err) {
+                console.error(chalk.red(`  ✗  Failed to write status for "${status.tool.name}": ${err?.message ?? String(err)}`));
+            }
+        }
+    }
+    const anyFailing = statuses.some(s => s.state === 'failing') || issues.length > 0;
+    if (opts.json) {
+        console.log(JSON.stringify({ tools: statuses, issues }, null, 2));
+    }
+    else {
+        console.log();
+        // Structurally excluded tools (§1.6) — reported distinctly from a
+        // verification failure: this is "the contract itself doesn't add up,"
+        // not "the contract's proof failed." Neither ran nor counted below.
+        const excludedNames = [...new Set(issues.map(i => i.tool.name))];
+        for (const name of excludedNames) {
+            console.log(`  ${chalk.red('✗ excluded')}   ${chalk.bold(name)}`);
+            for (const issue of issues.filter(i => i.tool.name === name)) {
+                console.log(chalk.gray(`      [${issue.check}] ${issue.message}`));
+            }
+            console.log();
+        }
+        for (const status of statuses) {
+            const icon = status.state === 'verified' ? chalk.green('✓ verified  ') :
+                status.state === 'failing' ? chalk.red('✗ failing   ') :
+                    chalk.yellow('○ unverified');
+            console.log(`  ${icon}  ${chalk.bold(status.tool.name)}` + chalk.gray(`  —  ${relative(process.cwd(), status.tool.filePath)}${status.tool.sectionLabel ? ` [${status.tool.sectionLabel}]` : ''}`));
+            if (status.note)
+                console.log(chalk.gray(`      ${status.note}`));
+            for (const r of status.results) {
+                const rIcon = r.passed ? chalk.green('✓') : chalk.red('✗');
+                console.log(`      ${rIcon} ${r.entry.role}: ${r.entry.sectionLabel}` + (r.reason ? chalk.gray(`  (${r.reason})`) : ''));
+            }
+            console.log();
+        }
+        const verified = statuses.filter(s => s.state === 'verified').length;
+        const unverified = statuses.filter(s => s.state === 'unverified').length;
+        const failing = statuses.filter(s => s.state === 'failing').length;
+        console.log(chalk.bold(`  ${statuses.length} tool(s)`) + chalk.gray(` — ${chalk.green(verified + ' verified')}, ${chalk.yellow(unverified + ' unverified')}, ${chalk.red(failing + ' failing')}`) + (excludedNames.length > 0 ? chalk.red(`, ${excludedNames.length} excluded`) : ''));
+        if (opts.write)
+            console.log(chalk.gray('  Status written back into each /tool block.'));
+        console.log();
+    }
+    process.exit(anyFailing ? EXIT_RUN_FAILURE : EXIT_SUCCESS);
+});
 program.parse();
 //# sourceMappingURL=index.js.map