@ouro.bot/cli 0.1.0-alpha.12 → 0.1.0-alpha.14

package/dist/senses/cli.js

@@ -38,6 +38,7 @@ exports.handleSigint = handleSigint;
 exports.addHistory = addHistory;
 exports.renderMarkdown = renderMarkdown;
 exports.createCliCallbacks = createCliCallbacks;
+exports.runCliSession = runCliSession;
 exports.main = main;
 const readline = __importStar(require("readline"));
 const os = __importStar(require("os"));
@@ -368,76 +369,12 @@ function createCliCallbacks() {
         },
     };
 }
-async function main(agentName, options) {
-    if (agentName)
-        (0, identity_1.setAgentName)(agentName);
-    const pasteDebounceMs = options?.pasteDebounceMs ?? 50;
-    // Fail fast if provider is misconfigured (triggers human-readable error + exit)
-    (0, core_1.getProvider)();
+async function runCliSession(options) {
+    const pasteDebounceMs = options.pasteDebounceMs ?? 50;
     const registry = (0, commands_1.createCommandRegistry)();
     (0, commands_1.registerDefaultCommands)(registry);
-    // Resolve context kernel (identity + channel) for CLI
-    const friendsPath = path.join((0, identity_1.getAgentRoot)(), "friends");
-    const friendStore = new store_file_1.FileFriendStore(friendsPath);
-    const username = os.userInfo().username;
-    const hostname = os.hostname();
-    const localExternalId = `${username}@${hostname}`;
-    const resolver = new resolver_1.FriendResolver(friendStore, {
-        provider: "local",
-        externalId: localExternalId,
-        displayName: username,
-        channel: "cli",
-    });
-    const resolvedContext = await resolver.resolve();
-    const cliToolContext = {
-        /* v8 ignore next -- CLI has no OAuth sign-in; this no-op satisfies the interface @preserve */
-        signin: async () => undefined,
-        context: resolvedContext,
-        friendStore,
-        summarize: (0, core_1.createSummarize)(),
-    };
-    const friendId = resolvedContext.friend.id;
-    const agentConfig = (0, identity_1.loadAgentConfig)();
-    (0, cli_logging_1.configureCliRuntimeLogger)(friendId, {
-        level: agentConfig.logging?.level,
-        sinks: agentConfig.logging?.sinks,
-    });
-    const sessPath = (0, config_1.sessionPath)(friendId, "cli", "session");
-    let sessionLock = null;
-    try {
-        sessionLock = (0, session_lock_1.acquireSessionLock)(`${sessPath}.lock`, (0, identity_1.getAgentName)());
-    }
-    catch (error) {
-        /* v8 ignore start -- integration: main() is interactive, lock tested in session-lock.test.ts @preserve */
-        if (error instanceof session_lock_1.SessionLockError) {
-            process.stderr.write(`${error.message}\n`);
-            return;
-        }
-        throw error;
-        /* v8 ignore stop */
-    }
-    // Load existing session or start fresh
-    const existing = (0, context_1.loadSession)(sessPath);
-    const messages = existing?.messages && existing.messages.length > 0
-        ? existing.messages
-        : [{ role: "system", content: await (0, prompt_1.buildSystem)("cli", undefined, resolvedContext) }];
-    // Pending queue drain: inject pending messages as harness-context + assistant-content pairs
-    const pendingDir = (0, pending_1.getPendingDir)((0, identity_1.getAgentName)(), friendId, "cli", "session");
-    const drainToMessages = () => {
-        const pending = (0, pending_1.drainPending)(pendingDir);
-        if (pending.length === 0)
-            return 0;
-        for (const msg of pending) {
-            messages.push({ role: "user", name: "harness", content: `[proactive message from ${msg.from}]` });
-            messages.push({ role: "assistant", content: msg.content });
-        }
-        return pending.length;
-    };
-    // Startup drain: deliver offline messages
-    const startupCount = drainToMessages();
-    if (startupCount > 0) {
-        (0, context_1.saveSession)(sessPath, messages);
-    }
+    const messages = options.messages
+        ?? [{ role: "system", content: await (0, prompt_1.buildSystem)("cli") }];
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout, terminal: true });
     const ctrl = new InputController(rl);
     let currentAbort = null;
