@aiden-ade/sandbox-agent 0.1.54 → 0.1.55

package/dist/index.cjs

@@ -16947,6 +16947,7 @@ var APPLICATION_PROBLEM_CODES = [
   "app.dispatch.runtime_offline",
   "app.dispatch.delivery_failed",
   "app.workspace.missing",
+  "app.workspace.branch_changed",
   "app.transport.disconnected",
   "app.persistence.failed",
   "app.service.unavailable",
@@ -16981,6 +16982,7 @@ var APPLICATION_PROBLEM_TITLES = {
   "app.dispatch.runtime_offline": "Runtime unavailable",
   "app.dispatch.delivery_failed": "Agent delivery failed",
   "app.workspace.missing": "Workspace unavailable",
+  "app.workspace.branch_changed": "Workspace branch changed",
   "app.transport.disconnected": "Connection lost",
   "app.persistence.failed": "Persistence failed",
   "app.service.unavailable": "Service unavailable",
@@ -17006,6 +17008,14 @@ var APPLICATION_PROBLEM_RECOVERY = {
   },
   "app.dispatch.delivery_failed": { mode: "manual", action: "start_new_attempt", safe: false },
   "app.workspace.missing": { mode: "after_user_action", action: "select_workspace", safe: true },
+  // Distinct from `app.workspace.missing`: the folder is exactly where it was, so
+  // telling the user to relocate it sends them looking for a problem that does not
+  // exist. What they need to do is restore the branch the run was pinned to.
+  "app.workspace.branch_changed": {
+    mode: "after_user_action",
+    action: "restore_branch",
+    safe: true
+  },
   "app.transport.disconnected": { mode: "automatic", action: "reconnect", safe: true },
   "app.persistence.failed": { mode: "automatic", action: "reconcile", safe: true },
   "app.service.unavailable": { mode: "after_user_action", action: "retry", safe: true },
@@ -51101,7 +51111,7 @@ var SuspensionDetector = class {
 };
 
 // src/version.ts
-var AGENT_VERSION = "0.1.54";
+var AGENT_VERSION = "0.1.55";
 
 // src/workspace-relocation.ts
 var import_node_child_process6 = require("child_process");
@@ -51185,6 +51195,9 @@ var WORKSPACE_LEASE_GIT_TIMEOUT_MS = parsePositiveMs(
   process.env.ALAN_WORKSPACE_LEASE_GIT_TIMEOUT_MS,
   2e3
 );
+function applicationCodeForWorkspaceLeaseFailure(code) {
+  return code === "workspace_lease_branch_changed" ? "app.workspace.branch_changed" : "app.workspace.missing";
+}
 function gitValue(cwd, args) {
   const result = (0, import_node_child_process7.spawnSync)("git", ["-C", cwd, ...args], {
     encoding: "utf8",
@@ -51209,8 +51222,8 @@ var DEFAULT_PROBE2 = {
       const repositoryRoot = gitValue(canonicalWorkspacePath, ["rev-parse", "--show-toplevel"]);
       const gitDirectory = gitValue(canonicalWorkspacePath, ["rev-parse", "--git-dir"]);
       const commonDirectory = gitValue(canonicalWorkspacePath, ["rev-parse", "--git-common-dir"]);
-      const branch = gitValue(canonicalWorkspacePath, ["rev-parse", "--abbrev-ref", "HEAD"]);
-      if (!repositoryRoot || !gitDirectory || !commonDirectory || !branch) return null;
+      const branch = gitValue(canonicalWorkspacePath, ["branch", "--show-current"]) ?? "";
+      if (!repositoryRoot || !gitDirectory || !commonDirectory) return null;
       const remote = gitValue(canonicalWorkspacePath, ["config", "--get", "remote.origin.url"]);
       const remoteIdentity = remote ? normalizeRepositoryIdentity(remote) : null;
       return {
@@ -51234,18 +51247,22 @@ var DEFAULT_PROBE2 = {
     }
   }
 };
-function unavailableFailure(target) {
+var IDENTITY_FAILURE_MESSAGES = {
+  workspace_lease_unavailable: "The workspace or Git checkout became unavailable while the run was active. Restore it and start a new run.",
+  workspace_lease_path_changed: "The selected workspace folder changed while the run was active. The run stopped before continuing; choose the correct folder and start a new run.",
+  workspace_lease_repository_changed: "The workspace now points to a different repository or worktree. The run stopped before continuing; restore the original checkout and start a new run."
+};
+function identityFailure(code, target) {
   return {
-    code: "workspace_lease_unavailable",
-    message: "The workspace or Git checkout became unavailable while the run was active. Restore it and start a new run.",
-    workspacePath: target.workspacePath,
-    expectedBranch: target.expectedBranch
+    code,
+    message: IDENTITY_FAILURE_MESSAGES[code],
+    workspacePath: target.workspacePath
   };
 }
 function branchFailure(target, expectedBranch, actualBranch) {
   return {
     code: "workspace_lease_branch_changed",
-    message: `The workspace branch changed from ${expectedBranch} to ${actualBranch} while the run was active. Restore ${expectedBranch} and start a new run.`,
+    message: `The workspace branch changed from ${expectedBranch} to ${actualBranch || "detached HEAD"} while the run was active. Restore ${expectedBranch} and start a new run.`,
     workspacePath: target.workspacePath,
     expectedBranch,
     actualBranch
@@ -51261,7 +51278,12 @@ var WorkspaceRunLease = class _WorkspaceRunLease {
     for (const target of targets) {
       const normalizedTarget = { ...target, workspacePath: (0, import_node_path11.resolve)(target.workspacePath) };
       const identity = probe.snapshot(normalizedTarget.workspacePath);
-      if (!identity) return { lease: null, failure: unavailableFailure(normalizedTarget) };
+      if (!identity) {
+        return {
+          lease: null,
+          failure: identityFailure("workspace_lease_unavailable", normalizedTarget)
+        };
+      }
       if (normalizedTarget.expectedBranch && identity.branch !== normalizedTarget.expectedBranch) {
         return {
           lease: null,
@@ -51282,81 +51304,49 @@ var WorkspaceRunLease = class _WorkspaceRunLease {
   /**
    * Classify the lease state for the run monitor.
    *
-   * - `transient: true` — a null snapshot while the workspace path still exists:
-   *   the git probe timed out or failed transiently (OS throttling / IO
-   *   contention), NOT a vanished checkout. The monitor should retry (require N
-   *   consecutive transient failures) before declaring the workspace lost.
-   * - `transient: false` — a definitive change: the path is genuinely missing
-   *   (ENOENT), or the workspace/repository/worktree/branch identity changed.
-   *   These are real and fail fast.
+   * Checks workspace identity only — path, repository, worktree. The branch is
+   * deliberately not checked here: it is working state, not identity, and the supervised
+   * process is a coding agent. A conflicted rebase leaves HEAD detached for as long as
+   * the agent takes to resolve it, so any mid-run branch assertion kills that run. What
+   * keeps work in the right place is the worktree's path and git-dir identity, both
+   * fenced below, plus `assertExpectedBranch` in binding-switch-git.ts at apply time.
+   * `capture()` still refuses to start a run on the wrong branch.
+   *
+   * `transient: true` means retryable — a git probe that timed out under OS throttling
+   * while the path still exists. `transient: false` is definitive and fails fast.
    */
   verifyDetailed() {
-    for (const captured of this.captured) {
-      const current = this.probe.snapshot(captured.target.workspacePath);
+    for (const { target, identity } of this.captured) {
+      const current = this.probe.snapshot(target.workspacePath);
       if (!current) {
-        const pathGone = this.probe.pathExists?.(captured.target.workspacePath) === false;
-        return { failure: unavailableFailure(captured.target), transient: !pathGone };
-      }
-      if (current.workspaceIdentity !== captured.identity.workspaceIdentity) {
+        const pathGone = this.probe.pathExists?.(target.workspacePath) === false;
         return {
-          failure: {
-            code: "workspace_lease_path_changed",
-            message: "The selected workspace folder changed while the run was active. The run stopped before continuing; choose the correct folder and start a new run.",
-            workspacePath: captured.target.workspacePath,
-            expectedBranch: captured.identity.branch,
-            actualBranch: current.branch
-          },
-          transient: false
+          failure: identityFailure("workspace_lease_unavailable", target),
+          transient: !pathGone
         };
       }
-      if (current.repositoryIdentity !== captured.identity.repositoryIdentity || current.worktreeIdentity !== captured.identity.worktreeIdentity) {
+      if (current.workspaceIdentity !== identity.workspaceIdentity) {
         return {
-          failure: {
-            code: "workspace_lease_repository_changed",
-            message: "The workspace now points to a different repository or worktree. The run stopped before continuing; restore the original checkout and start a new run.",
-            workspacePath: captured.target.workspacePath,
-            expectedBranch: captured.identity.branch,
-            actualBranch: current.branch
-          },
+          failure: identityFailure("workspace_lease_path_changed", target),
           transient: false
         };
       }
-      if (current.branch !== captured.identity.branch) {
+      if (current.repositoryIdentity !== identity.repositoryIdentity || current.worktreeIdentity !== identity.worktreeIdentity) {
         return {
-          failure: branchFailure(captured.target, captured.identity.branch, current.branch),
+          failure: identityFailure("workspace_lease_repository_changed", target),
           transient: false
         };
       }
     }
     return { failure: null, transient: false };
   }
+  /**
+   * Failure-only view of {@link verifyDetailed}. Kept as a thin delegation rather than a
+   * second copy of the checks: the two implementations previously duplicated all four
+   * comparisons and had to be edited in lockstep.
+   */
   verify() {
-    for (const captured of this.captured) {
-      const current = this.probe.snapshot(captured.target.workspacePath);
-      if (!current) return unavailableFailure(captured.target);
-      if (current.workspaceIdentity !== captured.identity.workspaceIdentity) {
-        return {
-          code: "workspace_lease_path_changed",
-          message: "The selected workspace folder changed while the run was active. The run stopped before continuing; choose the correct folder and start a new run.",
-          workspacePath: captured.target.workspacePath,
-          expectedBranch: captured.identity.branch,
-          actualBranch: current.branch
-        };
-      }
-      if (current.repositoryIdentity !== captured.identity.repositoryIdentity || current.worktreeIdentity !== captured.identity.worktreeIdentity) {
-        return {
-          code: "workspace_lease_repository_changed",
-          message: "The workspace now points to a different repository or worktree. The run stopped before continuing; restore the original checkout and start a new run.",
-          workspacePath: captured.target.workspacePath,
-          expectedBranch: captured.identity.branch,
-          actualBranch: current.branch
-        };
-      }
-      if (current.branch !== captured.identity.branch) {
-        return branchFailure(captured.target, captured.identity.branch, current.branch);
-      }
-    }
-    return null;
+    return this.verifyDetailed().failure;
   }
 };
 var FRESH_LEASE_MONITOR_STATE = {
@@ -53292,7 +53282,10 @@ var RuntimePresenter = class {
   }
   failWorkspaceLease(failure) {
     return this.failApplicationProblem({
-      code: "app.workspace.missing",
+      // A branch change is not a missing workspace. Reporting both as
+      // `app.workspace.missing` told the user to "choose or relocate the project
+      // folder" for a folder that never moved.
+      code: applicationCodeForWorkspaceLeaseFailure(failure.code),
       detail: failure.message,
       component: "agent-manager-workspace-lease",
       phase: "delivery"
@@ -54593,7 +54586,8 @@ async function startDaemon(args) {
       const runFailure = buildApplicationRunFailure({
         conversationId: payload.conversationId,
         runId: payload.runId,
-        code: "app.workspace.missing",
+        // A run dispatched onto the wrong branch is also not a missing workspace.
+        code: applicationCodeForWorkspaceLeaseFailure(failure.code),
         detail: failure.message,
         component: "agent-manager-workspace-lease",
         phase: "dispatch"

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@aiden-ade/sandbox-agent",
-  "deprecated": "Use @alan-ai-hq/agent-manager instead.",
-  "version": "0.1.54",
+  "version": "0.1.55",
   "type": "module",
   "description": "Alan agent runtime — cloud sandbox and local daemon (alan-agent CLI)",
   "bin": {
@@ -13,10 +12,24 @@
   "publishConfig": {
     "access": "public"
   },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.29.0",
+    "smol-toml": "^1.6.1"
+  },
+  "devDependencies": {
+    "socket.io-client": "^4.8.0",
+    "socket.io": "^4.8.0",
+    "@types/node": "^22.0.0",
+    "tsup": "^8.5.1",
+    "tsx": "^4.19.0",
+    "typescript": "~5.9.3",
+    "@alan-ai/shared": "0.1.0",
+    "@alan-ai/agent-core": "0.1.0"
+  },
+  "deprecated": "Use @alan-ai-hq/agent-manager instead.",
   "scripts": {
     "build": "tsup",
     "dev": "tsx src/index.ts",
-    "prepack": "pnpm build",
     "lint": "biome check .",
     "lint:fix": "biome check --write .",
     "format": "biome format --write .",
@@ -26,19 +39,5 @@
     "type-check": "tsc --noEmit",
     "publish:npm": "node ../../scripts/publish-agent-manager.mjs",
     "publish:npm:legacy": "node ../../scripts/publish-agent-manager.mjs --legacy-only"
-  },
-  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.29.0",
-    "smol-toml": "^1.6.1"
-  },
-  "devDependencies": {
-    "@alan-ai/agent-core": "workspace:*",
-    "@alan-ai/shared": "workspace:*",
-    "socket.io-client": "^4.8.0",
-    "socket.io": "^4.8.0",
-    "@types/node": "^22.0.0",
-    "tsup": "^8.5.1",
-    "tsx": "^4.19.0",
-    "typescript": "~5.9.3"
   }
-}
+}