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

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

@@ -15,7 +15,7 @@ const runtime_1 = require("../../nerves/runtime");
  * 7. Return { hatchedAgentName } -- name from hatch_agent if called
  */
 async function runSpecialistSession(deps) {
-    const { providerRuntime, systemPrompt, tools, execTool, readline, callbacks, signal, kickoffMessage } = 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",
@@ -28,6 +28,7 @@ async function runSpecialistSession(deps) {
     let hatchedAgentName = null;
     let done = false;
     let isFirstTurn = true;
+    let currentAbort = null;
     try {
         while (!done) {
             if (signal?.aborted)
@@ -39,16 +40,25 @@ async function runSpecialistSession(deps) {
             }
             else {
                 // Get user input
-                const userInput = await readline.question("> ");
-                if (!userInput.trim())
+                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 (signal?.aborted) {
+                if (mergedSignal?.aborted || currentAbort.signal.aborted) {
                     done = true;
                     break;
                 }
@@ -57,7 +67,7 @@ async function runSpecialistSession(deps) {
                     messages,
                     activeTools: tools,
                     callbacks,
-                    signal,
+                    signal: mergedSignal,
                 });
                 // Build assistant message
                 const assistantMsg = {
@@ -73,7 +83,9 @@ async function runSpecialistSession(deps) {
                     }));
                 }
                 if (!result.toolCalls.length) {
-                    // Plain text response -- push and re-prompt
+                    // Plain text response -- flush markdown, push and re-prompt
+                    if (flushMarkdown)
+                        flushMarkdown();
                     messages.push(assistantMsg);
                     turnDone = true;
                     continue;
@@ -96,6 +108,8 @@ async function runSpecialistSession(deps) {
                     }
                     if (answer != null) {
                         callbacks.onTextChunk(answer);
+                        if (flushMarkdown)
+                            flushMarkdown();
                         messages.push(assistantMsg);
                         done = true;
                         turnDone = true;
@@ -114,7 +128,7 @@ async function runSpecialistSession(deps) {
                 // Execute tool calls
                 messages.push(assistantMsg);
                 for (const tc of result.toolCalls) {
-                    if (signal?.aborted)
+                    if (mergedSignal?.aborted)
                         break;
                     let args = {};
                     try {
@@ -141,9 +155,22 @@ async function runSpecialistSession(deps) {
                 }
                 // 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/heart/daemon/subagent-installer.js

@@ -55,9 +55,18 @@ function listSubagentSources(subagentsDir) {
         .map((name) => path.join(subagentsDir, name))
         .sort((a, b) => a.localeCompare(b));
 }
+function pathExists(target) {
+    try {
+        fs.lstatSync(target);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 function ensureSymlink(source, target) {
     fs.mkdirSync(path.dirname(target), { recursive: true });
-    if (fs.existsSync(target)) {
+    if (pathExists(target)) {
         const stats = fs.lstatSync(target);
         if (stats.isSymbolicLink()) {
             const linkedPath = fs.readlinkSync(target);

package/dist/heart/identity.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_AGENT_PHRASES = exports.DEFAULT_AGENT_CONTEXT = void 0;
+exports.DEFAULT_AGENT_SENSES = exports.DEFAULT_AGENT_PHRASES = exports.DEFAULT_AGENT_CONTEXT = void 0;
 exports.buildDefaultAgentTemplate = buildDefaultAgentTemplate;
 exports.getAgentName = getAgentName;
 exports.getRepoRoot = getRepoRoot;
@@ -57,12 +57,73 @@ exports.DEFAULT_AGENT_PHRASES = {
     tool: ["running tool"],
     followup: ["processing"],
 };
+exports.DEFAULT_AGENT_SENSES = {
+    cli: { enabled: true },
+    teams: { enabled: false },
+    bluebubbles: { enabled: false },
+};
+function normalizeSenses(value, configFile) {
+    const defaults = {
+        cli: { ...exports.DEFAULT_AGENT_SENSES.cli },
+        teams: { ...exports.DEFAULT_AGENT_SENSES.teams },
+        bluebubbles: { ...exports.DEFAULT_AGENT_SENSES.bluebubbles },
+    };
+    if (value === undefined) {
+        return defaults;
+    }
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "error",
+            event: "config_identity.error",
+            component: "config/identity",
+            message: "agent config has invalid senses block",
+            meta: { path: configFile },
+        });
+        throw new Error(`agent.json at ${configFile} must include senses as an object when present.`);
+    }
+    const raw = value;
+    const senseNames = ["cli", "teams", "bluebubbles"];
+    for (const senseName of senseNames) {
+        const rawSense = raw[senseName];
+        if (rawSense === undefined) {
+            continue;
+        }
+        if (!rawSense || typeof rawSense !== "object" || Array.isArray(rawSense)) {
+            (0, runtime_1.emitNervesEvent)({
+                level: "error",
+                event: "config_identity.error",
+                component: "config/identity",
+                message: "agent config has invalid sense config",
+                meta: { path: configFile, sense: senseName },
+            });
+            throw new Error(`agent.json at ${configFile} has invalid senses.${senseName} config.`);
+        }
+        const enabled = rawSense.enabled;
+        if (typeof enabled !== "boolean") {
+            (0, runtime_1.emitNervesEvent)({
+                level: "error",
+                event: "config_identity.error",
+                component: "config/identity",
+                message: "agent config has invalid sense enabled flag",
+                meta: { path: configFile, sense: senseName, enabled: enabled ?? null },
+            });
+            throw new Error(`agent.json at ${configFile} must include senses.${senseName}.enabled as boolean.`);
+        }
+        defaults[senseName] = { enabled };
+    }
+    return defaults;
+}
 function buildDefaultAgentTemplate(_agentName) {
     return {
         version: 1,
         enabled: true,
         provider: "anthropic",
         context: { ...exports.DEFAULT_AGENT_CONTEXT },
+        senses: {
+            cli: { ...exports.DEFAULT_AGENT_SENSES.cli },
+            teams: { ...exports.DEFAULT_AGENT_SENSES.teams },
+            bluebubbles: { ...exports.DEFAULT_AGENT_SENSES.bluebubbles },
+        },
         phrases: {
             thinking: [...exports.DEFAULT_AGENT_PHRASES.thinking],
             tool: [...exports.DEFAULT_AGENT_PHRASES.tool],
@@ -257,6 +318,7 @@ function loadAgentConfig() {
         provider: rawProvider,
         context: parsed.context,
         logging: parsed.logging,
+        senses: normalizeSenses(parsed.senses, configFile),
         phrases: parsed.phrases,
     };
     (0, runtime_1.emitNervesEvent)({

package/dist/heart/sense-truth.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSenseInventory = getSenseInventory;
+const runtime_1 = require("../nerves/runtime");
+const identity_1 = require("./identity");
+const SENSES = [
+    { sense: "cli", label: "CLI", daemonManaged: false },
+    { sense: "teams", label: "Teams", daemonManaged: true },
+    { sense: "bluebubbles", label: "BlueBubbles", daemonManaged: true },
+];
+function configuredSenses(senses) {
+    return senses ?? {
+        cli: { ...identity_1.DEFAULT_AGENT_SENSES.cli },
+        teams: { ...identity_1.DEFAULT_AGENT_SENSES.teams },
+        bluebubbles: { ...identity_1.DEFAULT_AGENT_SENSES.bluebubbles },
+    };
+}
+function resolveStatus(enabled, daemonManaged, runtimeInfo) {
+    if (!enabled) {
+        return "disabled";
+    }
+    if (!daemonManaged) {
+        return "interactive";
+    }
+    if (runtimeInfo?.runtime === "error") {
+        return "error";
+    }
+    if (runtimeInfo?.runtime === "running") {
+        return "running";
+    }
+    if (runtimeInfo?.configured === false) {
+        return "needs_config";
+    }
+    return "ready";
+}
+function getSenseInventory(agent, runtime = {}) {
+    const senses = configuredSenses(agent.senses);
+    const inventory = SENSES.map(({ sense, label, daemonManaged }) => {
+        const enabled = senses[sense].enabled;
+        return {
+            sense,
+            label,
+            enabled,
+            daemonManaged,
+            status: resolveStatus(enabled, daemonManaged, runtime[sense]),
+        };
+    });
+    (0, runtime_1.emitNervesEvent)({
+        component: "channels",
+        event: "channel.sense_inventory_built",
+        message: "built sense inventory",
+        meta: {
+            senses: inventory.map((entry) => ({
+                sense: entry.sense,
+                enabled: entry.enabled,
+                status: entry.status,
+            })),
+        },
+    });
+    return inventory;
+}

package/dist/mind/prompt.js

@@ -51,6 +51,7 @@ const first_impressions_1 = require("./first-impressions");
 const tasks_1 = require("../repertoire/tasks");
 // Lazy-loaded psyche text cache
 let _psycheCache = null;
+let _senseStatusLinesCache = null;
 function loadPsycheFile(name) {
     try {
         const psycheDir = path.join((0, identity_1.getAgentRoot)(), "psyche");
@@ -74,6 +75,7 @@ function loadPsyche() {
 }
 function resetPsycheCache() {
     _psycheCache = null;
+    _senseStatusLinesCache = null;
 }
 const DEFAULT_ACTIVE_THRESHOLD_MS = 24 * 60 * 60 * 1000; // 24 hours
 function resolveFriendName(friendId, friendsDir, agentName) {
@@ -194,6 +196,7 @@ function runtimeInfoSection(channel) {
     lines.push(`agent: ${agentName}`);
     lines.push(`cwd: ${process.cwd()}`);
     lines.push(`channel: ${channel}`);
+    lines.push(`current sense: ${channel}`);
     lines.push(`i can read and modify my own source code.`);
     if (channel === "cli") {
         lines.push("i introduce myself on boot with a fun random greeting.");
@@ -204,8 +207,73 @@ function runtimeInfoSection(channel) {
     else {
         lines.push("i am responding in Microsoft Teams. i keep responses concise. i use markdown formatting. i do not introduce myself on boot.");
     }
+    lines.push("");
+    lines.push(...senseRuntimeGuidance(channel));
     return lines.join("\n");
 }
+function hasTextField(record, key) {
+    return typeof record?.[key] === "string" && record[key].trim().length > 0;
+}
+function localSenseStatusLines() {
+    if (_senseStatusLinesCache) {
+        return [..._senseStatusLinesCache];
+    }
+    const config = (0, identity_1.loadAgentConfig)();
+    const senses = config.senses ?? {
+        cli: { enabled: true },
+        teams: { enabled: false },
+        bluebubbles: { enabled: false },
+    };
+    let payload = {};
+    try {
+        const raw = fs.readFileSync((0, identity_1.getAgentSecretsPath)(), "utf-8");
+        const parsed = JSON.parse(raw);
+        if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+            payload = parsed;
+        }
+    }
+    catch {
+        payload = {};
+    }
+    const teams = payload.teams;
+    const bluebubbles = payload.bluebubbles;
+    const configured = {
+        cli: true,
+        teams: hasTextField(teams, "clientId") && hasTextField(teams, "clientSecret") && hasTextField(teams, "tenantId"),
+        bluebubbles: hasTextField(bluebubbles, "serverUrl") && hasTextField(bluebubbles, "password"),
+    };
+    const rows = [
+        { label: "CLI", status: "interactive" },
+        {
+            label: "Teams",
+            status: !senses.teams.enabled ? "disabled" : configured.teams ? "ready" : "needs_config",
+        },
+        {
+            label: "BlueBubbles",
+            status: !senses.bluebubbles.enabled ? "disabled" : configured.bluebubbles ? "ready" : "needs_config",
+        },
+    ];
+    _senseStatusLinesCache = rows.map((row) => `- ${row.label}: ${row.status}`);
+    return [..._senseStatusLinesCache];
+}
+function senseRuntimeGuidance(channel) {
+    const lines = ["available senses:"];
+    lines.push(...localSenseStatusLines());
+    lines.push("sense states:");
+    lines.push("- interactive = available when opened by the user instead of kept running by the daemon");
+    lines.push("- disabled = turned off in agent.json");
+    lines.push("- needs_config = enabled but missing required secrets.json values");
+    lines.push("- ready = enabled and configured; `ouro up` should bring it online");
+    lines.push("- running = enabled and currently active");
+    lines.push("- error = enabled but unhealthy");
+    lines.push("If asked how to enable another sense, I explain the relevant agent.json senses entry and required secrets.json fields instead of guessing.");
+    lines.push("teams setup truth: enable `senses.teams.enabled`, then provide `teams.clientId`, `teams.clientSecret`, and `teams.tenantId` in secrets.json.");
+    lines.push("bluebubbles setup truth: enable `senses.bluebubbles.enabled`, then provide `bluebubbles.serverUrl` and `bluebubbles.password` in secrets.json.");
+    if (channel === "cli") {
+        lines.push("cli is interactive: it is available when the user opens it, not something `ouro up` daemonizes.");
+    }
+    return lines;
+}
 function providerSection() {
     return `## my provider\n${(0, core_1.getProviderDisplayLabel)()}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.10",
+  "version": "0.1.0-alpha.12",
   "main": "dist/heart/daemon/ouro-entry.js",
   "bin": {
     "ouro": "dist/heart/daemon/ouro-entry.js",