@revisium/orchestrator 0.1.0-alpha.5 → 0.1.0-alpha.7

package/dist/cli/commands/doctor-report.js

@@ -0,0 +1,52 @@
+/**
+ * Pure decision logic for `revo doctor`: turn observed stack state into a pass/fail report with
+ * actionable issues. Kept free of IO so the diagnosis rules are unit-tested in isolation;
+ * lifecycle.ts does the file/port probing and the printing.
+ *
+ * `revo doctor` is the LIFECYCLE doctor — it sees the process/port/profile/stale-file problems that
+ * the daemon-side control-plane doctor (`api.doctor()`, exposed over MCP/GraphQL) structurally
+ * cannot diagnose about itself (a dead daemon answers nothing; a stale runtime file is invisible from
+ * inside the process that should have removed it). The two doctors are complementary, not duplicates.
+ */
+export function buildDoctorReport(o) {
+    const issues = [];
+    // Daemon-zoo signal: a process not tracked by host.json/runtime.json holds a profile port. The
+    // advisory-lock singleton (slice 139) stops new duplicates, but pre-existing/orphan ones must be seen.
+    for (const owner of o.unexpectedPortOwners ?? []) {
+        issues.push(`Unexpected process (pid ${owner.pid}) on the ${owner.label} port ${owner.port} — an untracked or ` +
+            'duplicate daemon. Run `revo stop` to reap the profile, then `revo start`.');
+    }
+    // Stale-code daemon: the live daemon is a different build than this CLI/installation.
+    if (o.versionMismatch && o.versionMismatch.running !== o.versionMismatch.current) {
+        issues.push(`Running daemon is version ${o.versionMismatch.running} but this build is ${o.versionMismatch.current} — ` +
+            'run `revo restart` to replace the stale daemon.');
+    }
+    // Nothing recorded on either tier → the stack is simply down (unless a rogue process was flagged above).
+    if (!o.host.present && !o.standalone.present) {
+        if (issues.length === 0)
+            return { ok: false, issues: ['Stack is not running. Run `revo start`.'] };
+        return { ok: false, issues };
+    }
+    // Host tier — the single DBOS owner and the GraphQL/MCP front door.
+    if (o.host.present && !o.host.alive) {
+        issues.push(`Stale host.json: recorded pid ${o.host.pid} is not alive. Run \`revo stop\` to clear it, then \`revo start\`.`);
+    }
+    else if (o.host.alive && !o.host.healthy) {
+        issues.push(`Host daemon (pid ${o.host.pid}) is running but its GraphQL front door on port ${o.host.port} is not responding.`);
+    }
+    else if (!o.host.present && o.standalone.alive) {
+        issues.push('Host daemon is not running while the standalone daemon is — the stack is partial. Run `revo start`.');
+    }
+    // Standalone tier — the Revisium control plane and its embedded Postgres.
+    if (o.standalone.present && !o.standalone.alive) {
+        issues.push(`Stale runtime.json: recorded standalone pid ${o.standalone.pid} is not alive.`);
+    }
+    else if (o.standalone.alive && !o.standalone.healthy) {
+        issues.push(`Standalone Revisium (pid ${o.standalone.pid}) is running but unhealthy on port ${o.standalone.port}.`);
+    }
+    else if (!o.standalone.present && o.host.alive) {
+        issues.push('Standalone Revisium is not running while the host daemon is — the stack is partial. Run `revo restart`.');
+    }
+    return { ok: issues.length === 0, issues };
+}
+//# sourceMappingURL=doctor-report.js.map

