@ouro.bot/cli 0.1.0-alpha.95 → 0.1.0-alpha.96

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.96",
+      "changes": [
+        "ensureSafeRepoWorkspace now re-reads the live branch from the worktree on every call and updates the in-memory and persisted selection when it has drifted, preventing stale workspaceBranch after external branch switches between coding sessions."
+      ]
+    },
     {
       "version": "0.1.0-alpha.95",
       "changes": [

package/dist/heart/safe-workspace.js

@@ -207,40 +207,59 @@ function resetSafeWorkspaceSelection(options = {}) {
 function getActiveSafeWorkspaceSelection() {
     return activeSelection;
 }
-function ensureSafeRepoWorkspace(options = {}) {
-    if (activeSelection) {
-        return activeSelection;
+function refreshSelectionWorkspaceBranch(selection, spawnSync) {
+    try {
+        if (!isGitClone(selection.workspaceRoot, spawnSync)) {
+            return selection;
+        }
+        const liveBranch = readCurrentBranch(selection.workspaceRoot, spawnSync);
+        if (liveBranch === selection.workspaceBranch) {
+            return selection;
+        }
+        return { ...selection, workspaceBranch: liveBranch };
     }
-    const repoRoot = options.repoRoot ?? (0, identity_1.getRepoRoot)();
+    catch {
+        return selection;
+    }
+}
+function ensureSafeRepoWorkspace(options = {}) {
     const agentName = resolveAgentName(options.agentName);
-    const canonicalRepoUrl = options.canonicalRepoUrl ?? identity_1.HARNESS_CANONICAL_REPO_URL;
     const workspaceBase = options.workspaceRoot ?? (0, identity_1.getAgentRepoWorkspacesRoot)(agentName);
     const persistSelection = shouldPersistSelection(options);
     const spawnSync = options.spawnSync ?? child_process_1.spawnSync;
     const existsSync = options.existsSync ?? fs.existsSync;
     const mkdirSync = options.mkdirSync ?? fs.mkdirSync;
     const rmSync = options.rmSync ?? fs.rmSync;
+    if (activeSelection) {
+        const refreshed = refreshSelectionWorkspaceBranch(activeSelection, spawnSync);
+        activeSelection = refreshed;
+        return refreshed;
+    }
+    const repoRoot = options.repoRoot ?? (0, identity_1.getRepoRoot)();
+    const canonicalRepoUrl = options.canonicalRepoUrl ?? identity_1.HARNESS_CANONICAL_REPO_URL;
     const now = options.now ?? defaultNow;
     const stamp = String(now());
     registerCleanupHook({ rmSync });
     if (persistSelection) {
         const restored = loadPersistedSelection(workspaceBase, options);
         if (restored) {
-            activeSelection = restored;
+            const refreshed = refreshSelectionWorkspaceBranch(restored, spawnSync);
+            activeSelection = refreshed;
+            persistSelectionState(workspaceBase, refreshed, options);
             (0, runtime_1.emitNervesEvent)({
                 component: "workspace",
                 event: "workspace.safe_repo_restored",
                 message: "restored safe repo workspace after runtime restart",
                 meta: {
-                    runtimeKind: restored.runtimeKind,
-                    repoRoot: restored.repoRoot,
-                    workspaceRoot: restored.workspaceRoot,
-                    workspaceBranch: restored.workspaceBranch,
-                    sourceBranch: restored.sourceBranch,
-                    cleanupAfterMerge: restored.cleanupAfterMerge,
+                    runtimeKind: refreshed.runtimeKind,
+                    repoRoot: refreshed.repoRoot,
+                    workspaceRoot: refreshed.workspaceRoot,
+                    workspaceBranch: refreshed.workspaceBranch,
+                    sourceBranch: refreshed.sourceBranch,
+                    cleanupAfterMerge: refreshed.cleanupAfterMerge,
                 },
             });
-            return restored;
+            return refreshed;
         }
     }
     let selection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.95",
+  "version": "0.1.0-alpha.96",
   "main": "dist/heart/daemon/ouro-entry.js",
   "bin": {
     "cli": "dist/heart/daemon/ouro-bot-entry.js",