@ouro.bot/cli 0.1.0-alpha.845 → 0.1.0-alpha.847

package/changelog.json

@@ -1,6 +1,18 @@
 {
   "_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.847",
+      "changes": [
+        "Bundle sync: post-turn push now removes an empty git index.lock older than 10 minutes (left by a git process that died mid-write) before committing, and any other failed local commit is recorded in state/pending-sync.json so the start-of-turn packet surfaces it. One stale lock had silently blocked every bundle commit for three months while untracked files piled up; a lock that cannot be removed is reported as a warning."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.846",
+      "changes": [
+        "Sanctuary: a natural question about the Butler's version ('what version are you on?') now requires a fresh install-state read, and any version it states must match that read. After an upgrade it had answered 'Just checked the live state: 0.1.0-alpha.841' from earlier conversation while running 845, with no tool call."
+      ]
+    },
     {
       "version": "0.1.0-alpha.845",
       "changes": [

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

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

package/dist/heart/sync.js

@@ -33,6 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.STALE_INDEX_LOCK_MS = void 0;
 exports.preTurnPull = preTurnPull;
 exports.postTurnPush = postTurnPush;
 exports.preTurnPullAsync = preTurnPullAsync;
@@ -87,6 +88,52 @@ function ensureGitRepo(agentRoot) {
     const error = `bundle is not a git repo; run \`git init\` inside ${agentRoot} to enable sync (or disable sync in agent.json)`;
     return { ok: false, error };
 }
+/**
+ * Git holds `.git/index.lock` for milliseconds to seconds, and every git call
+ * in this module has a timeout of 30s or less. A lock older than this was left
+ * behind by a git process that died mid-write; while it exists every `git add`
+ * fails, which silently stopped one bundle's sync for three months.
+ */
+exports.STALE_INDEX_LOCK_MS = 10 * 60 * 1000;
+// Only an empty lock is removed: git writes the new index into the lock right
+// after creating it, while a live `git commit` waiting in an editor holds a
+// full, unchanging lock that can be older than the threshold. When `.git` is a
+// gitdir file (worktree), statSync fails and the lock is left alone.
+function clearStaleIndexLock(agentRoot) {
+    const lockPath = path.join(agentRoot, ".git", "index.lock");
+    let ageMs;
+    try {
+        const stat = fs.statSync(lockPath);
+        if (stat.size !== 0)
+            return;
+        ageMs = Date.now() - stat.mtimeMs;
+    }
+    catch {
+        return;
+    }
+    if (ageMs < exports.STALE_INDEX_LOCK_MS)
+        return;
+    try {
+        fs.rmSync(lockPath, { force: true });
+    }
+    catch (err) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "heart",
+            event: "heart.sync_stale_lock_clear_failed",
+            message: "post-turn push: could not remove stale git index.lock",
+            meta: { agentRoot, lockPath, error: err instanceof Error ? err.message : /* v8 ignore next -- defensive non-Error catch @preserve */ String(err) },
+        });
+        return;
+    }
+    (0, runtime_1.emitNervesEvent)({
+        level: "warn",
+        component: "heart",
+        event: "heart.sync_stale_lock_cleared",
+        message: "post-turn push: removed stale git index.lock",
+        meta: { agentRoot, lockPath, ageMs },
+    });
+}
 /**
  * Pre-turn pull: sync the agent bundle from remote before assembling the start-of-turn packet.
  *
@@ -224,6 +271,7 @@ function postTurnPush(agentRoot, config) {
         return { ok: true };
     }
     const changedCount = statusOutput.split("\n").length;
+    clearStaleIndexLock(agentRoot);
     try {
         (0, child_process_1.execFileSync)("git", ["add", "-A"], {
             cwd: agentRoot,
@@ -322,6 +370,14 @@ function postTurnPush(agentRoot, config) {
     }
     catch (err) {
         const error = err instanceof Error ? err.message : String(err);
+        // Record it so the start-of-turn packet surfaces the failure; otherwise a
+        // failing local commit is visible only in nerves logs.
+        try {
+            writePendingSync(agentRoot, error, "unknown", []);
+        }
+        catch {
+            // Best effort: the nerves event below still records the failure.
+        }
         (0, runtime_1.emitNervesEvent)({
             component: "heart",
             event: "heart.sync_push_error",

package/dist/senses/sanctuary-install-state-contract.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sanctuaryInstallStateRequiredToolCalls = sanctuaryInstallStateRequiredToolCalls;
+exports.sanctuaryVersionQuestionRequiredToolCalls = sanctuaryVersionQuestionRequiredToolCalls;
 const runtime_1 = require("../nerves/runtime");
 const TOOL_NAME = "sanctuary_get_install_state";
 const REQUEST = /\b(?:use|run|call)\s+sanctuary_get_install_state\b/iu;
@@ -124,3 +125,45 @@ function sanctuaryInstallStateRequiredToolCalls(request, advertisedToolNames) {
         },
     };
 }
+const VERSION_QUESTION = /\b(?:what|which)(?:'s|\s+is)?\s+(?:your\s+|the\s+)?(?:current\s+|live\s+|installed\s+|running\s+)?version\b|\bversion\s+(?:are|r)\s+(?:you|u)\b|\bwhat\s+(?:are\s+you|you're)\s+(?:on|running)\b|\bare\s+you\s+(?:on|running)\s+(?:the\s+)?(?:latest|newest|new|current)\b/iu;
+const VERSION_CLAIM = /\bv?\d+\.\d+\.\d+(?:-[0-9A-Za-z]+(?:\.[0-9A-Za-z]+)*)?\b/gu;
+/**
+ * A natural question about the Butler's own version must be answered from a fresh
+ * install-state read. After an upgrade the Butler once answered "Just checked the live
+ * state: 0.1.0-alpha.841" from earlier conversation while it was running 845, with no
+ * tool call at all. Unlike the explicit install-state contract, the wording stays free:
+ * only the version it states is checked against the read.
+ */
+function sanctuaryVersionQuestionRequiredToolCalls(request, advertisedToolNames) {
+    const normalizedRequest = request.normalize("NFKC").replace(/[‘’]/gu, "'");
+    if (!advertisedToolNames.includes(TOOL_NAME) || REQUEST.test(normalizedRequest) || !VERSION_QUESTION.test(normalizedRequest))
+        return undefined;
+    let current;
+    (0, runtime_1.emitNervesEvent)({
+        component: "senses",
+        event: "senses.sanctuary_version_question_required",
+        message: "a question about the running version requires a fresh install-state read",
+        meta: { requiredToolName: TOOL_NAME },
+    });
+    return {
+        names: [TOOL_NAME],
+        retryMessage: "Call sanctuary_get_install_state with empty arguments now, then state the version from that fresh result, not from earlier conversation.",
+        requireSuccessfulResults: true,
+        validateRequiredToolResult: (name, result, args) => {
+            if (name !== TOOL_NAME || Object.keys(args).length !== 0)
+                return false;
+            current = parseInstallState(result);
+            return current !== undefined;
+        },
+        validateTerminalAnswer: (answer) => {
+            if (!current)
+                return "Call sanctuary_get_install_state and state the version from that fresh result.";
+            const known = new Set([current.runtimePackageVersion, current.packagedBundleVersion, ...(current.liveBundleVersion ? [current.liveBundleVersion] : [])].map((version) => version.replace(/^v/u, "")));
+            const claimed = [...answer.normalize("NFKC").matchAll(VERSION_CLAIM)].map((match) => match[0].replace(/^v/u, ""));
+            if (claimed.length === 0)
+                return `State the running version from the fresh result: ${current.runtimePackageVersion}.`;
+            const stale = claimed.filter((version) => !known.has(version));
+            return stale.length === 0 ? undefined : `The fresh install-state result says ${current.runtimePackageVersion}; do not state ${stale.join(", ")} as the current version.`;
+        },
+    };
+}

