@ouro.bot/cli 0.1.0-alpha.255 → 0.1.0-alpha.257

package/changelog.json

@@ -1,6 +1,21 @@
 {
   "_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.257",
+      "changes": [
+        "test(daemon): convert all `daemon-cli.test.ts` auth/thoughts/config tests to use `os.tmpdir()` via the new `createTmpBundle()` helper. Previously these tests wrote real bundles to `~/AgentBundles/auth-local-${Date.now()}.ouro` etc., relying on `try/finally` cleanup that doesn't fire on test interruption \u2014 leaking bundle directories into the developer's home and inflating noise on the running daemon. The `REAL_BUNDLES_WRITE_ALLOWLIST` ratchet in `test-isolation.contract.test.ts` is now empty.",
+        "fix(daemon/cli-exec): plumb `bundlesRoot` and `secretsRoot` deps through the auth.run / auth.verify / auth.switch / config.model / config.models / thoughts handlers so tests can route reads/writes to a tmpdir without monkey-patching the identity module. Production code paths still default to `getAgentBundlesRoot()` and `~/.agentsecrets`."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.256",
+      "changes": [
+        "fix(tui): cursor renders as inverse character (not inserted block) \u2014 matches standard terminal cursor behavior.",
+        "fix(tui): Alt+Enter via ESC-timing (50ms window) instead of raw stdin handler that interfered with arrow keys.",
+        "fix(tui): image path regex now matches backslash-escaped spaces from macOS drag-drop."
+      ]
+    },
     {
       "version": "0.1.0-alpha.255",
       "changes": [

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

@@ -1345,7 +1345,7 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
     }
     // ── auth (local, no daemon socket needed) ──
     if (command.kind === "auth.run") {
-        const provider = command.provider ?? (0, auth_flow_1.readAgentConfigForAgent)(command.agent).config.humanFacing.provider;
+        const provider = command.provider ?? (0, auth_flow_1.readAgentConfigForAgent)(command.agent, deps.bundlesRoot).config.humanFacing.provider;
         /* v8 ignore next -- tests always inject runAuthFlow; default is for production @preserve */
         const authRunner = deps.runAuthFlow ?? (await Promise.resolve().then(() => __importStar(require("../auth/auth-flow")))).runRuntimeAuthFlow;
         const result = await authRunner({
@@ -1359,7 +1359,7 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
         // Verify the credentials actually work by pinging the provider
         /* v8 ignore start -- integration: real API ping after auth @preserve */
         try {
-            const { secrets } = (0, auth_flow_1.loadAgentSecrets)(command.agent);
+            const { secrets } = (0, auth_flow_1.loadAgentSecrets)(command.agent, { secretsRoot: deps.secretsRoot });
             const status = await verifyProviderCredentials(provider, secrets.providers);
             deps.writeStdout(`${provider}: ${status}`);
         }
@@ -1372,7 +1372,7 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
     // ── auth verify (local, no daemon socket needed) ──
     /* v8 ignore start -- auth verify/switch: tested in daemon-cli.test.ts but v8 traces differ in CI @preserve */
     if (command.kind === "auth.verify") {
-        const { secrets } = (0, auth_flow_1.loadAgentSecrets)(command.agent);
+        const { secrets } = (0, auth_flow_1.loadAgentSecrets)(command.agent, { secretsRoot: deps.secretsRoot });
         const providers = secrets.providers;
         if (command.provider) {
             const status = await verifyProviderCredentials(command.provider, providers);
@@ -1391,7 +1391,7 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
     }
     // ── auth switch (local, no daemon socket needed) ──
     if (command.kind === "auth.switch") {
-        const { secrets } = (0, auth_flow_1.loadAgentSecrets)(command.agent);
+        const { secrets } = (0, auth_flow_1.loadAgentSecrets)(command.agent, { secretsRoot: deps.secretsRoot });
         const providerSecrets = secrets.providers[command.provider];
         if (!providerSecrets || !hasStoredCredentials(command.provider, providerSecrets)) {
             const message = `no credentials stored for ${command.provider}. Run \`ouro auth --agent ${command.agent} --provider ${command.provider}\` first.`;
@@ -1406,11 +1406,11 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
             return message;
         }
         if (command.facing) {
-            (0, auth_flow_1.writeAgentProviderSelection)(command.agent, command.facing, command.provider);
+            (0, auth_flow_1.writeAgentProviderSelection)(command.agent, command.facing, command.provider, deps.bundlesRoot);
         }
         else {
-            (0, auth_flow_1.writeAgentProviderSelection)(command.agent, "human", command.provider);
-            (0, auth_flow_1.writeAgentProviderSelection)(command.agent, "agent", command.provider);
+            (0, auth_flow_1.writeAgentProviderSelection)(command.agent, "human", command.provider, deps.bundlesRoot);
+            (0, auth_flow_1.writeAgentProviderSelection)(command.agent, "agent", command.provider, deps.bundlesRoot);
         }
         const message = `switched ${command.agent} to ${command.provider} (verified working)`;
         deps.writeStdout(message);
@@ -1420,14 +1420,14 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
     // ── config models (local, no daemon socket needed) ──
     /* v8 ignore start -- config models: tested via daemon-cli.test.ts @preserve */
     if (command.kind === "config.models") {
-        const { config } = (0, auth_flow_1.readAgentConfigForAgent)(command.agent);
+        const { config } = (0, auth_flow_1.readAgentConfigForAgent)(command.agent, deps.bundlesRoot);
         const provider = config.humanFacing.provider;
         if (provider !== "github-copilot") {
             const message = `model listing not available for ${provider} — check provider documentation.`;
             deps.writeStdout(message);
             return message;
         }
-        const { secrets } = (0, auth_flow_1.loadAgentSecrets)(command.agent);
+        const { secrets } = (0, auth_flow_1.loadAgentSecrets)(command.agent, { secretsRoot: deps.secretsRoot });
         const ghConfig = secrets.providers["github-copilot"];
         if (!ghConfig.githubToken || !ghConfig.baseUrl) {
             throw new Error(`github-copilot credentials not configured. Run \`ouro auth --agent ${command.agent} --provider github-copilot\` first.`);
@@ -1454,10 +1454,10 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
     if (command.kind === "config.model") {
         const facing = command.facing ?? "human";
         // Validate model availability for github-copilot before writing
-        const { config } = (0, auth_flow_1.readAgentConfigForAgent)(command.agent);
+        const { config } = (0, auth_flow_1.readAgentConfigForAgent)(command.agent, deps.bundlesRoot);
         const facingConfig = facing === "human" ? config.humanFacing : config.agentFacing;
         if (facingConfig.provider === "github-copilot") {
-            const { secrets } = (0, auth_flow_1.loadAgentSecrets)(command.agent);
+            const { secrets } = (0, auth_flow_1.loadAgentSecrets)(command.agent, { secretsRoot: deps.secretsRoot });
             const ghConfig = secrets.providers["github-copilot"];
             if (ghConfig.githubToken && ghConfig.baseUrl) {
                 const fetchFn = deps.fetchImpl ?? fetch;
@@ -1482,7 +1482,7 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
                 }
             }
         }
-        const { provider, previousModel } = (0, auth_flow_1.writeAgentModel)(command.agent, facing, command.modelName);
+        const { provider, previousModel } = (0, auth_flow_1.writeAgentModel)(command.agent, facing, command.modelName, { bundlesRoot: deps.bundlesRoot });
         const message = previousModel
             ? `updated ${command.agent} model on ${provider}: ${previousModel} → ${command.modelName}`
             : `set ${command.agent} model on ${provider}: ${command.modelName}`;
@@ -1569,7 +1569,9 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
     if (command.kind === "thoughts") {
         try {
             const agentName = command.agent ?? (0, identity_1.getAgentName)();
-            const agentRoot = path.join((0, identity_1.getAgentBundlesRoot)(), `${agentName}.ouro`);
+            /* v8 ignore next -- production fallback: tests always inject bundlesRoot via createTmpBundle @preserve */
+            const bundlesRoot = deps.bundlesRoot ?? (0, identity_1.getAgentBundlesRoot)();
+            const agentRoot = path.join(bundlesRoot, `${agentName}.ouro`);
             const sessionFilePath = (0, thoughts_1.getInnerDialogSessionPath)(agentRoot);
             if (command.json) {
                 try {

package/dist/senses/cli/image-paste.js

@@ -113,8 +113,8 @@ function formatImageRef(n) {
 function replacePathsWithRefs(input) {
     const images = new Map();
     // Match absolute paths starting with / that end with an image extension.
-    // Allow backslash-escaped characters (like `\ ` for spaces in macOS drag-drop).
-    const pathRegex = /(\/(?:[^\s\\]|\\.)+\.(?:png|jpe?g|gif|webp))/gi;
+    // Allow backslash-escaped spaces (like `\ ` from macOS drag-drop).
+    const pathRegex = /(\/(?:[^\s]|\\ )+\.(?:png|jpe?g|gif|webp))/gi;
     let counter = 0;
     const text = input.replace(pathRegex, (match) => {
         counter++;

package/dist/senses/cli/ouro-tui.js

@@ -163,23 +163,10 @@ function InputArea({ onSubmit, onCtrlC, history, queuedInputs, onPopQueue, agent
     const cursorRef = (0, react_1.useRef)(0);
     const historyIdx = (0, react_1.useRef)(-1);
     const savedInput = (0, react_1.useRef)("");
-    // Raw stdin handler for Alt+Enter (ESC + CR/LF) — Ink 3.2's useInput splits
-    // \x1b\r into separate events, so we catch the combined sequence here.
-    const { stdin } = (0, ink_1.useStdin)();
-    (0, react_1.useEffect)(() => {
-        if (!stdin)
-            return;
-        const onData = (data) => {
-            const str = data.toString("utf-8");
-            if (str === "\x1b\r" || str === "\x1b\n") {
-                const before = inputRef.current.slice(0, cursorRef.current);
-                const after = inputRef.current.slice(cursorRef.current);
-                updateInput(before + "\n" + after, cursorRef.current + 1);
-            }
-        };
-        stdin.on("data", onData);
-        return () => { stdin.off("data", onData); };
-    }, [stdin]); // eslint-disable-line react-hooks/exhaustive-deps
+    // Track last ESC timestamp for Alt+Enter detection.
+    // Ink 3.2 splits \x1b\r into separate escape + return events.
+    // We detect the pattern by checking if Return arrives within 50ms of Escape.
+    const lastEscTime = (0, react_1.useRef)(0);
     const tooltipTimerRef = (0, react_1.useRef)(null);
     (0, react_1.useEffect)(() => () => {
         if (tooltipTimerRef.current)
@@ -223,6 +210,7 @@ function InputArea({ onSubmit, onCtrlC, history, queuedInputs, onPopQueue, agent
         // Any non-Ctrl-C input clears tooltip
         setTooltip("");
         if (key.escape) {
+            lastEscTime.current = Date.now();
             if (inputRef.current) {
                 updateInput("");
                 historyIdx.current = -1;
@@ -243,8 +231,10 @@ function InputArea({ onSubmit, onCtrlC, history, queuedInputs, onPopQueue, agent
             return;
         }
         if (key.return) {
-            // Alt+Enter or Shift+Enter: insert newline
-            if (key.meta || key.shift) {
+            // Alt+Enter: detect via key.meta OR recent ESC (within 50ms — Ink splits \x1b\r)
+            const recentEsc = (Date.now() - lastEscTime.current) < 50;
+            if (key.meta || key.shift || recentEsc) {
+                lastEscTime.current = 0;
                 const before = inputRef.current.slice(0, cursorRef.current);
                 const after = inputRef.current.slice(cursorRef.current);
                 updateInput(before + "\n" + after, cursorRef.current + 1);
@@ -399,7 +389,9 @@ function InputArea({ onSubmit, onCtrlC, history, queuedInputs, onPopQueue, agent
     });
     const isMultiline = input.includes("\n");
     const inputLines = input.split("\n");
-    return ((0, jsx_runtime_1.jsxs)(ink_1.Box, { flexDirection: "column", children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: "─".repeat(termWidth()) }), isMultiline ? ((0, jsx_runtime_1.jsx)(ink_1.Box, { flexDirection: "column", children: inputLines.map((line, i) => ((0, jsx_runtime_1.jsxs)(ink_1.Box, { children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.teal, bold: true, children: i === 0 ? ") " : "· " }), (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.bone, children: line }), i === inputLines.length - 1 ? (cursorVisible ? (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.scale, children: "█" }) : (0, jsx_runtime_1.jsx)(ink_1.Text, { children: " " })) : null] }, i))) })) : ((0, jsx_runtime_1.jsxs)(ink_1.Box, { children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.teal, bold: true, children: ") " }), !input && queuedInputs.length > 0 ? ((0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.shadow, children: "Press up to edit queued messages" })) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.bone, children: input.slice(0, cursorPos) }), cursorVisible ? (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.scale, children: "█" }) : (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.bone, children: input[cursorPos] ?? " " }), (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.bone, children: input.slice(cursorPos + (cursorVisible ? 0 : 1)) })] }))] })), (0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: "─".repeat(termWidth()) }), (0, jsx_runtime_1.jsxs)(ink_1.Box, { children: [(0, jsx_runtime_1.jsxs)(ink_1.Text, { dimColor: true, children: ["  ", agentName, model ? ` · ${model}` : "", " \u00B7 /help"] }), (0, jsx_runtime_1.jsx)(ink_1.Box, { flexGrow: 1 }), tooltip ? (0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: tooltip }) : (0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: "opt+enter for newline" })] })] }));
+    return ((0, jsx_runtime_1.jsxs)(ink_1.Box, { flexDirection: "column", children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: "─".repeat(termWidth()) }), isMultiline ? ((0, jsx_runtime_1.jsx)(ink_1.Box, { flexDirection: "column", children: inputLines.map((line, i) => ((0, jsx_runtime_1.jsxs)(ink_1.Box, { children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.teal, bold: true, children: i === 0 ? ") " : "· " }), (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.bone, children: line }), i === inputLines.length - 1 ? (cursorVisible ? (0, jsx_runtime_1.jsx)(ink_1.Text, { inverse: true, children: " " }) : (0, jsx_runtime_1.jsx)(ink_1.Text, { children: " " })) : null] }, i))) })) : ((0, jsx_runtime_1.jsxs)(ink_1.Box, { children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.teal, bold: true, children: ") " }), !input && queuedInputs.length > 0 ? ((0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.shadow, children: "Press up to edit queued messages" })) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.bone, children: input.slice(0, cursorPos) }), cursorVisible
+                                ? (0, jsx_runtime_1.jsx)(ink_1.Text, { inverse: true, children: input[cursorPos] ?? " " })
+                                : (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.bone, children: input[cursorPos] ?? " " }), (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.bone, children: input.slice(cursorPos + 1) })] }))] })), (0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: "─".repeat(termWidth()) }), (0, jsx_runtime_1.jsxs)(ink_1.Box, { children: [(0, jsx_runtime_1.jsxs)(ink_1.Text, { dimColor: true, children: ["  ", agentName, model ? ` · ${model}` : "", " \u00B7 /help"] }), (0, jsx_runtime_1.jsx)(ink_1.Box, { flexGrow: 1 }), tooltip ? (0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: tooltip }) : (0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: "opt+enter for newline" })] })] }));
 }
 // ─── Main TUI Component ─────────────────────────────────────────────
 function OuroTui({ agentName, model, completedMessages, inputHistory, queuedInputs, live, elapsedSeconds, contextPercent, onSubmit, onCtrlC, onPopQueue, cwd, resumeInfo, onImageMap, }) {

package/package.json

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