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

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.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": [

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

@@ -1,5 +1,5 @@
 {
-  "runtimeVersion": "0.1.0-alpha.846",
+  "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.846</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/npm-shrinkwrap.json

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