@ouro.bot/cli 0.1.0-alpha.819 → 0.1.0-alpha.820

package/changelog.json

@@ -1,6 +1,12 @@
 {
   "_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.820",
+      "changes": [
+        "Teach the Sanctuary media catalog contract about media_search so taste and browse questions ground in its evidence instead of rejecting every terminal answer."
+      ]
+    },
     {
       "version": "0.1.0-alpha.819",
       "changes": [

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

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

package/dist/senses/sanctuary-media-catalog-contract.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sanctuaryMediaCatalogRequiredToolCalls = sanctuaryMediaCatalogRequiredToolCalls;
 const runtime_1 = require("../nerves/runtime");
 const sanctuary_media_optimization_1 = require("./sanctuary-media-optimization");
-const REQUIRED_TOOL_NAMES = ["sanctuary_search_media_catalog"];
+const LEGACY_CATALOG_TOOL = "sanctuary_search_media_catalog";
+const MEDIA_SEARCH_TOOL = "media_search";
+const MEDIA_REQUEST_TOOL = "media_request";
 const HOUSEHOLD_JARGON = /\b(?:bounded|catalog|inventory|endpoint|backend|data shape|pars(?:e|ed|ing)|json|jellyfin|unmanic|sanctuary_search_media_catalog)\b/iu;
 const NEGATED_MEDIA_ACCESS = /\b(?:not|never|none|nothing|zero|inaccessible|invisible|unavailable|broken|failed|failing)\b|\b(?:isn[’']t|won[’']t)\b|\bno\s+access\b|\b(?:lost|lacks?|lacking|without)\s+access\b|\bonly\s+\d|\bfewer\s+than\b|\bsome\s+of\b|\b(?:part|portion|subset)\s+of\b|\bi\s+(?:can(?:not|[’']t)|do\s+not|don[’']t|have\s+no)\b|\bi[’']m\s+not\b/iu;
 const UNSOLICITED_PIVOT = /\b(?:what would you like|what are you in the mood for|would you like me to|do you want me to|want me to|recommend we add)\b/iu;
@@ -84,6 +86,43 @@ function parseCatalogEvidence(result, args) {
             totalItems: parsed.data.totalItems,
             matchedItems: parsed.data.matchedItems,
             titles,
+            offShelfTitles: [],
+            fromMediaSearch: false,
+        };
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * media_search reports shelf state per title, so it can ground both "what do we own"
+ * and "what is worth adding" from one read. The legacy catalog read can only prove
+ * absence by returning zero matches for an exact title query.
+ */
+function parseMediaSearchEvidence(result, args) {
+    try {
+        const parsed = JSON.parse(result);
+        if (!Number.isSafeInteger(parsed.matched) || !Array.isArray(parsed.items))
+            return null;
+        const titles = [];
+        const offShelfTitles = [];
+        for (const entry of parsed.items) {
+            if (!entry || typeof entry !== "object" || Array.isArray(entry))
+                continue;
+            const item = entry;
+            if (typeof item.title !== "string" || !item.title.trim())
+                continue;
+            titles.push(item.title.trim());
+            if (item.on_shelf === false)
+                offShelfTitles.push(item.title.trim());
+        }
+        return {
+            query: (0, sanctuary_media_optimization_1.normalizeSanctuaryMediaText)(args.query ?? ""),
+            totalItems: parsed.matched,
+            matchedItems: parsed.matched,
+            titles,
+            offShelfTitles,
+            fromMediaSearch: true,
         };
     }
     catch {
@@ -126,7 +165,11 @@ function commonAnswerRejection(answer, technicalDetailRequested) {
     return undefined;
 }
 function sanctuaryMediaCatalogRequiredToolCalls(request, advertisedToolNames) {
-    if (!advertisedToolNames.includes("sanctuary_search_media_catalog"))
+    // Prefer media_search when the media surface is installed: it grounds both what is
+    // on the shelf and what is worth adding. Fall back to the legacy restricted read.
+    const catalogTool = advertisedToolNames.includes(MEDIA_SEARCH_TOOL) ? MEDIA_SEARCH_TOOL : LEGACY_CATALOG_TOOL;
+    const canRequestMedia = advertisedToolNames.includes(MEDIA_REQUEST_TOOL);
+    if (!advertisedToolNames.includes(catalogTool))
         return undefined;
     const normalized = (0, sanctuary_media_optimization_1.normalizeSanctuaryMediaText)(request);
     const mentionsMedia = /\b(?:film|films|movie|movies|shows|tv|jellyfin|watch|shelf|stock|catalog|library|lib)\b/u.test(normalized);
@@ -143,7 +186,7 @@ function sanctuaryMediaCatalogRequiredToolCalls(request, advertisedToolNames) {
     const listCount = requestedListCount(normalized);
     const technicalDetailRequested = /\b(?:technical|technically|implementation|endpoint|backend|debug|detail|internals?)\b/u.test(normalized);
     let latestEvidence;
-    const names = [...REQUIRED_TOOL_NAMES];
+    const names = [catalogTool];
     (0, runtime_1.emitNervesEvent)({
         component: "senses",
         event: "senses.sanctuary_media_catalog_obligation",
@@ -154,36 +197,38 @@ function sanctuaryMediaCatalogRequiredToolCalls(request, advertisedToolNames) {
         names,
         requireSuccessfulResults: true,
         retryMessage: asksForCount
-            ? "Use sanctuary_search_media_catalog before answering, then report only the current shelf count in ordinary household language."
+            ? `Use ${catalogTool} before answering, then report only the current shelf count in ordinary household language.`
             : kind === "visibility"
-                ? "Use sanctuary_search_media_catalog before answering. Lead with the direct answer from current catalog evidence, report the shelf count in ordinary household language, and stop without sampled titles or a follow-up question."
+                ? `Use ${catalogTool} before answering. Lead with the direct answer from current catalog evidence, report the shelf count in ordinary household language, and stop without sampled titles or a follow-up question.`
                 : kind === "title_lookup"
-                    ? "Use sanctuary_search_media_catalog with the requested title before answering. Confirm its presence or absence directly from current catalog evidence."
+                    ? `Use ${catalogTool} with the requested title before answering. Confirm its presence or absence directly from current catalog evidence.`
                     : kind === "taste_recommendation"
-                        ? "Use sanctuary_search_media_catalog before answering. Make one concise, decisive choice grounded in returned catalog evidence; do not volunteer an AI or 'I cannot watch' disclaimer."
+                        ? `Use ${catalogTool} before answering. Make one concise, decisive choice grounded in returned catalog evidence; do not volunteer an AI or 'I cannot watch' disclaimer.`
                         : listCount
-                            ? `Use sanctuary_search_media_catalog with limit ${listCount} before answering, then name exactly the returned catalog titles.`
-                            : "Use sanctuary_search_media_catalog before answering and base any named titles on the returned catalog evidence.",
+                            ? `Use ${catalogTool} with limit ${listCount} before answering, then name exactly the returned catalog titles.`
+                            : `Use ${catalogTool} before answering and base any named titles on the returned catalog evidence.`,
         validateRequiredToolResult(name, result, args) {
-            if (name !== "sanctuary_search_media_catalog")
+            if (name !== catalogTool)
                 return false;
-            const current = parseCatalogEvidence(result, args);
+            const current = catalogTool === MEDIA_SEARCH_TOOL ? parseMediaSearchEvidence(result, args) : parseCatalogEvidence(result, args);
             if (!current)
                 return false;
             latestEvidence = current;
             return true;
         },
         validateToolCallBeforeDispatch(name, args) {
-            if (name !== "sanctuary_search_media_catalog")
+            if (name !== catalogTool)
                 return undefined;
             const query = (0, sanctuary_media_optimization_1.normalizeSanctuaryMediaText)(args.query ?? "");
             if (kind === "title_lookup" && !query)
                 return "Search for the requested title by name before answering whether it is on the shelf.";
             if (kind === "title_lookup" && query !== requestedTitleQuery)
                 return `Search for the requested title ${requestedTitleQuery} before answering whether it is on the shelf.`;
-            if (asksForAddition && !query)
+            // media_search browses by genre, keyword and year and reports shelf state per
+            // title, so an addition question does not need a per-candidate title query.
+            if (asksForAddition && !query && catalogTool !== MEDIA_SEARCH_TOOL)
                 return "Search for one candidate title by name before recommending it as an addition.";
-            if (listCount && Number(args.limit) !== listCount)
+            if (listCount && Number(args.limit) !== listCount && catalogTool !== MEDIA_SEARCH_TOOL)
                 return `Set the catalog limit to ${listCount} so the answer is grounded in exactly the requested number of titles.`;
             return undefined;
         },
@@ -221,17 +266,31 @@ function sanctuaryMediaCatalogRequiredToolCalls(request, advertisedToolNames) {
             }
             if (kind === "taste_recommendation" && latest) {
                 if (asksForAddition) {
-                    if (!latest.query || latest.matchedItems !== 0 || !includesNormalizedPhrase(answer, latest.query))
+                    if (latest.fromMediaSearch) {
+                        // media_search states shelf membership per title, so a recommendation is
+                        // grounded when the named candidate came back marked absent.
+                        if (!latest.offShelfTitles.some((title) => includesNormalizedPhrase(answer, title))) {
+                            return "Recommend only a title the current search returned as not on the shelf.";
+                        }
+                    }
+                    else if (!latest.query || latest.matchedItems !== 0 || !includesNormalizedPhrase(answer, latest.query)) {
                         return "Recommend an addition only after an exact current catalog search shows that candidate is absent.";
-                    if (/\b(?:i|we)\s+(?:added|requested|submitted|queued)\b/iu.test(answer))
+                    }
+                    if (!canRequestMedia && /\b(?:i|we)\s+(?:added|requested|submitted|queued)\b/iu.test(answer)) {
                         return "Do not claim the title was added or requested when no media-request action was available.";
+                    }
                 }
                 else if (!latest.titles.some((title) => includesNormalizedPhrase(answer, title))) {
                     return "Make the choice from a title returned by the current catalog evidence.";
                 }
             }
-            if (kind === "other" && latest)
-                return catalogTitleGroundingRejection(answer, latest, listCount);
+            if (kind === "other" && latest) {
+                if (!latest.fromMediaSearch)
+                    return catalogTitleGroundingRejection(answer, latest, listCount);
+                if (latest.titles.length > 0 && !latest.titles.some((title) => includesNormalizedPhrase(answer, title))) {
+                    return "Name titles the current search returned; do not add unverified ones.";
+                }
+            }
             return undefined;
         },
     };

package/npm-shrinkwrap.json

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