@ouro.bot/cli 0.1.0-alpha.803 → 0.1.0-alpha.805

package/changelog.json

@@ -1,6 +1,20 @@
 {
   "_note": "This changelog is maintained as part of the PR/version-bump workflow. Agent-curated, not auto-generated. Agents read this file directly via read_file to understand what changed between versions.",
   "versions": [
+    {
+      "version": "0.1.0-alpha.805",
+      "changes": [
+        "Add the ACP frontend and daemon socket used by Ouro Workbench to start and supervise a selected boss agent.",
+        "Keep Workbench-owned session identity across prompts, approvals, cancellation, journaling, and session subscriptions.",
+        "Serialize identity-sensitive turns and per-turn runtime MCP cleanup so frontend state does not carry into the next turn."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.804",
+      "changes": [
+        "Complete safe Sanctuary rollback work before reporting container cleanup failure."
+      ]
+    },
     {
       "version": "0.1.0-alpha.803",
       "changes": [

package/deploy/unraid/README.txt

@@ -2285,6 +2285,8 @@ ouro-butler-rollback
       :
     else
       PRODUCTION_PREPARATION_STATUS=$?
+      PRODUCTION_PREPARATION_CLEANUP_STATUS=0
+      PRODUCTION_PREPARATION_RECOVERY_SAFE=true
       /usr/local/bin/node "$STAGED_DOCKERMAN_TRANSACTION" verify-jellyfin >/dev/null
       if docker container inspect ouro-butler >/dev/null 2>&1; then
         if docker container inspect ouro-butler-rollback >/dev/null 2>&1; then
@@ -2293,13 +2295,20 @@ ouro-butler-rollback
           test "$CURRENT_ROLLBACK_IMAGE_ID" = "$ROLLBACK_IMAGE_ID"
           docker rm --force ouro-butler-rollback >/dev/null 2>&1 || true
         fi
-        ! docker container inspect ouro-butler-rollback >/dev/null 2>&1 || exit 1
+        if docker container inspect ouro-butler-rollback >/dev/null 2>&1; then
+          PRODUCTION_PREPARATION_CLEANUP_STATUS=1
+          if test "$(docker inspect --format '{{.State.Running}}' ouro-butler-rollback)" != false; then
+            PRODUCTION_PREPARATION_RECOVERY_SAFE=false
+          fi
+        fi
         rollback_sanctuary_bundle_if_pending "$IMAGE_ID"
-        assert_update_source "$ROLLBACK_IMAGE_ID" "$AUDIT_RUNNER_IMAGE_ID"
-        start_only_butler_for_recovery
-        wait_butler_ready ouro-butler
-        enable_butler_autostart
-        finalize_sanctuary_bundle_rollback_if_retained "$IMAGE_ID"
+        if test "$PRODUCTION_PREPARATION_RECOVERY_SAFE" = true; then
+          assert_update_source "$ROLLBACK_IMAGE_ID" "$AUDIT_RUNNER_IMAGE_ID"
+          start_only_butler_for_recovery
+          wait_butler_ready ouro-butler
+          enable_butler_autostart
+          finalize_sanctuary_bundle_rollback_if_retained "$IMAGE_ID"
+        fi
       elif docker container inspect ouro-butler-rollback >/dev/null 2>&1; then
         docker stop ouro-butler-rollback >/dev/null 2>&1 || true
         test "$(docker inspect --format '{{.Image}}' ouro-butler-rollback)" = "$ROLLBACK_IMAGE_ID"
@@ -2312,14 +2321,17 @@ ouro-butler-rollback
         finalize_sanctuary_bundle_rollback_if_retained "$IMAGE_ID"
       fi
       /usr/local/bin/node "$STAGED_DOCKERMAN_TRANSACTION" rollback >/dev/null
+      if test "$PRODUCTION_PREPARATION_CLEANUP_STATUS" -ne 0; then
+        exit "$PRODUCTION_PREPARATION_CLEANUP_STATUS"
+      fi
       (exit "$PRODUCTION_PREPARATION_STATUS")
     fi
-  Preparation failure therefore either restores the still-named exact production after removing any stale rollback, or renames the exact stopped rollback back. Both paths revalidate and start the old container, wait within the fixed bound, restore production-only autostart atomically, and return the original failure.
+  Preparation failure therefore either restores the still-named exact production after attempting to remove any stale rollback, or renames the exact stopped rollback back. Both safe paths revalidate and start the old container, wait within the fixed bound, restore production-only autostart atomically, and return the original failure. If stale rollback removal fails, restore production only when the leftover is proven stopped; otherwise leave both containers untouched, roll back the journals, and return the cleanup failure for repair.
   If neither exact container can be found, the failure returns with Butler autostart disabled.
   Do not start a target-image daemon between the production rename and final production activation. The exact-image static audit, download-queue readiness, and vault-backed Telegram identity check have already passed before autostart or live-container changes.
   Provider and complete daemon readiness are exercised only by the transactional production activation below. Its failure arm restores and revalidates the exact prior production, so a disposable daemon cannot reconcile or claim live external-event state before cutover.
   Create and activate production from the same exact image ID and exact authority in one explicit conditional so `set -eu` cannot exit before rollback. Only a successful create, effective audit, start, stopped-rollback assertion, and bounded readiness wait may enable production autostart.
-  On failure, capture the activation status, remove only a partially created new production container, restore and audit the stopped rollback against its exact old image ID, prove it ready, restore production-only autostart atomically, and return the original failure:
+  On failure, capture the activation status, remove only a partially created new production container, restore and audit the stopped rollback against its exact old image ID, prove it ready, restore production-only autostart atomically, and return the original failure. If the partial target cannot be removed, preserve its matching target bundle and retained migration receipt, roll back the DockerMan journal without attempting the colliding rename, then return the cleanup failure:
     if test "$(inspect_registry_manifest_digest "$VERSION_IMAGE")" = "$MANIFEST_DIGEST" \
       && test "$(docker image inspect --format '{{.Id}}' "$VERSION_IMAGE")" = "$IMAGE_ID" \
       && docker create --pull=never --name ouro-butler --network host --restart unless-stopped --user 10001:10001 \
@@ -2341,6 +2353,7 @@ ouro-butler-rollback
       :
     else
       PRODUCTION_ACTIVATION_STATUS=$?
+      PRODUCTION_ACTIVATION_CLEANUP_STATUS=0
       /usr/local/bin/node "$STAGED_DOCKERMAN_TRANSACTION" verify-jellyfin >/dev/null
       if docker container inspect ouro-butler >/dev/null 2>&1; then
         docker stop ouro-butler >/dev/null 2>&1 || true
@@ -2348,17 +2361,24 @@ ouro-butler-rollback
         test "$PARTIAL_PRODUCTION_IMAGE_ID" = "$IMAGE_ID"
         docker rm --force ouro-butler >/dev/null 2>&1 || true
       fi
-      ! docker container inspect ouro-butler >/dev/null 2>&1 || exit 1
-      CURRENT_ROLLBACK_IMAGE_ID=$(docker inspect --format '{{.Image}}' ouro-butler-rollback)
-      test "$CURRENT_ROLLBACK_IMAGE_ID" = "$ROLLBACK_IMAGE_ID"
-      migrate_sanctuary_package_managed_bundle "$IMAGE_ID" rollback
-      docker rename ouro-butler-rollback ouro-butler
-      assert_update_source "$ROLLBACK_IMAGE_ID" "$AUDIT_RUNNER_IMAGE_ID"
-      start_only_butler_for_recovery
-      wait_butler_ready ouro-butler
-      enable_butler_autostart
-      migrate_sanctuary_package_managed_bundle "$IMAGE_ID" finalize-rollback
+      if docker container inspect ouro-butler >/dev/null 2>&1; then
+        PRODUCTION_ACTIVATION_CLEANUP_STATUS=1
+      fi
+      if test "$PRODUCTION_ACTIVATION_CLEANUP_STATUS" -eq 0; then
+        CURRENT_ROLLBACK_IMAGE_ID=$(docker inspect --format '{{.Image}}' ouro-butler-rollback)
+        test "$CURRENT_ROLLBACK_IMAGE_ID" = "$ROLLBACK_IMAGE_ID"
+        migrate_sanctuary_package_managed_bundle "$IMAGE_ID" rollback
+        docker rename ouro-butler-rollback ouro-butler
+        assert_update_source "$ROLLBACK_IMAGE_ID" "$AUDIT_RUNNER_IMAGE_ID"
+        start_only_butler_for_recovery
+        wait_butler_ready ouro-butler
+        enable_butler_autostart
+        migrate_sanctuary_package_managed_bundle "$IMAGE_ID" finalize-rollback
+      fi
       /usr/local/bin/node "$STAGED_DOCKERMAN_TRANSACTION" rollback >/dev/null
+      if test "$PRODUCTION_ACTIVATION_CLEANUP_STATUS" -ne 0; then
+        exit "$PRODUCTION_ACTIVATION_CLEANUP_STATUS"
+      fi
       (exit "$PRODUCTION_ACTIVATION_STATUS")
     fi
     migrate_sanctuary_package_managed_bundle "$IMAGE_ID" commit

package/deploy/unraid/sanctuary.ouro/bundle-meta.json

@@ -1,5 +1,5 @@
 {
-  "runtimeVersion": "0.1.0-alpha.803",
+  "runtimeVersion": "0.1.0-alpha.805",
   "bundleSchemaVersion": 3,
   "lastUpdated": "2026-09-03T00:00:00.000Z"
 }

package/deploy/unraid/sanctuary.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Container version="2">
   <Name>ouro-butler</Name>
-  <Repository>ghcr.io/ourostack/ouroboros-butler:0.1.0-alpha.803</Repository>
+  <Repository>ghcr.io/ourostack/ouroboros-butler:0.1.0-alpha.805</Repository>
   <Registry>https://github.com/ourostack/ouroboros/pkgs/container/ouroboros-butler</Registry>
   <Network>host</Network>
   <Shell>sh</Shell>

package/dist/heart/core.js

@@ -967,7 +967,7 @@ async function runAgent(messages, callbacks, channel, signal, options) {
     const facing = (0, friends_1.channelToFacing)(channel);
     let providerRuntime = options?.providerRuntimeOverride ?? await getProviderRuntime(facing);
     const provider = providerRuntime.id;
-    const toolChoiceRequired = options?.toolChoiceRequired ?? true;
+    const toolChoiceRequired = options?.hardDisableTools ? false : options?.toolChoiceRequired ?? true;
     const traceId = options?.traceId;
     (0, runtime_1.emitNervesEvent)({
         event: "engine.turn_start",
@@ -1253,15 +1253,17 @@ async function runAgent(messages, callbacks, channel, signal, options) {
             const ordinaryActiveTools = relationshipToolNames
                 ? unscopedOrdinaryActiveTools.filter((tool) => relationshipToolNames.includes(tool.function.name))
                 : unscopedOrdinaryActiveTools;
-            const candidateActiveTools = options?.toolProfile === "sanctuary-health-private"
-                ? (() => {
-                    const sendTools = baseTools.filter((tool) => tool.function.name === "send_message");
-                    if (channel !== "inner" || sendTools.length !== 1 || baseTools.length !== 1) {
-                        throw new Error("sanctuary-health-private requires inner channel with exactly one canonical send_message definition");
-                    }
-                    return [sendTools[0], tools_1.restTool];
-                })()
-                : ordinaryActiveTools;
+            const candidateActiveTools = options?.hardDisableTools
+                ? []
+                : options?.toolProfile === "sanctuary-health-private"
+                    ? (() => {
+                        const sendTools = baseTools.filter((tool) => tool.function.name === "send_message");
+                        if (channel !== "inner" || sendTools.length !== 1 || baseTools.length !== 1) {
+                            throw new Error("sanctuary-health-private requires inner channel with exactly one canonical send_message definition");
+                        }
+                        return [sendTools[0], tools_1.restTool];
+                    })()
+                    : ordinaryActiveTools;
             const candidateToolNames = new Set(candidateActiveTools.map((tool) => tool.function.name));
             const unadvertisedRequiredTool = requiredToolCallNames.find((name) => !candidateToolNames.has(name));
             if (unadvertisedRequiredTool) {
@@ -1328,7 +1330,7 @@ async function runAgent(messages, callbacks, channel, signal, options) {
                             callbacks: turnCallbackBufferRef.current?.callbacks ?? callbacks,
                             signal,
                             traceId,
-                            toolChoiceRequired: forcingHistoricalEffect || toolChoiceRequired,
+                            toolChoiceRequired: options?.hardDisableTools ? false : forcingHistoricalEffect || toolChoiceRequired,
                             reasoningEffort: currentReasoningEffort,
                             eagerSettleStreaming: true,
                             systemPrompt: structuredSystemPrompt,
@@ -2028,6 +2030,7 @@ async function runAgent(messages, callbacks, channel, signal, options) {
                             policyDigest,
                             policyId: protectedCall.policy.policyId,
                             actionClass: protectedCall.policy.actionClass,
+                            liveToolContext: augmentedToolContext,
                         });
                         suspension = {
                             approvalId: committed.approvalId,

package/dist/heart/daemon/cli-defaults.js

@@ -40,6 +40,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultStartDaemonProcess = defaultStartDaemonProcess;
+exports.defaultStartDaemonForFrontend = defaultStartDaemonForFrontend;
 exports.readFirstBundleMetaVersion = readFirstBundleMetaVersion;
 exports.isDaemonLaunchAgentLoaded = isDaemonLaunchAgentLoaded;
 exports.waitForBootstrappedDaemonSocket = waitForBootstrappedDaemonSocket;
@@ -80,10 +81,7 @@ const provider_credentials_1 = require("../provider-credentials");
 const startup_tui_1 = require("./startup-tui");
 const daemon_tombstone_1 = require("./daemon-tombstone");
 // ── Default implementations ──
-async function defaultStartDaemonProcess(socketPath) {
-    const launchdStarted = await startDaemonProcessViaLaunchd(socketPath);
-    if (launchdStarted)
-        return launchdStarted;
+function spawnDetachedDaemonProcess(socketPath, environment = process.env) {
     const entry = path.join((0, identity_1.getRepoRoot)(), "dist", "heart", "daemon", "daemon-entry.js");
     // Redirect stdio to /dev/null via file descriptors — using 'ignore' causes EPIPE
     // when the daemon's logging system writes to stderr after the parent exits.
@@ -92,11 +90,30 @@ async function defaultStartDaemonProcess(socketPath) {
     const child = (0, child_process_1.spawn)(process.execPath, [entry, "--socket", socketPath], {
         detached: true,
         stdio: ["ignore", outFd, errFd],
+        env: environment,
     });
     child.unref();
     // Don't close fds — the child process needs them. They'll be cleaned up when the parent exits.
     return { pid: child.pid ?? null };
 }
+async function defaultStartDaemonProcess(socketPath) {
+    const launchdStarted = await startDaemonProcessViaLaunchd(socketPath);
+    if (launchdStarted)
+        return launchdStarted;
+    return spawnDetachedDaemonProcess(socketPath);
+}
+async function defaultStartDaemonForFrontend(socketPath, agent) {
+    if (!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(agent)) {
+        throw new Error("frontend daemon startup requires a safe agent name");
+    }
+    if (process.platform === "darwin") {
+        bootoutDaemonLaunchAgentLabel(currentUserUid());
+    }
+    return spawnDetachedDaemonProcess(socketPath, {
+        ...process.env,
+        OURO_DAEMON_REQUIRED_AGENT: agent,
+    });
+}
 function defaultWriteStdout(text) {
     process.stdout.write(text.endsWith("\n") ? text : `${text}\n`);
 }
@@ -711,6 +728,7 @@ function createDefaultOuroCliDeps(socketPath = socket_client_1.DEFAULT_DAEMON_SO
                 : socket_client_1.DEFAULT_DAEMON_COMMAND_TIMEOUT_MS,
         }),
         startDaemonProcess: defaultStartDaemonProcess,
+        startDaemonForFrontend: defaultStartDaemonForFrontend,
         writeStdout: defaultWriteStdout,
         setExitCode: (code) => {
             const current = typeof process.exitCode === "number" ? process.exitCode : 0;

package/dist/heart/daemon/cli-exec.js

@@ -48,6 +48,7 @@ exports.ensureDaemonRunning = ensureDaemonRunning;
 exports.listGithubCopilotModels = listGithubCopilotModels;
 exports.checkManualCloneBundles = checkManualCloneBundles;
 exports.resolveWorkbenchRuntimeMcp = resolveWorkbenchRuntimeMcp;
+exports.resolveFrontendFriendId = resolveFrontendFriendId;
 exports.setupBlueBubblesHostForConnect = setupBlueBubblesHostForConnect;
 exports.resolveMailImportFilePath = resolveMailImportFilePath;
 exports.runOuroCli = runOuroCli;
@@ -2921,17 +2922,49 @@ function findInstalledWorkbenchMcp(deps, preferred) {
  * - a string path → use it if it exists, otherwise fall back to discovery
  *   (treating the string as the preferred candidate).
  *
- * Returns `{ ouro_workbench: { command, args: [] } }` so the daemon merges it
- * into the boss agent's toolset for the turn without writing to agent.json.
+ * Returns the command plus the exact Workbench runtime coordinates needed by
+ * the daemon-spawned MCP process, without writing them to agent.json.
  */
-function resolveWorkbenchRuntimeMcp(flag, deps) {
+function resolveWorkbenchRuntimeMcp(flag, deps, environment = process.env) {
     if (flag === undefined)
         return null;
     const preferred = typeof flag === "string" ? flag : null;
     const command = findInstalledWorkbenchMcp(deps, preferred);
     if (!command)
         return null;
-    return { ouro_workbench: { command, args: [] } };
+    const keys = [
+        "BUN_BIN",
+        "CMUX_BUNDLED_CLI_PATH",
+        "CMUX_SOCKET_PATH",
+        "CMUX_SOCKET_CAPABILITY",
+    ];
+    const env = Object.fromEntries(keys.map((key) => [key, environment[key]?.trim()]));
+    if (Object.values(env).some((value) => !value))
+        return null;
+    return { ouro_workbench: { command, args: [], env: env } };
+}
+async function resolveFrontendFriendId(input) {
+    if (!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(input.agent))
+        throw new Error("frontend requires a safe agent name");
+    const agentRoot = path.join(input.bundlesRoot ?? (0, identity_1.getAgentBundlesRoot)(), `${input.agent}.ouro`);
+    if (!input.store)
+        (0, auth_flow_1.readAgentConfigForAgent)(input.agent, input.bundlesRoot);
+    const store = input.store ?? new friends_1.FileFriendStore(path.join(agentRoot, "friends"));
+    if (input.explicitFriendId) {
+        const existing = await store.get(input.explicitFriendId);
+        if (!existing)
+            throw new Error(`friend not found: ${input.explicitFriendId}`);
+        return existing.id;
+    }
+    const ownerUsername = input.ownerUsername === undefined ? (0, friends_1.machineOwnerUsername)() : input.ownerUsername;
+    if (!ownerUsername)
+        throw new Error("local machine owner identity is unavailable");
+    return (await new friends_1.FriendResolver(store, {
+        provider: "local",
+        externalId: ownerUsername,
+        displayName: ownerUsername,
+        channel: "mcp",
+    }).resolve()).friend.id;
 }
 function removeWorkbenchMcpRegistration(agent, deps) {
     const { configPath } = (0, auth_flow_1.readAgentConfigForAgent)(agent, deps.bundlesRoot);
@@ -5128,7 +5161,7 @@ async function executeConnectWorkbench(agent, deps) {
         workbenchHasStaleBundleEntry
             ? "agent.json: removed stale senses.workbench / mcpServers.ouro_workbench entries"
             : "agent.json: no Workbench entries needed or written",
-        `boss launch path: ouro mcp-serve --agent ${agent} --workbench-mcp ${executablePath}`,
+        `boss launch path: ouro acp-serve --agent ${agent} --workbench-mcp ${executablePath}`,
         "Workbench tools are injected per served turn; provider secrets stay in the agent vault.",
         ...(syncSummary ? [syncSummary] : []),
     ].join("\n");
@@ -7485,7 +7518,10 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
         // bridge on every senseTurn and merged per-turn in the daemon — nothing is
         // written to agent.json.
         const workbenchMcpFlag = command.workbenchMcp;
-        const runtimeMcp = resolveWorkbenchRuntimeMcp(workbenchMcpFlag, deps);
+        const runtimeMcp = resolveWorkbenchRuntimeMcp(workbenchMcpFlag, deps, deps.workbenchMcpEnvironment ?? process.env);
+        if (workbenchMcpFlag !== undefined && !runtimeMcp) {
+            throw new Error("Workbench MCP runtime coordinates are unavailable");
+        }
         const server = createMcpServer({
             agent: command.agent,
             friendId,
@@ -7503,6 +7539,59 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
         await runMcpServeCliLifecycle(server, mcpInput);
         return "";
     }
+    if (command.kind === "acp-serve") {
+        const createAcpServer = deps.createAcpServer ?? (await Promise.resolve().then(() => __importStar(require("../../senses/acp-server")))).createAcpServer;
+        const resolveFriendId = deps.resolveFrontendFriendId ?? resolveFrontendFriendId;
+        const friendId = await resolveFriendId({
+            agent: command.agent,
+            ...(command.friendId ? { explicitFriendId: command.friendId } : {}),
+            ...(deps.bundlesRoot ? { bundlesRoot: deps.bundlesRoot } : {}),
+        });
+        const commandSocketPath = command.socketOverride ?? deps.socketPath;
+        const { frontendSocketPathForDaemon } = await Promise.resolve().then(() => __importStar(require("../frontend-socket")));
+        const input = deps.acpServeInput ?? process.stdin;
+        const output = deps.acpServeOutput ?? process.stdout;
+        const runtimeMcpServers = command.observeOnly
+            ? undefined
+            : resolveWorkbenchRuntimeMcp(command.workbenchMcp, deps, deps.workbenchMcpEnvironment ?? process.env);
+        if (!command.observeOnly && command.workbenchMcp !== undefined && !runtimeMcpServers) {
+            throw new Error("Workbench MCP runtime coordinates are unavailable");
+        }
+        const daemonResult = deps.ensureDaemonForFrontend
+            ? await deps.ensureDaemonForFrontend(command.agent)
+            : await ensureDaemonRunning({
+                ...deps,
+                startDaemonProcess: (socketPath) => deps.startDaemonForFrontend
+                    ? deps.startDaemonForFrontend(socketPath, command.agent)
+                    : deps.startDaemonProcess(socketPath),
+                reportDaemonStartupPhase: () => { },
+            });
+        if (!daemonResult.ok) {
+            throw new Error(daemonResult.message);
+        }
+        const server = createAcpServer({
+            agent: command.agent,
+            friendId,
+            frontendSocketPath: frontendSocketPathForDaemon(commandSocketPath),
+            stdin: input,
+            stdout: output,
+            ...(command.observeOnly ? { disableTools: true } : {}),
+            ...(runtimeMcpServers ? { runtimeMcpServers } : {}),
+        });
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.acp_serve_started",
+            message: "ACP frontend server started via CLI",
+            meta: {
+                agent: command.agent,
+                friendId,
+                observeOnly: command.observeOnly === true,
+                workbenchRuntimeMcp: !!runtimeMcpServers,
+            },
+        });
+        await runMcpServeCliLifecycle(server, input);
+        return "";
+    }
     if (command.kind === "private.decisions") {
         let response;
         try {

package/dist/heart/daemon/cli-help.js

@@ -345,6 +345,12 @@ exports.COMMAND_REGISTRY = {
         usage: "ouro mcp-serve --agent <name> [--friend <id>]",
         example: "ouro mcp-serve --agent ouroboros",
     },
+    "acp-serve": {
+        category: "System",
+        description: "Start the ACP frontend adapter for an Ouro agent",
+        usage: "ouro acp-serve --agent <name> [--friend-id <id>] [--workbench-mcp [path]] [--observe-only]",
+        example: "ouro acp-serve --agent ouroboros --workbench-mcp",
+    },
     setup: {
         category: "System",
         description: "Register MCP server and hooks for a dev tool",

package/dist/heart/daemon/cli-parse.js

@@ -13,6 +13,7 @@ exports.isAgentProvider = isAgentProvider;
 exports.usage = usage;
 exports.inferAgentNameFromRemote = inferAgentNameFromRemote;
 exports.parseMcpServeCommand = parseMcpServeCommand;
+exports.parseAcpServeCommand = parseAcpServeCommand;
 exports.parseOuroCommand = parseOuroCommand;
 const friends_1 = require("@ouro.bot/friends");
 const cli_help_1 = require("./cli-help");
@@ -1686,6 +1687,55 @@ function parseMcpServeCommand(args) {
         ...(workbenchMcp !== undefined ? { workbenchMcp } : {}),
     };
 }
+function parseAcpServeCommand(args) {
+    const usage = "Usage: ouro acp-serve --agent <name> [--friend-id <id>] [--socket <path>] [--workbench-mcp [path]] [--observe-only]";
+    let agent;
+    let friendId;
+    let socketOverride;
+    let workbenchMcp;
+    let observeOnly = false;
+    for (let i = 0; i < args.length; i++) {
+        const token = args[i];
+        if (token === "--workbench-mcp") {
+            const next = args[i + 1];
+            if (next && !next.startsWith("--"))
+                workbenchMcp = args[++i];
+            else
+                workbenchMcp = true;
+            continue;
+        }
+        if (token === "--observe-only") {
+            observeOnly = true;
+            continue;
+        }
+        const next = args[i + 1];
+        if (token === "--agent" || token === "--friend-id" || token === "--socket") {
+            if (!next || next.startsWith("--"))
+                throw new Error(`${token} requires a value\n${usage}`);
+            if (token === "--agent")
+                agent = next;
+            else if (token === "--friend-id")
+                friendId = next;
+            else
+                socketOverride = next;
+            i += 1;
+            continue;
+        }
+        throw new Error(usage);
+    }
+    if (!agent)
+        throw new Error(`acp-serve requires --agent <name>\n${usage}`);
+    if (!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(agent))
+        throw new Error("acp-serve requires a safe agent name");
+    return {
+        kind: "acp-serve",
+        agent,
+        ...(friendId ? { friendId } : {}),
+        ...(socketOverride ? { socketOverride } : {}),
+        ...(workbenchMcp !== undefined ? { workbenchMcp } : {}),
+        ...(observeOnly ? { observeOnly: true } : {}),
+    };
+}
 function parseSetupCommand(args) {
     let tool;
     let agent;
@@ -2675,6 +2725,8 @@ function parseOuroCommand(args) {
         return parseNervesReviewCommand(args.slice(1));
     if (head === "link")
         return parseLinkCommand(args.slice(1));
+    if (head === "acp-serve")
+        return parseAcpServeCommand(args.slice(1));
     if (head === "mcp-serve")
         return parseMcpServeCommand(args.slice(1));
     if (head === "setup")

package/dist/heart/daemon/daemon-bootstrap-startup.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PUBLIC_DAEMON_STARTUP_FAILURE_REASON = void 0;
+exports.providerReadinessAgents = providerReadinessAgents;
 exports.createProviderReadinessPreparationFailure = createProviderReadinessPreparationFailure;
 exports.createSanctuaryBundlePreparationFailure = createSanctuaryBundlePreparationFailure;
 exports.failFastContainerCredentialBootstrapStartup = failFastContainerCredentialBootstrapStartup;
@@ -20,6 +21,13 @@ exports.PUBLIC_DAEMON_STARTUP_FAILURE_REASON = "startupFailurePublic";
 class DaemonPreparationFailure extends Error {
     name = "DaemonPreparationFailure";
 }
+function providerReadinessAgents(managedAgents, requiredAgent) {
+    const candidate = requiredAgent?.trim();
+    if (!candidate || !/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(candidate)) {
+        return [...managedAgents];
+    }
+    return managedAgents.includes(candidate) ? [candidate] : [...managedAgents];
+}
 function createProviderReadinessPreparationFailure(issues) {
     const lines = ["Provider checks need attention"];
     for (const issue of issues) {

package/dist/heart/daemon/daemon-entry.js

@@ -94,6 +94,7 @@ const socketPath = parseSocketPath(process.argv);
 const entryPath = path.resolve(__dirname, "daemon-entry.js");
 const mode = (0, runtime_mode_1.detectRuntimeMode)((0, identity_1.getRepoRoot)());
 const managedAgents = (0, agent_discovery_1.listEnabledBundleAgents)();
+const readinessAgents = (0, daemon_bootstrap_startup_1.providerReadinessAgents)(managedAgents, process.env.OURO_DAEMON_REQUIRED_AGENT);
 const sanctuaryPackageManagement = (0, sanctuary_package_management_1.resolveSanctuaryPackageManagementActivation)({ mode, argv: process.argv, managedAgents, repoRoot: (0, identity_1.getRepoRoot)(), bundlesRoot: (0, identity_1.getAgentBundlesRoot)(), runtimePackageVersion: (0, bundle_manifest_1.getPackageVersion)() });
 try {
     (0, sanctuary_package_management_1.requireSanctuaryPackageManagementDecision)(sanctuaryPackageManagement);
@@ -598,7 +599,7 @@ function writeStopCommandHealthState() {
 }
 async function prepareProviderRuntime() {
     const bundlesRoot = (0, identity_1.getAgentBundlesRoot)();
-    const readiness = await Promise.all(managedAgents.map(async (agent) => {
+    const readiness = await Promise.all(readinessAgents.map(async (agent) => {
         try {
             await (0, runtime_credentials_1.refreshRuntimeCredentialConfig)(agent, { preserveCachedOnFailure: true });
             const result = await (0, agent_config_check_1.checkAgentConfigWithProviderHealth)(agent, bundlesRoot);