@1mcp/agent 0.33.0 → 0.34.0

package/build/commands/serve/serveBackground.js

@@ -0,0 +1,299 @@
+import { spawn } from 'child_process';
+import fs from 'fs';
+import path from 'path';
+import { ConfigManager } from '../../config/configManager.js';
+import { readPidFile } from '../../core/server/pidFileManager.js';
+import { discoverScopedRuntime, probeLoadingSummary, probeReadiness, } from '../../core/server/runtimeLifecycle.js';
+import logger from '../../logger/logger.js';
+import { resolveLoggingConfig } from '../../logger/loggingConfig.js';
+import { normalizedArgv } from '../../utils/cli/normalizedArgv.js';
+import { resolveServeConfigPaths } from './runtimeScope.js';
+/**
+ * `serve --background`: start the HTTP Aggregated Runtime as a detached child
+ * for the selected Runtime Scope, then return once it is ready.
+ *
+ * The parent never serves; it spawns a detached copy of this executable running
+ * the normal serve path (marked with an internal guard flag so it does not
+ * recursively background itself), waits for the child's PID file and
+ * `/health/ready`, and reports the result.
+ */
+/** Internal guard flag name; mirrors the hidden yargs option in `index.ts`. */
+export const BACKGROUND_GUARD_FLAG = 'background-bootstrap';
+/** Default log file for a background runtime when none is configured. */
+export function defaultBackgroundLogFile(configDir) {
+    return path.join(configDir, 'logs', 'server.log');
+}
+/**
+ * Build the child's serve arguments: strip flags the parent overrides
+ * (`--background`, `--transport`/`-t`, `--log-file`, and the guard — including
+ * their `=`-joined forms) and re-append the HTTP transport, the resolved log
+ * file, and the guard flag. Background is HTTP-only, so the child is always
+ * forced onto `--transport http`.
+ */
+export function buildBackgroundChildArgs(serveArgs, opts) {
+    const stripWithValue = new Set(['--transport', '-t', '--log-file']);
+    const out = [];
+    for (let i = 0; i < serveArgs.length; i++) {
+        const token = serveArgs[i];
+        if (token === '--background' || token === `--${BACKGROUND_GUARD_FLAG}`) {
+            continue;
+        }
+        if (/^--(transport|log-file)=/.test(token) || /^-t=/.test(token)) {
+            continue;
+        }
+        if (stripWithValue.has(token)) {
+            i++; // also skip the following value
+            continue;
+        }
+        out.push(token);
+    }
+    out.push('--transport', 'http', '--log-file', opts.logFile, `--${BACKGROUND_GUARD_FLAG}`);
+    return out;
+}
+/**
+ * Resolve how to re-invoke this executable cross-platform.
+ * - Under Node: `process.execPath` (node) + the JS entry script.
+ * - As a packaged SEA binary: `process.execPath` is the binary itself, no script.
+ */
+export function resolveSelfInvocation(argv = process.argv) {
+    const script = argv[1];
+    if (script && /\.(c|m)?js$/.test(script)) {
+        return { command: process.execPath, baseArgs: [script] };
+    }
+    return { command: process.execPath, baseArgs: [] };
+}
+/** Strip the single `serve` command token (it is re-added explicitly on spawn). */
+function stripServeToken(args) {
+    const index = args.indexOf('serve');
+    if (index === -1) {
+        return [...args];
+    }
+    return [...args.slice(0, index), ...args.slice(index + 1)];
+}
+/**
+ * Wait until the child's PID file identifies the spawned child AND
+ * `/health/ready` succeeds, or until timeout / child death.
+ */
+export async function waitForBackgroundReady(configDir, childPid, options = {}) {
+    const timeoutMs = options.timeoutMs ?? 30000;
+    const intervalMs = options.intervalMs ?? 250;
+    const probe = options.readinessProbe ?? probeReadiness;
+    const now = options.now ?? (() => Date.now());
+    const sleep = options.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+    const start = now();
+    while (now() - start < timeoutMs) {
+        if (options.isChildAlive && !options.isChildAlive()) {
+            return { ready: false, reason: 'background process exited before becoming ready' };
+        }
+        const info = readPidFile(configDir);
+        options.onProgress?.({ elapsedMs: now() - start, info: info ?? undefined });
+        if (info && info.pid === childPid && (await probe(info))) {
+            return { ready: true, info };
+        }
+        await sleep(intervalMs);
+    }
+    return { ready: false, reason: `timed out after ${timeoutMs}ms waiting for readiness` };
+}
+function defaultLoadAppConfig(parsedArgv) {
+    const { configFilePath } = resolveServeConfigPaths(parsedArgv);
+    return ConfigManager.getInstance(configFilePath).getAppConfig();
+}
+/**
+ * Parent routine for `serve --background`. Sets `process.exitCode` and returns;
+ * never starts a server in-process.
+ */
+export async function runServeBackground(parsedArgv, deps = {}) {
+    const { runtimeScope: configDir } = resolveServeConfigPaths(parsedArgv);
+    const loadAppConfig = deps.loadAppConfig ?? defaultLoadAppConfig;
+    const appConfig = loadAppConfig(parsedArgv);
+    // Mirror the async-loading precedence from serve.ts so the started report can
+    // hint at the fast-detach path when the runtime is in the (default) sync mode.
+    const asyncEnabled = parsedArgv['enable-async-loading'] ?? appConfig.asyncLoading?.enabled ?? false;
+    // HTTP-only: reject stdio; sse normalizes to http.
+    const effectiveTransport = parsedArgv.transport ?? appConfig.transport ?? 'http';
+    if (effectiveTransport === 'stdio') {
+        process.stderr.write('Error: `serve --background --transport stdio` is not supported.\n' +
+            'stdio uses the invoking process stdin/stdout and cannot be detached. Use HTTP transport.\n');
+        process.exitCode = 1;
+        return;
+    }
+    // Idempotency: do not start a second runtime if the scope is already occupied.
+    const existing = await discoverScopedRuntime(configDir);
+    if (existing.status === 'running' && existing.info) {
+        process.stdout.write(`A runtime is already running in this Runtime Scope; not starting another.\n` +
+            formatStartedReport(existing.info));
+        process.exitCode = 0;
+        return;
+    }
+    if (existing.status === 'unreachable' && existing.info) {
+        process.stderr.write(`A runtime already occupies this Runtime Scope (PID ${existing.info.pid}) but is not ready yet.\n` +
+            `Refusing to start a second runtime. Check 'serve --status' or stop it first.\n`);
+        process.exitCode = 1;
+        return;
+    }
+    if (existing.status === 'error') {
+        process.stderr.write(`Cannot inspect Runtime Scope ${configDir}: ${existing.error ?? 'PID file could not be read'}.\n` +
+            `Refusing to start a second runtime until the PID file problem is fixed.\n`);
+        process.exitCode = 1;
+        return;
+    }
+    // Resolve the effective log file, defaulting to <configDir>/logs/server.log.
+    // Only `resolved.file` is consumed here — the detached child re-resolves its
+    // own level on the normal serve path, so no env tier is needed (and reading
+    // process.env directly would bypass the yargs-based ONE_MCP_* loading).
+    const { resolved } = resolveLoggingConfig({
+        cli: { level: parsedArgv['log-level'], file: parsedArgv['log-file'] },
+        structured: appConfig.logging,
+        flat: { level: appConfig.logLevel, file: appConfig.logFile },
+    });
+    const logFile = resolved.file ?? defaultBackgroundLogFile(configDir);
+    fs.mkdirSync(path.dirname(logFile), { recursive: true });
+    // Build the detached child invocation.
+    const rawArgv = deps.rawArgv ?? normalizedArgv;
+    const childServeArgs = buildBackgroundChildArgs(stripServeToken(rawArgv), { logFile });
+    const { command, baseArgs } = resolveSelfInvocation();
+    const spawnArgs = [...baseArgs, 'serve', ...childServeArgs];
+    const spawnChild = deps.spawnChild ??
+        ((cmd, args, options) => spawn(cmd, args, options));
+    const child = spawnChild(command, spawnArgs, { detached: true, stdio: 'ignore' });
+    if (!child.pid) {
+        process.stderr.write('Error: failed to spawn background runtime process.\n');
+        process.exitCode = 1;
+        return;
+    }
+    // Allow the parent to exit independently of the child.
+    child.unref();
+    // Acknowledge the spawn immediately so the wait is never silent.
+    process.stderr.write(`Starting background runtime (PID ${child.pid})…\n`);
+    process.stderr.write(`Log file: ${logFile}\n`);
+    let childExited = false;
+    child.once('exit', () => {
+        childExited = true;
+    });
+    const renderer = createProgressRenderer(logFile);
+    const waitForReady = deps.waitForReady ?? waitForBackgroundReady;
+    const result = await waitForReady(configDir, child.pid, {
+        isChildAlive: () => !childExited,
+        onProgress: renderer.render,
+    });
+    renderer.clear();
+    if (result.ready && result.info) {
+        // One final probe so the report can show how many servers are already up.
+        const summary = await probeLoadingSummary(result.info);
+        process.stdout.write(`Background runtime started.\n${formatStartedReport(result.info, { summary, asyncEnabled })}`);
+        process.exitCode = 0;
+        return;
+    }
+    // Failure: report log path, terminate the child, exit non-zero.
+    process.stderr.write(`Error: background runtime did not become ready (${result.reason ?? 'unknown error'}).\n` +
+        `See the log for details: ${logFile}\n`);
+    const killChild = deps.killChild ?? defaultKillChild;
+    if (!childExited && child.pid) {
+        killChild(child.pid);
+    }
+    process.exitCode = 1;
+}
+function defaultKillChild(pid) {
+    try {
+        process.kill(pid, 'SIGTERM');
+    }
+    catch (error) {
+        logger.warn(`Failed to terminate background child (PID: ${pid}): ${error}`);
+    }
+}
+function formatStartedReport(info, opts = {}) {
+    let report = `PID: ${info.pid}\n` + `URL: ${info.url}\n` + `Log file: ${info.logFile ?? '(console only)'}\n`;
+    if (opts.summary) {
+        report += `Servers: ${opts.summary.ready}/${opts.summary.total} ready\n`;
+    }
+    // In the default sync mode the wait is bounded by upstream connection time;
+    // point users at the fast-detach path. Omitted when async is already on, or
+    // when the caller does not supply the flag (e.g. the idempotency report).
+    if (opts.asyncEnabled === false) {
+        report += `Tip: run with --enable-async-loading for near-instant background detach.\n`;
+    }
+    return report;
+}
+/** Truncate a single line so progress output stays on one terminal row. */
+function truncate(text, max) {
+    return text.length > max ? `${text.slice(0, max - 1)}…` : text;
+}
+/** Best-effort read of the last non-empty line of a (possibly absent) log file. */
+function tailLastLine(filePath) {
+    try {
+        const content = fs.readFileSync(filePath, 'utf8');
+        const lines = content.split('\n');
+        for (let i = lines.length - 1; i >= 0; i--) {
+            const trimmed = lines[i].trim();
+            if (trimmed.length > 0) {
+                return trimmed;
+            }
+        }
+        return '';
+    }
+    catch {
+        return '';
+    }
+}
+/**
+ * Build a stderr progress renderer for the background wait. Throttles to ~1s and
+ * uses an in-place line on a TTY, plain lines otherwise. Two phases:
+ * - before the PID file appears (sync mode's blocking window): elapsed time plus
+ *   the latest child log line;
+ * - once the runtime is up: aggregate `/health/mcp` loading counts.
+ */
+function createProgressRenderer(logFile) {
+    const isTty = Boolean(process.stderr.isTTY);
+    let lastRenderMs = -1;
+    let lastSummary = null;
+    let summaryProbeInFlight = false;
+    let lineActive = false;
+    const render = (progress) => {
+        // Throttle to roughly one update per second; always render the first tick.
+        if (progress.elapsedMs !== 0 && progress.elapsedMs - lastRenderMs < 900) {
+            return;
+        }
+        lastRenderMs = progress.elapsedMs;
+        const seconds = Math.floor(progress.elapsedMs / 1000);
+        // Refresh the loading summary out of band so rendering stays synchronous.
+        if (progress.info && !summaryProbeInFlight) {
+            summaryProbeInFlight = true;
+            void probeLoadingSummary(progress.info)
+                .then((summary) => {
+                lastSummary = summary;
+            })
+                .catch(() => { })
+                .finally(() => {
+                summaryProbeInFlight = false;
+            });
+        }
+        let detail;
+        if (progress.info && lastSummary) {
+            const s = lastSummary;
+            detail = `${s.ready}/${s.total} servers ready (${s.loading} loading, ${s.failed} failed)`;
+        }
+        else if (progress.info) {
+            detail = 'runtime starting…';
+        }
+        else {
+            const lastLogLine = tailLastLine(logFile);
+            detail = lastLogLine ? truncate(lastLogLine, 100) : 'waiting for runtime to start…';
+        }
+        const line = `[${seconds}s] ${detail}`;
+        if (isTty) {
+            process.stderr.write(`\x1b[2K\r${line}`);
+            lineActive = true;
+        }
+        else {
+            process.stderr.write(`${line}\n`);
+        }
+    };
+    const clear = () => {
+        if (isTty && lineActive) {
+            process.stderr.write('\x1b[2K\r');
+            lineActive = false;
+        }
+    };
+    return { render, clear };
+}
+//# sourceMappingURL=serveBackground.js.map

