@ouro.bot/cli 0.1.0-alpha.793 → 0.1.0-alpha.795

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

@@ -4,7 +4,8 @@ exports.sanctuaryMediaCatalogRequiredToolCalls = sanctuaryMediaCatalogRequiredTo
 const runtime_1 = require("../nerves/runtime");
 const sanctuary_media_optimization_1 = require("./sanctuary-media-optimization");
 const REQUIRED_TOOL_NAMES = ["sanctuary_search_media_catalog"];
-const HOUSEHOLD_JARGON = /\b(?:bounded|catalog read|inventory|endpoint|backend|data shape|pars(?:e|ed|ing)|json|sanctuary_search_media_catalog)\b/iu;
+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;
 const TITLE_LIST_GLUE = new Set(["and", "are", "catalog", "film", "films", "from", "have", "here", "in", "is", "library", "movie", "movies", "on", "shelf", "show", "shows", "the", "these", "titles", "we"]);
 const COUNT_ANSWER_GLUE = new Set(["and", "are", "currently", "episodes", "film", "films", "have", "in", "items", "library", "movie", "movies", "on", "shelf", "show", "shows", "the", "there", "tv", "we"]);
@@ -91,6 +92,23 @@ function parseCatalogEvidence(result, args) {
 function sentenceCount(answer) {
     return answer.split(/[.!?]+(?:\s+|$)/u).filter((part) => part.trim()).length;
 }
+function hasGroundedFirstPersonVisibility(answer, formattedCount) {
+    if (NEGATED_MEDIA_ACCESS.test(answer) || answer.split(formattedCount).length - 1 !== 1)
+        return false;
+    const escapedCount = formattedCount.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
+    const mediaNoun = "(?:titles?|movies?|films?|shows?|episodes?|items?)";
+    const countedObject = `(?:all\\s+|about\\s+|around\\s+|exactly\\s+|roughly\\s+)?${escapedCount}\\s+${mediaNoun}\\b`;
+    const contextObject = `(?:it|(?:(?:the|our)\\s+)?(?:full\\s+)?(?:library|shelf))(?:\\s+(?:now|again))?(?=\\s*(?:[.!?;,:—-]|$))`;
+    const accessObject = `(?:${contextObject}|${countedObject})`;
+    const firstPersonAccess = [
+        new RegExp(`\\bi\\s+(?:(?:can\\s+(?:(?:absolutely|clearly|currently|definitely|now|plainly|readily)\\s+)?|(?:currently|now)\\s+)?(?:see|browse|access|view))\\s+${accessObject}`, "iu"),
+        new RegExp(`\\bi(?:\\s+have|[’']ve\\s+got)\\s+(?:(?:full\\s+)?access\\s+to\\s+${accessObject}|${countedObject})`, "iu"),
+        new RegExp(`\\bi(?:\\s+am|[’']m)\\s+(?:(?:currently|now)\\s+)?(?:looking\\s+at|able\\s+to\\s+(?:see|browse|access|view))\\s+${accessObject}`, "iu"),
+        /\b(?:(?:the|our)\s+)?(?:full\s+)?(?:library|shelf)\s+is\s+(?:fully\s+)?(?:visible|accessible)\s+to\s+me\b/iu,
+    ];
+    const groundedCount = new RegExp(`\\b${escapedCount}\\s+${mediaNoun}\\b`, "iu");
+    return firstPersonAccess.some((pattern) => pattern.test(answer)) && groundedCount.test(answer);
+}
 function commonAnswerRejection(answer, technicalDetailRequested) {
     if (/\b(?:just|only|actually|merely)\s+(?:a\s+)?(?:bot|ai|assistant)\b|\bi\s+(?:can[’']?t|cannot|don[’']?t|do not)\s+(?:actually\s+)?watch\b|\bif i had to pick\b/iu.test(answer)) {
         return "Answer from the catalog evidence with a confident, personable choice; do not retreat into an AI or 'I cannot watch' disclaimer.";
@@ -175,14 +193,17 @@ function sanctuaryMediaCatalogRequiredToolCalls(request, advertisedToolNames) {
                     return "Answer library visibility in no more than two short sentences and 240 characters.";
                 if (!/^yes\b/iu.test(answer.trim()))
                     return "Lead with a direct yes when the current catalog read succeeds.";
+                if (latest) {
+                    const formattedCount = new Intl.NumberFormat("en-US").format(latest.totalItems);
+                    if (!hasGroundedFirstPersonVisibility(answer, formattedCount))
+                        return `Reply in one or two sentences. A valid shape is: Yes—I can see the library now. It contains ${formattedCount} titles.`;
+                }
                 if (/\b(?:titles? like|such as|including)\b/iu.test(answer))
                     return "Do not sample titles for a visibility question; answer whether the shelf is visible and give the current count.";
                 if ([...answer.matchAll(/\byes\b/giu)].length > 1)
                     return "Give one answer once; do not repeat the yes or restate the response.";
                 if (answer.includes("?"))
                     return "Answer the visibility question and stop without asking a new question.";
-                if (latest && !answer.includes(new Intl.NumberFormat("en-US").format(latest.totalItems)))
-                    return "Include the current shelf count from the successful catalog evidence.";
             }
             if (kind === "title_lookup" && latest?.query) {
                 const exactMatch = latest.titles.some((title) => (0, sanctuary_media_optimization_1.normalizeSanctuaryMediaText)(title) === requestedTitleQuery);

package/dist/senses/shared-turn.js

@@ -187,20 +187,27 @@ function hasAcceptedOutwardSessionAck(events, assistantIndex, toolCallId, toolNa
     }
     return false;
 }
-function newOutwardCoordinates(events, existingEventIds) {
+function newOutwardCoordinates(events, existingEventIds, afterEventId) {
+    const boundaryIndex = events.findIndex((event) => event.id === afterEventId);
+    if (boundaryIndex < 0)
+        return [];
     return events.flatMap((event, eventIndex) => {
-        if (existingEventIds.has(event.id) || event.role !== "assistant")
+        if (eventIndex <= boundaryIndex || existingEventIds.has(event.id) || event.role !== "assistant" || event.provenance?.captureKind === "synthetic")
             return [];
-        const outwardTools = event.toolCalls.filter((call) => {
+        const outwardTools = event.toolCalls.flatMap((call) => {
             if (call.function.name !== "speak" && call.function.name !== "settle")
-                return false;
-            return hasAcceptedOutwardSessionAck(events, eventIndex, call.id, call.function.name);
+                return [];
+            if (!hasAcceptedOutwardSessionAck(events, eventIndex, call.id, call.function.name))
+                return [];
+            const text = stripThinkBlocks(parseToolStringArg(call, call.function.name, call.function.name === "speak" ? "message" : "answer") ?? "");
+            return text ? [{ kind: call.function.name, eventId: event.id, text }] : [];
         });
         if (outwardTools.length > 0)
-            return outwardTools.map((call) => ({ kind: call.function.name, eventId: event.id }));
+            return outwardTools;
         if (event.toolCalls.length > 0)
             return [];
-        return typeof event.content === "string" && event.content.trim() ? [{ kind: "text", eventId: event.id }] : [];
+        const text = stripThinkBlocks(typeof event.content === "string" ? event.content : "");
+        return text ? [{ kind: "text", eventId: event.id, text }] : [];
     });
 }
 function newestPlainAssistantText(messages) {
@@ -210,12 +217,30 @@ function newestPlainAssistantText(messages) {
         && candidate.content.trim().length > 0);
     return message ? assistantContentText(message.content) : null;
 }
-function causalSessionEventIds(events, existingEventIds, attempts) {
-    const coordinates = newOutwardCoordinates(events, existingEventIds);
-    const aligned = coordinates.length === attempts.length && coordinates.every((coordinate, index) => coordinate.kind === attempts[index].kind)
-        ? coordinates.map((coordinate) => coordinate.eventId)
-        : attempts.map(() => null);
-    return attempts.flatMap((attempt, index) => attempt.delivered ? [aligned[index] ?? null] : []);
+function causalSessionEventIds(events, existingEventIds, attempts, afterEventId) {
+    if (!afterEventId)
+        return attempts.flatMap((attempt) => attempt.delivered ? [null] : []);
+    const coordinates = newOutwardCoordinates(events, existingEventIds, afterEventId);
+    let nextCoordinate = 0;
+    return attempts.flatMap((attempt) => {
+        if (!attempt.delivered)
+            return [];
+        const coordinateIndex = coordinates.findIndex((coordinate, index) => index >= nextCoordinate && coordinate.kind === attempt.kind && coordinate.text === attempt.text);
+        if (coordinateIndex < 0)
+            return [null];
+        nextCoordinate = coordinateIndex + 1;
+        return [coordinates[coordinateIndex].eventId];
+    });
+}
+function currentIngressEventId(events, existingEventIds, userMessage, precommittedIngress, ingressRelations) {
+    if (precommittedIngress)
+        return precommittedIngress.eventId;
+    const reference = ingressRelations?.references[0];
+    return events.findLast((event) => (!existingEventIds.has(event.id)
+        && event.role === "user"
+        && event.content === userMessage
+        && event.provenance?.captureKind !== "synthetic"
+        && (!reference || event.relations?.references.includes(reference))))?.id;
 }
 function getSenseSessionPath(agentName, friendId, channel, sessionKey, agentRootOverride) {
     return path.join(agentRootOverride ?? (0, identity_1.getAgentRoot)(agentName), "state", "sessions", friendId, channel, `${(0, config_1.sanitizeKey)(sessionKey)}.json`);
@@ -329,7 +354,7 @@ async function runSenseTurn(options) {
             if (!text)
                 return;
             const delivery = { kind, text };
-            const attempt = { kind, delivered: false };
+            const attempt = { kind, text, delivered: false };
             deliveryAttempts.push(attempt);
             try {
                 await options.deliverySink?.onDelivery(delivery);
@@ -444,6 +469,7 @@ async function runSenseTurn(options) {
             };
         }
         const persistedEvents = persistPromise ? await persistPromise : [];
+        const ingressEventId = currentIngressEventId(persistedEvents, existingEventIds, userMessage, options.precommittedIngress, options.ingressRelations);
         const finalDeliveryKind = terminalDeliveryKind;
         const acceptedTerminalOutcome = turnResult.turnOutcome === "settled" || turnResult.turnOutcome === "blocked";
         const failoverText = turnResult.turnOutcome === "errored" ? turnResult.failoverMessage?.trim() : undefined;
@@ -463,7 +489,7 @@ async function runSenseTurn(options) {
             else
                 pendingResponseText = "";
             if (!hadPendingCallbackText && plainTerminalText)
-                recoveredTerminalEventId = newOutwardCoordinates(persistedEvents, existingEventIds).at(-1)?.eventId;
+                recoveredTerminalEventId = causalSessionEventIds(persistedEvents, existingEventIds, [{ kind: "text", text: stripThinkBlocks(plainTerminalText), delivered: true }], ingressEventId)[0] ?? undefined;
         }
         else if (turnResult.turnOutcome === "command") {
             // Slash-command text is emitted directly by the pipeline and has no assistant event.
@@ -491,7 +517,7 @@ async function runSenseTurn(options) {
                     const recovered = extractOutwardSenseDeliveryText(postTurnSession.messages.slice(preTurnMessageCount));
                     finalResponse = recovered ?? emptyFallback ?? (hadReasoningChunk ? "" : "(agent responded but response was empty)");
                     if (recovered)
-                        responseCausalSessionEventId = newOutwardCoordinates(persistedEvents, existingEventIds).at(-1)?.eventId;
+                        responseCausalSessionEventId = causalSessionEventIds(persistedEvents, existingEventIds, [{ kind: finalDeliveryKind, text: stripThinkBlocks(recovered), delivered: true }], ingressEventId)[0] ?? undefined;
                 }
                 else {
                     finalResponse = emptyFallback ?? (hadReasoningChunk ? "" : "(agent responded but response was empty)");
@@ -538,7 +564,7 @@ async function runSenseTurn(options) {
             providerInvocationCount,
             toolInvocationCount,
             sessionPath: sessPath,
-            ...(deliveries.length > 0 ? { causalSessionEventIds: causalSessionEventIds(persistedEvents, existingEventIds, deliveryAttempts) } : {}),
+            ...(deliveries.length > 0 ? { causalSessionEventIds: causalSessionEventIds(persistedEvents, existingEventIds, deliveryAttempts, ingressEventId) } : {}),
             ...(responseCausalSessionEventId ? { responseCausalSessionEventId } : {}),
         };
     });

package/npm-shrinkwrap.json

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