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

package/changelog.json

@@ -1,6 +1,14 @@
 {
   "_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": [

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

@@ -1,5 +1,5 @@
 {
-  "runtimeVersion": "0.1.0-alpha.804",
+  "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.804</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);

package/dist/heart/daemon/daemon.js

@@ -82,6 +82,11 @@ const router_1 = require("../external-events/router");
 const habit_policy_1 = require("../../rsvp/habit-policy");
 const container_runtime_1 = require("./container-runtime");
 const habit_session_1 = require("../habits/habit-session");
+const turn_execution_lease_1 = require("../turn-execution-lease");
+const frontend_session_service_1 = require("../frontend-session-service");
+const frontend_socket_1 = require("../frontend-socket");
+const frontend_journal_1 = require("../frontend-journal");
+const frontend_approval_runtime_1 = require("../frontend-approval-runtime");
 const PIDFILE_PATH = path.join(os.homedir(), ".ouro-cli", "daemon.pids");
 /**
  * Defense-in-depth: detect if we're running under vitest. The pidfile lives
@@ -556,33 +561,35 @@ function taskIdFromTaskPokePrivateWakeCommand(command) {
  * restarts the daemon process (fresh module cache).
  */
 async function handleAgentSenseTurn(command, runtime) {
-    try {
-        const { setAgentName } = await Promise.resolve().then(() => __importStar(require("../identity")));
-        setAgentName(command.agent);
-        const { runSenseTurn } = await Promise.resolve().then(() => __importStar(require("../../senses/shared-turn")));
-        const result = await runSenseTurn({
-            agentName: command.agent,
-            channel: command.channel,
-            sessionKey: command.sessionKey,
-            friendId: command.friendId,
-            userMessage: command.message,
-            ...(runtime?.socketPath ? { toolContext: { daemonSocketPath: runtime.socketPath } } : {}),
-            // Per-turn, per-agent runtime MCP injection (e.g. Workbench's ouro_workbench).
-            // Scoped to THIS turn only — never stored as module state, so a concurrent
-            // turn for a different agent cannot inherit these servers.
-            ...(command.runtimeMcp ? { runtimeMcpServers: command.runtimeMcp } : {}),
-        });
-        return {
-            ok: true,
-            message: result.response,
-            data: { ponderDeferred: result.ponderDeferred },
-        };
-    }
-    catch (error) {
-        /* v8 ignore next -- branch: String(error) fallback only for non-Error throws @preserve */
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        return { ok: false, error: `sense turn failed: ${errorMessage}` };
-    }
+    return (0, turn_execution_lease_1.withTurnExecutionLease)(async () => {
+        try {
+            const { setAgentName } = await Promise.resolve().then(() => __importStar(require("../identity")));
+            setAgentName(command.agent);
+            const { runSenseTurn } = await Promise.resolve().then(() => __importStar(require("../../senses/shared-turn")));
+            const result = await runSenseTurn({
+                agentName: command.agent,
+                channel: command.channel,
+                sessionKey: command.sessionKey,
+                friendId: command.friendId,
+                userMessage: command.message,
+                ...(runtime?.socketPath ? { toolContext: { daemonSocketPath: runtime.socketPath } } : {}),
+                // Per-turn, per-agent runtime MCP injection (e.g. Workbench's ouro_workbench).
+                // Scoped to THIS turn only — never stored as module state, so a concurrent
+                // turn for a different agent cannot inherit these servers.
+                ...(command.runtimeMcp ? { runtimeMcpServers: command.runtimeMcp } : {}),
+            });
+            return {
+                ok: true,
+                message: result.response,
+                data: { ponderDeferred: result.ponderDeferred },
+            };
+        }
+        catch (error) {
+            /* v8 ignore next -- branch: String(error) fallback only for non-Error throws @preserve */
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            return { ok: false, error: `sense turn failed: ${errorMessage}` };
+        }
+    });
 }
 async function handleAgentAskTurn(command, runtime) {
     /* v8 ignore start -- ask command parameter defaults are legacy MCP compatibility; send_message shares the primary path @preserve */
@@ -614,12 +621,16 @@ class OuroDaemon {
     mode;
     server = null;
     mailboxServer = null;
+    frontendSocketServer = null;
     socketIdentity = null;
     senseAutostartTimer = null;
     externalEventReconcileTimer = null;
     externalEventReconcileRunning = false;
     constructedAtMs = Date.now();
     mailboxServerFactory;
+    frontendSocketPath;
+    frontendSessionService;
+    frontendSocketServerFactory;
     privateRuntimePolicyDeps;
     onStopCommandComplete;
     externalEventRoot;
@@ -644,6 +655,17 @@ class OuroDaemon {
         this.bundlesRoot = options.bundlesRoot ?? (0, identity_1.getAgentBundlesRoot)();
         this.mode = options.mode ?? "production";
         this.mailboxServerFactory = options.mailboxServerFactory ?? this.createDefaultMailboxServer.bind(this);
+        this.frontendSocketPath = options.frontendSocketPath ?? (0, frontend_socket_1.frontendSocketPathForDaemon)(this.socketPath);
+        /* v8 ignore next -- path-only default adapter; frontend service tests inject and verify the same root contract @preserve */
+        const frontendAgentRoot = (agent) => path.join(this.bundlesRoot, `${agent}.ouro`);
+        this.frontendSessionService = options.frontendSessionService ?? new frontend_session_service_1.FrontendSessionService({
+            journal: new frontend_journal_1.FrontendJournalStore({ agentRoot: frontendAgentRoot }),
+            authority: (0, frontend_approval_runtime_1.createFrontendApprovalRuntime)({
+                agentRoot: frontendAgentRoot,
+                settleApproval: frontend_approval_runtime_1.settleFrontendApproval,
+            }),
+        });
+        this.frontendSocketServerFactory = options.frontendSocketServerFactory ?? frontend_socket_1.startFrontendSocketServer;
         this.privateRuntimePolicyDeps = options.privateRuntimePolicyDeps ?? {};
         this.onStopCommandComplete = options.onStopCommandComplete ?? null;
         this.externalEventRoot = options.externalEventRoot ?? null;
@@ -848,6 +870,21 @@ class OuroDaemon {
                 meta: { port: mailbox_types_1.MAILBOX_DEFAULT_PORT },
             });
         }
+        try {
+            this.frontendSocketServer = await this.frontendSocketServerFactory({
+                socketPath: this.frontendSocketPath,
+                service: this.frontendSessionService,
+            });
+        }
+        catch (error) {
+            (0, runtime_1.emitNervesEvent)({
+                level: "warn",
+                component: "daemon",
+                event: "daemon.frontend_socket_start_failed",
+                message: `Frontend socket failed to start: ${String(error)}`,
+                meta: { socketPath: this.frontendSocketPath },
+            });
+        }
     }
     triggerAutoStartAgents() {
         if (this.processManager.triggerAutoStartAgents) {
@@ -1117,6 +1154,12 @@ class OuroDaemon {
             message: "stopping daemon server",
             meta: { socketPath: this.socketPath },
         });
+        this.frontendSessionService.cancelAllTurns();
+        if (this.frontendSocketServer) {
+            await this.frontendSocketServer.stop();
+            this.frontendSocketServer = null;
+        }
+        this.frontendSessionService.close?.();
         (0, update_checker_1.stopUpdateChecker)();
         (0, mcp_manager_1.shutdownSharedMcpManager)();
         this.scheduler.stop?.();
@@ -2402,28 +2445,32 @@ class OuroDaemon {
                 return this.handlePrivateRuntimeWake(this.buildAwaitPrivateWakeCommand(command));
             }
             case "mcp.list": {
-                (0, identity_1.setAgentName)(command.agent ?? "default");
-                const mcpManager = await (0, mcp_manager_1.getSharedMcpManager)();
-                if (!mcpManager) {
-                    return { ok: true, data: [], message: "no MCP servers configured" };
-                }
-                return { ok: true, data: mcpManager.listAllTools() };
+                return (0, turn_execution_lease_1.withTurnExecutionLease)(async () => {
+                    (0, identity_1.setAgentName)(command.agent ?? "default");
+                    const mcpManager = await (0, mcp_manager_1.getSharedMcpManager)();
+                    if (!mcpManager) {
+                        return { ok: true, data: [], message: "no MCP servers configured" };
+                    }
+                    return { ok: true, data: mcpManager.listAllTools() };
+                });
             }
             case "mcp.call": {
-                (0, identity_1.setAgentName)(command.agent ?? "default");
-                const mcpCallManager = await (0, mcp_manager_1.getSharedMcpManager)();
-                if (!mcpCallManager) {
-                    return { ok: false, error: "no MCP servers configured" };
-                }
-                try {
-                    const parsedArgs = command.args ? JSON.parse(command.args) : {};
-                    const result = await mcpCallManager.callTool(command.server, command.tool, parsedArgs);
-                    return { ok: true, data: result };
-                }
-                catch (error) {
-                    /* v8 ignore next -- defensive: callTool errors are always Error instances @preserve */
-                    return { ok: false, error: error instanceof Error ? error.message : String(error) };
-                }
+                return (0, turn_execution_lease_1.withTurnExecutionLease)(async () => {
+                    (0, identity_1.setAgentName)(command.agent ?? "default");
+                    const mcpCallManager = await (0, mcp_manager_1.getSharedMcpManager)();
+                    if (!mcpCallManager) {
+                        return { ok: false, error: "no MCP servers configured" };
+                    }
+                    try {
+                        const parsedArgs = command.args ? JSON.parse(command.args) : {};
+                        const result = await mcpCallManager.callTool(command.server, command.tool, parsedArgs);
+                        return { ok: true, data: result };
+                    }
+                    catch (error) {
+                        /* v8 ignore next -- defensive: callTool errors are always Error instances @preserve */
+                        return { ok: false, error: error instanceof Error ? error.message : String(error) };
+                    }
+                });
             }
             case "hatch.start":
                 return {

package/dist/heart/daemon/sense-manager.js

@@ -359,7 +359,7 @@ function senseRepairHint(agent, sense) {
     }
     /* v8 ignore next -- Workbench is deliberately not daemon-managed, so getSenseInventory never asks the daemon manager for a repair hint @preserve */
     if (sense === "workbench") {
-        return `Agent-runnable: install Ouro Workbench.app, then launch the boss through Workbench or run 'ouro mcp-serve --agent ${agent} --workbench-mcp'; 'ouro connect workbench --agent ${agent}' only cleans stale bundle entries.`;
+        return `Agent-runnable: install Ouro Workbench.app, then launch the boss through Workbench or run 'ouro acp-serve --agent ${agent} --workbench-mcp'; 'ouro connect workbench --agent ${agent}' only cleans stale bundle entries.`;
     }
     return `Run 'ouro connect bluebubbles --agent ${agent}' to attach BlueBubbles on this machine; then run 'ouro up' again.`;
 }