package/build/commands/serve/serveBackground.js.map

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

package/build/commands/serve/serveRestart.d.ts

@@ -0,0 +1,24 @@
+import type { ServeOptions } from './serve.js';
+import { runServeBackground } from './serveBackground.js';
+import { runServeStop } from './serveStop.js';
+/**
+ * `serve --restart`: stop the runtime in the selected Runtime Scope (if any),
+ * then start a fresh detached background runtime.
+ *
+ * Semantics mirror `systemctl restart`: when nothing is running the stop is a
+ * clean no-op and a background runtime is still started, so a successful restart
+ * always ends in a running runtime. This is a thin composition of the existing
+ * `--stop` and `--background` handlers; staleness handling, signal escalation,
+ * detached spawn, readiness wait, and idempotency all come from them unchanged.
+ *
+ * Both handlers communicate via `process.exitCode` (the established lifecycle
+ * pattern), so this routine inspects it between the two phases: if the stop
+ * genuinely failed (runtime still alive after SIGKILL) it aborts before starting
+ * to avoid two runtimes contending for the same scope/port.
+ */
+export interface RunRestartDeps {
+    runStop?: typeof runServeStop;
+    runBackground?: typeof runServeBackground;
+}
+export declare function runServeRestart(parsedArgv: ServeOptions, deps?: RunRestartDeps): Promise<void>;
+//# sourceMappingURL=serveRestart.d.ts.map

