@pasko70/pibo 3.0.1 → 3.1.0

package/dist/cli-session/localSessionSource.js

@@ -1,13 +1,20 @@
 import { randomUUID } from "node:crypto";
-import { DEFAULT_PIBO_PROFILE_NAME, createDefaultPiboPluginRegistry, resolvePiboProfileNameFromRegistryOrDefault, } from "../plugins/builtin.js";
+import { DEFAULT_PIBO_PROFILE_NAME, resolvePiboProfileNameFromRegistryOrDefault, } from "../plugins/builtin.js";
+import { createDefaultPiboUserProfileRegistry } from "../plugins/user-profile-resources.js";
 import { createDefaultPiboDataSessionStore } from "../sessions/pibo-data-store.js";
+import { OutputRenderSequencer, outputRenderHighWaterStore, validRenderSequence } from "../core/output-render-sequence.js";
+import { OutputPersistenceRetryQueue, } from "../core/output-persistence-retry.js";
 import { getDefaultPiboWorkspace } from "../core/workspace.js";
 import { buildTraceView } from "../apps/chat/trace.js";
 import { storedPiboEventFromV2Row, } from "../apps/chat/data/chat-data-mappers.js";
-import { ChatDataIngestService } from "../data/ingest-service.js";
+import { ChatDataIngestService, outputIdempotencyKey, outputPersistenceDeliveryKey } from "../data/ingest-service.js";
+import { OutputCompactor } from "../apps/chat/output-compactor.js";
+import { isPiboOutputEvent } from "../apps/chat/output-event-policy.js";
 import { ChatRoomService } from "../apps/chat/data/room-service.js";
 import { ChatHistoryQueryService } from "../apps/chat/data/history-query-service.js";
+import { createDefaultPiboReliabilityStore, } from "../reliability/store.js";
 import { buildSlashCommandCatalog, normalizeCommandErrorDescriptor, normalizeCommandResultDescriptor, } from "../session-ui/index.js";
+import { patchTraceViewWithEvent } from "../shared/trace-engine.js";
 import { CliSourceError, } from "./sessionSource.js";
 export const CLI_LOCAL_RECOVERY_SOURCE_ID = "local:root";
 export const CLI_LOCAL_RECOVERY_SOURCE_LABEL = "Local recovery";