package/dist/cli/commands/doctor-report.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"doctor-report.js","sourceRoot":"","sources":["../../../src/cli/commands/doctor-report.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AA6BH,MAAM,UAAU,iBAAiB,CAAC,CAAoB;IACpD,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,+FAA+F;IAC/F,uGAAuG;IACvG,KAAK,MAAM,KAAK,IAAI,CAAC,CAAC,oBAAoB,IAAI,EAAE,EAAE,CAAC;QACjD,MAAM,CAAC,IAAI,CACT,2BAA2B,KAAK,CAAC,GAAG,YAAY,KAAK,CAAC,KAAK,SAAS,KAAK,CAAC,IAAI,qBAAqB;YACjG,2EAA2E,CAC9E,CAAC;IACJ,CAAC;IAED,sFAAsF;IACtF,IAAI,CAAC,CAAC,eAAe,IAAI,CAAC,CAAC,eAAe,CAAC,OAAO,KAAK,CAAC,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;QACjF,MAAM,CAAC,IAAI,CACT,6BAA6B,CAAC,CAAC,eAAe,CAAC,OAAO,sBAAsB,CAAC,CAAC,eAAe,CAAC,OAAO,KAAK;YACxG,iDAAiD,CACpD,CAAC;IACJ,CAAC;IAED,yGAAyG;IACzG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QAC7C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,yCAAyC,CAAC,EAAE,CAAC;QACnG,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAC/B,CAAC;IAED,oEAAoE;IACpE,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACpC,MAAM,CAAC,IAAI,CACT,iCAAiC,CAAC,CAAC,IAAI,CAAC,GAAG,oEAAoE,CAChH,CAAC;IACJ,CAAC;SAAM,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAC3C,MAAM,CAAC,IAAI,CACT,oBAAoB,CAAC,CAAC,IAAI,CAAC,GAAG,mDAAmD,CAAC,CAAC,IAAI,CAAC,IAAI,qBAAqB,CAClH,CAAC;IACJ,CAAC;SAAM,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACjD,MAAM,CAAC,IAAI,CAAC,qGAAqG,CAAC,CAAC;IACrH,CAAC;IAED,0EAA0E;IAC1E,IAAI,CAAC,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QAChD,MAAM,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC,UAAU,CAAC,GAAG,gBAAgB,CAAC,CAAC;IAC/F,CAAC;SAAM,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QACvD,MAAM,CAAC,IAAI,CACT,4BAA4B,CAAC,CAAC,UAAU,CAAC,GAAG,sCAAsC,CAAC,CAAC,UAAU,CAAC,IAAI,GAAG,CACvG,CAAC;IACJ,CAAC;SAAM,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACjD,MAAM,CAAC,IAAI,CACT,yGAAyG,CAC1G,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;AAC7C,CAAC"}

package/dist/cli/commands/lifecycle.js