package/build/commands/serve/serveRestart.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"serveRestart.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serveRestart.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C;;;;;;;;;;;;;;GAcG;AAEH,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,EAAE,OAAO,YAAY,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,kBAAkB,CAAC;CAC3C;AAED,wBAAsB,eAAe,CAAC,UAAU,EAAE,YAAY,EAAE,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBxG"}

package/build/commands/serve/serveRestart.js

@@ -0,0 +1,22 @@
+import { resolveServeConfigPaths } from './runtimeScope.js';
+import { runServeBackground } from './serveBackground.js';
+import { runServeStop } from './serveStop.js';
+export async function runServeRestart(parsedArgv, deps = {}) {
+    const runStop = deps.runStop ?? runServeStop;
+    const runBackground = deps.runBackground ?? runServeBackground;
+    const { runtimeScope } = resolveServeConfigPaths(parsedArgv);
+    process.stderr.write('Restarting background runtime…\n');
+    // Phase 1: stop. A "nothing running" or stale-PID scope exits 0 here.
+    process.exitCode = undefined;
+    await runStop(runtimeScope);
+    if (process.exitCode) {
+        process.stderr.write('Error: restart aborted; could not stop the existing runtime. See messages above.\n');
+        // Leave the non-zero exit code from the stop phase in place.
+        return;
+    }
+    // Phase 2: start a fresh detached background runtime. The stop cleaned up the
+    // PID file, so the background idempotency probe sees an empty scope.
+    process.exitCode = undefined;
+    await runBackground(parsedArgv);
+}
+//# sourceMappingURL=serveRestart.js.map

