@ouro.bot/cli 0.1.0-alpha.907 → 0.1.0-alpha.909

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.909",
+      "changes": [
+        "The Butler's name check reads names one way everywhere: an italic action like *preens* is no longer taken for a name, and a name the sources hold counts even when typed in lowercase. The replay gate now uses the shipped check instead of its own copy."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.908",
+      "changes": [
+        "Vault commands use the Bitwarden CLI that ships with ouro (pinned 2026.6.0) instead of whichever bw is first on PATH. bw 2026.9 runs a user key id migration on sign-in that our Vaultwarden server answers with 404, so ouro vault unlock and create failed on machines with a newer global bw.",
+        "The bundled bw runs under ouro's own Node, so it works with no node on PATH and on Windows. A missing bundled bw is logged as repertoire.bw_cli_bundled_missing before ouro falls back to PATH, and the fallback npm install uses the same pinned version.",
+        "OURO_BW_BINARY names a specific bw to use ahead of the bundled one, for tests and unusual installs; ouro refuses it with a clear error when it is not an executable file.",
+        "ouro vault unlock now shows each step while it checks vault access: which bw it uses, pointing bw at the server, signing in or unlocking, syncing, and any retry with its reason."
+      ]
+    },
     {
       "version": "0.1.0-alpha.907",
       "changes": [

package/deploy/unraid/sanctuary-replay-gate.mjs

@@ -78,86 +78,11 @@ const SHELL_SEGMENT_SEPARATOR = /&&|\|\||[;|\n]/
 export const shellCommandOf = (args) => { try { const parsed = JSON.parse(String(args ?? "")); return typeof parsed?.command === "string" ? parsed.command : "" } catch { return String(args ?? "") } }
 export const isLookupCall = (call) => call.name === "web_search" || call.name === "media_search" || call.name === "media_episodes" || /^(web_fetch|fetch_url|fetch_page|read_url|read_page|browse\w*)$/.test(call.name) || (call.name === "shell" && shellCommandOf(call.args).split(SHELL_SEGMENT_SEPARATOR).some((segment) => SHELL_LOOKUP_SEGMENT.test(segment)))
 
-const HOUSE_WORDS = "Ari Butler Claude Code Sonarr Radarr Jellyfin Sanctuary Telegram Unraid Mendelow Cloud Calibre Books Jellyseerr Prowlarr calibre-web readarr lidarr overseerr tautulli sabnzbd deluge delugevpn binhex"
-const CAPITALISED = /\p{Lu}[\p{L}\p{M}'\u2019]*/gu
-// Ordinary words that open a sentence or a bullet; any other capitalised word there is a candidate name only with a sign it is one (the runtime check does the same, and a test keeps the two in step).
-export const STARTERS = new Set(("the this that these those it its i so and but or yes no not sure okay ok here there what when where why how who which if then now also both one two my your our we you he she they " +
-  "got thanks thank done understood noted good great fine sorry will can could would should let yeah yep nope right well anyway still just all any some each every for from with without to in on at by as is are " +
-  "was were do does did have has had maybe probably honestly unfortunately looks seems see check try use make keep stop start once first next last before after because since while though although however " +
-  "otherwise instead meanwhile today tonight tomorrow yesterday more most many other another such only even about over under between like nothing something everything anything everyone someone anyone " +
-  "overall basically actually generally usually often sometimes never always note tip warning update summary answer plan status result results source sources todo among per plus either neither whether yet nobody heads").split(" "))
-// Status verbs and media nouns that fill ordinary replies; never names, wherever they sit.
-export const EXEMPT_WORDS = new Set(("added adding found finding sent sending searching searched grabbing grabbed grab season seasons episode episodes queued queueing monitoring monitored imported importing " +
-  "downloading downloaded download downloads requested requesting removed removing deleted updated updating checking checked looking looked started starting finished finishing waiting stalled retrying retried " +
-  "marked set setting assigned assigning movie movies show shows book books series film films less tell ready missing available unavailable specials special").split(" "))
-export const LABEL_WORDS = new Set(("note notes tip warning update summary answer plan status result results source sources todo next why how what done reply title healthy snoozed down up broken failed pending " +
-  "running stopped paused queued cast characters authors books series shows movies episodes tldr caveat caveats options option").split(" "))
-export const STRICT_OPENERS = new Set("too mock very just same such quite rather really kind sort bit less fairly mostly almost simply much little big small high low hard pure plain cheap hmm hm well okay ok yes yeah sure right also great nice cool done sorry thanks thank perfect fine good alright first second third then now so short quick".split(" "))
-const STRICT_SIGN = /^(?:\s*[,:\u2014\u2013]|\s+(?:if|for)\s)/
-// Strict mode (the person asked for names): a sentence opener is a name when a comma, colon, dash, "if" or "for" follows it, it is not an ordinary opener or an -ing/-ly word, and the reply never uses it lowercase.
-export const strictOpenerName = (body, after, lower) => !(STRICT_OPENERS.has(lower) || /(?:ing|ly)$/.test(lower) || !STRICT_SIGN.test(after)) && !new RegExp(`(?<![\\p{L}\\p{N}])${escapeRegExp(lower)}(?![\\p{L}\\p{N}])`, "u").test(body)
-const CONTRACTION = /^\p{L}+['\u2019](?:ll|m|re|ve|d|t)$/iu
-const COPULA_AFTER = /^(?:['\u2019]s\b|\s+(?:is|was|are|were|isn['\u2019]t|wasn['\u2019]t|has|had|does|did)\b)/i
-
 const escapeRegExp = (text) => text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
 /** Whole-word, case-insensitive, Unicode-aware: "Dross" is not found inside "Drossel". */
 export const mentionsWord = (haystack, name) => new RegExp(`(?<![\\p{L}\\p{N}])${escapeRegExp(name)}(?![\\p{L}\\p{N}])`, "iu").test(String(haystack ?? ""))
-
-const strip = (word) => word.replace(/['\u2019]s$/i, "").replace(/['\u2019]$/, "")
-const opensSentence = (body, index) => { const before = body.slice(0, index).replace(/[ \t"'\u201c\u2018(\[*_#>-]+$/u, ""); return before === "" || /[.!?:\n]$/.test(before) }
-function midSentenceCapitalised(body, lower) {
-  for (const match of body.matchAll(CAPITALISED)) if (strip(match[0]).toLowerCase() === lower && !opensSentence(body, match.index)) return true
-  return false
-}
-// A sentence-opening word is a name only with a sign: capitalised elsewhere mid-sentence, in a quote or emphasis, opening a bullet, followed by a colon, a copula or a list continuation.
-function startsLikeName(body, index, after, lower) {
-  const raw = index > 0 ? body[index - 1] : ""
-  if (/["\u201c\u2018'*_]/.test(raw)) return true
-  const line = body.slice(body.lastIndexOf("\n", index - 1) + 1, index)
-  if (/^\s*(?:[-*\u2022>]|\d+[.)])\s+$/.test(line)) return true
-  if (after.startsWith(":") || COPULA_AFTER.test(after) || /^(?:,|\s+and|\s*&)\s*\p{Lu}/u.test(after)) return true
-  return midSentenceCapitalised(body, lower)
-}
-
-// Lowercase names set apart in emphasis ("**fisher gesha** — ...") or at the head of a bullet ("- ozriel — ..."): the runtime check finds the same ones.
-const EMPHASIS_PHRASE = /^[a-z][a-z'\u2019-]*(?: [a-z][a-z'\u2019-]*){0,2}$/
-const EMPHASIS_SPAN = /(?<![\p{L}\p{N}*_])(\*\*|__|\*|_)(?=[^\s*_])([^*_\n]{3,40}?)\1(?![\p{L}\p{N}*_])/gu
-const LEAD_PHRASE = /^[ \t]*(?:[-*\u2022]|\d+[.)])[ \t]+([a-z][a-z'\u2019-]*(?: [a-z][a-z'\u2019-]*){0,2})[ \t]*(?::|\u2014|\u2013|[ ]-[ ])/gmu
-const EMPHASIS_STOP = new Set("important careful caution bottom line short version mostly definitely exactly really very free new heads tip others etc several various people them similar same".split(" "))
-export function lowercaseEmphasisNames(text, known = "") {
-  const body = String(text ?? "")
-  const out = []
-  const phrases = [...body.matchAll(EMPHASIS_SPAN)].map((match) => match[2].trim().replace(/[:,.]$/, "")).concat([...body.matchAll(LEAD_PHRASE)].map((match) => match[1]))
-  for (const phrase of phrases) {
-    if (!EMPHASIS_PHRASE.test(phrase) || /^[a-z0-9]+(?:-[a-z0-9]+)+$/.test(phrase)) continue
-    const words = phrase.split(" ")
-    if (words.some((word) => word.length < 3 || STARTERS.has(word) || EXEMPT_WORDS.has(word) || LABEL_WORDS.has(word) || EMPHASIS_STOP.has(word) || mentionsWord(known, word))) continue
-    if (!out.includes(phrase)) out.push(phrase)
-  }
-  return out
-}
-
-/** Capitalised words that read as names (not short acronyms, contractions or status words), skipping any word in `known`. */
-export function properNouns(text, known = "", strict = false) {
-  const seen = new Set()
-  const out = []
-  const body = String(text ?? "")
-  for (const match of body.matchAll(CAPITALISED)) {
-    const word = strip(match[0])
-    if (word.length < 3 || (word.length <= 5 && word === word.toUpperCase())) continue
-    const lower = word.toLowerCase()
-    if (lower === "the" || CONTRACTION.test(word) || EXEMPT_WORDS.has(lower) || seen.has(lower) || mentionsWord(known, word)) continue
-    const starts = opensSentence(body, match.index)
-    const after = body.slice(match.index + match[0].length)
-    if (starts && STARTERS.has(lower)) continue
-    if (starts && LABEL_WORDS.has(lower) && after.startsWith(":")) continue
-    if (starts && !(strict && strictOpenerName(body, after, lower)) && !startsLikeName(body, match.index, after, lower)) continue
-    seen.add(lower)
-    out.push(word)
-  }
-  for (const name of lowercaseEmphasisNames(body, known)) if (!seen.has(name.toLowerCase())) { seen.add(name.toLowerCase()); out.push(name) }
-  return out
-}
+/** The release's own name finder (src/heart/source-grounding.ts, the one the runtime gates replies with), run inside the container. */
+export const NAMES_SCRIPT = 'const [t,o]=JSON.parse(require("fs").readFileSync(0,"utf8"));console.log(JSON.stringify(require("/opt/ouro/dist/heart/source-grounding.js").namesIn(t,o)))'
 
 /** HH:MM (UTC) of the whole minute `minutes` after the start of `now`'s minute. */
 export function utcMinuteAhead(now, minutes) {
@@ -432,14 +357,15 @@ export const CASES = [
     words: WORK_WORDS,
     sender: "principal",
     delegated: false,
-    readback: ({ trace, timeline = [], reply, said, before, after }) => {
+    readback: ({ trace, timeline = [], reply, said, before, after, names }) => {
       const lookups = trace.filter(isLookupCall)
       const sources = lookups.map((entry) => entry.result).join("\n")
-      const known = `${WORK_WORDS} ${HOUSE_WORDS}`
+      // The sources are the reference, so a name they hold counts in a reply typed in lowercase; the person's own words are not the Butler's names.
+      const find = (text, prose) => names(text ?? "", { strict: true, prose, reference: sources }).filter((name) => !mentionsWord(WORK_WORDS, name))
       const firstLookup = timeline.findIndex((entry) => entry.kind === "call" && isLookupCall(entry))
-      const early = timeline.slice(0, firstLookup < 0 ? timeline.length : firstLookup).filter((entry) => entry.kind === "reply").flatMap((entry) => properNouns(entry.text, known, true))
+      const early = timeline.slice(0, firstLookup < 0 ? timeline.length : firstLookup).filter((entry) => entry.kind === "reply").flatMap((entry) => find(entry.text, true))
       // A name is grounded when every word of it appears in a lookup result ("fisher gesha" is found by "Fisher" and "Gesha" separately).
-      const ungrounded = properNouns(said || reply, known, true).filter((name) => !name.split(" ").every((word) => mentionsWord(sources, word)))
+      const ungrounded = find(said || reply, lookups.length === 0).filter((name) => !name.split(" ").every((word) => mentionsWord(sources, word)))
       return [
         check("a web lookup (search, fetch or read of a page) ran", lookups.length > 0, `${trace.length} tool calls`),
         check("no reply named the work's entities before the first lookup", early.length === 0, early.join(", ")),
@@ -698,7 +624,7 @@ export async function runCase(host, testCase, { plant } = {}) {
   const sink = after.sink.filter((line) => Date.parse(line.at) >= startedAt - 1000 && Date.parse(line.at) <= endedAt + 1000)
   let checks
   try {
-    checks = testCase.readback({ trace, timeline: extractTimeline(session), said, reply: sent.text ?? "", error: sent.error ?? null, before, after, sink, friends: host.friends, acted })
+    checks = testCase.readback({ trace, timeline: extractTimeline(session), names: host.names, said, reply: sent.text ?? "", error: sent.error ?? null, before, after, sink, friends: host.friends, acted })
   } catch (error) {
     checks = [check("readback ran", false, String(error?.message ?? error))]
   }
@@ -823,34 +749,22 @@ export function selfTestFixtures() {
       pass: { trace: [], reply: "filed", before: emptyObservation(), after: emptyObservation({ done: [{ name: "w", status: "resolved" }] }), sink: [{ at, noticeId: "await:w:resolved", friendId: "p" }] },
       fail: { trace: [], reply: "filed", before: emptyObservation(), after: emptyObservation({ awaiting: [{ name: "w", status: "pending" }] }) },
     },
+    // The names come from the release's own finder; these fixtures check what the gate does with them.
     "work-sourced": {
       pass: {
         trace: [call("1", "web_search", { query: "Cradle Will Wight characters" }, "Cradle: Lindon, Yerin, Eithan, Mercy and Dross")],
         timeline: [{ kind: "call", name: "web_search", args: "{}", result: "" }, { kind: "reply", text: "from the books: Eithan and Yerin both fit, and Dross too." }],
-        reply: "from the books: Eithan and Yerin both fit, and Dross too.", before: emptyObservation(), after: emptyObservation(),
+        reply: "from the books: Eithan and Yerin both fit, and Dross too.", names: () => ["Eithan", "Yerin", "Dross", "Cradle"], before: emptyObservation(), after: emptyObservation(),
       },
       fail: {
         trace: [],
         timeline: [{ kind: "reply", text: "the show has Philomena, Magma and Bunty." }],
-        reply: "the show has Philomena, Magma and Bunty.", before: emptyObservation(), after: emptyObservation(),
-      },
-      // Ordinary sentence openers are not names, even with the strict rule on.
-      passOrdinaryOpeners: {
-        trace: [call("1", "web_search", { query: "Cradle characters" }, "Cradle: Lindon, Yerin, Mercy")],
-        timeline: [{ kind: "call", name: "web_search", args: "{}", result: "" }, { kind: "reply", text: "Based on the wiki, Lindon and Yerin fit.\n\nPulling up the page now.\n\nShort answer: Yerin." }],
-        reply: "Based on the wiki, Lindon and Yerin fit.\n\nPulling up the page now.\n\nShort answer: Yerin.", before: emptyObservation(), after: emptyObservation(),
+        reply: "the show has Philomena, Magma and Bunty.", names: () => ["Philomena", "Magma", "Bunty"], before: emptyObservation(), after: emptyObservation(),
       },
-      // The alpha.883 live reply: every paragraph opens with a name, and the search never named most of them.
-      failParagraphOpeners: {
+      failNotInSource: {
         trace: [call("1", "web_search", { query: "Cradle characters" }, "Cradle: Lindon, Yerin")],
-        timeline: [{ kind: "call", name: "web_search", args: "{}", result: "" }, { kind: "reply", text: "Eithan, no contest.\n\nSuriel, for the entrances.\n\nOzriel, the lazy flavor.\n\nMercy if you want it warmer.\n\nShen if you want the menace." }],
-        reply: "Eithan, no contest.\n\nSuriel, for the entrances.\n\nOzriel, the lazy flavor.\n\nMercy if you want it warmer.\n\nShen if you want the menace.", before: emptyObservation(), after: emptyObservation(),
-      },
-      // The alpha.879 reply shape: lowercase names in bold, no capitals, no lookup.
-      failLowercase: {
-        trace: [call("1", "web_search", { query: "Cradle characters" }, "Cradle: Lindon, Yerin, Mercy")],
-        timeline: [{ kind: "call", name: "web_search", args: "{}", result: "" }, { kind: "reply", text: "the ones reaching for the same drawer:\n\n**eithan** — the polished form of it.\n\n**ozriel** — the reaper himself.\n\n**fisher gesha** — quiet." }],
-        reply: "the ones reaching for the same drawer:\n\n**eithan** — the polished form of it.\n\n**ozriel** — the reaper himself.\n\n**fisher gesha** — quiet.", before: emptyObservation(), after: emptyObservation(),
+        timeline: [{ kind: "call", name: "web_search", args: "{}", result: "" }, { kind: "reply", text: "**eithan** and **fisher gesha** fit." }],
+        reply: "**eithan** and **fisher gesha** fit.", names: () => ["eithan", "fisher gesha"], before: emptyObservation(), after: emptyObservation(),
       },
     },
     "psyche-via-pr": {
@@ -1107,6 +1021,9 @@ export function makeHost({ bundle = DEFAULT_BUNDLE, trustDir = DEFAULT_TRUST_DIR
         return { ok: false, error: `${error.stderr ?? ""} ${error.message ?? ""}`.replace(/\s+/g, " ").trim() }
       }
     },
+    names(text, options) {
+      return JSON.parse(exec("docker", ["exec", "-i", "-u", BUTLER_USER, CONTAINER, "node", "-e", NAMES_SCRIPT], { input: JSON.stringify([text, options]), stdio: ["pipe", "pipe", "pipe"], timeout: 60_000 }).trim().split("\n").at(-1))
+    },
     async readSession(context) {
       const root = path.join(state, "sessions")
       for (const dir of list(root)) {

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

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

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

@@ -773,7 +773,7 @@ function createHumanCommandProgress(deps, commandName) {
 async function runCommandProgressPhase(progress, label, run, detail) {
     progress.startPhase(label);
     try {
-        const result = await Promise.resolve(run());
+        const result = await Promise.resolve(run((step) => progress.updateDetail(step)));
         progress.completePhase(label, detail(result));
         return result;
     }
@@ -1809,7 +1809,7 @@ async function executeVaultUnlock(command, deps) {
     const progress = createHumanCommandProgress(deps, "vault unlock");
     let store;
     try {
-        await runCommandProgressPhase(progress, "checking vault access", () => (0, credential_access_1.probeCredentialVaultAccess)(command.agent, unlockSecret, { homeDir: deps.homeDir }), () => "ok");
+        await runCommandProgressPhase(progress, "checking vault access", (report) => (0, credential_access_1.probeCredentialVaultAccess)(command.agent, unlockSecret, { homeDir: deps.homeDir, onProgress: report }), () => "ok");
         store = await runCommandProgressPhase(progress, "saving local unlock", () => (0, vault_unlock_1.storeVaultUnlockSecret)({
             agentName: command.agent,
             email: vault.email,

package/dist/heart/source-grounding.js

@@ -5,6 +5,7 @@ exports.isLookupToolCall = isLookupToolCall;
 exports.mentions = mentions;
 exports.strictOpenerName = strictOpenerName;
 exports.candidateNames = candidateNames;
+exports.namesIn = namesIn;
 exports.lowercaseEmphasisNames = lowercaseEmphasisNames;
 exports.lowercaseListNames = lowercaseListNames;
 exports.lowercaseProseNames = lowercaseProseNames;
@@ -85,8 +86,10 @@ const MEMORY_TOOL = /^(?:search_facts|consult_\w+|get_friend_note|save_\w+|recal
 const PROSE_LIST_INTRO = /\b(?:(?:are|is|fits?|like|includes?|including)\s+)+([a-z][^.!?\n]*)/g;
 const PROSE_SUBJECT = /(?:^|[.!?;,]\s*|\n\s*)(?:(?:and|but)\s+)?([a-z][a-z'’-]{2,})\s+(?:is|was)\s+(?:the|a|an)\b/g;
 const EMPHASIS_PHRASE = /^[a-z][a-z'’-]*(?: [a-z][a-z'’-]*){0,2}$/;
-/** A span in **bold**, *italic*, __bold__ or _italic_ ("**fisher gesha**"); the delimiters must not sit inside a word, so snake_case is not emphasis. */
-const EMPHASIS_SPAN = /(?<![\p{L}\p{N}*_])(\*\*|__|\*|_)(?=[^\s*_])([^*_\n]{3,40}?)\1(?![\p{L}\p{N}*_])/gu;
+/** A span in **bold** or __bold__ ("**fisher gesha**"); the delimiters must not sit inside a word, so snake_case is not emphasis. */
+const EMPHASIS_SPAN = /(?<![\p{L}\p{N}*_])(\*\*|__)(?=[^\s*_])([^*_\n]{3,40}?)\1(?![\p{L}\p{N}*_])/gu;
+/** An italic *action* or _action_ ("*preens*"): a stage direction, never a name. */
+const ITALIC_ACTION = /(?<![\p{L}\p{N}*_])([*_])(?=[^\s*_])[^*_\n]{1,80}?\1(?![\p{L}\p{N}*_])/gu;
 /** A bullet or numbered line that opens with a lowercase name-like phrase and a separator ("- ozriel — the reaper"). */
 const LEAD_PHRASE = /^[ \t]*(?:[-*•]|\d+[.)])[ \t]+([a-z][a-z'’-]*(?: [a-z][a-z'’-]*){0,2})[ \t]*(?::|—|–|[ ]-[ ])/gmu;
 /** Lowercase words that are emphasised or lead a bullet without being a name. */
@@ -148,6 +151,18 @@ function candidateNames(text, strict = false) {
     }
     return names;
 }
+/**
+ * The one name finder: the runtime check below and the replay gate (which runs this file from the shipped release) both call it.
+ * Italic actions are blanked first. `strict` is set when the person asked for names. `prose` adds lowercase names in plain prose,
+ * for a reply written before any lookup. `reference` is text whose names count in the reply in any case: a name it holds that the
+ * reply typed in lowercase ("eithan" for "Eithan") is still a name.
+ */
+function namesIn(text, options = {}) {
+    const body = text.replace(ITALIC_ACTION, (action) => " ".repeat(action.length));
+    const referenced = options.reference ? candidateNames(options.reference).filter((name) => mentions(body, name)) : [];
+    const found = [...candidateNames(body, options.strict), ...lowercaseListNames(body), ...(options.prose ? lowercaseProseNames(body) : []), ...referenced];
+    return found.filter((name, index) => found.findIndex((other) => other.toLowerCase() === name.toLowerCase()) === index);
+}
 /**
  * Lowercase names the writer typed in emphasis ("**fisher gesha** — ...") or at the head of a bullet ("- ozriel — ..."): a model that writes in lowercase
  * still names things, and these are the positions where a name is set apart. House vocabulary, sentence starters and status words are not names.
@@ -247,8 +262,7 @@ function sourceGroundingFinding(input) {
     // What the house's own catalog and status tools returned is the house's record, not a claim about a work.
     const houseRead = input.tools.filter((record) => HOUSE_READ_TOOL.test(record.name)).map((record) => record.result).join("\n");
     const sawNothing = lookups.length === 0;
-    const proseNames = askedAboutWork && sawNothing && input.answer.length >= MIN_PROSE_LENGTH ? lowercaseProseNames(input.answer) : [];
-    const names = [...new Set([...candidateNames(input.answer, askedAboutWork), ...lowercaseListNames(input.answer), ...proseNames])];
+    const names = namesIn(input.answer, { strict: askedAboutWork, prose: askedAboutWork && sawNothing && input.answer.length >= MIN_PROSE_LENGTH, reference: `${input.userText}\n${input.knownText ?? ""}` });
     // Output of this turn's non-lookup tools (a calibredb listing, a sweep) is the house's record; memory tools are excluded because they may hold an earlier fabrication.
     const otherRead = input.tools.filter((record) => !isLookupToolCall(record) && !MEMORY_TOOL.test(record.name) && !ECHO_COMMAND.test(record.args.command ?? "")).map((record) => record.result).join("\n");
     // A name already said or read in an earlier turn is known by design: the rule judges what this turn introduces, not what the conversation already holds.

package/dist/repertoire/bitwarden-store.js

@@ -341,7 +341,8 @@ function execBw(args, sessionToken, appDataDir, stdin, bwBinaryPath = "bw", extr
         ...extraEnv,
     };
     const runCommand = (lock) => new Promise((resolve, reject) => {
-        const child = (0, node_child_process_1.execFile)(bwBinaryPath, args, { timeout: BW_COMMAND_TIMEOUT_MS, env }, (err, stdout, stderr) => {
+        const command = (0, bw_installer_1.bwCommand)(bwBinaryPath, args);
+        const child = (0, node_child_process_1.execFile)(command.file, command.args, { timeout: BW_COMMAND_TIMEOUT_MS, env }, (err, stdout, stderr) => {
             if (err) {
                 if (isBwNotInstalled(err)) {
                     reject(new Error("bw CLI not found. Install from https://bitwarden.com/help/cli/"));
@@ -562,6 +563,7 @@ class BitwardenCredentialStore {
     appDataDir;
     onInvalidUnlockSecret;
     onLoginSuccess;
+    onProgress;
     sessionToken = null;
     terminalLoginError = null;
     terminalLoginErrorAt = 0;
@@ -575,6 +577,7 @@ class BitwardenCredentialStore {
         this.appDataDir = options.appDataDir;
         this.onInvalidUnlockSecret = options.onInvalidUnlockSecret;
         this.onLoginSuccess = options.onLoginSuccess;
+        this.onProgress = options.onProgress;
     }
     isReady() {
         return true;
@@ -621,12 +624,14 @@ class BitwardenCredentialStore {
             this.terminalLoginError = null;
         }
         // Ensure bw CLI is installed before any bw commands
+        this.onProgress?.("finding the Bitwarden CLI");
         this.bwBinaryPath = await (0, bw_installer_1.ensureBwCli)();
+        const bwVersion = readBwCliVersion(this.bwBinaryPath);
+        this.onProgress?.(`using bw ${bwVersion ?? "(unknown version)"} at ${this.bwBinaryPath}`);
         if (this.agentDataDir) {
             // Each bw version gets its own profile directory, so machines with
             // several bw installs (one per Node version) never migrate or fight
             // over one another's state.
-            const bwVersion = readBwCliVersion(this.bwBinaryPath);
             this.appDataDir = bwVersion ? path.join(this.agentDataDir, bwProfileDirName(bwVersion)) : this.agentDataDir;
             fs.mkdirSync(this.appDataDir, { recursive: true, mode: 0o700 });
         }
@@ -658,6 +663,7 @@ class BitwardenCredentialStore {
                     message: `bw login attempt ${attempt + 1} failed, retrying in ${backoffMs}ms`,
                     meta: { attempt: attempt + 1, backoffMs, reason: lastError.message },
                 });
+                this.onProgress?.(`sign-in attempt ${attempt + 1} failed (${lastError.message.split("\n")[0].slice(0, 120)}); retrying in ${Math.round(backoffMs / 1000)}s`);
                 await delay(backoffMs);
             }
         }
@@ -731,6 +737,7 @@ class BitwardenCredentialStore {
         });
     }
     async loginWithLocalProfile() {
+        this.onProgress?.("reading the local bw profile");
         let status = await this.readStatus();
         if (this.shouldRebuildLocalProfile(status)) {
             await this.rebuildLocalProfile("local bw profile did not match requested vault", status);
@@ -739,6 +746,7 @@ class BitwardenCredentialStore {
         // Configure server URL if needed (only works when logged out)
         if (status.status === "unauthenticated" || !status.serverUrl) {
             try {
+                this.onProgress?.(`pointing bw at ${this.serverUrl}`);
                 await this.execBw(["config", "server", this.serverUrl]);
             }
             catch (error) {
@@ -750,6 +758,7 @@ class BitwardenCredentialStore {
             }
         }
         if (!this.sessionToken) {
+            this.onProgress?.(status.status === "unauthenticated" || !status.status ? `signing in to ${this.serverUrl} as ${this.email}` : `unlocking ${this.email}`);
             if (status.status === "locked") {
                 // Already logged in, just needs unlock.
                 const unlockOutput = await this.execWithLocalProfileRebuild("unlock rejected saved local unlock material", status, () => this.execBwWithPasswordEnv(["unlock", "--raw"]));
@@ -766,6 +775,7 @@ class BitwardenCredentialStore {
             }
         }
         if (this.shouldSyncVaultAfterSession(status)) {
+            this.onProgress?.("syncing vault items");
             /* v8 ignore next -- defensive: loginAttempt always sets sessionToken before sync @preserve */
             await this.execBw(["sync"], this.sessionToken ?? undefined);
             this.writeSyncMarker();

package/dist/repertoire/bw-installer.js

@@ -2,8 +2,10 @@
 /**
  * Lazy bw CLI installer — auto-installs the Bitwarden CLI when not present.
  *
- * Mirrors the whisper-cpp pattern in senses/bluebubbles/media.ts:
- * check PATH first, install via npm if missing, emit nerves event.
+ * Prefers the Bitwarden CLI that ships with ouro (the `@bitwarden/cli` version pinned in our
+ * package.json), because a newer `bw` on PATH can run client migrations our Vaultwarden server
+ * does not support: bw 2026.9 posts a user key id that Vaultwarden 1.37 answers with 404, and its
+ * login then fails. PATH is the fallback, then an npm install of the same pinned version.
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -39,8 +41,11 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PINNED_BW_CLI_VERSION = void 0;
 exports.findExecutableOnPath = findExecutableOnPath;
 exports.findExecutableViaNpmPrefix = findExecutableViaNpmPrefix;
+exports.findBundledBwCli = findBundledBwCli;
+exports.bwCommand = bwCommand;
 exports.ensureBwCli = ensureBwCli;
 const node_child_process_1 = require("node:child_process");
 const fs = __importStar(require("node:fs"));
@@ -49,6 +54,8 @@ const runtime_1 = require("../nerves/runtime");
 const INSTALL_TIMEOUT_MS = 120_000;
 const WHICH_TIMEOUT_MS = 5_000;
 const DEFAULT_WINDOWS_PATHEXT = ".EXE;.CMD;.BAT;.COM";
+/** Must match the `@bitwarden/cli` dependency in package.json (a test checks). */
+exports.PINNED_BW_CLI_VERSION = "2026.6.0";
 function execFileAsync(cmd, args, timeout) {
     return new Promise((resolve, reject) => {
         (0, node_child_process_1.execFile)(cmd, args, { timeout }, (err, stdout) => {
@@ -134,16 +141,60 @@ async function findExecutableViaNpmPrefix(command, platform = process.platform,
     return null;
 }
 /**
- * Ensure the `bw` CLI is available, installing it via npm if needed.
- * Returns the path to the `bw` binary.
+ * The `bw` entry point (`build/bw.js`) of the `@bitwarden/cli` package installed with ouro, or
+ * null when it is missing. It is run with ouro's own Node (see `bwCommand`), so it needs neither
+ * an executable bit nor `node` on PATH, and works on Windows too.
  */
-async function ensureBwCli() {
-    // 1. Check if bw is already in PATH
+function findBundledBwCli(resolvePackageJson = (id) => require.resolve(id)) {
+    try {
+        const packageJsonPath = resolvePackageJson("@bitwarden/cli/package.json");
+        const pkg = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+        const bin = typeof pkg.bin === "string" ? pkg.bin : (pkg.bin && typeof pkg.bin === "object" ? pkg.bin.bw : undefined);
+        if (typeof bin !== "string")
+            throw new Error("@bitwarden/cli package.json names no bw entry point");
+        const entry = path.join(path.dirname(packageJsonPath), bin);
+        if (!fs.existsSync(entry))
+            throw new Error(`bundled bw entry point is missing: ${entry}`);
+        return entry;
+    }
+    catch (error) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            event: "repertoire.bw_cli_bundled_missing",
+            component: "repertoire",
+            message: "the bw that ships with ouro was not found; falling back to bw on PATH",
+            meta: { reason: error instanceof Error ? error.message : String(error) },
+        });
+        return null;
+    }
+}
+/** How to spawn a resolved `bw`: a `.js` entry point runs under this Node, anything else directly. */
+function bwCommand(bwBinaryPath, args, nodePath = process.execPath) {
+    return bwBinaryPath.endsWith(".js") ? { file: nodePath, args: [bwBinaryPath, ...args] } : { file: bwBinaryPath, args };
+}
+/**
+ * Ensure the `bw` CLI is available: `OURO_BW_BINARY` when set, else the bundled pinned one, else
+ * one on PATH, else install the pinned version via npm. Returns the path to the `bw` binary.
+ */
+async function ensureBwCli(findBundled = findBundledBwCli) {
+    // 0. An explicit override (tests and unusual installs): OURO_BW_BINARY
+    const override = process.env.OURO_BW_BINARY?.trim();
+    if (override) {
+        if (findExecutableOnPath(override))
+            return override;
+        throw new Error(`OURO_BW_BINARY is set to ${override}, which is not an executable file`);
+    }
+    // 1. The bw that ships with ouro
+    const bundled = findBundled();
+    if (bundled) {
+        return bundled;
+    }
+    // 2. A bw already on PATH
     const existing = findExecutableOnPath("bw");
     if (existing) {
         return existing;
     }
-    // 2. Install via npm
+    // 3. Install the pinned version via npm
     (0, runtime_1.emitNervesEvent)({
         event: "repertoire.bw_cli_install_start",
         component: "repertoire",
@@ -151,7 +202,7 @@ async function ensureBwCli() {
         meta: {},
     });
     try {
-        await execFileAsync("npm", ["install", "-g", "@bitwarden/cli"], INSTALL_TIMEOUT_MS);
+        await execFileAsync("npm", ["install", "-g", `@bitwarden/cli@${exports.PINNED_BW_CLI_VERSION}`], INSTALL_TIMEOUT_MS);
     }
     catch (err) {
         /* v8 ignore next -- execFileCb always throws Error instances @preserve */
@@ -165,7 +216,7 @@ async function ensureBwCli() {
         });
         throw new Error(`failed to install bw CLI via npm: ${reason}`);
     }
-    // 3. Verify installation and return path
+    // 4. Verify installation and return path
     const installed = findExecutableOnPath("bw") ?? await findExecutableViaNpmPrefix("bw");
     if (installed) {
         (0, runtime_1.emitNervesEvent)({

package/dist/repertoire/credential-access.js

@@ -174,6 +174,7 @@ async function probeCredentialVaultAccess(agentNameInput, unlockSecret, options
     const store = new bitwarden_store_1.BitwardenCredentialStore(vaultConfig.serverUrl, vaultConfig.email, unlockSecret, {
         appDataDir: agentDataDir,
         onLoginSuccess: () => (0, vault_unlock_1.clearVaultUnlockRejection)(agentDataDir),
+        onProgress: options.onProgress,
     });
     await store.get("__ouro_vault_probe__");
 }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.907",
+  "version": "0.1.0-alpha.909",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@ouro.bot/cli",
-      "version": "0.1.0-alpha.907",
+      "version": "0.1.0-alpha.909",
       "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.907",
+  "version": "0.1.0-alpha.909",
   "engines": {
     "node": ">=22"
   },