@@ -0,0 +1,304 @@
+import { closeSync, existsSync, openSync, readSync, statSync } from 'node:fs';
+import { execFileSync } from 'node:child_process';
+import { baseUrl, getConfig, isAlive, isHealthy, readRuntime, removeRuntime, } from '../config.js';
+import { killTree, tailLines, waitForExit } from './revisium-helpers.js';
+import { buildDoctorReport } from './doctor-report.js';
+import { ensureHost, expectedGraphqlPort, isGraphqlHealthy } from '../../host/ensure-host.js';
+import { runHostDaemon } from '../../host/daemon.js';
+import { hostCodeVersion, isHostRunning, readHostRuntime, removeHostRuntime, } from '../../host/host-runtime.js';
+// Resolve lsof to a FIXED absolute path — never via $PATH (S4036: a writable PATH entry could shadow
+// the binary). null if lsof isn't installed, in which case port-owner detection/reaping degrade to no-op.
+const LSOF_PATH = ['/usr/sbin/lsof', '/usr/bin/lsof', '/bin/lsof'].find((p) => existsSync(p)) ?? null;
+/** PID listening on a local TCP port (via lsof), or null. Best-effort — null on any failure. */
+function listenerPid(port) {
+    if (LSOF_PATH === null)
+        return null;
+    try {
+        const out = execFileSync(LSOF_PATH, ['-nP', `-tiTCP:${port}`, '-sTCP:LISTEN'], {
+            encoding: 'utf8',
+            stdio: ['ignore', 'pipe', 'ignore'],
+        }).trim();
+        const pid = Number(out.split(/\r?\n/)[0]);
+        return Number.isInteger(pid) && pid > 0 ? pid : null;
+    }
+    catch {
+        return null; // no listener / lsof error
+    }
+}
+/** The four ports a profile's stack uses (host GraphQL+MCP, standalone HTTP+Postgres), deduped. */
+function profilePortList(host, standalone) {
+    const cfg = getConfig();
+    const gql = host?.graphqlPort ?? expectedGraphqlPort();
+    return [
+        ...new Set([
+            gql,
+            host?.mcpPort ?? gql + 1,
+            standalone?.httpPort ?? cfg.preferredPort,
+            standalone?.pgPort ?? cfg.preferredPgPort,
+        ]),
+    ];
+}
+const DEFAULT_LOG_LINES = 50;
+/** A --profile flag sets REVO_PROFILE so the resolved profile flows to the daemon child via env. */
+function applyProfileEnv(options) {
+    if (options.profile)
+        process.env['REVO_PROFILE'] = options.profile;
+}
+/** `revo start` — bring up the whole stack (host daemon + standalone) and print its endpoints. */
+async function startStack(options) {
+    applyProfileEnv(options);
+    const { profile, dataDir } = getConfig();
+    try {
+        const { runtime, alreadyRunning } = await ensureHost();
+        const standalone = readRuntime();
+        console.log(alreadyRunning ? `Revo already running (profile ${profile})` : `Revo started (profile ${profile})`);
+        console.log(`Host daemon: pid ${runtime.pid}`);
+        console.log(`GraphQL: ${baseUrl(runtime.graphqlPort)}/graphql`);
+        if (standalone)
+            console.log(`Revisium: ${baseUrl(standalone.httpPort)} (pg ${standalone.pgPort})`);
+        console.log(`Data dir: ${dataDir}`);
+    }
+    catch (err) {
+        console.error(err instanceof Error ? err.message : String(err));
+        process.exitCode = 1;
+    }
+}
+/** Stop a pid gracefully: SIGTERM, then SIGKILL if it has not exited within the grace period. */
+async function stopProcess(pid) {
+    if (!isAlive(pid))
+        return;
+    killTree(pid, 'SIGTERM');
+    if (!(await waitForExit(pid, 20_000))) {
+        killTree(pid, 'SIGKILL');
+        await waitForExit(pid, 5_000);
+    }
+}
+/** `revo stop` — stop the host daemon first (it owns DBOS), then the standalone Revisium daemon. */
+async function stopStack(options) {
+    applyProfileEnv(options);
+    const host = readHostRuntime();
+    const standalone = readRuntime();
+    const ports = profilePortList(host, standalone);
+    let stopped = false;
+    // Host first (it owns DBOS); then the standalone daemon underneath it.
+    if (host && isAlive(host.pid)) {
+        await stopProcess(host.pid);
+        stopped = true;
+    }
+    removeHostRuntime();
+    if (standalone && isAlive(standalone.pid)) {
+        await stopProcess(standalone.pid);
+        stopped = true;
+    }
+    removeRuntime();
+    // Reap any orphan/duplicate still holding a profile port (slice 139) — a daemon/standalone NOT
+    // tracked by host.json/runtime.json. Without this, `revo stop` leaves a zoo that can silently serve
+    // runs off the shared DBOS queue.
+    let reaped = 0;
+    for (const port of ports) {
+        const pid = listenerPid(port);
+        if (pid !== null && isAlive(pid)) {
+            await stopProcess(pid);
+            reaped += 1;
+        }
+    }
+    if (reaped > 0)
+        console.log(`stopped (reaped ${reaped} orphan process${reaped === 1 ? '' : 'es'})`);
+    else
+        console.log(stopped ? 'stopped' : 'not running');
+}
+/** `revo status` — summarize the stack: profile, data dir, host daemon, and Revisium health. */
+async function statusStack(options) {
+    applyProfileEnv(options);
+    const { profile, dataDir } = getConfig();
+    console.log(`Profile: ${profile}`);
+    console.log(`Data dir: ${dataDir}`);
+    const host = readHostRuntime();
+    if (host && isHostRunning()) {
+        const healthy = await isGraphqlHealthy(host.graphqlPort);
+        console.log(`Host daemon: running (pid ${host.pid}) — GraphQL ${baseUrl(host.graphqlPort)}/graphql ${healthy ? 'OK' : 'FAILING'}`);
+    }
+    else {
+        console.log(`Host daemon: stopped (GraphQL port ${expectedGraphqlPort()})`);
+    }
+    const standalone = readRuntime();
+    if (standalone && isAlive(standalone.pid)) {
+        const healthy = await isHealthy(standalone.httpPort);
+        console.log(`Revisium: running (pid ${standalone.pid}) on ${baseUrl(standalone.httpPort)} pg ${standalone.pgPort} — health ${healthy ? 'OK' : 'FAILING'}`);
+    }
+    else {
+        console.log('Revisium: stopped');
+    }
+}
+/** `revo restart` — stop then start the whole stack (same profile). The dev code-reload primitive. */
+async function restartStack(options) {
+    applyProfileEnv(options);
+    console.log('Restarting Revo stack…');
+    await stopStack(options);
+    await startStack(options);
+}
+/** `revo doctor` — diagnose the stack as a pure client: process/port/profile/stale-file health. */
+async function doctorStack(options) {
+    applyProfileEnv(options);
+    const { profile, dataDir } = getConfig();
+    const host = readHostRuntime();
+    const hostAlive = host !== null && isAlive(host.pid);
+    const hostHealthy = host !== null && hostAlive && (await isGraphqlHealthy(host.graphqlPort));
+    const standalone = readRuntime();
+    const standaloneAlive = standalone !== null && isAlive(standalone.pid);
+    const standaloneHealthy = standalone !== null && standaloneAlive && (await isHealthy(standalone.httpPort));
+    // Detect untracked/duplicate daemons on the profile ports + a stale-version daemon (slice 139): a
+    // listener whose pid isn't the tracked host/standalone is an orphan or a second daemon (the zoo).
+    const gql = host?.graphqlPort ?? expectedGraphqlPort();
+    const portChecks = [
+        { label: 'GraphQL', port: gql, expected: host?.pid ?? null },
+        { label: 'MCP', port: host?.mcpPort ?? gql + 1, expected: host?.pid ?? null },
+        { label: 'standalone HTTP', port: standalone?.httpPort ?? getConfig().preferredPort, expected: standalone?.pid ?? null },
+        { label: 'Postgres', port: standalone?.pgPort ?? getConfig().preferredPgPort, expected: standalone?.pid ?? null },
+    ];
+    const unexpectedPortOwners = [];
+    for (const check of portChecks) {
+        const pid = listenerPid(check.port);
+        if (pid !== null && pid !== check.expected) {
+            unexpectedPortOwners.push({ label: check.label, port: check.port, pid });
+        }
+    }
+    const versionMismatch = host?.version !== undefined ? { running: host.version, current: hostCodeVersion() } : undefined;
+    const report = buildDoctorReport({
+        host: {
+            present: host !== null,
+            alive: hostAlive,
+            healthy: hostHealthy,
+            pid: host?.pid ?? null,
+            port: host?.graphqlPort ?? null,
+        },
+        standalone: {
+            present: standalone !== null,
+            alive: standaloneAlive,
+            healthy: standaloneHealthy,
+            pid: standalone?.pid ?? null,
+            port: standalone?.httpPort ?? null,
+        },
+        unexpectedPortOwners,
+        versionMismatch,
+    });
+    console.log(`Profile: ${profile}`);
+    console.log(`Data dir: ${dataDir}`);
+    if (report.ok) {
+        console.log('OK — stack is healthy.');
+        return;
+    }
+    for (const issue of report.issues)
+        console.log(`✗ ${issue}`);
+    process.exitCode = 1;
+}
+/** Resolve which logs to read: `host`, `standalone`, or both (default). Profile-scoped paths. */
+function resolveLogTargets(target) {
+    const { logFile, hostLogFile } = getConfig();
+    const host = { label: 'host', file: hostLogFile };
+    const standalone = { label: 'standalone', file: logFile };
+    if (target === 'host')
+        return [host];
+    if (target === 'standalone')
+        return [standalone];
+    return [host, standalone];
+}
+/** `revo logs [target]` — print the tail of the daemon logs; a pure file read (works when down). */
+async function logsStack(target, options) {
+    applyProfileEnv(options);
+    if (target !== undefined && target !== 'host' && target !== 'standalone') {
+        console.error(`Invalid logs target "${target}". Use "host" or "standalone".`);
+        process.exitCode = 1;
+        return;
+    }
+    const requested = Number(options.lines ?? DEFAULT_LOG_LINES);
+    const lines = Number.isInteger(requested) && requested > 0 ? requested : DEFAULT_LOG_LINES;
+    const targets = resolveLogTargets(target);
+    for (const { label, file } of targets) {
+        const tail = tailLines(file, lines);
+        console.log(`==> [${label}] ${file} <==`);
+        console.log(tail === '' ? '(no log yet)' : tail);
+        console.log('');
+    }
+    if (options.follow)
+        await followLogs(targets);
+}
+/**
+ * Follow mode: poll each log for bytes appended past a tracked offset and stream them, labelled,
+ * until interrupted (Ctrl-C). The daemons open their logs append-only (no rotation), so a byte
+ * offset is a stable cursor; a shrink (manual truncate) simply resyncs to the new end.
+ */
+async function followLogs(targets) {
+    const offsets = new Map();
+    for (const { file } of targets)
+        offsets.set(file, existsSync(file) ? statSync(file).size : 0);
+    for (;;) {
+        for (const { label, file } of targets) {
+            if (!existsSync(file))
+                continue;
+            const size = statSync(file).size;
+            const from = offsets.get(file) ?? 0;
+            if (size > from) {
+                const fd = openSync(file, 'r');
+                try {
+                    const buf = Buffer.alloc(size - from);
+                    readSync(fd, buf, 0, buf.length, from);
+                    process.stdout.write(prefixLines(label, buf.toString('utf8')));
+                }
+                finally {
+                    closeSync(fd);
+                }
+            }
+            offsets.set(file, size);
+        }
+        await new Promise((resolve) => setTimeout(resolve, 500));
+    }
+}
+/** Prefix each non-empty line of a streamed chunk with its tier label for interleaved follow output. */
+function prefixLines(label, chunk) {
+    return chunk
+        .split('\n')
+        .map((line) => (line === '' ? line : `[${label}] ${line}`))
+        .join('\n');
+}
+/** Register the lifecycle commands (start/stop/status/restart/doctor/logs) + the hidden `__daemon` entrypoint. */
+export function registerLifecycle(program) {
+    program
+        .command('start')
+        .description('Start the Revo stack (host daemon + standalone Revisium)')
+        .option('--profile <name>', 'Runtime profile (default|dev)')
+        .action((options) => startStack(options));
+    program
+        .command('stop')
+        .description('Stop the Revo stack (host daemon first, then standalone)')
+        .option('--profile <name>', 'Runtime profile (default|dev)')
+        .action((options) => stopStack(options));
+    program
+        .command('status')
+        .description('Show Revo stack status (host daemon, Revisium, profile)')
+        .option('--profile <name>', 'Runtime profile (default|dev)')
+        .action((options) => statusStack(options));
+    program
+        .command('restart')
+        .description('Restart the Revo stack (stop, then start)')
+        .option('--profile <name>', 'Runtime profile (default|dev)')
+        .action((options) => restartStack(options));
+    program
+        .command('doctor')
+        .description('Diagnose the Revo stack (process/port/profile health)')
+        .option('--profile <name>', 'Runtime profile (default|dev)')
+        .action((options) => doctorStack(options));
+    program
+        .command('logs [target]')
+        .description('Tail Revo logs (target: host | standalone; default both)')
+        .option('--profile <name>', 'Runtime profile (default|dev)')
+        .option('-n, --lines <count>', 'Lines to show from the end', String(DEFAULT_LOG_LINES))
+        .option('-f, --follow', 'Stream new log output until interrupted')
+        .action((target, options) => logsStack(target, options));
+    // Internal: the detached daemon entrypoint spawned by ensureHost (not a user-facing command).
+    program
+        .command('__daemon', { hidden: true })
+        .description('Run the host daemon in the foreground (internal — spawned by `revo start`)')
+        .action(() => runHostDaemon());
+}
+//# sourceMappingURL=lifecycle.js.map