package/build/commands/serve/serveRestart.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serveRestart.js","sourceRoot":"","sources":["../../../src/commands/serve/serveRestart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAuB9C,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,UAAwB,EAAE,OAAuB,EAAE;IACvF,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,YAAY,CAAC;IAC7C,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,kBAAkB,CAAC;IAC/D,MAAM,EAAE,YAAY,EAAE,GAAG,uBAAuB,CAAC,UAAU,CAAC,CAAC;IAE7D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;IAEzD,sEAAsE;IACtE,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC7B,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC;IAC5B,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oFAAoF,CAAC,CAAC;QAC3G,6DAA6D;QAC7D,OAAO;IACT,CAAC;IAED,8EAA8E;IAC9E,qEAAqE;IACrE,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC7B,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC;AAClC,CAAC"}

package/build/commands/serve/serveStatus.d.ts

@@ -0,0 +1,39 @@
+import { ServerPidInfo } from '../../core/server/pidFileManager.js';
+import { RuntimeStatus } from '../../core/server/runtimeLifecycle.js';
+/**
+ * `serve --status`: report the state of the Background Aggregated Runtime in the
+ * selected Runtime Scope. Discovery goes through the lifecycle module, so the
+ * same two-tier staleness rule applies — a dead PID file is cleaned up and the
+ * scope is reported not-running.
+ */
+export interface RuntimeStatusReport {
+    status: RuntimeStatus;
+    /** The Runtime Scope (resolved configuration directory). */
+    configDir: string;
+    /** PID record for `running`/`unreachable`; null for `not-running`/`error`. */
+    info: ServerPidInfo | null;
+    /** Human-readable discovery failure for `error` reports. */
+    error?: string;
+}
+/**
+ * Process exit codes per runtime state, so scripts can branch on `serve --status`:
+ * - running (alive and ready) → 0
+ * - not-running (empty scope or stale dead PID) → 3
+ * - unreachable (alive but `/health/ready` failing) → 4
+ */
+export declare const STATUS_EXIT_CODES: Record<RuntimeStatus, number>;
+/**
+ * Discover the scoped runtime and assemble a status report. The default
+ * readiness probe (`/health/ready`) distinguishes alive-but-not-ready from
+ * alive-and-ready.
+ */
+export declare function getRuntimeStatusReport(configDirOption?: string): Promise<RuntimeStatusReport>;
+/**
+ * Render a status report as human-readable lines.
+ */
+export declare function formatRuntimeStatusReport(report: RuntimeStatusReport): string;
+/**
+ * Entry point for `serve --status`: discover, print, and set the exit code.
+ */
+export declare function runServeStatus(configDirOption?: string): Promise<void>;
+//# sourceMappingURL=serveStatus.d.ts.map

