@ouro.bot/cli 0.1.0-alpha.277 → 0.1.0-alpha.279

package/changelog.json

@@ -1,13 +1,25 @@
 {
   "_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.279",
+      "changes": [
+        "fix(tui): paste cursor to end of pasted text, ANSI string rendering for wrapped-line cursor, Option+Backspace word-delete, fn+Delete forward-delete, strip ANSI and \\r from paste."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.278",
+      "changes": [
+        "fix(identity): spread-with-validation loader eliminates the field-drop bug class that caused #349 (silent `sync` drop). Two distinct structural bugs fixed, one in each agent.json loader: (1) `loadAgentConfig` in `src/heart/identity.ts` previously built the returned `AgentConfig` via a hand-rolled object literal that listed every field explicitly \u2014 any new field on `AgentConfig` that wasn't added to this literal got silently dropped. Root cause of #349. Refactored to a spread-then-override pattern: start with `{ ...parsed as AgentConfig }`, then explicitly override `version`, `enabled`, `humanFacing`, `agentFacing`, `senses`, `phrases` which need validation/normalization. The deprecated `provider` field is re-attached from the validated `rawProvider` check. (2) `readAgentConfigForAgent` in `src/heart/auth/auth-flow.ts` previously did `parsed as unknown as AgentConfig` which passed through ALL fields unconditionally (so no silent drops) but ALSO had zero per-field validation \u2014 any garbage in agent.json leaked into the returned config. Refactored to apply the same spread-with-validation pattern, reusing `normalizeSenses` (now exported from identity.ts). Both entry points now return equivalent configs for the same agent.json file. New `src/__tests__/heart/identity-fixture.ts` exports `FULL_AGENT_JSON satisfies DeepRequired<AgentConfig>` \u2014 a compile-time regression guard that fails to build if any new field is added to `AgentConfig` without updating the fixture. Two new test files: `identity-contract.test.ts` exercises `readAgentConfigForAgent` with `createTmpBundle`; `identity-load-contract.test.ts` exercises `loadAgentConfig` via `vi.mock(\"fs\")` (split to avoid the fs-mock-vs-real-fs conflict). 7 tests total."
+      ]
+    },
     {
       "version": "0.1.0-alpha.277",
       "changes": [
-        "feat(pulse): multi-agent situational awareness for peer agents on the same machine. The harness scales horizontally — multiple peer agents share a machine, each with their own identity and bundle (the Bob model from We Are Legion / We Are Bob). Without explicit awareness, peer agents are isolated workers who don't even know each other exist. The pulse fixes that.",
+        "feat(pulse): multi-agent situational awareness for peer agents on the same machine. The harness scales horizontally \u2014 multiple peer agents share a machine, each with their own identity and bundle (the Bob model from We Are Legion / We Are Bob). Without explicit awareness, peer agents are isolated workers who don't even know each other exist. The pulse fixes that.",
         "feat(pulse): new `src/heart/daemon/pulse.ts` module. Daemon writes `~/.ouro-cli/pulse.json` whenever any managed agent's snapshot changes (status, errorReason, fixHint, etc.). Each entry includes name, bundle path, status, last-seen-at, errorReason+fixHint when broken, alertId for at-most-once delivery tracking, and currentActivity (read from each agent's `state/sessions/self/inner/runtime.json` when running). Pure helpers `buildPulseState`, `findNovelBrokenAgents`, `findRecoveredAgents`, `pickWakeRecipient`, `flushPulse`, `readAgentActivity`, `buildAlertId`, `buildRecoveryAlertId`, `pruneDeliveredState` exported for unit coverage; I/O wrappers `writePulse`, `readPulse`, `writeDeliveredState`, `readDeliveredState` use injectable deps.",
         "feat(pulse): both passive AND active surfacing. Passive: every agent's prompt assembly renders a `## the pulse` section in Group 7 (dynamic state) showing siblings grouped into broken / reachable / idle buckets. Self-excluded so each agent describes its peers, not itself. Renders nothing on single-agent machines (zero token cost). Active: when a sibling newly breaks (or recovers), the daemon fires `inner.wake` on the most-recently-active running agent so the user finds out within seconds rather than next-time-they-talk-to-someone. Persistent at-most-once delivery via `~/.ouro-cli/pulse-delivered.json` so daemon restarts don't re-page.",
-        "feat(pulse): horizontal-scaling norm in bodyMapSection. New `### peers` subsection teaches the agent the Bob model directly: 'i talk first. when i need a sibling's help, i `send_message` them — that's how peers coordinate, the same way humans on a team do. i only open a sibling's bundle directly via read_file/glob/grep when conversation isn't possible (they're crashed, sleeping, or i need history they haven't surfaced).' Direct declarative voice — no hedging, no soft modal verbs.",
+        "feat(pulse): horizontal-scaling norm in bodyMapSection. New `### peers` subsection teaches the agent the Bob model directly: 'i talk first. when i need a sibling's help, i `send_message` them \u2014 that's how peers coordinate, the same way humans on a team do. i only open a sibling's bundle directly via read_file/glob/grep when conversation isn't possible (they're crashed, sleeping, or i need history they haven't surfaced).' Direct declarative voice \u2014 no hedging, no soft modal verbs.",
         "feat(daemon): `DaemonAgentSnapshot` gains `errorReason` and `fixHint` fields, populated by `checkAgentConfig` results in `startAgent` (set on failure, cleared on recovery). Cleared error fields are how the recovery wake fires: when a previously-broken agent transitions to running with `errorReason: null`, `findRecoveredAgents` flags it.",
         "feat(daemon): `DaemonProcessManager` gains `onSnapshotChange` callback option. Called after every snapshot mutation (start, exit, config-fail, recovery, restart-exhausted). Errors from the observer are swallowed so lifecycle code never breaks because the observer threw. The daemon-entry registers a callback that calls `flushPulse` to update the pulse state and fire wakes.",
         "feat(daemon): wake recipient picker (`pickWakeRecipient`) chooses the most-recently-active running sibling. Excludes the broken agent itself, non-running siblings, and siblings that have never been seen alive. Returns null when no eligible recipient exists, in which case the alert is still marked delivered to avoid spam on subsequent flushes."
@@ -16,7 +28,7 @@
     {
       "version": "0.1.0-alpha.276",
       "changes": [
-        "fix(nerves): root-cause the `start_end_pairing` audit flake on `daemon.server_start`, `daemon.update_checker_start`, and `daemon.apply_pending_updates_start`. Three fixes: (1) `applyPendingUpdates` in `update-hooks.ts` now wraps its body in try/finally so `_end` always fires, including on the early returns for `!fs.existsSync(bundlesRoot)` and `readdirSync` throws that previously orphaned the `_start`. (2) `daemon.start()` now wraps the ~380-line startup body in a try/catch that emits `daemon.server_error` with the error message and rethrows — the audit's pairing rule accepts `_end` OR `_error` as a valid closure for a `_start`, so startup throws no longer orphan `server_start`. The body was extracted to a private `startInner()` method to keep the try/catch small and readable. (3) `startUpdateChecker` callers in the update-checker test suite were already paired via an `afterEach(stopUpdateChecker)`; audited and confirmed no new unpaired callers. Also adds a vitest `afterEach` pairing guard in `src/__tests__/nerves/global-capture.ts` that fails loudly on any orphaned lifecycle `_start` in a test's per-test event stream — scoped to the three lifecycle events above so it catches regressions without false-positiving on legitimate narrow-slice operational events like `repertoire.task_scan_start`. New `src/__tests__/nerves/pairing-regression.test.ts` locks in the contract with 5 tests (nonexistent-dir, readdirSync-throws, happy-path, startUpdateChecker-pair, daemon-start-throw). Three consecutive `npm run test:coverage` runs confirm zero flakes on the target events."
+        "fix(nerves): root-cause the `start_end_pairing` audit flake on `daemon.server_start`, `daemon.update_checker_start`, and `daemon.apply_pending_updates_start`. Three fixes: (1) `applyPendingUpdates` in `update-hooks.ts` now wraps its body in try/finally so `_end` always fires, including on the early returns for `!fs.existsSync(bundlesRoot)` and `readdirSync` throws that previously orphaned the `_start`. (2) `daemon.start()` now wraps the ~380-line startup body in a try/catch that emits `daemon.server_error` with the error message and rethrows \u2014 the audit's pairing rule accepts `_end` OR `_error` as a valid closure for a `_start`, so startup throws no longer orphan `server_start`. The body was extracted to a private `startInner()` method to keep the try/catch small and readable. (3) `startUpdateChecker` callers in the update-checker test suite were already paired via an `afterEach(stopUpdateChecker)`; audited and confirmed no new unpaired callers. Also adds a vitest `afterEach` pairing guard in `src/__tests__/nerves/global-capture.ts` that fails loudly on any orphaned lifecycle `_start` in a test's per-test event stream \u2014 scoped to the three lifecycle events above so it catches regressions without false-positiving on legitimate narrow-slice operational events like `repertoire.task_scan_start`. New `src/__tests__/nerves/pairing-regression.test.ts` locks in the contract with 5 tests (nonexistent-dir, readdirSync-throws, happy-path, startUpdateChecker-pair, daemon-start-throw). Three consecutive `npm run test:coverage` runs confirm zero flakes on the target events."
       ]
     },
     {

package/dist/heart/auth/auth-flow.js

@@ -159,9 +159,18 @@ function readAgentConfigForAgent(agentName, bundlesRoot = (0, identity_1.getAgen
     if (!agentFacing || typeof agentFacing !== "object") {
         throw new Error(`agent.json at ${configPath} has unsupported provider '${String(parsed.provider)}'`);
     }
+    // Spread-with-validation: same pattern as loadAgentConfig to eliminate
+    // the unvalidated-pass-through bug class. The spread carries through
+    // every field present in parsed; senses goes through the same
+    // normalization as loadAgentConfig so the two entry points return
+    // equivalent configs for the same file.
+    const config = {
+        ...parsed,
+        senses: (0, identity_1.normalizeSenses)(parsed.senses, configPath),
+    };
     return {
         configPath,
-        config: parsed,
+        config,
     };
 }
 function writeAgentProviderSelection(agentName, facing, provider, bundlesRoot = (0, identity_1.getAgentBundlesRoot)()) {

package/dist/heart/identity.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HARNESS_CANONICAL_REPO_URL = exports.DEFAULT_AGENT_SENSES = exports.DEFAULT_VAULT_SERVER_URL = exports.DEFAULT_AGENT_PHRASES = exports.DEFAULT_AGENT_CONTEXT = exports.PROVIDER_CREDENTIALS = void 0;
 exports.resolveVaultConfig = resolveVaultConfig;
+exports.normalizeSenses = normalizeSenses;
 exports.buildDefaultAgentTemplate = buildDefaultAgentTemplate;
 exports.getAgentName = getAgentName;
 exports.getRepoRoot = getRepoRoot;
@@ -404,27 +405,27 @@ function loadAgentConfig() {
     // Tolerate deprecated provider field for backward compatibility
     const rawProvider = parsed.provider;
     const provider = isValidProvider(rawProvider) ? rawProvider : undefined;
+    // Spread parsed first so any field present in AgentConfig is carried
+    // through by default, then explicitly override the fields that need
+    // validation or normalization. This eliminates the field-drop bug class
+    // that caused the `sync` block (and previously `shell`) to be silently
+    // omitted from the returned config. Regression-guarded by the
+    // Required<AgentConfig> contract test in identity-contract.test.ts.
     const config = {
+        ...parsed,
         version,
         enabled,
-        ...(provider !== undefined ? { provider } : {}),
         humanFacing,
         agentFacing,
-        context: parsed.context,
-        logging: parsed.logging,
         senses: normalizeSenses(parsed.senses, configFile),
-        mcpServers: parsed.mcpServers,
         phrases: parsed.phrases,
-        vault: parsed.vault,
-        // The sync block was missing from this hand-rolled object literal since
-        // it was added to AgentConfig. Result: `getSyncConfig()` always read
-        // `agentConfig.sync?.enabled ?? false` and always saw undefined, so the
-        // entire sync code path (preTurnPull / postTurnPush in pipeline.ts) was
-        // dead. The `ouro status` per-agent Git Sync display kept reporting
-        // "enabled" because it reads agent.json directly via `listBundleSyncRows`,
-        // not through loadAgentConfig — so the bug hid in plain sight for weeks.
-        sync: parsed.sync,
     };
+    if (provider !== undefined) {
+        config.provider = provider;
+    }
+    else {
+        delete config.provider;
+    }
     (0, runtime_1.emitNervesEvent)({
         event: "identity.resolve",
         component: "config/identity",

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

@@ -282,23 +282,26 @@ function InputArea({ onSubmit, onCtrlC, history, queuedInputs, onPopQueue, agent
             historyIdx.current = -1;
             return;
         }
-        // Backspace / Delete: Ink 3.2 maps \x7f (macOS backspace) to key.delete,
-        // and \x08 to key.backspace. Both mean "delete backward" on macOS.
-        // Only \x1b[3~ (fn+Backspace) is true forward-delete — but Ink also maps
-        // it to key.delete. We treat key.backspace OR key.delete as backspace
-        // (since \x7f is the common case), and handle forward-delete via Ctrl+D.
+        // Backspace / Forward Delete:
+        // Ink 3.2 maps \x7f (macOS backspace) to key.delete (meta=false).
+        // Ink maps \x1b[3~ (fn+Delete / forward delete) to key.delete (meta=true,
+        // because \x1b prefix triggers meta detection).
+        // Ink maps \x08 (Ctrl+H style) to key.backspace.
+        // Distinguishing: key.meta differentiates fn+Delete from plain backspace.
+        if ((key.backspace || key.delete) && key.meta) {
+            // fn+Delete: forward delete
+            const result = (0, input_keys_1.handleForwardDelete)(inputRef.current, cursorRef.current);
+            updateInput(result.text, result.cursorPos);
+            historyIdx.current = -1;
+            return;
+        }
         if (key.backspace || key.delete) {
+            // Plain backspace: delete backward
             if (cursorRef.current > 0) {
-                // Token-aware: check for image ref chip before cursor
                 const chip = (0, image_ref_navigation_1.deleteTokenBefore)(inputRef.current, cursorRef.current);
                 if (chip) {
                     updateInput(chip.text, chip.pos);
                 }
-                else if (key.meta) {
-                    // Option+Backspace: delete word (also pushes to kill ring)
-                    const result = (0, input_keys_1.handleKillWordBack)(inputRef.current, cursorRef.current, killRing);
-                    updateInput(result.text, result.cursorPos);
-                }
                 else {
                     const result = (0, input_keys_1.handleBackspace)(inputRef.current, cursorRef.current);
                     updateInput(result.text, result.cursorPos);
@@ -503,6 +506,23 @@ function InputArea({ onSubmit, onCtrlC, history, queuedInputs, onPopQueue, agent
                 updateInput(result.text, result.cursorPos);
             return;
         }
+        // Option+Backspace: Ink parses \x1b\x7f as meta=true, inputChar="" (empty because
+        // \x7f matches key.delete but the whole input was \x1b\x7f not \x7f).
+        // Signature: key.meta && !inputChar && !key.escape && !key.return
+        if (key.meta && !inputChar && !key.escape && !key.return && !key.tab) {
+            if (cursorRef.current > 0) {
+                const chip = (0, image_ref_navigation_1.deleteTokenBefore)(inputRef.current, cursorRef.current);
+                if (chip) {
+                    updateInput(chip.text, chip.pos);
+                }
+                else {
+                    const result = (0, input_keys_1.handleKillWordBack)(inputRef.current, cursorRef.current, killRing);
+                    updateInput(result.text, result.cursorPos);
+                }
+            }
+            historyIdx.current = -1;
+            return;
+        }
         // ─── Non-kill/non-yank keystroke resets ────────────────────────
         killRing.resetAccumulation();
         killRing.resetYankState();
@@ -538,17 +558,31 @@ function InputArea({ onSubmit, onCtrlC, history, queuedInputs, onPopQueue, agent
             return;
         // Regular character: insert at cursor position
         if (!key.ctrl && !key.meta && inputChar) {
+            // Strip ANSI escape codes and normalize \r to \n (SSH/paste compat)
+            const cleaned = inputChar.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "").replace(/\r\n?/g, "\n");
+            if (!cleaned)
+                return;
             const before = inputRef.current.slice(0, cursorRef.current);
             const after = inputRef.current.slice(cursorRef.current);
-            updateInput(before + inputChar + after, cursorRef.current + 1);
+            updateInput(before + cleaned + after, cursorRef.current + cleaned.length);
             historyIdx.current = -1;
         }
     });
     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, { backgroundColor: OURO.scale, color: "#000000", 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, { backgroundColor: OURO.scale, color: "#000000", 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" })] })] }));
+    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, { backgroundColor: OURO.scale, color: "#000000", children: " " }) : (0, jsx_runtime_1.jsx)(ink_1.Text, { children: " " })) : null] }, i))) })) : ((0, jsx_runtime_1.jsx)(ink_1.Box, { children: (0, jsx_runtime_1.jsx)(ink_1.Text, { wrap: "wrap", children: (() => {
+                        const prompt = `\x1b[1m\x1b[38;2;78;201;176m) \x1b[0m`;
+                        if (!input && queuedInputs.length > 0) {
+                            return `${prompt}\x1b[38;2;112;131;115mPress up to edit queued messages\x1b[0m`;
+                        }
+                        const beforeCursor = `\x1b[38;2;238;242;234m${input.slice(0, cursorPos)}\x1b[0m`;
+                        const cursorChar = input[cursorPos] ?? " ";
+                        const cursor = cursorVisible
+                            ? `\x1b[48;2;47;143;78m\x1b[38;2;0;0;0m${cursorChar}\x1b[0m`
+                            : `\x1b[38;2;238;242;234m${cursorChar}\x1b[0m`;
+                        const afterCursor = `\x1b[38;2;238;242;234m${input.slice(cursorPos + 1)}\x1b[0m`;
+                        return `${prompt}${beforeCursor}${cursor}${afterCursor}`;
+                    })() }) })), (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, onHistoryAdd, }) {

package/package.json

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