package/dist/cli/commands/lifecycle.js.map

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

package/dist/cli/commands/mcp.js

@@ -1,16 +1,54 @@
-import { McpStdioService } from '../../mcp/mcp-stdio.service.js';
-async function startMcp(app) {
-    if (!app) {
-        console.error('mcp requires the host context — invoke via the host path');
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { Server } from '@modelcontextprotocol/sdk/server/index.js';
+import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
+import { readPackageVersion } from '../../package-info.js';
+import { ensureHost } from '../../host/ensure-host.js';
+import { readHostRuntime } from '../../host/host-runtime.js';
+/**
+ * `revo mcp` — a thin stdio↔daemon MCP bridge (ADR 0006). It ensures the host daemon is up, then
+ * proxies tool list/call from the stdio client (Claude Code) to the daemon's in-process MCP server
+ * over StreamableHTTP. It does NOT build AppModule or launch DBOS — the daemon is the single DBOS
+ * owner, so every tool runs against the one host and read tools never trigger a recovery pass.
+ */
+async function runMcpBridge() {
+    await ensureHost();
+    const runtime = readHostRuntime();
+    if (!runtime) {
+        console.error('Revo host daemon is not available — run `revo start`.');
         process.exitCode = 1;
         return;
     }
-    await app.get(McpStdioService).start();
+    const version = readPackageVersion();
+    const upstream = new Client({ name: 'revo-mcp-bridge', version });
+    await upstream.connect(new StreamableHTTPClientTransport(new URL(`http://127.0.0.1:${runtime.mcpPort}/mcp`)));
+    // Downstream stdio server (faces Claude Code) — forwards tools to the daemon's MCP server.
+    const server = new Server({ name: 'revo', version }, { capabilities: { tools: {} } });
+    server.setRequestHandler(ListToolsRequestSchema, () => upstream.listTools());
+    server.setRequestHandler(CallToolRequestSchema, (request) => upstream.callTool(request.params));
+    const transport = new StdioServerTransport();
+    const closed = new Promise((resolve) => {
+        transport.onclose = () => resolve();
+        process.stdin.once('end', resolve);
+        process.stdin.once('close', resolve);
+        process.once('SIGINT', resolve);
+        process.once('SIGTERM', resolve);
+    });
+    try {
+        await server.connect(transport);
+        await closed;
+    }
+    finally {
+        await upstream.close().catch(() => undefined);
+        await server.close().catch(() => undefined);
+    }
 }
-export function registerMcp(program, app) {
+/** Register `revo mcp` — the thin stdio bridge to the daemon's MCP front door (no AppModule/DBOS). */
+export function registerMcp(program) {
     program
         .command('mcp')
-        .description('Start the local stdio MCP server for task development control')
-        .action(() => startMcp(app));
+        .description('Start the local stdio MCP server (bridges to the running Revo daemon)')
+        .action(() => runMcpBridge());
 }
 //# sourceMappingURL=mcp.js.map

package/dist/cli/commands/mcp.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../../src/cli/commands/mcp.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,KAAK,UAAU,QAAQ,CAAC,GAAwC;IAC9D,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAC;QAC1E,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,OAAO;IACT,CAAC;IACD,MAAM,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,KAAK,EAAE,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,OAAgB,EAAE,GAA6B;IACzE,OAAO;SACJ,OAAO,CAAC,KAAK,CAAC;SACd,WAAW,CAAC,+DAA+D,CAAC;SAC5E,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AACjC,CAAC"}
+{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../../src/cli/commands/mcp.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/revisium-helpers.js

@@ -1,6 +1,6 @@
 /**
- * Private helpers shared between `revisium.ts` (stop/logs) and `ensure-revisium.ts`.
- * Extracted to avoid duplication (F9).
+ * Process + log helpers shared by the lifecycle CLI (`lifecycle.ts`: stop/logs) and the daemon
+ * bring-up path (`ensure-revisium.ts`). Extracted to avoid duplication (F9).
  */
 import { existsSync, readFileSync } from 'node:fs';
 import { isAlive } from '../config.js';

package/dist/cli/index.js

@@ -1,32 +1,8 @@
+// reflect-metadata is required by the daemon entrypoint (`revo __daemon` → NestFactory); load it once
+// here so it is present whichever command runs.
 import 'reflect-metadata';
-import { isMcpCommand, needsHost } from './needs-host.js';
 import { buildProgram } from './program.js';
-const argv = process.argv;
-if (needsHost(argv)) {
-    // Host path: dev:ping, dev:status (and future run/work when they move onto DBOS).
-    // Nest/DBOS/AppModule are imported lazily so the host-free path never loads them.
-    const mcpCommand = isMcpCommand(argv);
-    if (mcpCommand) {
-        process.env.REVO_MCP_STDIO = '1';
-    }
-    else {
-        delete process.env.REVO_MCP_STDIO;
-    }
-    const { NestFactory } = await import('@nestjs/core');
-    const { AppModule } = await import('../app.module.js');
-    const app = await NestFactory.createApplicationContext(AppModule, { logger: mcpCommand ? false : ['error', 'warn'] });
-    try {
-        await buildProgram(app).parseAsync(argv);
-    }
-    finally {
-        // onApplicationShutdown → DBOS.shutdown() only; daemon is NOT stopped (Round 3).
-        await app.close();
-    }
-}
-else {
-    // Host-free path: revisium start/stop/status/logs, bootstrap, run, work,
-    // --help, --version, empty/unknown commands.
-    // Nest/DBOS are NOT loaded here — fast and safe for daemon-management commands.
-    await buildProgram().parseAsync(argv);
-}
+// The CLI is a lightweight client/process-manager (ADR 0006): it NEVER builds AppModule or launches
+// DBOS. The only long-lived host is the daemon, spawned detached via the hidden `__daemon` command.
+await buildProgram().parseAsync(process.argv);
 //# sourceMappingURL=index.js.map

package/dist/cli/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAE1B,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;IACpB,kFAAkF;IAClF,kFAAkF;IAClF,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,GAAG,CAAC;IACnC,CAAC;SAAM,CAAC;QACN,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;IACpC,CAAC;IACD,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;IACrD,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACvD,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,wBAAwB,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACtH,IAAI,CAAC;QACH,MAAM,YAAY,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;YAAS,CAAC;QACT,iFAAiF;QACjF,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC;AACH,CAAC;KAAM,CAAC;IACN,yEAAyE;IACzE,6CAA6C;IAC7C,gFAAgF;IAChF,MAAM,YAAY,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AACxC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAAA,sGAAsG;AACtG,gDAAgD;AAChD,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,oGAAoG;AACpG,oGAAoG;AACpG,MAAM,YAAY,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}

package/dist/cli/program.js

@@ -1,37 +1,21 @@
 import { Command } from 'commander';
 import { readPackageVersion } from '../package-info.js';
-import { registerBootstrap } from './commands/bootstrap.js';
-import { registerDev } from './commands/dev.js';
-import { registerInbox } from './commands/inbox.js';
+import { registerLifecycle } from './commands/lifecycle.js';
 import { registerMcp } from './commands/mcp.js';
-import { registerPlaybook } from './commands/playbook.js';
-import { registerRevisium } from './commands/revisium.js';
-import { registerRun } from './commands/run.js';
-import { registerServe } from './commands/serve.js';
 export { readPackageVersion };
 /**
- * Build the commander program.
- *
- * @param app - Optional Nest app context (host path only).
- *   - When `app` is provided, dev:ping/dev:status actions are wired to the DI context.
- *   - When `app` is absent (host-free path or tests), dev command DEFINITIONS are still
- *     registered so `dev:ping --help` works; actions guard on the absent `app`.
- *   - The no-arg overload is preserved for program.test.ts compatibility.
+ * Build the Revo CLI. The CLI is lifecycle-only (ADR 0006): `revo start/stop/status/...` manage the
+ * whole stack, and `revo mcp` is a thin stdio bridge to the daemon. Orchestration (runs, inbox,
+ * method, …) is reached through the daemon's MCP + GraphQL front doors, not the CLI.
  */
-export function buildProgram(app) {
+export function buildProgram() {
     const program = new Command();
     program
         .name('revo')
         .description('Agent orchestrator CLI')
         .version(readPackageVersion(), '-v, --version', 'Print the revo version');
-    registerRevisium(program);
-    registerBootstrap(program);
-    registerPlaybook(program);
-    registerRun(program, app);
-    registerInbox(program, app); // G6: forward app so gate resolve path can access DbosService
-    registerMcp(program, app);
-    registerDev(program, app);
-    registerServe(program);
+    registerLifecycle(program);
+    registerMcp(program);
     return program;
 }
 //# sourceMappingURL=program.js.map

package/dist/cli/program.js.map

@@ -1 +1 @@
-{"version":3,"file":"program.js","sourceRoot":"","sources":["../../src/cli/program.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAE9B;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY,CAAC,GAA6B;IACxD,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC9B,OAAO;SACJ,IAAI,CAAC,MAAM,CAAC;SACZ,WAAW,CAAC,wBAAwB,CAAC;SACrC,OAAO,CAAC,kBAAkB,EAAE,EAAE,eAAe,EAAE,wBAAwB,CAAC,CAAC;IAC5E,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC1B,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC3B,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC1B,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC1B,aAAa,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,8DAA8D;IAC3F,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC1B,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC1B,aAAa,CAAC,OAAO,CAAC,CAAC;IACvB,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"program.js","sourceRoot":"","sources":["../../src/cli/program.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAE9B;;;;GAIG;AACH,MAAM,UAAU,YAAY;IAC1B,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC9B,OAAO;SACJ,IAAI,CAAC,MAAM,CAAC;SACZ,WAAW,CAAC,wBAAwB,CAAC;SACrC,OAAO,CAAC,kBAAkB,EAAE,EAAE,eAAe,EAAE,wBAAwB,CAAC,CAAC;IAC5E,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC3B,WAAW,CAAC,OAAO,CAAC,CAAC;IACrB,OAAO,OAAO,CAAC;AACjB,CAAC"}