@yefengr/remote-pi 0.7.4 → 0.7.6

package/dist/daemon/registry.js

@@ -1,152 +1,206 @@
-import { existsSync, mkdirSync, readFileSync, realpathSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, realpathSync, renameSync, writeFileSync } from "node:fs";
+import { randomUUID } from "node:crypto";
 import { homedir } from "node:os";
 import { dirname, isAbsolute, join, resolve as resolvePath } from "node:path";
-import { daemonIdForCwd } from "./id.js";
 import { defaultAgentName } from "../session/local_config.js";
 /**
- * The global daemon registry: which working directories are promoted to
- * always-on daemons under the supervisor.
- *
- * Schema rationale (decision Q in plan/26): the registry stores **only**
- * `cwd` per entry. Everything else (agent_name, auto_start_relay, etc.)
- * is the cwd's local config at `<cwd>/.pi/remote-pi/config.json` — single
- * source of truth, no duplication. The daemon `id` is *derived* from cwd
- * via `daemonIdForCwd`, never persisted.
- *
- * Cwds are always normalized to an **absolute realpath** before storage.
- * A user typing `/remote-pi create ~/Movies` or `/remote-pi create .`
- * results in the same entry as `/remote-pi create /Users/x/Movies` — no
- * surprise duplicates, symlinks collapse correctly.
+ * A malformed or old registry is an operator-visible error, not an empty
+ * registry. Treating it as empty could overwrite valid registrations on the
+ * next save, which is destructive.
  */
-/** Resolved at call time so tests can override via `REMOTE_PI_HOME`. The
- *  prod path is always `~/.pi/remote/daemons.json`. */
+export class RegistrySchemaError extends Error {
+    code;
+    constructor(code, message) {
+        super(message);
+        this.code = code;
+        this.name = "RegistrySchemaError";
+    }
+}
 function registryPathInternal() {
     const root = process.env["REMOTE_PI_HOME"] || homedir();
     return join(root, ".pi", "remote", "daemons.json");
 }
