@ouro.bot/cli 0.1.0-alpha.911 → 0.1.0-alpha.913

package/changelog.json

@@ -1,6 +1,18 @@
 {
   "_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.913",
+      "changes": [
+        "CLI screens read on light terminals: main text uses the terminal's own colour, and the accent colours hold about 4:1 contrast on both light and dark backgrounds."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.912",
+      "changes": [
+        "Shepherd judges a hooked agent that sits mid-turn at a prompt without stopping (a permission or trust question) after 20 quiet seconds, leaves idle and freshly started sessions alone, and no longer stays silent when the judge writes its reply as a bare string or with code-style backticks; a refused reply is logged with what was wrong."
+      ]
+    },
     {
       "version": "0.1.0-alpha.911",
       "changes": [

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

@@ -1,5 +1,5 @@
 {
-  "runtimeVersion": "0.1.0-alpha.911",
+  "runtimeVersion": "0.1.0-alpha.913",
   "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.911</Repository>
+  <Repository>ghcr.io/ourostack/ouroboros-butler:0.1.0-alpha.913</Repository>
   <Registry>https://github.com/ourostack/ouroboros/pkgs/container/ouroboros-butler</Registry>
   <Network>host</Network>
   <Shell>sh</Shell>

package/dist/heart/daemon/terminal-ui.js

@@ -14,12 +14,15 @@ exports.renderTerminalOperation = renderTerminalOperation;
 const runtime_1 = require("../../nerves/runtime");
 const RESET = "\x1b[0m";
 const BOLD = "\x1b[1m";
-const CANOPY = "\x1b[38;2;30;61;40m";
+// The terminal's background is unknown, so every tone has to read on light and on dark: each
+// holds about 4:1 contrast against both white and near-black. Main text takes no colour at all
+// and stays in the terminal's own text colour.
+const CANOPY = "\x1b[38;2;84;130;100m";
 const SCALE = "\x1b[38;2;45;148;71m";
-const GLOW = "\x1b[38;2;74;227;108m";
-const BONE = "\x1b[38;2;237;242;238m";
-const MIST = "\x1b[38;2;154;174;159m";
-const ALERT = "\x1b[38;2;255;106;106m";
+const GLOW = "\x1b[38;2;34;160;80m";
+const BONE = "";
+const MIST = "\x1b[38;2;110;130;116m";
+const ALERT = "\x1b[38;2;220;70;70m";
 const ANSI_RE = /\x1b\[[0-9;]*m/g;
 const MASTHEAD_WORD = "OUROBOROS";
 const CLASSIC_WORDMARK_GLYPHS = {
@@ -32,7 +35,8 @@ const CLASSIC_WORDMARK_GLYPHS = {
 function color(text, tone, bold = false) {
     if (!text)
         return text;
-    return `${tone}${bold ? BOLD : ""}${text}${RESET}`;
+    const style = `${tone}${bold ? BOLD : ""}`;
+    return style ? `${style}${text}${RESET}` : text;
 }
 function stripAnsi(text) {
     return text.replace(ANSI_RE, "");

package/dist/heart/daemon/up-progress.js

@@ -21,7 +21,7 @@ const RESET = "\x1b[0m";
 const BOLD = "\x1b[1m";
 const DIM = "\x1b[2m";
 const GREEN = "\x1b[38;2;46;204;64m";
-const RED = "\x1b[38;2;255;106;106m";
+const RED = "\x1b[38;2;220;70;70m";
 const BASE_UP_PHASE_PLAN = [
     "update check",
     "system setup",

package/dist/senses/shepherd/cmux.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QUIET_MAX_MS = exports.QUIET_MS = exports.POLL_MS = exports.BACKGROUND_GRACE_MS = exports.GRACE_MS = exports.CMUX_STATUS_KEY = void 0;
+exports.QUIET_MAX_MS = exports.HOOKED_QUIET_MS = exports.QUIET_MS = exports.POLL_MS = exports.BACKGROUND_GRACE_MS = exports.GRACE_MS = exports.CMUX_STATUS_KEY = void 0;
 exports.realSchedule = realSchedule;
 exports.readCmuxHookSession = readCmuxHookSession;
 exports.createCmuxHost = createCmuxHost;
@@ -47,9 +47,11 @@ const runtime_1 = require("../../nerves/runtime");
  * `agent.hook.Stop` event, which cmux publishes for every agent its hooks cover (Claude Code,
  * Codex, Copilot and more). After a short grace period, a stop is dropped if the agent resumed. A
  * stop that cmux's session store says left background work running waits longer, and is then
- * passed on marked as such: the agent is still working, not handing back control. Terminals no hook has spoken for
- * (an agent cmux does not hook, such as Agency today) are polled: output that stops changing for a
- * quiet window counts as a return. cmux has no bell or output event, so polling is the fallback.
+ * passed on marked as such: the agent is still working, not handing back control. Every terminal
+ * whose agent is not idle is also polled: output that stops changing for a quiet window counts
+ * as a return. That covers an agent cmux does not hook, and a hooked agent sitting mid-turn at a
+ * prompt that fires no stop (a permission or trust question); a hooked agent gets a longer window,
+ * because its stop normally speaks first. cmux has no bell or output event, so polling is the fallback.
  */
 exports.CMUX_STATUS_KEY = "ouro";
 exports.GRACE_MS = 3_000;
@@ -57,11 +59,15 @@ exports.GRACE_MS = 3_000;
 exports.BACKGROUND_GRACE_MS = 30_000;
 exports.POLL_MS = 4_000;
 exports.QUIET_MS = 8_000;
+/** A hooked agent mid-turn: long enough that a stop hook or a spinner normally speaks before the quiet screen does. */
+exports.HOOKED_QUIET_MS = 20_000;
 /** A quiet terminal judged as still working or not an agent is checked less often, doubling up to this. */
 exports.QUIET_MAX_MS = 300_000;
 const POLL_LINES = 40;
 const RECONNECT_DELAYS_MS = [1_000, 2_000, 5_000, 10_000, 30_000];
 const STOP_HOOKS = new Set(["Stop", "StopFailure"]);
+/** Hooks after which the agent waits for the human: a stop, or a session that has not been given work yet. */
+const IDLE_HOOKS = new Set([...STOP_HOOKS, "SessionStart"]);
 /** Hooks that say nothing about whether the main agent is working. */
 const NEUTRAL_HOOKS = new Set(["SubagentStop", "Notification"]);
 const NAMED_KEYS = new Set(["enter", "escape", "up", "down", "tab"]);
@@ -244,14 +250,17 @@ function createCmuxHost(client, options = {}) {
                     return;
                 const agent = str(payload._source) ?? str(frame.source) ?? "unknown";
                 const cwd = str(payload.cwd);
-                hooked.set(surface, { agent, cwd, sessionId });
+                const neutral = NEUTRAL_HOOKS.has(hook);
+                // An idle agent's return came from its stop; the quiet-screen poll leaves it alone until it works again.
+                hooked.set(surface, { agent, cwd, sessionId, idle: IDLE_HOOKS.has(hook) || (neutral && hooked.get(surface)?.idle === true) });
                 if (STOP_HOOKS.has(hook))
                     return stopped(surface, `cmux:${String(frame.boot_id)}:${String(frame.seq)}`, agent, sessionId, cwd);
-                if (NEUTRAL_HOOKS.has(hook))
+                if (neutral || hook === "SessionStart")
                     return;
-                // The agent is working again: no pending stop, and no stale status.
+                // The agent is working again: no pending stop, no stale status, and its quiet screen is checked at the normal pace.
                 cancelPending(surface);
                 clearStatus(surface);
+                quietMs.delete(surface);
                 // An agent that exited leaves a plain terminal, which the quiet-screen fallback watches again.
                 if (hook === "SessionEnd")
                     forget(surface);
@@ -285,10 +294,10 @@ function createCmuxHost(client, options = {}) {
                     },
                 });
             };
-            /** Terminals with no hook: output that changed and then held still for the quiet window is a return. */
+            /** Terminals whose agent is not idle: output that changed and then held still for the quiet window is a return. */
             const poll = async () => {
                 try {
-                    const terminals = (await surfaces()).filter((surface) => surface.type === "terminal" && !hooked.has(surface.id));
+                    const terminals = (await surfaces()).filter((surface) => surface.type === "terminal" && hooked.get(surface.id)?.idle !== true);
                     const seen = new Set(terminals.map((surface) => surface.id));
                     for (const id of screens.keys())
                         if (!seen.has(id))
@@ -303,9 +312,10 @@ function createCmuxHost(client, options = {}) {
                             screens.set(surface.id, { hash, changedAt: at, active: true });
                             clearStatus(surface.id);
                         }
-                        else if (last.active && at - last.changedAt >= (quietMs.get(surface.id) ?? exports.QUIET_MS)) {
+                        else if (last.active && at - last.changedAt >= Math.max(quietMs.get(surface.id) ?? exports.QUIET_MS, hooked.has(surface.id) ? exports.HOOKED_QUIET_MS : 0)) {
                             last.active = false;
-                            handlers.returned({ sessionId: surface.id, transitionId: `cmux:quiet:${surface.id}:${last.changedAt}`, agent: null, cwd: null, lastBody: null, backgroundWork: null });
+                            const hook = hooked.get(surface.id);
+                            handlers.returned({ sessionId: surface.id, transitionId: `cmux:quiet:${surface.id}:${last.changedAt}`, agent: hook?.agent ?? null, cwd: hook?.cwd ?? null, lastBody: null, backgroundWork: null });
                         }
                     }
                 }

package/dist/senses/shepherd/judge.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.REPLY_MAX_CHARS = void 0;
+exports.replyTextProblem = replyTextProblem;
 exports.safeReplyText = safeReplyText;
 exports.parseVerdict = parseVerdict;
 exports.judgeMessages = judgeMessages;
@@ -16,14 +17,24 @@ const CALLBACKS = { onModelStart: NOOP, onModelStreamStart: NOOP, onTextChunk: N
  * A reply that is safe to type: one line, short, and nothing an agent's input box treats as a
  * command (a leading `/`, `!` or `#`, an `@` mention, or a backslash escape). Because the terminal
  * may turn out to be a plain shell, nothing a shell treats as syntax either (`; $ \` | < > &`),
- * and no invisible formatting or bidirectional-override characters. Anything else is not sent;
- * the return is let through and logged.
+ * and no invisible formatting or bidirectional-override characters. Models write code-style
+ * backticks and line breaks out of habit, so those are dropped first: they are formatting, and
+ * without them nothing is left for a shell to substitute. Anything else is not sent; the return
+ * is let through and logged with what was wrong.
  */
+function replyTextProblem(text) {
+    const line = text.replace(/`/g, "").replace(/\s+/g, " ").trim();
+    if (!line)
+        return { problem: "an empty reply" };
+    if (line.length > exports.REPLY_MAX_CHARS)
+        return { problem: `a reply of ${line.length} characters (the limit is ${exports.REPLY_MAX_CHARS})` };
+    if (/[\\@;$|<>&\p{Cc}\p{Cf}]/u.test(line) || /^[/!#]/.test(line))
+        return { problem: "a reply with characters a terminal could read as a command" };
+    return { line };
+}
 function safeReplyText(text) {
-    const line = text.trim();
-    if (!line || line.length > exports.REPLY_MAX_CHARS || /[\r\n\\@;$`|<>&\p{Cc}\p{Cf}]/u.test(line) || /^[/!#]/.test(line))
-        return null;
-    return line;
+    const checked = replyTextProblem(text);
+    return "line" in checked ? checked.line : null;
 }
 /**
  * The JSON in a model's answer. Models differ: some wrap it in a code fence, some think aloud in
@@ -60,15 +71,16 @@ function parseVerdict(content) {
         return { kind, reply: null, reason, news: true };
     if (kind !== "premature")
         return { kind, reply: null, reason };
-    const reply = value.reply && typeof value.reply === "object" ? value.reply : {};
+    // Some models write the reply as a bare string instead of {"text": ...} or {"key": ...}; a string that is exactly a key is one.
+    const reply = typeof value.reply === "string" ? (KEYS.has(value.reply) ? { key: value.reply } : { text: value.reply }) : value.reply && typeof value.reply === "object" ? value.reply : {};
     if (typeof reply.key === "string" && KEYS.has(reply.key)) {
         // A key can approve a prompt, and a key from JSON found inside prose may be one the screen planted.
         if (parsed.inProse)
             return { kind: "unclear", reply: null, reason: `premature, but the key came from JSON inside prose: ${reason}` };
         return { kind, reply: { key: reply.key }, reason };
     }
-    const text = typeof reply.text === "string" ? safeReplyText(reply.text) : null;
-    return text ? { kind, reply: { text }, reason } : { kind: "unclear", reply: null, reason: `premature, but the judge gave no safe reply: ${reason}` };
+    const checked = typeof reply.text === "string" ? replyTextProblem(reply.text) : { problem: "no reply" };
+    return "line" in checked ? { kind, reply: { text: checked.line }, reason } : { kind: "unclear", reply: null, reason: `premature, but the judge gave ${checked.problem}: ${reason}` };
 }
 function judgeMessages(packet) {
     return [

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.911",
+  "version": "0.1.0-alpha.913",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@ouro.bot/cli",
-      "version": "0.1.0-alpha.911",
+      "version": "0.1.0-alpha.913",
       "dependencies": {
         "@anthropic-ai/sdk": "^0.78.0",
         "@azure/identity": "^4.13.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.911",
+  "version": "0.1.0-alpha.913",
   "engines": {
     "node": ">=22"
   },