@pleri/olam-cli 0.1.144 → 0.1.145

package/dist/commands/doctor.d.ts

@@ -1,23 +1,43 @@
 /**
  * olam doctor — pass/fail host-health command.
  *
- * Phase A3 of olam-operator-onboarding-parity (plan
- * ~/.claude/plans/olam-operator-onboarding-parity.md).
- *
- * Five probes via packages/cli/src/lib/health-probes.ts (the Seam):
- *   1. probeDockerDaemon — first; fast-fails before per-image probes
- *      (Risk T5 mitigation — paused-daemon false-positives on image probes)
- *   2. probeImagePresence — checks 4 canonical images via docker image inspect
- *   3. probeHostCpHealth — 5s timeout fetch on 127.0.0.1:19000/health
- *   4. probeAuthVault — OLAM_HOME/auth/data.json; active non-cooled claude count
- *   5. probeKgStorage — pristine + overlay enumeration; 1.5GB soft / 5GB hard
- *
- * Exit code: 0 if all probes ok, 1 if ANY fail.
- * --json flag emits machine-readable structured output.
- *
- * Decision 5 (plan): doctor IS the gate; warn-only would defeat the
- * purpose. Soft-warn on KG storage (>=1.5GB) stays ok:true; only the
- * hard cap (>=5GB) flips to ok:false.
+ * Phase A3 of olam-operator-onboarding-parity (original 5 probes) +
+ * Phase C / C2 of olam-host-cp-k3s-prereqs (engine + colima probes).
+ *
+ * Probe layout — Decision 16 positional contract for `--json` consumers:
+ *
+ *   On engine=docker (default):
+ *     1. docker daemon                — probeDockerDaemon (fast-fail gate)
+ *     2. images                       — probeImagePresence (per-image)
+ *     3. host-cp /health              — probeHostCpHealth
+ *     4. auth vault                   — probeAuthVault
+ *     5. KG storage                   — probeKgStorage
+ *     6. engine                       — probeEngine (NEW Phase C / C2)
+ *     7. colima version               — probeColimaVersion (NEW Phase C / C2)
+ *
+ *   On engine=kubernetes:
+ *     1. api server                   — probeK8sApiReachable     (slot replaced)
+ *     2. images                       — probeK8sImagePresence    (slot replaced)
+ *     3. host-cp /health              — probeHostCpHealth        (unchanged)
+ *     4. auth vault                   — probeAuthVault           (unchanged)
+ *     5. KG storage                   — probeKgStorage           (unchanged)
+ *     6. engine                       — probeEngine              (NEW)
+ *     7. colima version               — probeColimaVersion       (NEW)
+ *
+ * The `--json` payload's `probes[]` indexes are stable across engine swap:
+ * consumers parsing `probes[0]` for "daemon-reachability" still see a
+ * daemon-reachability probe; consumers parsing `probes[5]` for engine
+ * identity see it regardless of which runtime is active.
+ *
+ * Exit code:
+ *   - 0 on all PASS
+ *   - 0 on PASS+WARN  (WARN doesn't block — Colima 0.10.x is a hint)
+ *   - 1 on any FAIL
+ *
+ * Output format:
+ *   - `[PASS]` / `[WARN]` / `[FAIL]` prefix per row.
+ *   - Indented detail under WARN/FAIL.
+ *   - `--json` emits the same probe array (canonical positional shape).
  */
 import type { Command } from 'commander';
 import { type ProbeResult, type DockerExec, type FetchLike } from '../lib/health-probes.js';