@@ -445,11 +382,26 @@ async function main(agentName, options) {
     let closed = false;
     rl.on("close", () => { closed = true; });
     // eslint-disable-next-line no-console -- terminal UX: startup banner
-    console.log(`\n${(0, identity_1.getAgentName)()} (type /commands for help)\n`);
+    console.log(`\n${options.agentName} (type /commands for help)\n`);
     const cliCallbacks = createCliCallbacks();
+    // exitOnToolCall machinery: wrap execTool to detect target tool
+    let exitToolResult;
+    let exitToolFired = false;
+    const resolvedExecTool = options.execTool;
+    const wrappedExecTool = options.exitOnToolCall && resolvedExecTool
+        ? async (name, args, ctx) => {
+            const result = await resolvedExecTool(name, args, ctx);
+            if (name === options.exitOnToolCall) {
+                exitToolResult = result;
+                exitToolFired = true;
+            }
+            return result;
+        }
+        : resolvedExecTool;
+    // Resolve toolChoiceRequired: use explicit option if set, else fall back to toggle
+    const getEffectiveToolChoiceRequired = () => options.toolChoiceRequired !== undefined ? options.toolChoiceRequired : (0, commands_1.getToolChoiceRequired)();
     process.stdout.write("\x1b[36m> \x1b[0m");
     // Ctrl-C at the input prompt: clear line or warn/exit
-    // readline with terminal:true catches Ctrl-C in raw mode (no ^C echo)
     rl.on("SIGINT", () => {
         const rlInt = rl;
         const currentLine = rlInt.line || "";
@@ -481,7 +433,6 @@ async function main(agentName, options) {
             const first = await iter.next();
             if (first.done)
                 break;
-            // Collect any lines that arrive within the debounce window (paste detection)
             const lines = [first.value];
             let more = true;
             while (more) {
@@ -502,6 +453,13 @@ async function main(agentName, options) {
             yield lines.join("\n");
         }
     }
+    (0, runtime_1.emitNervesEvent)({
+        component: "senses",
+        event: "senses.cli_session_start",
+        message: "runCliSession started",
+        meta: { agentName: options.agentName, hasExitOnToolCall: !!options.exitOnToolCall },
+    });
+    let exitReason = "user_quit";
     try {
         for await (const input of debouncedLines(rl)) {
             if (closed)
@@ -510,20 +468,18 @@ async function main(agentName, options) {
                 process.stdout.write("\x1b[36m> \x1b[0m");
                 continue;
             }
-            const trustGate = (0, trust_gate_1.enforceTrustGate)({
-                friend: resolvedContext.friend,
-                provider: "local",
-                externalId: localExternalId,
-                channel: "cli",
-            });
-            if (!trustGate.allowed) {
-                if (trustGate.reason === "stranger_first_reply") {
-                    process.stdout.write(`${trustGate.autoReply}\n`);
+            // Optional input gate (e.g. trust gate in main)
+            if (options.onInput) {
+                const gate = options.onInput(input);
+                if (!gate.allowed) {
+                    if (gate.reply) {
+                        process.stdout.write(`${gate.reply}\n`);
+                    }
+                    if (closed)
+                        break;
+                    process.stdout.write("\x1b[36m> \x1b[0m");
+                    continue;
                 }
-                if (closed)
-                    break;
-                process.stdout.write("\x1b[36m> \x1b[0m");
-                continue;
             }
             // Check for slash commands
             const parsed = (0, commands_1.parseSlashCommand)(input);
@@ -536,7 +492,7 @@ async function main(agentName, options) {
                     else if (dispatchResult.result.action === "new") {
                         messages.length = 0;
                         messages.push({ role: "system", content: await (0, prompt_1.buildSystem)("cli") });
-                        (0, context_1.deleteSession)(sessPath);
+                        await options.onNewSession?.();
                         // eslint-disable-next-line no-console -- terminal UX: session cleared
                         console.log("session cleared");
                         process.stdout.write("\x1b[36m> \x1b[0m");
@@ -550,13 +506,12 @@ async function main(agentName, options) {
                     }
                 }
             }
-            // Re-style the echoed input lines (readline terminal:true echoes each line)
-            // For multiline paste, each line was echoed separately — erase them all
+            // Re-style the echoed input lines
             const cols = process.stdout.columns || 80;
             const inputLines = input.split("\n");
             let echoRows = 0;
             for (const line of inputLines) {
-                echoRows += Math.ceil((2 + line.length) / cols); // "> " prefix + line content
+                echoRows += Math.ceil((2 + line.length) / cols);
             }
             process.stdout.write(`\x1b[${echoRows}A\x1b[K` + `\x1b[1m> ${inputLines[0]}${inputLines.length > 1 ? ` (+${inputLines.length - 1} lines)` : ""}\x1b[0m\n\n`);
             messages.push({ role: "user", content: input });
@@ -567,38 +522,147 @@ async function main(agentName, options) {
             let result;
             try {
                 result = await (0, core_1.runAgent)(messages, cliCallbacks, "cli", currentAbort.signal, {
-                    toolChoiceRequired: (0, commands_1.getToolChoiceRequired)(),
-                    toolContext: cliToolContext,
+                    toolChoiceRequired: getEffectiveToolChoiceRequired(),
                     traceId,
+                    tools: options.tools,
+                    execTool: wrappedExecTool,
+                    toolContext: options.toolContext,
                 });
             }
             catch {
-                // AbortError — silently return to prompt
+                // AbortError -- silently return to prompt
             }
             cliCallbacks.flushMarkdown();
             ctrl.restore();
             currentAbort = null;
+            // Check if exit tool was fired during this turn
+            if (exitToolFired) {
+                exitReason = "tool_exit";
+                break;
+            }
             // Safety net: never silently swallow an empty response
             const lastMsg = messages[messages.length - 1];
             if (lastMsg?.role === "assistant" && !(typeof lastMsg.content === "string" ? lastMsg.content : "").trim()) {
                 process.stderr.write("\x1b[33m(empty response)\x1b[0m\n");
             }
             process.stdout.write("\n\n");
-            (0, context_1.postTurn)(messages, sessPath, result?.usage);
-            await (0, tokens_1.accumulateFriendTokens)(friendStore, resolvedContext.friend.id, result?.usage);
-            // Post-turn: drain any pending messages that arrived during runAgent
-            drainToMessages();
-            // Post-turn: refresh system prompt so active sessions metadata is current
-            await (0, prompt_refresh_1.refreshSystemPrompt)(messages, "cli", undefined, resolvedContext);
+            // Post-turn hook (session persistence, pending drain, prompt refresh, etc.)
+            if (options.onTurnEnd) {
+                await options.onTurnEnd(messages, result ?? { usage: undefined });
+            }
             if (closed)
                 break;
             process.stdout.write("\x1b[36m> \x1b[0m");
         }
     }
     finally {
-        sessionLock?.release();
         rl.close();
         // eslint-disable-next-line no-console -- terminal UX: goodbye
         console.log("bye");
     }
+    return { exitReason, toolResult: exitToolResult };
+}
+async function main(agentName, options) {
+    if (agentName)
+        (0, identity_1.setAgentName)(agentName);
+    const pasteDebounceMs = options?.pasteDebounceMs ?? 50;
+    // Fail fast if provider is misconfigured (triggers human-readable error + exit)
+    (0, core_1.getProvider)();
+    // Resolve context kernel (identity + channel) for CLI
+    const friendsPath = path.join((0, identity_1.getAgentRoot)(), "friends");
+    const friendStore = new store_file_1.FileFriendStore(friendsPath);
+    const username = os.userInfo().username;
+    const hostname = os.hostname();
+    const localExternalId = `${username}@${hostname}`;
+    const resolver = new resolver_1.FriendResolver(friendStore, {
+        provider: "local",
+        externalId: localExternalId,
+        displayName: username,
+        channel: "cli",
+    });
+    const resolvedContext = await resolver.resolve();
+    const cliToolContext = {
+        /* v8 ignore next -- CLI has no OAuth sign-in; this no-op satisfies the interface @preserve */
+        signin: async () => undefined,
+        context: resolvedContext,
+        friendStore,
+        summarize: (0, core_1.createSummarize)(),
+    };
+    const friendId = resolvedContext.friend.id;
+    const agentConfig = (0, identity_1.loadAgentConfig)();
+    (0, cli_logging_1.configureCliRuntimeLogger)(friendId, {
+        level: agentConfig.logging?.level,
+        sinks: agentConfig.logging?.sinks,
+    });
+    const sessPath = (0, config_1.sessionPath)(friendId, "cli", "session");
+    let sessionLock = null;
+    try {
+        sessionLock = (0, session_lock_1.acquireSessionLock)(`${sessPath}.lock`, (0, identity_1.getAgentName)());
+    }
+    catch (error) {
+        /* v8 ignore start -- integration: main() is interactive, lock tested in session-lock.test.ts @preserve */
+        if (error instanceof session_lock_1.SessionLockError) {
+            process.stderr.write(`${error.message}\n`);
+            return;
+        }
+        throw error;
+        /* v8 ignore stop */
+    }
+    // Load existing session or start fresh
+    const existing = (0, context_1.loadSession)(sessPath);
+    const sessionMessages = existing?.messages && existing.messages.length > 0
+        ? existing.messages
+        : [{ role: "system", content: await (0, prompt_1.buildSystem)("cli", undefined, resolvedContext) }];
+    // Pending queue drain: inject pending messages as harness-context + assistant-content pairs
+    const pendingDir = (0, pending_1.getPendingDir)((0, identity_1.getAgentName)(), friendId, "cli", "session");
+    const drainToMessages = () => {
+        const pending = (0, pending_1.drainPending)(pendingDir);
+        if (pending.length === 0)
+            return 0;
+        for (const msg of pending) {
+            sessionMessages.push({ role: "user", name: "harness", content: `[proactive message from ${msg.from}]` });
+            sessionMessages.push({ role: "assistant", content: msg.content });
+        }
+        return pending.length;
+    };
+    // Startup drain: deliver offline messages
+    const startupCount = drainToMessages();
+    if (startupCount > 0) {
+        (0, context_1.saveSession)(sessPath, sessionMessages);
+    }
+    try {
+        await runCliSession({
+            agentName: (0, identity_1.getAgentName)(),
+            pasteDebounceMs,
+            messages: sessionMessages,
+            toolContext: cliToolContext,
+            onInput: () => {
+                const trustGate = (0, trust_gate_1.enforceTrustGate)({
+                    friend: resolvedContext.friend,
+                    provider: "local",
+                    externalId: localExternalId,
+                    channel: "cli",
+                });
+                if (!trustGate.allowed) {
+                    return {
+                        allowed: false,
+                        reply: trustGate.reason === "stranger_first_reply" ? trustGate.autoReply : undefined,
+                    };
+                }
+                return { allowed: true };
+            },
+            onTurnEnd: async (msgs, result) => {
+                (0, context_1.postTurn)(msgs, sessPath, result.usage);
+                await (0, tokens_1.accumulateFriendTokens)(friendStore, resolvedContext.friend.id, result.usage);
+                drainToMessages();
+                await (0, prompt_refresh_1.refreshSystemPrompt)(msgs, "cli", undefined, resolvedContext);
+            },
+            onNewSession: () => {
+                (0, context_1.deleteSession)(sessPath);
+            },
+        });
+    }
+    finally {
+        sessionLock?.release();
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.12",
+  "version": "0.1.0-alpha.14",
   "main": "dist/heart/daemon/ouro-entry.js",
   "bin": {
     "ouro": "dist/heart/daemon/ouro-entry.js",
@@ -9,7 +9,8 @@
   "files": [
     "dist/",
     "AdoptionSpecialist.ouro/",
-    "subagents/"
+    "subagents/",
+    "assets/"
   ],
   "exports": {
     ".": "./dist/heart/daemon/daemon-cli.js",
@@ -34,6 +35,10 @@
     "@microsoft/teams.dev": "^2.0.5",
     "openai": "^6.27.0"
   },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ouroborosbot/ouroboros"
+  },
   "devDependencies": {
     "@vitest/coverage-v8": "^4.0.18",
     "eslint": "^10.0.2",

package/dist/heart/daemon/specialist-session.js

@@ -1,177 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runSpecialistSession = runSpecialistSession;
-const runtime_1 = require("../../nerves/runtime");
-/**
- * Run the specialist conversation session loop.
- *
- * The loop:
- * 1. Initialize messages with system prompt
- * 2. Prompt user -> add to messages -> call streamTurn -> process result
- * 3. If result has no tool calls: push assistant message, re-prompt
- * 4. If result has final_answer sole call: extract answer, emit via callbacks, done
- * 5. If result has other tool calls: execute each, push tool results, continue loop
- * 6. On abort signal: clean exit
- * 7. Return { hatchedAgentName } -- name from hatch_agent if called
- */
-async function runSpecialistSession(deps) {
-    const { providerRuntime, systemPrompt, tools, execTool, readline, callbacks, signal, kickoffMessage, suppressInput, restoreInput, flushMarkdown, writePrompt, } = deps;
-    (0, runtime_1.emitNervesEvent)({
-        component: "daemon",
-        event: "daemon.specialist_session_start",
-        message: "starting specialist session loop",
-        meta: {},
-    });
-    const messages = [
-        { role: "system", content: systemPrompt },
-    ];
-    let hatchedAgentName = null;
-    let done = false;
-    let isFirstTurn = true;
-    let currentAbort = null;
-    try {
-        while (!done) {
-            if (signal?.aborted)
-                break;
-            // On the first turn with a kickoff message, inject it so the specialist speaks first
-            if (isFirstTurn && kickoffMessage) {
-                isFirstTurn = false;
-                messages.push({ role: "user", content: kickoffMessage });
-            }
-            else {
-                // Get user input
-                const userInput = await readline.question(writePrompt ? "" : "> ");
-                if (!userInput.trim()) {
-                    if (writePrompt)
-                        writePrompt();
-                    continue;
-                }
-                messages.push({ role: "user", content: userInput });
-            }
-            providerRuntime.resetTurnState(messages);
-            // Suppress input during model execution
-            currentAbort = new AbortController();
-            const mergedSignal = signal;
-            if (suppressInput) {
-                suppressInput(() => currentAbort.abort());
-            }
-            // Inner loop: process tool calls until we get a final_answer or plain text
-            let turnDone = false;
-            while (!turnDone) {
-                if (mergedSignal?.aborted || currentAbort.signal.aborted) {
-                    done = true;
-                    break;
-                }
-                callbacks.onModelStart();
-                const result = await providerRuntime.streamTurn({
-                    messages,
-                    activeTools: tools,
-                    callbacks,
-                    signal: mergedSignal,
-                });
-                // Build assistant message
-                const assistantMsg = {
-                    role: "assistant",
-                };
-                if (result.content)
-                    assistantMsg.content = result.content;
-                if (result.toolCalls.length) {
-                    assistantMsg.tool_calls = result.toolCalls.map((tc) => ({
-                        id: tc.id,
-                        type: "function",
-                        function: { name: tc.name, arguments: tc.arguments },
-                    }));
-                }
-                if (!result.toolCalls.length) {
-                    // Plain text response -- flush markdown, push and re-prompt
-                    if (flushMarkdown)
-                        flushMarkdown();
-                    messages.push(assistantMsg);
-                    turnDone = true;
-                    continue;
-                }
-                // Check for final_answer
-                const isSoleFinalAnswer = result.toolCalls.length === 1 && result.toolCalls[0].name === "final_answer";
-                if (isSoleFinalAnswer) {
-                    let answer;
-                    try {
-                        const parsed = JSON.parse(result.toolCalls[0].arguments);
-                        if (typeof parsed === "string") {
-                            answer = parsed;
-                        }
-                        else if (parsed.answer != null) {
-                            answer = parsed.answer;
-                        }
-                    }
-                    catch {
-                        // malformed
-                    }
-                    if (answer != null) {
-                        callbacks.onTextChunk(answer);
-                        if (flushMarkdown)
-                            flushMarkdown();
-                        messages.push(assistantMsg);
-                        done = true;
-                        turnDone = true;
-                        continue;
-                    }
-                    // Malformed final_answer -- ask model to retry
-                    messages.push(assistantMsg);
-                    messages.push({
-                        role: "tool",
-                        tool_call_id: result.toolCalls[0].id,
-                        content: "your final_answer was incomplete or malformed. call final_answer again with your complete response.",
-                    });
-                    providerRuntime.appendToolOutput(result.toolCalls[0].id, "retry");
-                    continue;
-                }
-                // Execute tool calls
-                messages.push(assistantMsg);
-                for (const tc of result.toolCalls) {
-                    if (mergedSignal?.aborted)
-                        break;
-                    let args = {};
-                    try {
-                        args = JSON.parse(tc.arguments);
-                    }
-                    catch {
-                        // ignore parse error
-                    }
-                    callbacks.onToolStart(tc.name, args);
-                    let toolResult;
-                    try {
-                        toolResult = await execTool(tc.name, args);
-                    }
-                    catch (e) {
-                        toolResult = `error: ${e}`;
-                    }
-                    callbacks.onToolEnd(tc.name, tc.name, true);
-                    // Track hatchling name
-                    if (tc.name === "hatch_agent" && args.name) {
-                        hatchedAgentName = args.name;
-                    }
-                    messages.push({ role: "tool", tool_call_id: tc.id, content: toolResult });
-                    providerRuntime.appendToolOutput(tc.id, toolResult);
-                }
-                // After processing tool calls, continue inner loop for tool result processing
-            }
-            // Restore input and show prompt for next turn
-            if (flushMarkdown)
-                flushMarkdown();
-            if (restoreInput)
-                restoreInput();
-            currentAbort = null;
-            if (!done) {
-                process.stdout.write("\n\n");
-                if (writePrompt)
-                    writePrompt();
-            }
-        }
-    }
-    finally {
-        if (restoreInput)
-            restoreInput();
-        readline.close();
-    }
-    return { hatchedAgentName };
-}

package/dist/inner-worker-entry.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// Backward-compatible wrapper; unified runtime now lives at heart/agent-entry.
-require("./heart/agent-entry");