@@ -20,9 +27,14 @@ export class LocalCliSessionSource {
     ownsRouter;
     unsubscribeRouter;
     now;
+    outputRenderSequencer;
+    outputCompactor = new OutputCompactor();
+    outputPersistenceRetries;
     statusMessage;
     dataStore;
     ownsDataStore;
+    reliabilityStore;
+    ownsReliabilityStore;
     ingestService;
     roomService;
     agentSummaries;
@@ -39,14 +51,28 @@ export class LocalCliSessionSource {
             options.ownsSessionStore ?? options.sessionStore === undefined;
         this.roomProvider = options.roomProvider;
         this.pluginRegistry =
-            options.pluginRegistry ?? createDefaultPiboPluginRegistry();
+            options.pluginRegistry ?? createDefaultPiboUserProfileRegistry();
         this.router = options.router;
         this.ownsRouter = options.ownsRouter ?? false;
-        this.unsubscribeRouter = this.router?.subscribe((event) => this.handleRouterEvent(event));
         this.now = options.now ?? (() => new Date().toISOString());
+        this.outputRenderSequencer = new OutputRenderSequencer({
+            now: () => {
+                const timestamp = Date.parse(this.now());
+                return Number.isFinite(timestamp) ? timestamp : Date.now();
+            },
+            highWaterStore: outputRenderHighWaterStore(this.sessionStore),
+        });
         this.statusMessage = options.statusMessage;
         this.dataStore = options.dataStore;
         this.ownsDataStore = options.ownsDataStore === true;
+        this.reliabilityStore = options.reliabilityStore
+            ?? (this.ownsDataStore ? createDefaultPiboReliabilityStore() : undefined);
+        this.ownsReliabilityStore = options.ownsReliabilityStore
+            ?? (this.ownsDataStore && options.reliabilityStore === undefined);
+        this.outputPersistenceRetries = new OutputPersistenceRetryQueue({
+            durableStore: this.reliabilityStore,
+            queueName: "output-persistence-cli",
+        });
         this.ingestService = options.dataStore
             ? new ChatDataIngestService(options.dataStore)
             : undefined;
@@ -56,6 +82,13 @@ export class LocalCliSessionSource {
         this.agentSummaries = options.agentSummaries
             ? [...options.agentSummaries]
             : undefined;
+        this.outputPersistenceRetries.recover((job) => {
+            const persistenceState = parseCliOutputPersistenceState(job.payload);
+            if (!persistenceState)
+                throw new Error(`Invalid durable CLI output persistence job ${job.key}`);
+            return this.createOutputPersistenceJob(persistenceState);
+        });
+        this.unsubscribeRouter = this.router?.subscribe((event) => this.handleRouterEvent(event));
     }
     async listRooms() {
         this.assertOpen();
@@ -179,6 +212,14 @@ export class LocalCliSessionSource {
         const session = this.resolveSession(sessionId);
         const eventId = randomUUID();
         this.ingestUserMessage(session, eventId, trimmed);
+        this.recordOutputEvent({
+            type: "message_queued",
+            piboSessionId: sessionId,
+            eventId,
+            text: trimmed,
+            source: "ui",
+            queuedMessages: 0,
+        });
         if (this.router) {
             try {
                 await this.router.emit({
@@ -195,7 +236,6 @@ export class LocalCliSessionSource {
             }
             return;
         }
-        this.recordLocalUserMessage(sessionId, eventId, trimmed, "done");
         this.updateSessionStatus(sessionId, "idle");
     }
     async listAgents() {
@@ -371,14 +411,20 @@ export class LocalCliSessionSource {
         }
         try {
             this.closed = true;
+            await this.outputPersistenceRetries.drain();
+            this.outputPersistenceRetries.dispose();
             for (const handle of [...this.openHandles])
                 handle.close();
             this.listeners.clear();
+            this.outputRenderSequencer.disposeAll();
+            this.outputCompactor.disposeAll();
             this.unsubscribeRouter?.();
             if (this.ownsSessionStore)
                 this.sessionStore.close?.();
             if (this.ownsDataStore)
                 this.dataStore?.close();
+            if (this.ownsReliabilityStore)
+                this.reliabilityStore?.close();
         }
         finally {
             this.closing = false;
@@ -544,170 +590,95 @@ export class LocalCliSessionSource {
     handleRouterEvent(event) {
         if (this.closed)
             return;
+        if (!isPiboOutputEvent(event)) {
+            this.outputPersistenceRetries.quarantine("runtime_output_event_invalid");
+            return;
+        }
         const session = this.sessionStore.get(event.piboSessionId);
         if (!session)
             return;
-        this.ingestOutputEvent(session, event);
-        this.recordOutputEvent(event);
+        const positionedEvent = this.outputRenderSequencer.position(event);
+        const compacted = this.outputCompactor.prepare(positionedEvent);
+        if (compacted.persistedEvents.length === 0) {
+            compacted.ack();
+        }
+        else {
+            const persistenceState = {
+                version: 1,
+                piboSessionId: session.id,
+                deliveries: compacted.persistedEvents.map((persistedEvent) => ({ event: persistedEvent })),
+            };
+            this.outputPersistenceRetries.enqueue(this.createOutputPersistenceJob(persistenceState, () => compacted.ack(), () => compacted.rollback()));
+        }
+        for (const liveEvent of compacted.liveEvents)
+            this.recordOutputEvent(liveEvent);
+    }
+    createOutputPersistenceJob(persistenceState, onSuccess, onDeadLetter) {
+        const firstEvent = persistenceState.deliveries[0]?.event;
+        return {
+            key: JSON.stringify(persistenceState.deliveries.map((delivery) => outputPersistenceDeliveryKey(delivery.event))),
+            piboSessionId: persistenceState.piboSessionId,
+            eventId: firstEvent ? outputPersistenceDeliveryKey(firstEvent) : undefined,
+            payload: persistenceState,
+            run: (retryContext) => this.deliverOutputPersistenceState(retryContext),
+            onSuccess,
+            onDeadLetter,
+        };
+    }
+    deliverOutputPersistenceState(retryContext) {
+        const persistenceState = parseCliOutputPersistenceState(retryContext.payload);
+        if (!persistenceState)
+            throw new Error("Invalid durable CLI output persistence state");
+        const session = this.sessionStore.get(persistenceState.piboSessionId);
+        if (!session)
+            throw new Error(`No session available for ${persistenceState.piboSessionId}`);
+        for (const delivery of persistenceState.deliveries) {
+            if (delivery.persisted)
+                continue;
+            if (!this.ingestOutputEvent(session, delivery.event)) {
+                throw new Error(`Failed to persist ${outputPersistenceDeliveryKey(delivery.event)}`);
+            }
+            delivery.persisted = true;
+            retryContext.updatePayload(persistenceState);
+        }
     }
     recordOutputEvent(event) {
-        const sessionId = event.piboSessionId;
-        const eventId = "eventId" in event ? event.eventId : undefined;
-        if (event.type === "message_queued" || event.type === "message_started") {
-            this.recordLocalUserMessage(sessionId, eventId ?? randomUUID(), event.text, event.type === "message_started" ? "running" : "done");
+        const positionedEvent = validRenderSequence(event.renderSequence)
+            ? event
+            : this.outputRenderSequencer.position(event);
+        const sessionId = positionedEvent.piboSessionId;
+        const session = this.resolveSession(sessionId);
+        const current = this.traceViews.get(sessionId) ?? emptyTraceView(session);
+        const status = positionedEvent.type === "session_error"
+            ? "error"
+            : positionedEvent.type === "message_finished"
+                ? "idle"
+                : "running";
+        const next = patchTraceViewWithEvent(current, storedEvent(positionedEvent, this.now(), current.rawEvents.length + 1), status === "idle" ? "idle" : status);
+        next.eventCount = next.rawEvents.length;
+        next.version = `local-${next.rawEvents.length}-${session.updatedAt}`;
+        this.traceViews.set(sessionId, next);
+        this.emit(sessionId, {
+            type: "trace",
+            session: sessionToSummary(session, this.ensureDefaultRoom().id),
+            traceView: next,
+        });
+        if (positionedEvent.type === "message_queued" || positionedEvent.type === "message_started") {
             this.updateSessionStatus(sessionId, "running");
-            return;
         }
-        if (event.type === "message_finished") {
+        else if (positionedEvent.type === "message_finished") {
             this.updateSessionStatus(sessionId, "idle");
-            return;
-        }
-        if (event.type === "assistant_delta") {
-            this.upsertTraceNode(sessionId, {
-                id: traceNodeId("assistant", eventId, event.assistantIndex ?? event.contentIndex),
-                piboSessionId: sessionId,
-                type: "assistant.message",
-                title: "Agent Message",
-                status: "running",
-                startedAt: this.now(),
-                output: event.text,
-                children: [],
-            }, { appendOutput: true, rawEvent: event });
-            return;
-        }
-        if (event.type === "assistant_message") {
-            this.upsertTraceNode(sessionId, {
-                id: traceNodeId("assistant", eventId, event.assistantIndex ?? event.contentIndex),
-                piboSessionId: sessionId,
-                type: "assistant.message",
-                title: "Agent Message",
-                status: "done",
-                startedAt: this.now(),
-                completedAt: this.now(),
-                output: event.text,
-                children: [],
-            }, { rawEvent: event });
-            return;
-        }
-        if (event.type === "tool_call" ||
-            event.type === "tool_execution_started" ||
-            event.type === "tool_execution_updated" ||
-            event.type === "tool_execution_finished") {
-            const finished = event.type === "tool_execution_finished";
-            this.upsertTraceNode(sessionId, {
-                id: traceNodeId("tool", event.toolCallId),
-                piboSessionId: sessionId,
-                eventId,
-                toolCallId: event.toolCallId,
-                type: finished ? "tool.result" : "tool.call",
-                title: event.toolName,
-                status: finished ? (event.isError ? "error" : "done") : "running",
-                startedAt: this.now(),
-                completedAt: finished ? this.now() : undefined,
-                input: "args" in event ? event.args : undefined,
-                output: finished
-                    ? event.result
-                    : "partialResult" in event
-                        ? event.partialResult
-                        : undefined,
-                children: [],
-            }, { rawEvent: event });
-            return;
         }
-        if (event.type === "session_error") {
-            this.recordLocalError(sessionId, eventId ?? randomUUID(), event.error);
-            return;
+        else if (positionedEvent.type === "session_error") {
+            this.updateSessionStatus(sessionId, "error");
         }
-        this.appendRawEvent(sessionId, event);
-    }
-    recordLocalUserMessage(sessionId, eventId, text, status) {
-        this.upsertTraceNode(sessionId, {
-            id: traceNodeId("user", eventId),
-            piboSessionId: sessionId,
-            eventId,
-            type: "user.message",
-            title: "User Message",
-            status,
-            startedAt: this.now(),
-            completedAt: status === "done" ? this.now() : undefined,
-            output: text,
-            children: [],
-        }, {
-            rawEvent: {
-                type: "message_queued",
-                piboSessionId: sessionId,
-                eventId,
-                queuedMessages: 0,
-                text,
-                source: "ui",
-            },
-        });
     }
     recordLocalError(sessionId, eventId, error) {
-        this.upsertTraceNode(sessionId, {
-            id: traceNodeId("error", eventId),
+        this.recordOutputEvent({
+            type: "session_error",
             piboSessionId: sessionId,
             eventId,
-            type: "error",
-            title: "CLI source error",
-            status: "error",
-            startedAt: this.now(),
-            completedAt: this.now(),
             error: error instanceof Error ? error.message : String(error),
-            children: [],
-        }, {
-            rawEvent: {
-                type: "session_error",
-                piboSessionId: sessionId,
-                eventId,
-                error: error instanceof Error ? error.message : String(error),
-            },
-        });
-        this.updateSessionStatus(sessionId, "error");
-    }
-    upsertTraceNode(sessionId, node, options = {}) {
-        const session = this.resolveSession(sessionId);
-        const traceView = cloneJson(this.traceViews.get(sessionId) ?? emptyTraceView(session));
-        const index = traceView.nodes.findIndex((candidate) => candidate.id === node.id);
-        if (index >= 0) {
-            const previous = traceView.nodes[index];
-            const output = options.appendOutput &&
-                typeof previous.output === "string" &&
-                typeof node.output === "string"
-                ? previous.output + node.output
-                : node.output;
-            traceView.nodes[index] = {
-                ...previous,
-                ...node,
-                output,
-                children: node.children ?? previous.children,
-            };
-        }
-        else {
-            traceView.nodes.push(node);
-        }
-        if (options.rawEvent)
-            traceView.rawEvents.push(storedEvent(options.rawEvent, this.now(), traceView.rawEvents.length + 1));
-        traceView.eventCount = traceView.rawEvents.length;
-        traceView.version = `local-${traceView.rawEvents.length}-${session.updatedAt}`;
-        this.traceViews.set(sessionId, traceView);
-        this.emit(sessionId, {
-            type: "trace",
-            session: sessionToSummary(session, this.ensureDefaultRoom().id),
-            traceView: cloneJson(traceView),
-        });
-    }
-    appendRawEvent(sessionId, event) {
-        const session = this.resolveSession(sessionId);
-        const traceView = cloneJson(this.traceViews.get(sessionId) ?? emptyTraceView(session));
-        traceView.rawEvents.push(storedEvent(event, this.now(), traceView.rawEvents.length + 1));
-        traceView.eventCount = traceView.rawEvents.length;
-        traceView.version = `local-${traceView.rawEvents.length}-${session.updatedAt}`;
-        this.traceViews.set(sessionId, traceView);
-        this.emit(sessionId, {
-            type: "trace",
-            session: sessionToSummary(session, this.ensureDefaultRoom().id),
-            traceView: cloneJson(traceView),
         });
     }
     updateSessionStatus(sessionId, status) {
@@ -770,7 +741,7 @@ export class LocalCliSessionSource {
     }
     ingestOutputEvent(session, event) {
         if (!this.ingestService)
-            return;
+            return true;
         try {
             this.ingestService.ingestOutputEvent({
                 session,
@@ -779,9 +750,11 @@ export class LocalCliSessionSource {
                 event,
                 createdAt: this.now(),
             });
+            return true;
         }
         catch {
-            // Persistence is best-effort; live local rendering still proceeds through in-memory trace updates.
+            // The caller retains the prepared compaction and retries this exact event identity.
+            return false;
         }
     }
     buildStatus(session) {
@@ -860,6 +833,29 @@ export class LocalCliSessionSource {
 export function createLocalCliSessionSource(options = {}) {
     return new LocalCliSessionSource(options);
 }
+function parseCliOutputPersistenceState(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return undefined;
+    const candidate = value;
+    if (candidate.version !== 1 || typeof candidate.piboSessionId !== "string" || !Array.isArray(candidate.deliveries))
+        return undefined;
+    const deliveries = [];
+    for (const rawDelivery of candidate.deliveries) {
+        if (!rawDelivery || typeof rawDelivery !== "object" || Array.isArray(rawDelivery))
+            return undefined;
+        const delivery = rawDelivery;
+        const event = delivery.event;
+        if (!isPiboOutputEvent(event) || !outputIdempotencyKey(event))
+            return undefined;
+        deliveries.push({
+            event: event,
+            ...(delivery.persisted === true ? { persisted: true } : {}),
+        });
+    }
+    if (!deliveries.length)
+        return undefined;
+    return { version: 1, piboSessionId: candidate.piboSessionId, deliveries };
+}
 export function redactCliSecretText(text) {
     return text
         .replace(/\b([A-Z0-9_]*(?:API[_-]?KEY|TOKEN|SECRET|PASSWORD)[A-Z0-9_]*)\s*=\s*([^\s]+)/gi, "$1=[redacted]")
@@ -989,17 +985,13 @@ function storedEvent(event, createdAt, eventSequence) {
         id: eventId ?? `${event.piboSessionId}-${event.type}-${eventSequence}`,
         piboSessionId: event.piboSessionId,
         eventSequence,
+        renderSequence: event.renderSequence,
         eventId,
         type: event.type,
         createdAt,
         payload: cloneJson(event),
     };
 }
-function traceNodeId(kind, eventId, index) {
-    return ["local", kind, eventId ?? "event", index]
-        .filter((part) => part !== undefined)
-        .join(":");
-}
 function toCliSourceError(code, message, cause) {
     return cause instanceof CliSourceError
         ? cause

package/dist/cli.js

@@ -1,16 +1,12 @@
-import { existsSync, readFileSync } from "node:fs";
+import { readFileSync } from "node:fs";
 import { Command } from "commander";
 import { PIBO_CONFIG_KEYS, getDefaultPiboConfigPath, deletePiboConfigValue, getDisplayPiboConfigValue, loadPiboConfig, redactPiboConfig, savePiboConfig, setPiboConfigValue, } from "./config/config.js";
 import { parsePiboThinkingLevel } from "./core/thinking.js";
-import { ensurePrivatePiboHome, piboHomePath } from "./core/pibo-home.js";
+import { ensurePrivatePiboHome } from "./core/pibo-home.js";
 async function resolveCliProfile(profileName) {
-    const { createDefaultPiboPluginRegistry, createGatewayProducerPiboProfile, createPiboProfileFromRegistryOrDefault } = await import("./plugins/builtin.js");
-    const registry = createDefaultPiboPluginRegistry();
-    const chatAgentStorePath = piboHomePath("chat-agents.sqlite");
-    if (existsSync(chatAgentStorePath)) {
-        const { createPiboChatCustomAgentProfilesPlugin } = await import("./plugins/chat-custom-agents.js");
-        registry.registerPlugin(createPiboChatCustomAgentProfilesPlugin({ agentStorePath: chatAgentStorePath }));
-    }
+    const { createGatewayProducerPiboProfile, createPiboProfileFromRegistryOrDefault } = await import("./plugins/builtin.js");
+    const { createDefaultPiboUserProfileRegistry } = await import("./plugins/user-profile-resources.js");
+    const registry = createDefaultPiboUserProfileRegistry();
     const profile = profileName === "gateway-producer" || profileName === "pibo-gateway-producer"
         ? createGatewayProducerPiboProfile()
         : createPiboProfileFromRegistryOrDefault(registry, profileName);
@@ -281,7 +277,7 @@ export async function runPiboCli(argv = process.argv) {
     });
     program
         .command("setup")
-        .description("Plan user-host installs and developer-host upgrades")
+        .description("Plan and manage supported host installation profiles")
         .helpOption(false)
         .allowUnknownOption(true)
         .allowExcessArguments(true)
@@ -533,7 +529,7 @@ Commands:
   compute      Manage Pibo Docker compute workers
   resources    Inspect and safely reap managed compute and browser resources
   preview      Expose session-linked live development previews
-  setup        Plan user-host installs and developer-host upgrades
+  setup        Plan and manage supported host installation profiles
   skills       Manage Pibo user skills
   cron         Manage scheduled Pibo jobs
   loop         Manage continuous agent loops (goal mode by default)

package/dist/compute/cli.js

@@ -1,5 +1,5 @@
-import { Command } from "commander";
-import { IMAGE_NAME, imageExists, shouldRebuild, shouldRebuildDeps, dockerBuild, saveHash, saveDepHash, spawnWorker, spawnDevWorker, listWorkers, releaseWorker, planReapWorkers, applyComputeWorkerReapPlan, getComputeDiskDiagnostics, } from "./docker.js";
+import { Command, InvalidArgumentError } from "commander";
+import { imageExists, shouldRebuild, shouldRebuildDeps, dockerBuild, resolveComputeImageBuildConfig, saveHash, saveDepHash, spawnWorker, spawnDevWorker, listWorkers, releaseWorker, planReapWorkers, applyComputeWorkerReapPlan, getComputeDiskDiagnostics, } from "./docker.js";
 import { getComputeResourceHealth } from "./resource-health.js";
 import { mkdir } from "node:fs/promises";
 import path from "node:path";
@@ -7,6 +7,9 @@ import os from "node:os";
 const WORKSPACE_DIR = process.env.PIBO_COMPUTE_WORKSPACE || process.cwd();
 const HASH_FILE = path.join(os.homedir(), ".pibo", "compute-image-hash");
 const DEP_HASH_FILE = path.join(os.homedir(), ".pibo", "compute-dep-hash");
+function computeImageBuildConfig() {
+    return resolveComputeImageBuildConfig(WORKSPACE_DIR);
+}
 function printJson(value) {
     console.log(JSON.stringify(value, null, 2));
 }
@@ -16,6 +19,12 @@ function parsePositiveIntegerOption(value) {
     const parsed = Number(value);
     return Number.isInteger(parsed) && parsed > 0 ? parsed : undefined;
 }
+function parseNonNegativeNumber(value) {
+    const parsed = Number(value);
+    if (!Number.isFinite(parsed) || parsed < 0)
+        throw new InvalidArgumentError("Value must be a non-negative number");
+    return parsed;
+}
 function hostPort(value) {
     if (!value || value === "-")
         return undefined;
@@ -233,18 +242,24 @@ Creates a worker container and starts the gateway. Prints JSON with the containe
 
 Use this for quick isolated checks. For code changes, prefer:
   $ pibo compute dev spawn --worktree my-fix
+
+Environment:
+  PIBO_COMPUTE_IMAGE       Override the Docker image name.
+  PIBO_COMPUTE_WORKSPACE   Use an explicit workspace or source checkout.
 `)
         .action(async (options) => {
         await mkdir(path.dirname(HASH_FILE), { recursive: true });
-        const needsBuild = !(await imageExists(IMAGE_NAME)) || (await shouldRebuild(WORKSPACE_DIR, HASH_FILE));
+        const image = computeImageBuildConfig();
+        const needsBuild = !(await imageExists(image.imageName)) || (await shouldRebuild(image.buildContext, HASH_FILE, image.dockerfile));
         if (needsBuild) {
-            console.error(`Building ${IMAGE_NAME} from ${WORKSPACE_DIR}...`);
-            await dockerBuild(WORKSPACE_DIR);
-            await saveHash(WORKSPACE_DIR, HASH_FILE);
+            console.error(`Building ${image.imageName} from ${image.buildContext}...`);
+            await dockerBuild(image);
+            await saveHash(image.buildContext, HASH_FILE, image.dockerfile);
             console.error("Build complete.");
         }
         const worker = await spawnWorker({
             workspaceDir: WORKSPACE_DIR,
+            imageName: image.imageName,
             name: options.name,
             holder: options.holder,
             ttlSeconds: parsePositiveIntegerOption(options.ttlSeconds),
@@ -282,12 +297,13 @@ Example:
 `)
         .action(async (options) => {
         await mkdir(path.dirname(DEP_HASH_FILE), { recursive: true });
+        const image = resolveComputeImageBuildConfig(options.repo, { packageRoot: options.repo });
         console.error("[pibo compute] Checking Docker image status...");
-        const needsBuild = !(await imageExists(IMAGE_NAME)) || (await shouldRebuildDeps(options.repo, DEP_HASH_FILE));
+        const needsBuild = !(await imageExists(image.imageName)) || (await shouldRebuildDeps(options.repo, DEP_HASH_FILE));
         if (needsBuild) {
             console.error(`[pibo compute] Dependencies changed (package.json, package-lock.json, or Dockerfile).`);
-            console.error(`[pibo compute] Rebuilding Docker image ${IMAGE_NAME} — this takes 1-2 minutes...`);
-            await dockerBuild(options.repo);
+            console.error(`[pibo compute] Rebuilding Docker image ${image.imageName} — this takes 1-2 minutes...`);
+            await dockerBuild(image);
             await saveDepHash(options.repo, DEP_HASH_FILE);
             console.error("[pibo compute] Docker image build complete.");
         }
@@ -298,6 +314,7 @@ Example:
         const worker = await spawnDevWorker({
             repoDir: options.repo,
             worktreeName: options.worktree,
+            imageName: image.imageName,
             holder: options.holder,
             ttlSeconds: parsePositiveIntegerOption(options.ttlSeconds),
             idleSeconds: parsePositiveIntegerOption(options.idleSeconds),
@@ -317,10 +334,11 @@ Example:
 Rebuilds from the current workspace and refreshes compute image hashes.
 `)
         .action(async () => {
-        console.error(`Rebuilding ${IMAGE_NAME} from ${WORKSPACE_DIR}...`);
-        await dockerBuild(WORKSPACE_DIR);
-        await saveHash(WORKSPACE_DIR, HASH_FILE);
-        await saveDepHash(WORKSPACE_DIR, DEP_HASH_FILE);
+        const image = computeImageBuildConfig();
+        console.error(`Rebuilding ${image.imageName} from ${image.buildContext}...`);
+        await dockerBuild(image);
+        await saveHash(image.buildContext, HASH_FILE, image.dockerfile);
+        await saveDepHash(image.buildContext, DEP_HASH_FILE);
         console.error("Build complete.");
     });
     program
@@ -403,7 +421,7 @@ Use the name or id shown by:
     program
         .command("reap")
         .description("Preview or apply compute worker container cleanup")
-        .option("--max-age-minutes <n>", "Select workers older than this many minutes", "60")
+        .option("--max-age-minutes <n>", "Select workers older than this many minutes", parseNonNegativeNumber, 60)
         .option("--include-dev", "Also select dev-worker containers; dev workers are skipped by default")
         .option("--no-stopped", "Do not select stopped, dead, created, or restarting containers")
         .option("--no-dirty", "Do not select dirty or OOM-killed containers")
@@ -416,12 +434,13 @@ Stopped, dirty/OOM, and old workers are selected unless disabled by selector fla
 Worktrees are preserved; container cleanup never deletes Git worktrees.
 `)
         .action(async (options) => {
-        const maxAge = Number(options.maxAgeMinutes);
+        if (options.apply && options.dryRun)
+            throw new Error("Use either --apply or --dry-run, not both");
         const plan = await planReapWorkers({
             includeDev: options.includeDev === true,
             includeStopped: options.stopped !== false,
             includeDirty: options.dirty !== false,
-            maxAgeMinutes: Number.isFinite(maxAge) ? maxAge : 60,
+            maxAgeMinutes: options.maxAgeMinutes,
         });
         const shouldApply = options.apply === true;
         const removed = shouldApply ? await applyComputeWorkerReapPlan(plan) : [];