package/build/commands/serve/serveStatus.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"serveStatus.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serveStatus.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAyB,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAE5F;;;;;GAKG;AAEH,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,aAAa,CAAC;IACtB,4DAA4D;IAC5D,SAAS,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,IAAI,EAAE,aAAa,GAAG,IAAI,CAAC;IAC3B,4DAA4D;IAC5D,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM,CAK3D,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAInG;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAuB7E;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI5E"}

package/build/commands/serve/serveStatus.js

@@ -0,0 +1,58 @@
+import { getConfigDir } from '../../constants.js';
+import { discoverScopedRuntime } from '../../core/server/runtimeLifecycle.js';
+/**
+ * Process exit codes per runtime state, so scripts can branch on `serve --status`:
+ * - running (alive and ready) → 0
+ * - not-running (empty scope or stale dead PID) → 3
+ * - unreachable (alive but `/health/ready` failing) → 4
+ */
+export const STATUS_EXIT_CODES = {
+    running: 0,
+    'not-running': 3,
+    unreachable: 4,
+    error: 2,
+};
+/**
+ * Discover the scoped runtime and assemble a status report. The default
+ * readiness probe (`/health/ready`) distinguishes alive-but-not-ready from
+ * alive-and-ready.
+ */
+export async function getRuntimeStatusReport(configDirOption) {
+    const configDir = getConfigDir(configDirOption);
+    const { status, info, error } = await discoverScopedRuntime(configDir);
+    return { status, configDir, info, error };
+}
+/**
+ * Render a status report as human-readable lines.
+ */
+export function formatRuntimeStatusReport(report) {
+    const { status, configDir, info } = report;
+    const lines = [`Runtime Scope: ${configDir}`];
+    if (status === 'not-running' || !info) {
+        if (status === 'error') {
+            lines.push('Status: error');
+            lines.push(`Error: ${report.error ?? 'PID file could not be read'}`);
+            return `${lines.join('\n')}\n`;
+        }
+        lines.push('Status: not running');
+        return `${lines.join('\n')}\n`;
+    }
+    const ready = status === 'running';
+    lines.push(`Status: ${ready ? 'running (ready)' : 'starting (not ready)'}`);
+    lines.push(`PID: ${info.pid}`);
+    lines.push(`URL: ${info.url}`);
+    lines.push(`Started: ${info.startedAt}`);
+    lines.push(`Log file: ${info.logFile ?? '(console only)'}`);
+    lines.push('Process: alive');
+    lines.push(`Readiness (/health/ready): ${ready ? 'ready' : 'not ready'}`);
+    return `${lines.join('\n')}\n`;
+}
+/**
+ * Entry point for `serve --status`: discover, print, and set the exit code.
+ */
+export async function runServeStatus(configDirOption) {
+    const report = await getRuntimeStatusReport(configDirOption);
+    process.stdout.write(formatRuntimeStatusReport(report));
+    process.exitCode = STATUS_EXIT_CODES[report.status];
+}
+//# sourceMappingURL=serveStatus.js.map