@@ -32,6 +52,7 @@ interface DoctorReport {
     readonly rows: ReadonlyArray<ProbeRow>;
     readonly summary: 'OK' | 'FAILED';
     readonly failureCount: number;
+    readonly warnCount: number;
 }
 export interface RunDoctorDeps {
     readonly dockerExec?: DockerExec;
@@ -39,20 +60,29 @@ export interface RunDoctorDeps {
     readonly olamHomeOverride?: string;
     /** Override registry prefix used to derive registry-prefixed image refs. Defaults to ghcr.io/pleri. */
     readonly registry?: string;
+    /**
+     * Phase C / C2: explicit engine override. When omitted the engine is
+     * derived from `OLAM_HOST_CP_ENGINE` (falls back to 'docker'). Tests
+     * use this hook to exercise both index-stability paths without
+     * spinning up a real K8s cluster.
+     */
+    readonly engine?: 'docker' | 'kubernetes';
 }
 interface RunResult {
     readonly exitCode: number;
     readonly report: DoctorReport;
 }
 /**
- * Run all 5 probes against the host. Daemon-reachability runs FIRST + ALONE.
- * If it fails, the remaining probes are SKIPPED — image-presence probes
- * against a paused daemon return confusing "404 no such image" errors that
- * the operator would misread as "rebuild your devbox" when the real fix
- * is "start Docker" (Risk T5 mitigation per plan).
+ * Run probes against the host. Probe-1 (daemon / API) runs FIRST + ALONE.
+ * If it fails, the remaining slot-1+2 probes are SKIPPED — image presence
+ * probes against a paused daemon / unreachable cluster return confusing
+ * errors that misdirect the operator's fix (Risk T5 mitigation per plan).
  *
- * On daemon-success, the remaining 4 probes run in parallel via Promise.all
+ * On daemon-success, probes 2-7 run in parallel via Promise.all
  * (P1 budget: doctor < 2s on healthy host).
+ *
+ * Phase C / C2: engine-aware. When `engine=kubernetes` we substitute
+ * positions 1 + 2 in-place to preserve the positional `--json` contract.
  */
 export declare function runDoctor(opts: DoctorOptions, deps?: RunDoctorDeps): Promise<RunResult>;
 export declare function registerDoctor(program: Command): void;

package/dist/commands/doctor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAML,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,SAAS,EACf,MAAM,yBAAyB,CAAC;AAqCjC,UAAU,aAAa;IACrB,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,UAAU,QAAQ;IAChB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;CAC9B;AAED,UAAU,YAAY;IACpB,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,IAAI,GAAG,QAAQ,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;IACjC,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC;IAC/B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,uGAAuG;IACvG,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,UAAU,SAAS;IACjB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;CAC/B;AAED;;;;;;;;;GASG;AACH,wBAAsB,SAAS,CAC7B,IAAI,EAAE,aAAa,EACnB,IAAI,GAAE,aAAkB,GACvB,OAAO,CAAC,SAAS,CAAC,CAqCpB;AAkDD,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAYrD"}
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAUL,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,SAAS,EACf,MAAM,yBAAyB,CAAC;AAqCjC,UAAU,aAAa;IACrB,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,UAAU,QAAQ;IAChB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;CAC9B;AAED,UAAU,YAAY;IACpB,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,IAAI,GAAG,QAAQ,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;IACjC,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC;IAC/B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,uGAAuG;IACvG,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,GAAG,YAAY,CAAC;CAC3C;AAED,UAAU,SAAS;IACjB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;CAC/B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,SAAS,CAC7B,IAAI,EAAE,aAAa,EACnB,IAAI,GAAE,aAAkB,GACvB,OAAO,CAAC,SAAS,CAAC,CAwDpB;AAiFD,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAYrD"}

package/dist/commands/doctor.js

@@ -1,25 +1,45 @@
 /**
  * olam doctor — pass/fail host-health command.
  *
- * Phase A3 of olam-operator-onboarding-parity (plan
- * ~/.claude/plans/olam-operator-onboarding-parity.md).
+ * Phase A3 of olam-operator-onboarding-parity (original 5 probes) +
+ * Phase C / C2 of olam-host-cp-k3s-prereqs (engine + colima probes).
  *
- * Five probes via packages/cli/src/lib/health-probes.ts (the Seam):
- *   1. probeDockerDaemon — first; fast-fails before per-image probes
- *      (Risk T5 mitigation — paused-daemon false-positives on image probes)
- *   2. probeImagePresence — checks 4 canonical images via docker image inspect
- *   3. probeHostCpHealth — 5s timeout fetch on 127.0.0.1:19000/health
- *   4. probeAuthVault — OLAM_HOME/auth/data.json; active non-cooled claude count
- *   5. probeKgStorage — pristine + overlay enumeration; 1.5GB soft / 5GB hard
+ * Probe layout — Decision 16 positional contract for `--json` consumers:
  *
- * Exit code: 0 if all probes ok, 1 if ANY fail.
- * --json flag emits machine-readable structured output.
+ *   On engine=docker (default):
+ *     1. docker daemon                — probeDockerDaemon (fast-fail gate)
+ *     2. images                       — probeImagePresence (per-image)
+ *     3. host-cp /health              — probeHostCpHealth
+ *     4. auth vault                   — probeAuthVault
+ *     5. KG storage                   — probeKgStorage
+ *     6. engine                       — probeEngine (NEW Phase C / C2)
+ *     7. colima version               — probeColimaVersion (NEW Phase C / C2)
  *
- * Decision 5 (plan): doctor IS the gate; warn-only would defeat the
- * purpose. Soft-warn on KG storage (>=1.5GB) stays ok:true; only the
- * hard cap (>=5GB) flips to ok:false.
+ *   On engine=kubernetes:
+ *     1. api server                   — probeK8sApiReachable     (slot replaced)
+ *     2. images                       — probeK8sImagePresence    (slot replaced)
+ *     3. host-cp /health              — probeHostCpHealth        (unchanged)
+ *     4. auth vault                   — probeAuthVault           (unchanged)
+ *     5. KG storage                   — probeKgStorage           (unchanged)
+ *     6. engine                       — probeEngine              (NEW)
+ *     7. colima version               — probeColimaVersion       (NEW)
+ *
+ * The `--json` payload's `probes[]` indexes are stable across engine swap:
+ * consumers parsing `probes[0]` for "daemon-reachability" still see a
+ * daemon-reachability probe; consumers parsing `probes[5]` for engine
+ * identity see it regardless of which runtime is active.
+ *
+ * Exit code:
+ *   - 0 on all PASS
+ *   - 0 on PASS+WARN  (WARN doesn't block — Colima 0.10.x is a hint)
+ *   - 1 on any FAIL
+ *
+ * Output format:
+ *   - `[PASS]` / `[WARN]` / `[FAIL]` prefix per row.
+ *   - Indented detail under WARN/FAIL.
+ *   - `--json` emits the same probe array (canonical positional shape).
  */
-import { probeDockerDaemon, probeImagePresence, probeHostCpHealth, probeAuthVault, probeKgStorage, } from '../lib/health-probes.js';
+import { probeDockerDaemon, probeImagePresence, probeHostCpHealth, probeAuthVault, probeKgStorage, probeEngine, probeColimaVersion, probeK8sApiReachable, probeK8sImagePresence, } from '../lib/health-probes.js';
 import { printError, printSuccess, printWarning, printHeader } from '../output.js';
 /** Default registry prefix for registry-tagged images. Mirrors bootstrap.ts's default. */
 const DEFAULT_REGISTRY = 'ghcr.io/pleri';
@@ -54,52 +74,96 @@ function buildRequiredImageRefs(registry) {
     return refs;
 }
 /**
- * Run all 5 probes against the host. Daemon-reachability runs FIRST + ALONE.
- * If it fails, the remaining probes are SKIPPED — image-presence probes
- * against a paused daemon return confusing "404 no such image" errors that
- * the operator would misread as "rebuild your devbox" when the real fix
- * is "start Docker" (Risk T5 mitigation per plan).
+ * Run probes against the host. Probe-1 (daemon / API) runs FIRST + ALONE.
+ * If it fails, the remaining slot-1+2 probes are SKIPPED — image presence
+ * probes against a paused daemon / unreachable cluster return confusing
+ * errors that misdirect the operator's fix (Risk T5 mitigation per plan).
  *
- * On daemon-success, the remaining 4 probes run in parallel via Promise.all
+ * On daemon-success, probes 2-7 run in parallel via Promise.all
  * (P1 budget: doctor < 2s on healthy host).
+ *
+ * Phase C / C2: engine-aware. When `engine=kubernetes` we substitute
+ * positions 1 + 2 in-place to preserve the positional `--json` contract.
  */
 export async function runDoctor(opts, deps = {}) {
     const dockerExec = deps.dockerExec;
     const fetchImpl = deps.fetchImpl;
     const olamHomeOverride = deps.olamHomeOverride;
     const registry = deps.registry ?? DEFAULT_REGISTRY;
-    // Probe 1: docker daemon (fast-fail gate).
-    const dockerResult = await probeDockerDaemon(dockerExec);
-    const rows = [{ name: 'docker daemon', result: dockerResult }];
-    if (!dockerResult.ok) {
-        // Fast-fail: skip per-image / host-cp / auth / kg probes when daemon down.
-        // Auth + KG probes don't strictly need docker but are useless without it.
-        return emit({ rows, summary: 'FAILED', failureCount: 1 }, opts);
+    const engine = deps.engine ?? resolveEngineFromEnv();
+    const isK8s = engine === 'kubernetes';
+    // Slot 1: daemon / API reachability (fast-fail gate). Engine-aware.
+    const slot1Result = isK8s
+        ? await probeK8sApiReachable(dockerExec)
+        : await probeDockerDaemon(dockerExec);
+    const slot1Name = isK8s ? 'api server' : 'docker daemon';
+    const rows = [{ name: slot1Name, result: slot1Result }];
+    if (!slot1Result.ok) {
+        // Fast-fail: skip per-image / host-cp / auth / kg probes when the
+        // engine's daemon-equivalent is down. Engine + colima probes still
+        // surface for diagnostic context, though, since they may hint at WHY
+        // the daemon is unreachable (e.g. Colima 0.10.x kubernetes-mode bug).
+        const [engineRes, colimaRes] = await Promise.all([
+            probeEngine(fetchImpl),
+            probeColimaVersion(dockerExec),
+        ]);
+        rows.push({ name: 'engine', result: engineRes }, { name: 'colima version', result: colimaRes });
+        return emit(makeReport(rows), opts);
     }
-    // Probes 2-5: parallel (independent; no shared state).
+    // Slots 2-7: parallel (independent; no shared state).
     const imageRefs = buildRequiredImageRefs(registry);
-    const [imageResult, hostCpResult, authResult, kgResult] = await Promise.all([
-        probeImagePresence(imageRefs, dockerExec),
+    const slot2Promise = isK8s
+        ? probeK8sImagePresence(imageRefs, dockerExec)
+        : probeImagePresence(imageRefs, dockerExec);
+    const [imageResult, hostCpResult, authResult, kgResult, engineResult, colimaResult] = await Promise.all([
+        slot2Promise,
         probeHostCpHealth(fetchImpl),
         probeAuthVault(olamHomeOverride),
         probeKgStorage(olamHomeOverride),
+        probeEngine(fetchImpl),
+        probeColimaVersion(dockerExec),
     ]);
-    rows.push({ name: 'images', result: imageResult }, { name: 'host-cp /health', result: hostCpResult }, { name: 'auth vault', result: authResult }, { name: 'KG storage', result: kgResult });
+    rows.push({ name: 'images', result: imageResult }, { name: 'host-cp /health', result: hostCpResult }, { name: 'auth vault', result: authResult }, { name: 'KG storage', result: kgResult }, { name: 'engine', result: engineResult }, { name: 'colima version', result: colimaResult });
+    return emit(makeReport(rows), opts);
+}
+function makeReport(rows) {
     const failureCount = rows.filter((r) => !r.result.ok).length;
+    const warnCount = rows.filter((r) => isWarn(r.result)).length;
     const summary = failureCount === 0 ? 'OK' : 'FAILED';
-    return emit({ rows, summary, failureCount }, opts);
+    return { rows, summary, failureCount, warnCount };
+}
+function resolveEngineFromEnv() {
+    const explicit = process.env.OLAM_HOST_CP_ENGINE;
+    if (explicit === 'kubernetes')
+        return 'kubernetes';
+    if (explicit === 'docker')
+        return 'docker';
+    // Autodetect via KUBERNETES_SERVICE_HOST (matches resolveHostCpEngine).
+    return process.env.KUBERNETES_SERVICE_HOST ? 'kubernetes' : 'docker';
+}
+function isWarn(r) {
+    return r.ok === true && r.warn === true;
 }
 function emit(report, opts) {
     if (opts.json) {
         process.stdout.write(JSON.stringify({
             summary: report.summary,
             failureCount: report.failureCount,
-            probes: report.rows.map((r) => ({
-                name: r.name,
-                ok: r.result.ok,
-                message: r.result.message,
-                ...(r.result.ok ? {} : { remedy: r.result.remedy }),
-            })),
+            warnCount: report.warnCount,
+            probes: report.rows.map((r) => {
+                const isFail = !r.result.ok;
+                const warn = isWarn(r.result);
+                const base = {
+                    name: r.name,
+                    ok: r.result.ok,
+                    message: r.result.message,
+                };
+                if (warn)
+                    base.warn = true;
+                if (isFail || warn)
+                    base.remedy = r.result.remedy;
+                return base;
+            }),
         }, null, 2) + '\n');
     }
     else {
@@ -113,17 +177,24 @@ function renderHuman(report) {
     const namePad = Math.max(...report.rows.map((r) => r.name.length));
     for (const row of report.rows) {
         const label = row.name.padEnd(namePad);
-        if (row.result.ok) {
-            printSuccess(`${label}  ${row.result.message}`);
+        if (isWarn(row.result)) {
+            printWarning(`[WARN] ${label}  ${row.result.message}`);
+            const remedy = row.result.remedy;
+            if (remedy)
+                printWarning(`${''.padEnd(namePad + 7)}  remedy: ${remedy}`);
+        }
+        else if (row.result.ok) {
+            printSuccess(`[PASS] ${label}  ${row.result.message}`);
         }
         else {
-            printError(`${label}  ${row.result.message}`);
-            printWarning(`${''.padEnd(namePad)}  remedy: ${row.result.remedy}`);
+            printError(`[FAIL] ${label}  ${row.result.message}`);
+            printWarning(`${''.padEnd(namePad + 7)}  remedy: ${row.result.remedy}`);
         }
     }
     process.stdout.write('\n');
     if (report.summary === 'OK') {
-        printSuccess(`OK — all ${report.rows.length} probes green`);
+        const warnNote = report.warnCount > 0 ? ` (${report.warnCount} warn)` : '';
+        printSuccess(`OK — all ${report.rows.length} probes green${warnNote}`);
     }
     else {
         printError(`FAILED — ${report.failureCount} of ${report.rows.length} probes failed`);
@@ -132,8 +203,8 @@ function renderHuman(report) {
 export function registerDoctor(program) {
     program
         .command('doctor')
-        .description('Pass/fail host-health check. Exits 0 on a healthy host; 1 on any failed probe. '
-        + 'Runs Docker daemon / image presence / host-cp /health / auth vault / KG storage probes.')
+        .description('Pass/fail host-health check. Exits 0 on a healthy host (including WARN-only); 1 on any FAIL probe. '
+        + 'Runs daemon / image / host-cp /health / auth / KG / engine / colima probes (7 total).')
         .option('--json', 'emit the report as JSON instead of a human-readable table')
         .action(async (opts) => {
         const r = await runDoctor(opts);

package/dist/commands/doctor.js.map

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

package/dist/commands/logs.d.ts

@@ -1,11 +1,19 @@
 /**
  * olam logs <world> — Stream application logs from a world.
  *
- * Connects to the per-world CP's /api/logs SSE endpoints through the
- * host-cp proxy at http://127.0.0.1:19000/api/world/<worldId>/api/logs.
+ * Phase C / C1 (engine-aware): on invocation, fetches /health to read the
+ * X-Olam-Engine header, then streams from `GET /v1/worlds/<id>/logs` on
+ * host-cp which delegates to the active ContainerEngine (Docker | K8s).
+ * Output is engine-agnostic newline-delimited:
+ *   `<ISO timestamp> <pod-or-container>/<container> <line>`
+ *
+ * Pre-C the command consumed the per-world CP's /api/logs SSE channel via
+ * the host-cp proxy. That code path stays alive elsewhere in the codebase
+ * (per-world CP still serves the SSE stream) but olam-cli no longer calls
+ * it — revert this commit and the old behavior comes back wholesale.
  *
  * Options:
- *   --service <name>   Stream a single service (default: all interleaved)
+ *   --service <name>   Stream a single container (K8s) / pass-through (Docker)
  *   --follow           Stream indefinitely until Ctrl-C (default: false)
  *   --tail <n>         Lines to show before exiting (default: 200)
  */
@@ -33,6 +41,12 @@ interface SseLine {
 }
 type SseEvent = SseReplay | SseLine;
 export declare function parseSseEvent(raw: string): SseEvent | null;
+export interface LogsRequestOpts {
+    readonly tail: number;
+    readonly follow: boolean;
+    readonly service?: string;
+}
+export declare function buildLogsUrl(worldId: string, opts: LogsRequestOpts, port?: number): string;
 export declare function registerLogs(program: Command): void;
 export {};
 //# sourceMappingURL=logs.d.ts.map

package/dist/commands/logs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../src/commands/logs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAazC;;;GAGG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAK9C;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM,CAGlG;AAMD,UAAU,SAAS;IACjB,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,UAAU,OAAO;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,KAAK,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC;AAEpC,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAY1D;AAMD,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAuHnD"}
+{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../src/commands/logs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAazC;;;GAGG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAK9C;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM,CAGlG;AAQD,UAAU,SAAS;IACjB,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,UAAU,OAAO;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,KAAK,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC;AAEpC,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAY1D;AAMD,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,GAAE,MAAqB,GAAG,MAAM,CAOxG;AAMD,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAuGnD"}

package/dist/commands/logs.js

@@ -1,11 +1,19 @@
 /**
  * olam logs <world> — Stream application logs from a world.
  *
- * Connects to the per-world CP's /api/logs SSE endpoints through the
- * host-cp proxy at http://127.0.0.1:19000/api/world/<worldId>/api/logs.
+ * Phase C / C1 (engine-aware): on invocation, fetches /health to read the
+ * X-Olam-Engine header, then streams from `GET /v1/worlds/<id>/logs` on
+ * host-cp which delegates to the active ContainerEngine (Docker | K8s).
+ * Output is engine-agnostic newline-delimited:
+ *   `<ISO timestamp> <pod-or-container>/<container> <line>`
+ *
+ * Pre-C the command consumed the per-world CP's /api/logs SSE channel via
+ * the host-cp proxy. That code path stays alive elsewhere in the codebase
+ * (per-world CP still serves the SSE stream) but olam-cli no longer calls
+ * it — revert this commit and the old behavior comes back wholesale.
  *
  * Options:
- *   --service <name>   Stream a single service (default: all interleaved)
+ *   --service <name>   Stream a single container (K8s) / pass-through (Docker)
  *   --follow           Stream indefinitely until Ctrl-C (default: false)
  *   --tail <n>         Lines to show before exiting (default: 200)
  */
@@ -57,15 +65,24 @@ export function parseSseEvent(raw) {
         return null;
     }
 }
+export function buildLogsUrl(worldId, opts, port = HOST_CP_PORT) {
+    const qs = new URLSearchParams({
+        tail: String(opts.tail),
+        follow: opts.follow ? '1' : '0',
+    });
+    if (opts.service)
+        qs.set('service', opts.service);
+    return `http://127.0.0.1:${port}/v1/worlds/${encodeURIComponent(worldId)}/logs?${qs.toString()}`;
+}
 // ---------------------------------------------------------------------------
 // Command registration
 // ---------------------------------------------------------------------------
 export function registerLogs(program) {
     program
         .command('logs')
-        .description('Stream application logs from a world')
+        .description('Stream application logs from a world (engine-agnostic)')
         .argument('<world>', 'World ID')
-        .option('--service <name>', 'Stream a specific service (default: all services)')
+        .option('--service <name>', 'Stream a specific container within the world')
         .option('--follow', 'Stream indefinitely until Ctrl-C', false)
         .option('--tail <n>', 'Number of lines to display before exiting', '200')
         .action(async (worldId, opts) => {
@@ -88,12 +105,11 @@ export function registerLogs(program) {
             return;
         }
         const tailLimit = Math.max(1, parseInt(opts.tail, 10) || 200);
-        const showService = opts.service === undefined;
-        const subPath = opts.service
-            ? `/api/logs/${encodeURIComponent(opts.service)}`
-            : '/api/logs';
-        const url = `http://127.0.0.1:${HOST_CP_PORT}/api/world/${encodeURIComponent(worldId)}${subPath}`;
-        let lineCount = 0;
+        const url = buildLogsUrl(worldId, {
+            tail: tailLimit,
+            follow: opts.follow,
+            ...(opts.service ? { service: opts.service } : {}),
+        });
         let done = false;
         let resolveStream;
         const streamDone = new Promise((r) => { resolveStream = r; });
@@ -103,15 +119,6 @@ export function registerLogs(program) {
                 resolveStream();
             }
         };
-        const emit = (line, service) => {
-            process.stdout.write(formatLine(line, service, showService) + '\n');
-            lineCount++;
-            if (!opts.follow && lineCount >= tailLimit) {
-                finish();
-                return false;
-            }
-            return true;
-        };
         const req = http.get(url, { headers: { Authorization: `Bearer ${token}` } }, (res) => {
             if (res.statusCode !== 200) {
                 printError(`Log stream returned HTTP ${res.statusCode ?? 'unknown'}`);
@@ -120,6 +127,10 @@ export function registerLogs(program) {
                 res.destroy();
                 return;
             }
+            // Server emits one canonical line per record:
+            //   `<ts> <pod>/<container> <line>\n`
+            // We pass the line through `colorLine` for level-based coloring
+            // and write to stdout verbatim. No SSE framing on the new path.
             let buf = '';
             res.on('data', (chunk) => {
                 if (done)
@@ -130,24 +141,16 @@ export function registerLogs(program) {
                 for (const raw of rawLines) {
                     if (done)
                         break;
-                    const ev = parseSseEvent(raw);
-                    if (!ev)
+                    if (!raw)
                         continue;
-                    if (ev.type === 'replay') {
-                        for (const l of ev.lines) {
-                            if (!emit(l, ev.service)) {
-                                req.destroy();
-                                break;
-                            }
-                        }
-                    }
-                    else if (ev.type === 'line') {
-                        if (!emit(ev.line, ev.service))
-                            req.destroy();
-                    }
+                    process.stdout.write(colorLine(raw) + '\n');
                 }
             });
-            res.on('end', () => finish());
+            res.on('end', () => {
+                if (buf)
+                    process.stdout.write(colorLine(buf) + '\n');
+                finish();
+            });
             res.on('error', (err) => {
                 if (!done)
                     printError(`Stream error: ${err.message}`);

package/dist/commands/logs.js.map

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

package/dist/commands/memory/bridge.d.ts

@@ -0,0 +1,57 @@
+/**
+ * olam memory bridge serve --local — embedded Miniflare bridge.
+ *
+ * `wrangler dev` is a dev iteration loop, not a production-style host
+ * for a long-lived service. This subcommand spawns
+ * `packages/memory-service/scripts/local-bridge-server.mjs` as a
+ * foreground Node process: operators wire it into launchd / systemd
+ * (Type=simple) and get the agent-memory bridge running on their
+ * laptop without a Cloudflare account.
+ *
+ * Flow:
+ *   1. Resolve packages/memory-service/ via the shared candidates list
+ *      (handles workspace / bundled-CLI / cwd-checkout layouts).
+ *   2. Locate scripts/local-bridge-server.mjs inside it.
+ *   3. Ensure ~/.olam/memory-secret (0600) exists; pass it via
+ *      AGENTMEMORY_SECRET env so the bridge can authenticate
+ *      /bridge/stats callers without leaking the secret on argv.
+ *   4. Spawn the .mjs in foreground; stdin/stdout/stderr propagate so
+ *      the service-manager journal captures the bridge's logs.
+ *   5. Forward SIGTERM/SIGINT to the child + exit with its code.
+ *
+ * Mirrors `start.ts`'s service-resolution + secret-handling pattern;
+ * differs in that the spawned process stays in foreground (start.ts
+ * detaches because the agentmemory engine is a separate long-lived
+ * service).
+ *
+ * Plan reference: architecture conversation in PR #612.
+ */
+import type { Command } from 'commander';
+import { type ChildProcess } from 'node:child_process';
+export interface BridgeServeOpts {
+    /** TCP port to bind on. Defaults to 8788. */
+    port?: number;
+    /** DO SQLite persistence directory. Default is in-memory (lost on restart). */
+    persistTo?: string;
+    /** Required for forward-compat with future `--cloud` / `--remote` flags. */
+    local?: boolean;
+}
+/** Test seam — runtime injection of the spawn path resolution + child factory. */
+export interface BridgeDeps {
+    /** Override the memory-service directory lookup (testing). */
+    resolveServiceDir?: () => string;
+    /** Override the secret-resolver (testing). */
+    ensureSecret?: () => string;
+    /** Override the spawn entry point (testing). */
+    spawnChild?: (command: string, args: readonly string[], env: NodeJS.ProcessEnv) => ChildProcess;
+}
+export declare function resolveMemoryServiceDir(): string;
+export declare function resolveLocalBridgeScript(serviceDir: string): string;
+export declare function validateBridgeOpts(opts: BridgeServeOpts): {
+    port: number;
+    persistTo?: string;
+    local: boolean;
+};
+export declare function runBridgeServe(opts: BridgeServeOpts, deps?: BridgeDeps): Promise<number>;
+export declare function registerMemoryBridge(cmd: Command): void;
+//# sourceMappingURL=bridge.d.ts.map

package/dist/commands/memory/bridge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../../src/commands/memory/bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAS9D,MAAM,WAAW,eAAe;IAC9B,6CAA6C;IAC7C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,+EAA+E;IAC/E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,4EAA4E;IAC5E,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,kFAAkF;AAClF,MAAM,WAAW,UAAU;IACzB,8DAA8D;IAC9D,iBAAiB,CAAC,EAAE,MAAM,MAAM,CAAC;IACjC,8CAA8C;IAC9C,YAAY,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5B,gDAAgD;IAChD,UAAU,CAAC,EAAE,CACX,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,YAAY,CAAC;CACnB;AAED,wBAAgB,uBAAuB,IAAI,MAAM,CAQhD;AAED,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CASnE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,eAAe,GAAG;IACzD,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;CAChB,CAoBA;AAED,wBAAsB,cAAc,CAClC,IAAI,EAAE,eAAe,EACrB,IAAI,GAAE,UAAe,GACpB,OAAO,CAAC,MAAM,CAAC,CAsEjB;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAsBvD"}