-/**
- * Normalizes a user-provided path: expands `~`/`~/...`, resolves relative
- * components against `process.cwd()`, and runs `realpath` to canonicalize
- * symlinks. Throws if the resulting path doesn't exist on disk.
- *
- * `/remote-pi create` always stores normalized paths so two registrations
- * of the same logical folder via different aliases produce a single entry.
- */
+function emptyRegistry() {
+    return { version: 2, daemons: [] };
+}
+/** Canonicalizes a supplied cwd and rejects nonexistent paths. */
 export function normalizeCwd(input) {
-    if (!input || !input.trim()) {
+    if (!input || !input.trim())
         throw new Error("cwd is required");
+    let path = input.trim();
+    if (path === "~")
+        path = homedir();
+    else if (path.startsWith("~/"))
+        path = join(homedir(), path.slice(2));
+    if (!isAbsolute(path))
+        path = resolvePath(process.cwd(), path);
+    return realpathSync(path);
+}
+function registryError(message, code = "registry_schema_invalid") {
+    throw new RegistrySchemaError(code, message);
+}
+function isOpaqueId(value) {
+    // UUID is generated by this registry. Accept UUID variants to keep the
+    // persisted identifier opaque without coupling validation to a display form.
+    return typeof value === "string" && /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(value);
+}
+function parseEntry(value, index) {
+    if (!value || typeof value !== "object")
+        registryError(`registry daemon[${index}] must be an object`);
+    const entry = value;
+    if (!isOpaqueId(entry["id"]))
+        registryError(`registry daemon[${index}].id must be an opaque UUID`);
+    if (typeof entry["cwd"] !== "string" || !isAbsolute(entry["cwd"]) || entry["cwd"].length === 0) {
+        registryError(`registry daemon[${index}].cwd must be an absolute path`);
+    }
+    // A vanished cwd stays loadable long enough for supervisor reconcile to
+    // remove it. Existing paths must already be their canonical realpath.
+    if (existsSync(entry["cwd"]) && realpathSync(entry["cwd"]) !== entry["cwd"]) {
+        registryError(`registry daemon[${index}].cwd must be a filesystem realpath`);
     }
-    let p = input.trim();
-    // Expand `~` / `~/relative`. Shell wouldn't expand inside slash command args.
-    if (p === "~")
-        p = homedir();
-    else if (p.startsWith("~/"))
-        p = join(homedir(), p.slice(2));
-    if (!isAbsolute(p))
-        p = resolvePath(process.cwd(), p);
-    // realpath canonicalizes symlinks + throws if path doesn't exist.
-    return realpathSync(p);
-}
-/** Reads the registry, returning an empty one when the file is absent. */
+    if (typeof entry["name"] !== "string" || entry["name"].trim().length === 0) {
+        registryError(`registry daemon[${index}].name must be a non-empty string`);
+    }
+    if (entry["desired_state"] !== "running" && entry["desired_state"] !== "stopped") {
+        registryError(`registry daemon[${index}].desired_state must be running or stopped`);
+    }
+    if (typeof entry["created_at"] !== "number" || !Number.isFinite(entry["created_at"]) || entry["created_at"] < 0) {
+        registryError(`registry daemon[${index}].created_at must be an epoch timestamp`);
+    }
+    return {
+        id: entry["id"],
+        cwd: entry["cwd"],
+        name: entry["name"].trim(),
+        desired_state: entry["desired_state"],
+        created_at: entry["created_at"],
+    };
+}
+function validateRegistry(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+        registryError("registry root must be an object");
+    }
+    const root = value;
+    if (root["version"] !== 2) {
+        const code = root["version"] === undefined || root["version"] === 1
+            ? "registry_schema_unsupported"
+            : "registry_schema_invalid";
+        registryError(`unsupported daemon registry version ${String(root["version"])}; remove or replace ~/.pi/remote/daemons.json before registering daemons`, code);
+    }
+    if (!Array.isArray(root["daemons"]))
+        registryError("registry.daemons must be an array");
+    const daemons = root["daemons"].map((entry, index) => parseEntry(entry, index));
+    const ids = new Set();
+    const cwds = new Set();
+    for (const entry of daemons) {
+        if (ids.has(entry.id))
+            registryError(`registry contains duplicate id ${entry.id}`);
+        if (cwds.has(entry.cwd))
+            registryError(`registry contains duplicate cwd ${entry.cwd}`);
+        ids.add(entry.id);
+        cwds.add(entry.cwd);
+    }
+    return { version: 2, daemons };
+}
+/** Missing file is empty v2; every existing file must be valid v2. */
 export function loadRegistry() {
-    if (!existsSync(registryPathInternal()))
-        return { daemons: [] };
+    const path = registryPathInternal();
+    if (!existsSync(path))
+        return emptyRegistry();
+    let raw;
     try {
-        const raw = readFileSync(registryPathInternal(), "utf8");
-        const parsed = JSON.parse(raw);
-        if (!parsed || typeof parsed !== "object")
-            return { daemons: [] };
-        const arr = parsed.daemons;
-        if (!Array.isArray(arr))
-            return { daemons: [] };
-        const daemons = [];
-        for (const item of arr) {
-            if (!item || typeof item !== "object")
-                continue;
-            const cwd = item.cwd;
-            if (typeof cwd === "string" && cwd.length > 0) {
-                const rawName = item.name;
-                const entry = { cwd };
-                if (typeof rawName === "string" && rawName.length > 0)
-                    entry.name = rawName;
-                daemons.push(entry);
-            }
-        }
-        return { daemons };
+        raw = readFileSync(path, "utf8");
     }
-    catch {
-        return { daemons: [] };
+    catch (error) {
+        throw new RegistrySchemaError("registry_schema_invalid", `cannot read daemon registry: ${String(error)}`);
     }
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch (error) {
+        throw new RegistrySchemaError("registry_schema_invalid", `invalid daemon registry JSON: ${String(error)}`);
+    }
+    return validateRegistry(parsed);
 }
-export function saveRegistry(reg) {
-    mkdirSync(dirname(registryPathInternal()), { recursive: true });
-    writeFileSync(registryPathInternal(), JSON.stringify(reg, null, 2) + "\n");
+/** Validates before atomically replacing the on-disk registry. */
+export function saveRegistry(registry) {
+    const valid = validateRegistry(registry);
+    const path = registryPathInternal();
+    mkdirSync(dirname(path), { recursive: true });
+    const temp = `${path}.${process.pid}.${randomUUID()}.tmp`;
+    try {
+        writeFileSync(temp, JSON.stringify(valid, null, 2) + "\n", "utf8");
+        renameSync(temp, path);
+    }
+    catch (error) {
+        throw new Error(`failed to save daemon registry: ${String(error)}`);
+    }
 }
-/**
- * Adds a daemon entry. Refuses duplicates (same normalized cwd already
- * present). Returns the derived id + normalized cwd so the caller can
- * report it back to the user.
- */
+/** Explicit registration always starts in the desired running state. */
 export function addDaemon(rawCwd, name) {
     const cwd = normalizeCwd(rawCwd);
-    const reg = loadRegistry();
-    if (reg.daemons.some((d) => d.cwd === cwd)) {
+    const registry = loadRegistry();
+    if (registry.daemons.some((entry) => entry.cwd === cwd)) {
         throw new Error(`Daemon already registered for cwd: ${cwd}`);
     }
-    // Always persist a name (the registry is the source of truth now that the
-    // supervisor injects config via env instead of a local config file).
-    const resolvedName = name?.trim() || defaultAgentName(cwd);
-    reg.daemons.push({ cwd, name: resolvedName });
-    saveRegistry(reg);
-    return { id: daemonIdForCwd(cwd), cwd, name: resolvedName };
+    const entry = {
+        id: randomUUID(),
+        cwd,
+        name: name?.trim() || defaultAgentName(cwd),
+        desired_state: "running",
+        created_at: Date.now(),
+    };
+    registry.daemons.push(entry);
+    saveRegistry(registry);
+    return entry;
 }
-/**
- * Removes the daemon entry whose derived id matches `id`. Returns the
- * removed cwd (if any). Does NOT touch the cwd's local config — `create`
- * the same cwd later restores the registration idempotently.
- */
 export function removeDaemon(id) {
-    const reg = loadRegistry();
-    const idx = reg.daemons.findIndex((d) => daemonIdForCwd(d.cwd) === id);
-    if (idx === -1)
+    const registry = loadRegistry();
+    const index = registry.daemons.findIndex((entry) => entry.id === id);
+    if (index === -1)
         return { removed: false };
-    const [removed] = reg.daemons.splice(idx, 1);
-    saveRegistry(reg);
+    const [removed] = registry.daemons.splice(index, 1);
+    saveRegistry(registry);
     return { removed: true, cwd: removed.cwd };
 }
-/** Snapshot of all registered daemons with derived ids. Order matches the
- *  file's insertion order — first-registered first. */
+/** Finds a registration by canonical cwd for external lifecycle integrations. */
+export function findDaemonByCwd(rawCwd) {
+    let cwd;
+    try {
+        cwd = normalizeCwd(rawCwd);
+    }
+    catch {
+        let path = rawCwd.trim();
+        if (path === "~")
+            path = homedir();
+        else if (path.startsWith("~/"))
+            path = join(homedir(), path.slice(2));
+        cwd = isAbsolute(path) ? resolvePath(path) : resolvePath(process.cwd(), path);
+    }
+    return loadRegistry().daemons.find((entry) => entry.cwd === cwd);
+}
+/** Persists intended lifecycle independently from process state. */
+export function setDaemonDesiredState(id, desiredState) {
+    const registry = loadRegistry();
+    const entry = registry.daemons.find((item) => item.id === id);
+    if (!entry)
+        return undefined;
+    entry.desired_state = desiredState;
+    saveRegistry(registry);
+    return entry;
+}
+/** Returns v2 entries in insertion order. */
 export function listDaemons() {
-    return loadRegistry().daemons.map((d) => ({
-        id: daemonIdForCwd(d.cwd),
-        cwd: d.cwd,
-        // Legacy entries (cwd only) fall back to the folder-derived name so a
-        // daemon is never nameless. New entries already carry an explicit name.
-        name: d.name ?? defaultAgentName(d.cwd),
-    }));
+    return loadRegistry().daemons;
 }
 /**
- * One-shot migration: backfill `name` (folder-derived) into legacy entries
- * that predate the name field, persisting the change to `daemons.json`.
- * Idempotent — writes only when something was missing. Returns how many
- * entries were backfilled. The supervisor runs this on start.
+ * Backward compatible export name only. v2 deliberately has no in-place
+ * migration: an old registry must be explicitly replaced by its operator.
  */
 export function migrateRegistryNames() {
-    const reg = loadRegistry();
-    let changed = 0;
-    for (const d of reg.daemons) {
-        if (!d.name) {
-            d.name = defaultAgentName(d.cwd);
-            changed++;
-        }
-    }
-    if (changed > 0)
-        saveRegistry(reg);
-    return changed;
-}
-/** Test/diag-only: returns the on-disk path. Exported so tests can poke
- *  at it (e.g. tmpdir override is done via env, but for now the path is
- *  hardcoded to ~/.pi/remote/daemons.json). */
+    loadRegistry();
+    return 0;
+}
 export function registryPath() {
     return registryPathInternal();
 }

package/dist/daemon/registry.js.map

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

package/dist/daemon/rpc_child.d.ts

@@ -1,194 +1,140 @@
 import { EventEmitter } from "node:events";
-import type { DaemonState } from "./control_protocol.js";
+import type { DaemonState, ProcessState, RelayState, RuntimeState } from "./control_protocol.js";
 import { type LocalConfig } from "../session/local_config.js";
-/**
- * Wrapper around a `pi --mode rpc -e <extension>` child process for the
- * supervisor.
- *
- * Lifecycle:
- *   - `spawn()` boots the child with the daemon's cwd + `REMOTE_PI_DAEMON=1`
- *     env so the extension knows to skip the interactive wizard.
- *   - `sendPrompt(text)` writes a Pi RPC `prompt` command to stdin.
- *   - The child's stdout (Pi RPC events) is currently consumed line-by-line
- *     and ignored — wave 2 only needs fire-and-forget. Later waves can
- *     surface the events back through the supervisor's status op.
- *   - Exit/crash fires `exit` event with `{code, signal, isCrash}` so the
- *     supervisor can decide whether to auto-restart.
- *
- * Each `RpcChild` instance maps 1:1 to a registry entry (single cwd).
- * The supervisor owns the map of these and addresses them by `id`.
- */
+/** RPC child wrapper. PID creation is not readiness: only structured stdout
+ * responses/events can move runtime from pending to ready. */
 export interface RpcChildOptions {
-    /** Path to the `pi` binary. Defaults to "pi" (must be on PATH). */
     piBin?: string;
-    /** Absolute path to the remote-pi `dist/index.js` to load as -e. */
+    /** Retained until bin/supervisor wiring is removed; daemon spawn deliberately
+     * does not pass it as `-e` because Pi's configured extension environment is
+     * the sole extension source. */
     extensionPath: string;
-    /** Working directory for the spawned process. Determines which local
-     *  config the extension reads. */
     cwd: string;
-    /** Additional env vars merged on top of `process.env` + the mandatory
-     *  `REMOTE_PI_DAEMON=1`. */
+    /** Stable daemon endpoint identity supplied by the supervisor. */
+    endpointId?: string;
     env?: NodeJS.ProcessEnv;
-    /**
-     * Daemon config injected into the child via `REMOTE_PI_DIRECT_CONFIG`
-     * (JSON inline) instead of a per-cwd `.pi/remote-pi/config.json` file. The
-     * supervisor builds this from the registry. When set, the child reads it
-     * env-first (see `loadLocalConfig`) and no config file is needed. Also the
-     * source of the `--name` for the session. Falls back to the on-disk config
-     * when omitted.
-     */
     config?: LocalConfig;
+    readinessTimeoutMs?: number;
+    promptTimeoutMs?: number;
 }
 export interface RpcChildExitEvent {
     code: number | null;
     signal: NodeJS.Signals | null;
-    /** True when exit was not clean (non-zero or signal). */
+    /** True for every exit not initiated through stop(), including code 0. */
     isCrash: boolean;
 }
+export interface PromptAcceptance {
+    accepted: boolean;
+    code?: string;
+    error?: string;
+}
+export interface RuntimeReadyEvent {
+    control_protocol_version?: number;
+    extension_version?: string;
+    endpoint_id?: string;
+    runtime_instance_id?: string;
+    session_id?: string;
+}
+export interface RuntimeFailedEvent {
+    stage?: string;
+    code: string;
+    message?: string;
+    retryable: boolean;
+}
+export interface RelayStateChangedEvent {
+    state: RelayState;
+}
+export interface SessionChangedEvent {
+    session_id?: string;
+}
 export declare const EXIT_DAEMON_FRESH_SESSION = 42;
-/**
- * Resolve the `pi` executable for `spawn` (plan/40, decision C). On Windows a
- * bare `pi` is actually `pi.cmd`/`pi.ps1`, and `spawn` won't find it without an
- * extension → resolve the real path via `where` (rather than `shell:true`,
- * which risks shell injection). An explicit path or an already-suffixed name is
- * used as-is. POSIX returns the name unchanged. Best-effort: if `where` fails,
- * fall back to the bare name (spawn will surface ENOENT honestly).
- *
- * `where` lists every match in PATH order, which on pi-node installs puts the
- * extensionless `pi` (a shell script) BEFORE `pi.cmd`. Naively taking the first
- * line spawns the unrunnable script → ENOENT → "crashed". So we prefer a result
- * with a real Windows executable extension and only fall back to the first line.
- */
+export declare const DEFAULT_READINESS_TIMEOUT_MS = 10000;
+export declare const DEFAULT_PROMPT_TIMEOUT_MS = 5000;
 export declare function resolvePiBin(piBin: string, plat?: NodeJS.Platform): string;
-/** What to pass to `spawn`: the executable and any args to prepend before the
- *  caller's args. On POSIX (and for `.exe`) `prefixArgs` is empty. */
 export interface PiSpawnTarget {
     command: string;
     prefixArgs: string[];
 }
-/**
- * Resolve `pi` to a directly-spawnable target (plan/40). On Windows `pi` is an
- * npm `.cmd` shim, which modern Node refuses to `spawn` without `shell:true`
- * (EINVAL, post CVE-2024-27980). Wrapping it in `cmd.exe` would (a) add a layer
- * that orphans the real `node` on kill and (b) complicate stdio — both fatal for
- * a long-lived RPC daemon the supervisor must stop/restart cleanly. Instead we
- * parse the shim to recover the underlying `node <cli.js>` and spawn that
- * directly: one process, clean signals, clean stdio.
- *
- * Falls back to the bare resolved path when not a parseable shim (e.g. a real
- * `pi.exe`, or POSIX) so `spawn` surfaces any real error honestly.
- */
 export declare function resolvePiSpawn(piBin: string, plat?: NodeJS.Platform, nodeExe?: string): PiSpawnTarget;
-/**
- * Extract the JS entry an npm `.cmd` shim launches. npm shims invoke
- * `"%_prog%"  "%dp0%\<relative>\entry.js" %*`; we recover `<dir>\<relative>\entry.js`
- * (dir = the shim's own folder, i.e. `%dp0%`). Returns null when the shim
- * doesn't match the expected shape or the target is missing.
- */
 export declare function _npmShimTarget(cmdPath: string): string | null;
+export declare function busyTransition(line: string): boolean | null;
 /**
- * Maps an RPC stdout line to a busy-state transition: `message_start` → true
- * (a message is streaming), `message_end` → false. Other lines → null (no
- * change). Pure + exported for tests.
- *
- * NOTE (plan/39 detail 1): the Pi RPC stream has NO turn-level event — only
- * per-message start/end (and `response{command:"prompt"}` is emitted at
- * PREFLIGHT, i.e. turn START, not end). So this passive flag reflects
- * "a message is being produced right now"; the authoritative turn-busy signal
- * is `get_state.isStreaming` (see `RpcChild.refreshBusy`).
+ * The installed Pi RPC starts configured extensions itself. In particular this
+ * must not attach Remote Pi with `-e`, which could load it a second time.
  */
-export declare function busyTransition(line: string): boolean | null;
+export declare function rpcSpawnArgs(_extensionPath: string, sessionName?: string, useContinue?: boolean): string[];
+type ParsedRuntimeEvent = {
+    type: "runtime_ready";
+    event: RuntimeReadyEvent;
+} | {
+    type: "runtime_failed";
+    event: RuntimeFailedEvent;
+} | {
+    type: "relay_state_changed";
+    event: RelayStateChangedEvent;
+} | {
+    type: "session_changed";
+    event: SessionChangedEvent;
+};
 /**
- * CLI args for the daemon's `pi --mode rpc` child.
- *
- * `--continue` is the key bit: it resumes the **most recent** session for the
- * cwd (`SessionManager.continueRecent`, non-interactive — unlike `--resume`
- * which opens a picker). Without it every supervisor restart spun up a brand
- * new session file, piling up thousands of JSONLs per folder. With it, a
- * restart REUSES the one session; the app's `/new` (session_new) still rolls
- * it over to a fresh one, which the next restart then continues. First boot
- * (no prior session) just creates the first one.
- *
- * `--name <sessionName>`, when given, pins the session's display name to the
- * daemon's identity (its `agent_name`) so every restart shows up under the
- * same stable name in the picker/app instead of an auto-generated one. The
- * daemon's name is set at registration (`remote-pi create <cwd> --name "…"`).
- * Omitted when no name resolves, so the arg list stays minimal.
- *
- * `--approve` is mandatory for a daemon (pi ≥0.79 project trust): RPC mode is
- * non-interactive, so without an override Pi resolves an untrusted project
- * folder (any folder with `.pi/` or CLAUDE.md/AGENTS.md) to NOT trusted and
- * silently skips its `.pi/settings.json` (model/provider/keys), instructions,
- * resources and project extensions — the daemon then comes up with no model
- * and fails on the first turn. The operator already authorized this folder by
- * registering/launching a daemon in it, so `--approve` (trust-for-this-run) is
- * the correct non-interactive stance. (Does NOT affect the separate "extension
- * loaded twice" conflict, which comes from the extension being BOTH installed
- * in ~/.pi/agent/extensions or cwd/.pi/extensions AND passed via `-e`.)
+ * Parses direct daemon-control events and the current extension's custom
+ * relay-state message shape. Natural-language stderr is intentionally absent.
  */
-export declare function rpcSpawnArgs(extensionPath: string, sessionName?: string, useContinue?: boolean): string[];
+export declare function parseRuntimeEvent(line: string): ParsedRuntimeEvent | null;
 export declare class RpcChild extends EventEmitter {
     private readonly opts;
     private child;
     private _state;
+    private _process;
+    private _runtime;
+    private _relay;
     private _startedAt;
+    private _runtimeInstanceId;
+    private _sessionId;
     private _restartCount;
-    /** True while a deliberate `stop()` is in flight. The process dies by
-     *  signal (SIGTERM/SIGKILL), which would otherwise look like a crash and
-     *  trip the supervisor's auto-restart — re-spawning a daemon the operator
-     *  just stopped/removed. Gating `isCrash` on this makes a deliberate stop a
-     *  clean exit (no restart). Reset on every `spawn()`. */
     private _stopping;
-    /** Next spawn should create a fresh session instead of --continue. */
     private forceFreshSessionOnNextSpawn;
-    /** Accumulates partial stdout lines while waiting for `\n`. */
     private stdoutBuf;
-    /** Passive busy flag derived from the RPC stream (message_start/end). Hint
-     *  only; `refreshBusy` syncs it authoritatively via get_state.isStreaming. */
     private _busy;
-    /** In-flight `get_state` requests, keyed by request id. */
-    private readonly _statePending;
+    private rpcReady;
+    private extensionReady;
+    private extensionReadyEvent;
+    private readinessTimer;
+    private readyPromise;
+    private readyResolve;
+    private readonly statePending;
+    private readonly promptPending;
     constructor(opts: RpcChildOptions);
     get state(): DaemonState;
-    /** Passive busy hint from the stream. Prefer `refreshBusy()` for an
-     *  authoritative check before acting on it (cron skip_if_busy). */
+    get processState(): ProcessState;
+    get runtimeState(): RuntimeState;
+    get relayState(): RelayState;
     get isBusy(): boolean;
     get pid(): number | undefined;
     get restartCount(): number;
+    get startedAt(): number | undefined;
+    get runtimeInstanceId(): string | undefined;
+    get sessionId(): string | undefined;
     get uptimeMs(): number | undefined;
-    /**
-     * Spawn the child process. Idempotent for the same instance: a second
-     * call while already running is a no-op.
-     */
+    /** Resolves true only after the readiness probe/event, false on timeout/exit. */
+    ready(): Promise<boolean>;
     spawn(): void;
-    /**
-     * Sends a Pi RPC `prompt` command to the child's stdin. Fire-and-forget
-     * — we don't wait for the response (response would be the success ack;
-     * the actual agent output streams via the relay/UDS, not back through
-     * stdout).
-     *
-     * Returns false if the child isn't running (caller decides how to report).
-     */
-    sendPrompt(text: string, requestId?: string): boolean;
-    /**
-     * Asks the child to exit gracefully. Sends SIGTERM; if the child doesn't
-     * exit within `timeoutMs`, escalates to SIGKILL. Resolves when the
-     * `exit` event fires.
-     */
+    /** Waits for Pi's correlated prompt preflight response, not merely stdin write. */
+    sendPrompt(text: string, requestId?: string, timeoutMs?: number): Promise<PromptAcceptance>;
     stop(timeoutMs?: number): Promise<void>;
-    private _onStdout;
-    private _handleStdoutLine;
-    /**
-     * Authoritative busy check: queries the child's `get_state` and syncs
-     * `_busy` to `isStreaming`. Resolves the passive flag on timeout (no
-     * response) or when the child isn't running. Used by the cron `skip_if_busy`
-     * gate, where a false "not busy" would pile a prompt onto a live turn.
-     */
     refreshBusy(timeoutMs?: number): Promise<boolean>;
-    /** Test-only: feed a raw stdout line through the same handler. */
+    /** Test injection point for deterministic RPC event/response coverage. */
     _ingestStdoutForTest(line: string): void;
-    private _onExit;
-    /** Bumps the restart counter — called by the supervisor when it
-     *  decides to re-spawn after a crash. Exposed so tests can drive it. */
+    private startReadinessProbe;
+    private onStdout;
+    private handleStdoutLine;
+    private parseResponse;
+    private handleResponse;
+    private handleRuntimeEvent;
+    private acceptExtensionReady;
+    private maybeMarkReady;
+    private failRuntime;
+    private onExit;
     noteRestart(): void;
 }
+export {};