package/build/commands/serve/serveStatus.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serveStatus.js","sourceRoot":"","sources":["../../../src/commands/serve/serveStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,qBAAqB,EAAiB,MAAM,sCAAsC,CAAC;AAmB5F;;;;;GAKG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAkC;IAC9D,OAAO,EAAE,CAAC;IACV,aAAa,EAAE,CAAC;IAChB,WAAW,EAAE,CAAC;IACd,KAAK,EAAE,CAAC;CACT,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,eAAwB;IACnE,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,qBAAqB,CAAC,SAAS,CAAC,CAAC;IACvE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AAC5C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CAAC,MAA2B;IACnE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAC3C,MAAM,KAAK,GAAa,CAAC,kBAAkB,SAAS,EAAE,CAAC,CAAC;IAExD,IAAI,MAAM,KAAK,aAAa,IAAI,CAAC,IAAI,EAAE,CAAC;QACtC,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;YACvB,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC5B,KAAK,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,KAAK,IAAI,4BAA4B,EAAE,CAAC,CAAC;YACrE,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QACjC,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAClC,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IACjC,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,KAAK,SAAS,CAAC;IACnC,KAAK,CAAC,IAAI,CAAC,WAAW,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,sBAAsB,EAAE,CAAC,CAAC;IAC5E,KAAK,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/B,KAAK,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/B,KAAK,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;IACzC,KAAK,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,OAAO,IAAI,gBAAgB,EAAE,CAAC,CAAC;IAC5D,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC7B,KAAK,CAAC,IAAI,CAAC,8BAA8B,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IAC1E,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AACjC,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,eAAwB;IAC3D,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,eAAe,CAAC,CAAC;IAC7D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,CAAC;IACxD,OAAO,CAAC,QAAQ,GAAG,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AACtD,CAAC"}