package/dist/senses/telegram.js

@@ -1234,9 +1234,12 @@ function createTelegramSenseApp(options) {
             const installState = isSanctuaryOwner
                 ? (0, sanctuary_install_state_contract_1.sanctuaryInstallStateRequiredToolCalls)(input.userMessage, relationshipAuthorization.advertisedToolNames)
                 : undefined;
+            const versionQuestion = isSanctuaryOwner
+                ? (0, sanctuary_install_state_contract_1.sanctuaryVersionQuestionRequiredToolCalls)(input.userMessage, relationshipAuthorization.advertisedToolNames)
+                : undefined;
             if (input.fullVisibilityProgress && fullVisibility)
                 input.fullVisibilityProgress.fallback = fullVisibility.emptyResponseFallback;
-            const contracts = [storageOptimization, fullVisibility, staleDockerCare, mediaCatalog, installState].filter(Boolean);
+            const contracts = [storageOptimization, fullVisibility, staleDockerCare, mediaCatalog, installState, versionQuestion].filter(Boolean);
             const ownedNames = contracts.map((contract) => new Set(contract.names));
             const requiredToolCalls = contracts.length === 0 ? undefined : {
                 names: [...new Set(contracts.flatMap((contract) => [...contract.names]))],

package/npm-shrinkwrap.json

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