package/build/commands/serve/serveStop.d.ts

@@ -0,0 +1,36 @@
+import { readPidFile } from '../../core/server/pidFileManager.js';
+/**
+ * `serve --stop`: stop only the runtime in the selected Runtime Scope.
+ *
+ * Discovery uses the pure PID reader plus a liveness check (not the readiness
+ * probe — stopping should work even for an alive-but-not-ready runtime). The
+ * signal targets exactly the PID recorded for this scope, so runtimes in other
+ * config directories are never affected.
+ */
+export interface WaitForExitOptions {
+    timeoutMs?: number;
+    intervalMs?: number;
+    isAlive?: (pid: number) => boolean;
+    now?: () => number;
+    sleep?: (ms: number) => Promise<void>;
+}
+/** Poll until the process is gone or the timeout elapses. Returns true if it exited. */
+export declare function waitForProcessExit(pid: number, options?: WaitForExitOptions): Promise<boolean>;
+/** Signals this command sends to a runtime process. */
+type StopSignal = 'SIGTERM' | 'SIGKILL';
+export interface RunStopDeps {
+    readInfo?: typeof readPidFile;
+    isAlive?: (pid: number) => boolean;
+    kill?: (pid: number, signal: StopSignal) => void;
+    /** Delete the PID file only if it still records the stopped PID. */
+    cleanup?: (configDir: string, expectedPid: number) => boolean;
+    waitForExit?: typeof waitForProcessExit;
+    /** Graceful wait before escalating to SIGKILL. */
+    gracefulTimeoutMs?: number;
+}
+/**
+ * Stop the scoped runtime. Sets `process.exitCode` and returns.
+ */
+export declare function runServeStop(configDirOption?: string, deps?: RunStopDeps): Promise<void>;
+export {};
+//# sourceMappingURL=serveStop.d.ts.map

package/build/commands/serve/serveStop.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"serveStop.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serveStop.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,WAAW,EACZ,MAAM,oCAAoC,CAAC;AAG5C;;;;;;;GAOG;AAEH,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACnC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,wFAAwF;AACxF,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,OAAO,CAAC,CAexG;AAED,uDAAuD;AACvD,KAAK,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;AAExC,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,OAAO,WAAW,CAAC;IAC9B,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACnC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACjD,oEAAoE;IACpE,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC;IAC9D,WAAW,CAAC,EAAE,OAAO,kBAAkB,CAAC;IACxC,kDAAkD;IAClD,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAMD;;GAEG;AACH,wBAAsB,YAAY,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyElG"}

package/build/commands/serve/serveStop.js

@@ -0,0 +1,93 @@
+import { getConfigDir } from '../../constants.js';
+import { cleanupPidFileIfMatches, isProcessAlive, PidFileReadError, readPidFile, } from '../../core/server/pidFileManager.js';
+import logger from '../../logger/logger.js';
+/** Poll until the process is gone or the timeout elapses. Returns true if it exited. */
+export async function waitForProcessExit(pid, options = {}) {
+    const timeoutMs = options.timeoutMs ?? 10000;
+    const intervalMs = options.intervalMs ?? 200;
+    const isAlive = options.isAlive ?? isProcessAlive;
+    const now = options.now ?? (() => Date.now());
+    const sleep = options.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+    const start = now();
+    while (now() - start < timeoutMs) {
+        if (!isAlive(pid)) {
+            return true;
+        }
+        await sleep(intervalMs);
+    }
+    return !isAlive(pid);
+}
+function defaultKill(pid, signal) {
+    process.kill(pid, signal);
+}
+/**
+ * Stop the scoped runtime. Sets `process.exitCode` and returns.
+ */
+export async function runServeStop(configDirOption, deps = {}) {
+    const configDir = getConfigDir(configDirOption);
+    const readInfo = deps.readInfo ?? readPidFile;
+    const isAlive = deps.isAlive ?? isProcessAlive;
+    const kill = deps.kill ?? defaultKill;
+    const cleanup = deps.cleanup ?? cleanupPidFileIfMatches;
+    const waitForExit = deps.waitForExit ?? waitForProcessExit;
+    const gracefulTimeoutMs = deps.gracefulTimeoutMs ?? 10000;
+    let info;
+    try {
+        info = readInfo(configDir);
+    }
+    catch (error) {
+        if (error instanceof PidFileReadError) {
+            process.stderr.write(`Error: cannot inspect Runtime Scope ${configDir}: ${error.message}\n`);
+            process.exitCode = 1;
+            return;
+        }
+        throw error;
+    }
+    if (!info) {
+        process.stdout.write(`No runtime is running in this Runtime Scope: ${configDir}\n`);
+        process.exitCode = 0;
+        return;
+    }
+    // Stale dead-process PID file: clean it up and report cleanly.
+    if (!isAlive(info.pid)) {
+        if (cleanup(configDir, info.pid)) {
+            process.stdout.write(`No running runtime in this Runtime Scope; removed a stale PID file (was PID ${info.pid}).\n`);
+        }
+        else {
+            process.stderr.write(`No running runtime in this Runtime Scope, but the stale PID file could not be removed ` +
+                `(${getConfigDir(configDirOption)}). Remove it manually.\n`);
+        }
+        process.exitCode = 0;
+        return;
+    }
+    // Graceful termination, then escalate to SIGKILL if it does not exit in time.
+    try {
+        kill(info.pid, 'SIGTERM');
+    }
+    catch (error) {
+        logger.warn(`Failed to send SIGTERM to PID ${info.pid}: ${error}`);
+    }
+    let exited = await waitForExit(info.pid, { timeoutMs: gracefulTimeoutMs, isAlive });
+    if (!exited) {
+        logger.warn(`Runtime (PID ${info.pid}) did not exit after SIGTERM; escalating to SIGKILL`);
+        try {
+            kill(info.pid, 'SIGKILL');
+        }
+        catch (error) {
+            logger.warn(`Failed to send SIGKILL to PID ${info.pid}: ${error}`);
+        }
+        exited = await waitForExit(info.pid, { timeoutMs: 2000, isAlive });
+    }
+    if (exited) {
+        // The runtime removes its own PID file on graceful shutdown; clean up in
+        // case it was force-killed before it could. Match on PID so a runtime that
+        // restarted in this scope (rare, but possible) is not clobbered.
+        cleanup(configDir, info.pid);
+        process.stdout.write(`Stopped runtime in Runtime Scope ${configDir} (PID ${info.pid}).\n`);
+        process.exitCode = 0;
+        return;
+    }
+    process.stderr.write(`Error: failed to stop runtime (PID ${info.pid}) in Runtime Scope ${configDir}.\n`);
+    process.exitCode = 1;
+}
+//# sourceMappingURL=serveStop.js.map

package/build/commands/serve/serveStop.js.map

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

package/build/constants/mcp.d.ts

@@ -6,7 +6,7 @@ export declare const MCP_CONFIG_FILE = "mcp.json";
 export declare const APP_CONFIG_FILE = "config.toml";
 export declare const MCP_INSTRUCTIONS_TEMPLATE_FILE = "instructions-template.md";
 export declare const MCP_SERVER_NAME = "1mcp";
-export declare const MCP_SERVER_VERSION = "0.33.0";
+export declare const MCP_SERVER_VERSION = "0.34.0";
 export declare const MCP_URI_SEPARATOR = "_1mcp_";
 /**
  * Default maximum number of MCP servers to load concurrently

package/build/constants/mcp.js

@@ -3,7 +3,7 @@ export const MCP_CONFIG_FILE = 'mcp.json';
 export const APP_CONFIG_FILE = 'config.toml';
 export const MCP_INSTRUCTIONS_TEMPLATE_FILE = 'instructions-template.md';
 export const MCP_SERVER_NAME = '1mcp';
-export const MCP_SERVER_VERSION = '0.33.0';
+export const MCP_SERVER_VERSION = '0.34.0';
 export const MCP_URI_SEPARATOR = '_1mcp_';
 /**
  * Default maximum number of MCP servers to load concurrently