@alan-ai-hq/agent-manager-linux-arm64 0.1.161 → 0.1.163

package/alan-agent.cjs

@@ -47275,8 +47275,9 @@ var init_driver = __esm({
 });
 
 // src/holder/drivers/persistent.ts
-function sessionContextFor(opened, inputs) {
-  return opened.fresh ? inputs.agentContext?.full : inputs.agentContext?.update;
+async function sessionContextFor(opened, inputs) {
+  const text3 = await inputs.agentContext;
+  return opened.fresh ? text3?.full : text3?.update;
 }
 function steerEcho(request2) {
   return {
@@ -47525,7 +47526,7 @@ function createPersistentDriver(provider4, options) {
       };
       signal.addEventListener("abort", onAbort, { once: true });
       try {
-        const contextPrefix = [sessionContextFor(opened, inputs), opened.contextPrefix].filter((part) => part !== void 0).join("\n\n");
+        const contextPrefix = [await sessionContextFor(opened, inputs), opened.contextPrefix].filter((part) => part !== void 0).join("\n\n");
         const input2 = await provider4.turnInput(spec, inputs, contextPrefix || void 0);
         if (signal.aborted) return { outcome: "aborted" };
         const timeoutMs = options.firstOutputTimeoutMs ?? FIRST_OUTPUT_TIMEOUT_MS;
@@ -57829,7 +57830,7 @@ var require_websocket_server = __commonJS({
 // package.json
 var package_default = {
   name: "@alan-ai-hq/agent-manager",
-  version: "0.1.161",
+  version: "0.1.163",
   private: true,
   type: "module",
   description: "Alan machine runtime (alan-agent): identity, link, reconciler, session holders, run log, uploader, local API",
@@ -60290,6 +60291,20 @@ async function checkOne(path4, deps, signal) {
   );
   return fetched.exitCode === 0 ? write({ state: "behind", path: path4, snapshot, tip, fetched: true }) : write({ state: "failed", path: path4, snapshot, reason: gitError(fetched, "fetch") });
 }
+async function currentBranch(git, cwd, signal) {
+  const output2 = await git.run(
+    { cwd, args: ["symbolic-ref", "--quiet", "--short", "HEAD"], readOnly: true },
+    signal
+  );
+  return output2.exitCode === 0 ? output2.stdout.trim() || null : null;
+}
+async function moveSnapshotTo(git, cwd, snapshot, tip, signal) {
+  const run2 = (args) => git.run({ cwd, args }, signal);
+  if ((await run2(["switch", "--quiet", "--detach", tip])).exitCode !== 0) return false;
+  const moved = await run2(["update-ref", `refs/heads/${snapshot.branch}`, tip, snapshot.head]);
+  const back = await run2(["switch", "--quiet", snapshot.branch]);
+  return moved.exitCode === 0 && back.exitCode === 0;
+}
 async function isCheckout(path4) {
   return (0, import_promises11.stat)((0, import_node_path7.join)(path4, ".git")).then(
     () => true,
@@ -61309,7 +61324,6 @@ function runtimePaths(stateDir) {
 
 // src/platform/process-memory.ts
 var import_node_child_process4 = require("child_process");
-var import_node_fs7 = require("fs");
 var import_promises16 = require("fs/promises");
 var import_node_os2 = require("os");
 var import_node_util3 = require("util");
@@ -61377,52 +61391,9 @@ function readMemoryPressure() {
   if (process.platform === "linux") return linuxPressure();
   return Promise.resolve("normal");
 }
-function parseDarwinVmStat(output2) {
-  const pageSize = Number(/page size of (\d+) bytes/.exec(output2)?.[1]);
-  if (!Number.isFinite(pageSize) || pageSize <= 0) return null;
-  const pages = (name) => {
-    const match = new RegExp(`^Pages ${name}:\\s+(\\d+)\\.?$`, "m").exec(output2);
-    return match ? Number(match[1]) : null;
-  };
-  const free = pages("free");
-  if (free === null) return null;
-  return (free + (pages("inactive") ?? 0) + (pages("speculative") ?? 0)) * pageSize;
-}
-function parseLinuxMemInfo(output2) {
-  const kilobytes = /^MemAvailable:\s+(\d+)\s+kB$/m.exec(output2)?.[1];
-  return kilobytes === void 0 ? null : Number(kilobytes) * 1024;
-}
-var CAPACITY_PROBE_TTL_MS = 2e3;
-var AvailableMemoryProbe = class {
-  cached = null;
-  read(now) {
-    if (this.cached !== null && now - this.cached.at < CAPACITY_PROBE_TTL_MS) {
-      return this.cached.bytes;
-    }
-    let bytes = null;
-    try {
-      if (process.platform === "darwin") {
-        bytes = parseDarwinVmStat(
-          (0, import_node_child_process4.execFileSync)("vm_stat", { encoding: "utf8", timeout: PROBE_TIMEOUT_MS })
-        );
-      } else if (process.platform === "linux") {
-        bytes = parseLinuxMemInfo((0, import_node_fs7.readFileSync)("/proc/meminfo", "utf8"));
-      }
-    } catch {
-      bytes = null;
-    }
-    this.cached = { at: now, bytes };
-    return bytes;
-  }
-};
-var availableMemoryProbe = new AvailableMemoryProbe();
-function readMemoryCapacity() {
+function readTotalMemoryBytes() {
   const constrained = process.constrainedMemory();
-  const totalBytes = constrained > 0 ? Math.min((0, import_node_os2.totalmem)(), constrained) : (0, import_node_os2.totalmem)();
-  const reported = typeof process.availableMemory === "function" ? process.availableMemory() : (0, import_node_os2.freemem)();
-  const probed = constrained > 0 && process.platform === "linux" ? null : availableMemoryProbe.read(Date.now());
-  const availableBytes = Math.min(totalBytes, Math.max(reported, probed ?? reported));
-  return { totalBytes, availableBytes };
+  return constrained > 0 ? Math.min((0, import_node_os2.totalmem)(), constrained) : (0, import_node_os2.totalmem)();
 }
 async function processMemoryRows() {
   if (process.platform === "win32") {
@@ -61902,7 +61873,7 @@ var import_promises20 = require("fs/promises");
 var import_node_path17 = require("path");
 
 // src/platform/service/windows-service.ts
-var import_node_fs8 = require("fs");
+var import_node_fs7 = require("fs");
 var import_promises19 = require("fs/promises");
 var import_node_path16 = require("path");
 
@@ -62132,7 +62103,7 @@ function windowsManager(host, profile) {
     name: files.runValue,
     definitionPath: files.config,
     install: async (spec, { restart }) => {
-      if (process.platform === "win32" && !(0, import_node_fs8.existsSync)(files.helper)) {
+      if (process.platform === "win32" && !(0, import_node_fs7.existsSync)(files.helper)) {
         throw new RuntimeFault("io_failed", `Windows helper is missing: ${files.helper}`);
       }
       await (0, import_promises19.mkdir)((0, import_node_path16.dirname)(spec.logPath), { recursive: true });
@@ -62827,7 +62798,7 @@ function systemAssertionSpawner(log) {
 // src/platform/spawn-detached.ts
 var import_node_child_process8 = require("child_process");
 var import_node_crypto12 = require("crypto");
-var import_node_fs9 = require("fs");
+var import_node_fs8 = require("fs");
 var import_node_path21 = require("path");
 var WINDOWS_UNSAFE_ENV = "NODE_PENDING_PIPE_INSTANCES";
 var SYSTEMD_RUN = "systemd-run";
@@ -62882,8 +62853,8 @@ function isolatedCommand(request2, isolation) {
   };
 }
 function spawnDetached(request2, isolation) {
-  (0, import_node_fs9.mkdirSync)((0, import_node_path21.dirname)(request2.outputPath), { recursive: true, mode: 448 });
-  const output2 = (0, import_node_fs9.openSync)(request2.outputPath, "a", 384);
+  (0, import_node_fs8.mkdirSync)((0, import_node_path21.dirname)(request2.outputPath), { recursive: true, mode: 448 });
+  const output2 = (0, import_node_fs8.openSync)(request2.outputPath, "a", 384);
   const { command, args } = isolatedCommand(request2, isolation);
   try {
     const child = (0, import_node_child_process8.spawn)(command, args, {
@@ -62899,7 +62870,7 @@ function spawnDetached(request2, isolation) {
     child.unref();
     return { pid: child.pid };
   } finally {
-    (0, import_node_fs9.closeSync)(output2);
+    (0, import_node_fs8.closeSync)(output2);
   }
 }
 
@@ -62939,7 +62910,7 @@ function createUpdateGate(deps) {
 
 // src/platform/wake-clock.ts
 var import_node_child_process9 = require("child_process");
-var import_node_fs10 = require("fs");
+var import_node_fs9 = require("fs");
 var import_node_readline = require("readline");
 var PTP_DEVICE = "/dev/ptp0";
 var RESPAWN_BASE_MS = 1e3;
@@ -63023,7 +62994,7 @@ function systemWakeClockSpawner(log) {
 function startWakeClock(options) {
   const { clock, log } = options;
   const platform3 = options.platform ?? process.platform;
-  const hasPtpDevice = options.hasPtpDevice ?? (() => (0, import_node_fs10.existsSync)(PTP_DEVICE));
+  const hasPtpDevice = options.hasPtpDevice ?? (() => (0, import_node_fs9.existsSync)(PTP_DEVICE));
   if (platform3 !== "linux" || !hasPtpDevice()) return { [Symbol.dispose]: () => {
   } };
   const spawner = options.spawner ?? systemWakeClockSpawner(log);
@@ -65157,7 +65128,7 @@ function fingerprintWholeText(fingerprint) {
 }
 
 // src/capabilities/native-ingest/hook-config.ts
-var import_node_fs11 = require("fs");
+var import_node_fs10 = require("fs");
 var import_node_path28 = require("path");
 
 // src/capabilities/native-ingest/provider-paths.ts
@@ -65235,9 +65206,9 @@ function hookHandler(provider4, event, options) {
   return { type: "command", command: posixCommand(argv, environment), timeout: 5 };
 }
 function readSettings(path4, backupWhenMalformed, now) {
-  if (!(0, import_node_fs11.existsSync)(path4)) return {};
+  if (!(0, import_node_fs10.existsSync)(path4)) return {};
   try {
-    const value2 = JSON.parse((0, import_node_fs11.readFileSync)(path4, "utf8"));
+    const value2 = JSON.parse((0, import_node_fs10.readFileSync)(path4, "utf8"));
     if (!isRecord4(value2)) throw new Error("settings root must be an object");
     if (value2.hooks !== void 0 && !isRecord4(value2.hooks)) {
       throw new Error("settings `hooks` must be an object");
@@ -65247,7 +65218,7 @@ function readSettings(path4, backupWhenMalformed, now) {
     const reason = error62 instanceof Error ? error62.message : String(error62);
     if (!backupWhenMalformed) throw new Error(`${path4} is malformed: ${reason}`);
     const backup = `${path4}.malformed-${now}.bak`;
-    (0, import_node_fs11.copyFileSync)(path4, backup);
+    (0, import_node_fs10.copyFileSync)(path4, backup);
     throw new Error(`${path4} is malformed and was copied to ${backup}: ${reason}`);
   }
 }
@@ -65255,14 +65226,14 @@ function hooksOf(settings2) {
   return isRecord4(settings2.hooks) ? settings2.hooks : {};
 }
 function writeSettings(path4, settings2) {
-  (0, import_node_fs11.mkdirSync)((0, import_node_path28.dirname)(path4), { recursive: true, mode: 448 });
+  (0, import_node_fs10.mkdirSync)((0, import_node_path28.dirname)(path4), { recursive: true, mode: 448 });
   const temporary = `${path4}.${process.pid}.tmp`;
   try {
-    (0, import_node_fs11.writeFileSync)(temporary, `${JSON.stringify(settings2, null, 2)}
+    (0, import_node_fs10.writeFileSync)(temporary, `${JSON.stringify(settings2, null, 2)}
 `, { mode: 384 });
-    (0, import_node_fs11.renameSync)(temporary, path4);
+    (0, import_node_fs10.renameSync)(temporary, path4);
   } finally {
-    (0, import_node_fs11.rmSync)(temporary, { force: true });
+    (0, import_node_fs10.rmSync)(temporary, { force: true });
   }
 }
 function isIngestionHandler(handler) {
@@ -65307,7 +65278,7 @@ function installIngestionHooks(provider4, options, now) {
 }
 function removeIngestionHooks(provider4, where, now) {
   const path4 = providerHookSettingsPath(provider4, where);
-  if (!(0, import_node_fs11.existsSync)(path4)) return { provider: provider4, path: path4, changed: false };
+  if (!(0, import_node_fs10.existsSync)(path4)) return { provider: provider4, path: path4, changed: false };
   const settings2 = readSettings(path4, true, now);
   const hooks = hooksOf(settings2);
   const nextHooks = {};
@@ -65344,7 +65315,7 @@ function ingestionHookStatus(provider4, options) {
 }
 
 // src/capabilities/native-ingest/hook-input.ts
-var import_node_fs12 = require("fs");
+var import_node_fs11 = require("fs");
 var import_node_path29 = require("path");
 var ALAN_MANAGED_SESSION_ENV = "ALAN_MANAGED_SESSION";
 var MAX_HOOK_STDIN_BYTES = 256 * 1024 * 1024;
@@ -65444,10 +65415,10 @@ function hookPayload(input2) {
 }
 function realpathOrSelf(path4) {
   try {
-    return (0, import_node_fs12.realpathSync)(path4);
+    return (0, import_node_fs11.realpathSync)(path4);
   } catch {
     try {
-      return (0, import_node_path29.join)((0, import_node_fs12.realpathSync)((0, import_node_path29.dirname)(path4)), (0, import_node_path29.basename)(path4));
+      return (0, import_node_path29.join)((0, import_node_fs11.realpathSync)((0, import_node_path29.dirname)(path4)), (0, import_node_path29.basename)(path4));
     } catch {
       return path4;
     }
@@ -65478,7 +65449,7 @@ function parseHookSignal(input2) {
 }
 
 // src/capabilities/native-ingest/ingest.ts
-var import_node_fs13 = require("fs");
+var import_node_fs12 = require("fs");
 
 // ../shared/dist/types/native-agent-session.js
 var nativeAgentProviderBackendKinds = {
@@ -66248,7 +66219,7 @@ function workerKey(provider4, externalSessionId) {
   return `${provider4}\0${externalSessionId}`;
 }
 function holdFor(entry) {
-  const stats = (0, import_node_fs13.statSync)(entry.transcriptPath, { bigint: true, throwIfNoEntry: false });
+  const stats = (0, import_node_fs12.statSync)(entry.transcriptPath, { bigint: true, throwIfNoEntry: false });
   if (!stats) return [];
   return [
     {
@@ -66449,7 +66420,7 @@ async function startNativeIngest(deps) {
     return "accepted";
   };
   const hasUnreadBytes = (entry, now) => {
-    const stats = (0, import_node_fs13.statSync)(entry.transcriptPath, { bigint: true, throwIfNoEntry: false });
+    const stats = (0, import_node_fs12.statSync)(entry.transcriptPath, { bigint: true, throwIfNoEntry: false });
     if (!stats || now - Number(stats.mtimeMs) > timing.sweepRecencyMs) return false;
     const replaced = String(stats.dev) !== entry.device || String(stats.ino) !== entry.inode;
     return replaced || Number(stats.size) > entry.cursor.offset;
@@ -66493,7 +66464,7 @@ async function startNativeIngest(deps) {
   const recordAlanRun = async (hold, runId) => {
     const entry = store.get(hold.provider, hold.externalSessionId);
     if (!entry || entry.dead) return;
-    const stats = (0, import_node_fs13.statSync)(entry.transcriptPath, { bigint: true, throwIfNoEntry: false });
+    const stats = (0, import_node_fs12.statSync)(entry.transcriptPath, { bigint: true, throwIfNoEntry: false });
     if (!stats) return;
     const identity = { device: String(stats.dev), inode: String(stats.ino) };
     const size = Number(stats.size);
@@ -66567,7 +66538,7 @@ async function startNativeIngest(deps) {
 init_alan_code();
 
 // src/capabilities/providers/commands.ts
-var import_node_fs14 = require("fs");
+var import_node_fs13 = require("fs");
 var import_promises35 = require("fs/promises");
 var import_node_path32 = require("path");
 var PROVIDER_COMMANDS = [
@@ -66605,7 +66576,7 @@ function pathDelimiter(platform3) {
 async function isRunnable(path4, platform3) {
   try {
     if (!(await (0, import_promises35.stat)(path4)).isFile()) return false;
-    if (platform3 !== "win32") await (0, import_promises35.access)(path4, import_node_fs14.constants.X_OK);
+    if (platform3 !== "win32") await (0, import_promises35.access)(path4, import_node_fs13.constants.X_OK);
     return true;
   } catch {
     return false;
@@ -66788,7 +66759,7 @@ init_runtime_v2();
 
 // src/capabilities/providers/account-label.ts
 var import_node_child_process12 = require("child_process");
-var import_node_fs15 = require("fs");
+var import_node_fs14 = require("fs");
 var import_node_path33 = require("path");
 var import_node_url3 = require("url");
 var ACCOUNT_TIMEOUT_MS = 2e4;
@@ -66891,7 +66862,7 @@ async function claudeLabel(executable, env) {
     const childEnv = { ...env };
     delete childEnv.FORCE_CODE_TERMINAL;
     const bundledSdk = typeof __dirname === "string" ? (0, import_node_path33.join)(__dirname, "claude-sdk.mjs") : "";
-    const sdkSpecifier = (0, import_node_fs15.existsSync)(bundledSdk) ? (0, import_node_url3.pathToFileURL)(bundledSdk).href : "@anthropic-ai/claude-agent-sdk";
+    const sdkSpecifier = (0, import_node_fs14.existsSync)(bundledSdk) ? (0, import_node_url3.pathToFileURL)(bundledSdk).href : "@anthropic-ai/claude-agent-sdk";
     const { query } = await import(sdkSpecifier);
     const session = query({
       prompt: idlePrompt(abort.signal),
@@ -67301,7 +67272,7 @@ var import_node_path37 = require("path");
 // ../shared/dist/node/shell-environment.js
 var import_node_child_process13 = require("child_process");
 var import_node_crypto16 = require("crypto");
-var import_node_fs17 = require("fs");
+var import_node_fs16 = require("fs");
 var import_node_os6 = require("os");
 var import_node_path36 = require("path");
 
@@ -67310,7 +67281,7 @@ var import_node_os5 = require("os");
 var import_node_path35 = require("path");
 
 // ../shared/dist/node/version-manager-paths.js
-var import_node_fs16 = require("fs");
+var import_node_fs15 = require("fs");
 var import_node_path34 = require("path");
 function compareNodeVersionsDesc(a, b) {
   const parse7 = (value2) => value2.replace(/^v/, "").split(".").map((part) => Number.parseInt(part, 10) || 0);
@@ -67325,19 +67296,19 @@ function compareNodeVersionsDesc(a, b) {
 }
 function resolveNvmDefaultBin(home) {
   const versionsDir = (0, import_node_path34.join)(home, ".nvm", "versions", "node");
-  if (!(0, import_node_fs16.existsSync)(versionsDir))
+  if (!(0, import_node_fs15.existsSync)(versionsDir))
     return null;
   let alias = null;
   try {
     const aliasFile = (0, import_node_path34.join)(home, ".nvm", "alias", "default");
-    if ((0, import_node_fs16.existsSync)(aliasFile))
-      alias = (0, import_node_fs16.readFileSync)(aliasFile, "utf8").trim();
+    if ((0, import_node_fs15.existsSync)(aliasFile))
+      alias = (0, import_node_fs15.readFileSync)(aliasFile, "utf8").trim();
   } catch {
     alias = null;
   }
   let installed;
   try {
-    installed = (0, import_node_fs16.readdirSync)(versionsDir).filter((entry) => entry.startsWith("v"));
+    installed = (0, import_node_fs15.readdirSync)(versionsDir).filter((entry) => entry.startsWith("v"));
   } catch {
     return null;
   }
@@ -67348,7 +67319,7 @@ function resolveNvmDefaultBin(home) {
   if (!chosen)
     return null;
   const bin = (0, import_node_path34.join)(versionsDir, chosen, "bin");
-  return (0, import_node_fs16.existsSync)(bin) ? bin : null;
+  return (0, import_node_fs15.existsSync)(bin) ? bin : null;
 }
 function resolveVersionManagerBinDirs(home, platform3 = process.platform) {
   if (platform3 === "win32")
@@ -67367,7 +67338,7 @@ function resolveVersionManagerBinDirs(home, platform3 = process.platform) {
     if (!dir || seen.has(dir))
       continue;
     seen.add(dir);
-    if ((0, import_node_fs16.existsSync)(dir))
+    if ((0, import_node_fs15.existsSync)(dir))
       resolved.push(dir);
   }
   return resolved;
@@ -67409,7 +67380,7 @@ function promoteUserBinDirs(path4, home, versionManagerDirs) {
 // ../shared/dist/node/shell-environment.js
 function isExecutableFile(path4) {
   try {
-    (0, import_node_fs17.accessSync)(path4, import_node_fs17.constants.X_OK);
+    (0, import_node_fs16.accessSync)(path4, import_node_fs16.constants.X_OK);
     return true;
   } catch {
     return false;
@@ -69319,7 +69290,7 @@ async function publishLocalSkill(options) {
 
 // src/capabilities/skills/native-index.ts
 var import_node_crypto23 = require("crypto");
-var import_node_fs18 = require("fs");
+var import_node_fs17 = require("fs");
 var import_promises45 = require("fs/promises");
 var import_node_path45 = require("path");
 var ALAN_SKILLS_PLUGIN_NAME = "alan";
@@ -69470,7 +69441,7 @@ async function reconcileNativeIndex(layout, installed, options) {
   };
 }
 function installedSkillFolders(layout) {
-  return (0, import_node_fs18.existsSync)((0, import_node_path45.join)(layout.pluginDir, ".claude-plugin", "plugin.json")) ? { pluginDir: layout.pluginDir, skillsDir: layout.pluginSkillsDir } : null;
+  return (0, import_node_fs17.existsSync)((0, import_node_path45.join)(layout.pluginDir, ".claude-plugin", "plugin.json")) ? { pluginDir: layout.pluginDir, skillsDir: layout.pluginSkillsDir } : null;
 }
 
 // src/capabilities/skills/sync.ts
@@ -71359,10 +71330,10 @@ async function reapLeftoverEngines(path4, options) {
 }
 
 // src/holder/launch-command.ts
-var import_node_fs19 = require("fs");
+var import_node_fs18 = require("fs");
 var import_node_path53 = require("path");
 var HOLDER_BUNDLE = "alan-holder.cjs";
-function holderArguments(runtimeArgs, nodeFlags, exists6 = import_node_fs19.existsSync) {
+function holderArguments(runtimeArgs, nodeFlags, exists6 = import_node_fs18.existsSync) {
   const bundle = runtimeArgs.at(-1);
   const lean = bundle === void 0 ? void 0 : (0, import_node_path53.join)((0, import_node_path53.dirname)(bundle), HOLDER_BUNDLE);
   const script = lean !== void 0 && exists6(lean) ? [...runtimeArgs.slice(0, -1), lean] : runtimeArgs;
@@ -71501,20 +71472,20 @@ async function prepareRunInputs(spec, { source, tmpDir, signal, skills = [] }) {
 
 // src/holder/serve.ts
 var import_node_crypto30 = require("crypto");
-var import_node_fs24 = require("fs");
+var import_node_fs23 = require("fs");
 var import_node_net3 = require("net");
 var import_node_path66 = require("path");
 init_runtime_v2();
 
 // src/holder/admission.ts
-var import_node_fs21 = require("fs");
+var import_node_fs20 = require("fs");
 var import_promises61 = require("fs/promises");
 var import_node_os10 = require("os");
 var import_node_path60 = require("path");
 init_constants();
 
 // ../shared/dist/node/local-workspace.js
-var import_node_fs20 = require("fs");
+var import_node_fs19 = require("fs");
 var import_node_os9 = require("os");
 var import_node_path55 = require("path");
 function resolveAlanDefaultWorkspacePath(homeDirectory = (0, import_node_os9.homedir)()) {
@@ -71742,18 +71713,16 @@ async function switchTo(checkout, current, operationId, deps, signal) {
 async function applyRequestedCheckout(checkout, spec, deps, signal) {
   try {
     if (!await isCheckout(checkout.path)) return await clone2(checkout, deps, signal);
-    const status = await readCheckoutStatus(deps.git, checkout.path, signal);
-    if (status === null) return notSwitched(checkout, null, "git status failed");
-    if (status.branch === checkout.branch) return { kind: "on_branch" };
-    if (status.dirty) return notSwitched(checkout, status.branch, "it has uncommitted changes");
+    const branch = await currentBranch(deps.git, checkout.path, signal);
+    if (branch === checkout.branch) return { kind: "on_branch" };
     if (!await claimFirstLease(deps.dir, checkout.path)) {
       return notSwitched(
         checkout,
-        status.branch,
+        branch,
         "an earlier conversation on this machine already uses it"
       );
     }
-    return await switchTo(checkout, status.branch, `checkout-${spec.runId}`, deps, signal);
+    return await switchTo(checkout, branch, `checkout-${spec.runId}`, deps, signal);
   } catch (error62) {
     return noted(
       `could not be put on ${checkout.branch}, the branch picked for this chat`,
@@ -71784,15 +71753,13 @@ async function fastForward(freshness, operationId, deps, signal) {
     const attempt2 = await deps.locks.tryExclusive(snapshot.commonDir, operationId);
     if (attempt2.kind === "busy") return false;
     const _lock = __using(_stack, attempt2.lock, true);
-    const now = await readCheckoutStatus(deps.git, cwd, signal);
-    if (now === null || now.dirty || now.head !== snapshot.head || now.branch !== snapshot.branch) {
-      return false;
-    }
-    const git = (args) => deps.git.run({ cwd, args }, signal);
-    if ((await git(["switch", "--quiet", "--detach", tip])).exitCode !== 0) return false;
-    const moved = await git(["update-ref", `refs/heads/${snapshot.branch}`, tip, snapshot.head]);
-    const back = await git(["switch", "--quiet", snapshot.branch]);
-    return moved.exitCode === 0 && back.exitCode === 0;
+    const head = await deps.git.run(
+      { cwd, args: ["rev-parse", "--verify", "HEAD"], readOnly: true },
+      signal
+    );
+    if (head.exitCode !== 0 || head.stdout.trim() !== snapshot.head) return false;
+    if (await currentBranch(deps.git, cwd, signal) !== snapshot.branch) return false;
+    return moveSnapshotTo(deps.git, cwd, snapshot, tip, signal);
   } catch (_) {
     var _error = _, _hasError = true;
   } finally {
@@ -71843,13 +71810,15 @@ async function applyRequestedCheckouts(spec, deps, signal) {
   const settled2 = /* @__PURE__ */ new Set();
   const problems = [];
   for (const checkout of requestedCheckoutsOf(spec, deps.log)) {
+    const startedAt = Date.now();
     const outcome2 = await applyRequestedCheckout(checkout, spec, deps, signal);
     deps.log.info("workspace.requested_checkout", {
       runId: spec.runId,
       path: checkout.path,
       branch: checkout.branch,
       outcome: outcome2.kind,
-      ...outcome2.kind === "moved" ? { how: outcome2.how } : {}
+      ...outcome2.kind === "moved" ? { how: outcome2.how } : {},
+      ms: Date.now() - startedAt
     });
     if (outcome2.kind === "on_branch") continue;
     settled2.add((0, import_node_path59.resolve)(checkout.path));
@@ -71865,6 +71834,7 @@ async function refreshSnapshotCheckouts(spec, targets, settled2, deps, signal) {
     if (settled2.has((0, import_node_path59.resolve)(target))) continue;
     const freshness = await readCheckoutFreshness(deps.dir, target);
     if (freshness === null) continue;
+    const startedAt = Date.now();
     const outcome2 = await atFirstLease(freshness, spec, deps, signal).catch(
       () => "noted"
     );
@@ -71873,7 +71843,8 @@ async function refreshSnapshotCheckouts(spec, targets, settled2, deps, signal) {
       runId: spec.runId,
       path: freshness.path,
       state: freshness.state,
-      outcome: outcome2
+      outcome: outcome2,
+      ms: Date.now() - startedAt
     });
   }
   return problems;
@@ -71934,7 +71905,7 @@ async function inspectReadiness(path4) {
     if (!(await (0, import_promises61.stat)(path4)).isDirectory()) {
       return { ready: false, missing: true, message: MESSAGES.missing };
     }
-    await (0, import_promises61.access)(path4, import_node_fs21.constants.R_OK | import_node_fs21.constants.W_OK | import_node_fs21.constants.X_OK);
+    await (0, import_promises61.access)(path4, import_node_fs20.constants.R_OK | import_node_fs20.constants.W_OK | import_node_fs20.constants.X_OK);
     return { ready: true };
   } catch (error62) {
     const code = errnoCode(error62) ?? "";
@@ -71979,7 +71950,7 @@ async function admitDefaultWorkspace(spec, context, skills) {
   const path4 = resolveAlanDefaultWorkspacePath(env.HOME || env.USERPROFILE || (0, import_node_os10.homedir)());
   try {
     await (0, import_promises61.mkdir)(path4, { recursive: true, mode: 448 });
-    await (0, import_promises61.access)(path4, import_node_fs21.constants.R_OK | import_node_fs21.constants.W_OK | import_node_fs21.constants.X_OK);
+    await (0, import_promises61.access)(path4, import_node_fs20.constants.R_OK | import_node_fs20.constants.W_OK | import_node_fs20.constants.X_OK);
     return { kind: "admitted", spec: { ...spec, projectPath: path4 }, skills };
   } catch (error62) {
     const code = errnoCode(error62);
@@ -72228,7 +72199,7 @@ ${added.join("\n")}
 
 // src/run-log/complete.ts
 var import_node_crypto29 = require("crypto");
-var import_node_fs22 = require("fs");
+var import_node_fs21 = require("fs");
 var import_node_path63 = require("path");
 
 // src/run-log/directory.ts
@@ -72279,23 +72250,23 @@ async function isRunClaimed(runsDir, runId) {
 // src/run-log/complete.ts
 function writeLogFile(path4, dir, text3) {
   const temp = (0, import_node_path63.join)(dir, `.log.${(0, import_node_crypto29.randomUUID)()}.tmp`);
-  const fd = (0, import_node_fs22.openSync)(temp, "wx", 384);
+  const fd = (0, import_node_fs21.openSync)(temp, "wx", 384);
   try {
-    (0, import_node_fs22.writeSync)(fd, text3);
-    (0, import_node_fs22.fsyncSync)(fd);
+    (0, import_node_fs21.writeSync)(fd, text3);
+    (0, import_node_fs21.fsyncSync)(fd);
   } finally {
-    (0, import_node_fs22.closeSync)(fd);
+    (0, import_node_fs21.closeSync)(fd);
   }
   try {
-    (0, import_node_fs22.renameSync)(temp, path4);
+    (0, import_node_fs21.renameSync)(temp, path4);
   } finally {
-    (0, import_node_fs22.rmSync)(temp, { force: true });
+    (0, import_node_fs21.rmSync)(temp, { force: true });
   }
 }
 async function writeCompleteRunLog(runsDir, meta3, records) {
   const paths = runDirectory(runsDir, meta3.runId);
   if (!await isRunClaimed(runsDir, meta3.runId)) {
-    (0, import_node_fs22.mkdirSync)(paths.dir, { recursive: true, mode: 448 });
+    (0, import_node_fs21.mkdirSync)(paths.dir, { recursive: true, mode: 448 });
     const text3 = records.map((record2, index) => {
       const line = { seq: index + 1, at: record2.at, update: record2.update };
       return `${JSON.stringify(line)}
@@ -72552,13 +72523,13 @@ function runEnded(input2) {
 var decoder = new TextDecoder();
 
 // src/run-log/writer.ts
-var import_node_fs23 = require("fs");
+var import_node_fs22 = require("fs");
 var import_node_path65 = require("path");
 init_runtime_v2();
 function lastSeq(fd, size) {
   for (const length of tailWindows(size)) {
     const buffer = Buffer.alloc(length);
-    (0, import_node_fs23.readSync)(fd, buffer, 0, length, size - length);
+    (0, import_node_fs22.readSync)(fd, buffer, 0, length, size - length);
     const last = lastLine(buffer.toString("utf8").trimEnd(), length === size);
     if (last === void 0) continue;
     if (last.length === 0) return 0;
@@ -72569,13 +72540,13 @@ function lastSeq(fd, size) {
   throw new RuntimeFault("record_too_large", "Run log tail record is larger than any record");
 }
 function openRunLog(path4, clock) {
-  (0, import_node_fs23.mkdirSync)((0, import_node_path65.dirname)(path4), { recursive: true, mode: 448 });
-  const fd = (0, import_node_fs23.openSync)(path4, "a+", 384);
-  let size = (0, import_node_fs23.fstatSync)(fd).size;
+  (0, import_node_fs22.mkdirSync)((0, import_node_path65.dirname)(path4), { recursive: true, mode: 448 });
+  const fd = (0, import_node_fs22.openSync)(path4, "a+", 384);
+  let size = (0, import_node_fs22.fstatSync)(fd).size;
   let seq = lastSeq(fd, size);
   let dirty = false;
   const sync = () => {
-    (0, import_node_fs23.fsyncSync)(fd);
+    (0, import_node_fs22.fsyncSync)(fd);
     dirty = false;
   };
   return {
@@ -72589,7 +72560,7 @@ function openRunLog(path4, clock) {
       };
       const line = Buffer.from(`${JSON.stringify(record2)}
 `, "utf8");
-      (0, import_node_fs23.writeSync)(fd, line);
+      (0, import_node_fs22.writeSync)(fd, line);
       size += line.length;
       dirty = true;
       if (isRunLifecycleKind(update.sessionUpdate)) sync();
@@ -72601,7 +72572,7 @@ function openRunLog(path4, clock) {
     },
     [Symbol.dispose]: () => {
       if (dirty) sync();
-      (0, import_node_fs23.closeSync)(fd);
+      (0, import_node_fs22.closeSync)(fd);
     }
   };
 }
@@ -72664,20 +72635,17 @@ async function runWithInputs({ spec, skills }, context, sink, signal) {
         message: `Could not fetch this run's attachments or provider credential: ${error62 instanceof Error ? error62.message : String(error62)}`
       };
     }
-    const agentContext = await sessionContext;
     const prepared = __using(_stack, inputs, true);
-    const result = await context.driver.runTurn(
-      spec,
-      sink,
-      signal,
-      agentContext === void 0 ? prepared : {
-        ...prepared,
-        agentContext: {
-          full: agentContext.full,
-          ...agentContext.update ? { update: agentContext.update } : {}
+    const result = await context.driver.runTurn(spec, sink, signal, {
+      ...prepared,
+      agentContext: sessionContext.then(
+        (agentContext2) => agentContext2 === void 0 ? void 0 : {
+          full: agentContext2.full,
+          ...agentContext2.update ? { update: agentContext2.update } : {}
         }
-      }
-    );
+      )
+    });
+    const agentContext = await sessionContext;
     if (agentContext !== void 0 && result.outcome !== "rejected") {
       await agentContext.save().catch((error62) => {
         context.log.warn("holder.agent_context_save_failed", { runId: spec.runId, error: error62 });
@@ -73045,7 +73013,7 @@ async function runHolder({
     for (const client of holder.clients) client.end();
     await new Promise((resolve13) => server.close(() => resolve13()));
     await statusWrites;
-    (0, import_node_fs24.rmSync)(launch.statusPath, { force: true });
+    (0, import_node_fs23.rmSync)(launch.statusPath, { force: true });
     log.info("holder.suspended", { conversationId: launch.conversationId });
   } catch (_) {
     var _error = _, _hasError = true;
@@ -73055,14 +73023,6 @@ async function runHolder({
 }
 
 // src/sessions/admission.ts
-var GIB = 1024 ** 3;
-var MIN_RUN_BYTES = 1.25 * GIB;
-function memoryAllowsStart(capacity, activeRuns, pendingStarts = 0) {
-  if (activeRuns + pendingStarts === 0) return true;
-  const headroom = Math.max(512 * 1024 ** 2, capacity.totalBytes * 0.2);
-  const slots = Math.max(1, Math.floor((capacity.totalBytes - headroom) / MIN_RUN_BYTES));
-  return activeRuns + pendingStarts < slots && capacity.availableBytes >= MIN_RUN_BYTES * (pendingStarts + 1);
-}
 function runOccupancy(held, reserved, exclude = null) {
   const active = new Set(
     held.filter((run2) => run2.state === "running" && run2.runId !== exclude).map((run2) => run2.runId)
@@ -73075,11 +73035,11 @@ function runOccupancy(held, reserved, exclude = null) {
 }
 
 // src/sessions/suspend-policy.ts
-var GIB2 = 1024 ** 3;
-var SESSION_MEMORY_CEILING_BYTES = 2.5 * GIB2;
+var GIB = 1024 ** 3;
+var SESSION_MEMORY_CEILING_BYTES = 2.5 * GIB;
 var MEMORY_BUDGET_SHARE = 0.15;
-var MEMORY_BUDGET_MIN_BYTES = GIB2;
-var MEMORY_BUDGET_MAX_BYTES = 4 * GIB2;
+var MEMORY_BUDGET_MIN_BYTES = GIB;
+var MEMORY_BUDGET_MAX_BYTES = 4 * GIB;
 function memoryBudgetFor(totalMemoryBytes) {
   const share = Math.round(totalMemoryBytes * MEMORY_BUDGET_SHARE);
   return Math.min(MEMORY_BUDGET_MAX_BYTES, Math.max(MEMORY_BUDGET_MIN_BYTES, share));
@@ -73192,8 +73152,8 @@ async function openSessions(deps) {
   const retiring = /* @__PURE__ */ new Map();
   const legacy = /* @__PURE__ */ new Map();
   const maxActiveRuns = deps.maxActiveRuns ?? DEFAULT_MAX_ACTIVE_RUNS;
-  const memoryCapacity = deps.memoryCapacity ?? readMemoryCapacity;
-  const suspendPolicy = deps.suspendPolicy ?? defaultSuspendPolicy(memoryCapacity().totalBytes);
+  const totalMemoryBytes = deps.totalMemoryBytes ?? readTotalMemoryBytes;
+  const suspendPolicy = deps.suspendPolicy ?? defaultSuspendPolicy(totalMemoryBytes());
   const admitted = /* @__PURE__ */ new Set();
   let admitting = Promise.resolve();
   const memoryPressure = deps.memoryPressure ?? readMemoryPressure;
@@ -73475,8 +73435,7 @@ async function openSessions(deps) {
     const claim2 = admitting.then(async () => {
       const held = await heldRuns();
       const { active, pending } = runOccupancy(held, [...admitted, ...launched.keys()], runId);
-      if (active + pending >= maxActiveRuns || !memoryAllowsStart(memoryCapacity(), active, pending))
-        return false;
+      if (active + pending >= maxActiveRuns) return false;
       admitted.add(runId);
       return true;
     });
@@ -73501,20 +73460,12 @@ async function openSessions(deps) {
       return "started";
     }
     if (!await claimCapacity(run2.runId)) {
-      const capacity = memoryCapacity();
       const { active, pending } = runOccupancy(
         await heldRuns(),
         [...admitted, ...launched.keys()],
         run2.runId
       );
-      log.info("sessions.resource_wait", {
-        runId: run2.runId,
-        active,
-        pending,
-        maxActiveRuns,
-        totalMiB: Math.round(capacity.totalBytes / 2 ** 20),
-        availableMiB: Math.round(capacity.availableBytes / 2 ** 20)
-      });
+      log.info("sessions.resource_wait", { runId: run2.runId, active, pending, maxActiveRuns });
       return "waiting";
     }
     try {
@@ -73547,7 +73498,7 @@ async function openSessions(deps) {
     heldRuns,
     hasFreeSlot: async () => {
       const { active, pending } = runOccupancy(await heldRuns(), [...admitted, ...launched.keys()]);
-      return active + pending < maxActiveRuns && memoryAllowsStart(memoryCapacity(), active, pending);
+      return active + pending < maxActiveRuns;
     },
     applySuspendPolicy,
     start: (run2) => {
@@ -75815,7 +75766,7 @@ async function runLogout(argv, signal) {
 }
 
 // src/cli/commands/run.ts
-var import_node_fs26 = require("fs");
+var import_node_fs25 = require("fs");
 var import_node_path82 = require("path");
 
 // src/local-api/app-attachments.ts
@@ -76370,7 +76321,7 @@ var machineFeatureRoutes = [
 ];
 
 // src/local-api/run-log-routes.ts
-var import_node_fs25 = require("fs");
+var import_node_fs24 = require("fs");
 init_runtime_v2();
 var RUN_ENDED = "_alan/run.ended";
 var decoder2 = new TextDecoder();
@@ -76387,7 +76338,7 @@ async function openWhenWritten(deps, runId, res, signal) {
   const path4 = runDirectory(deps.runsDir, runId).log;
   while (!signal.aborted) {
     const appended = deps.appends.nextAppend(runId, signal);
-    if ((0, import_node_fs25.existsSync)(path4) || !await deps.isHeld(runId, signal)) return openReader(res, path4);
+    if ((0, import_node_fs24.existsSync)(path4) || !await deps.isHeld(runId, signal)) return openReader(res, path4);
     await appended;
   }
   return null;
@@ -82735,7 +82686,7 @@ function lockWaitMs(argv) {
 async function openManagedProviders(config2, paths) {
   const providerEnv = readCliEnvironment();
   const bundledNpm = (0, import_node_path82.join)((0, import_node_path82.dirname)(process.execPath), "npm", "bin", "npm-cli.js");
-  const providerToolchain = config2.providerToolchain ?? (process.platform === "win32" && (0, import_node_fs26.existsSync)(bundledNpm) ? { node: process.execPath, npmCli: bundledNpm } : null);
+  const providerToolchain = config2.providerToolchain ?? (process.platform === "win32" && (0, import_node_fs25.existsSync)(bundledNpm) ? { node: process.execPath, npmCli: bundledNpm } : null);
   const npmPath = providerToolchain?.node ?? await resolveCommandOnPath("npm", providerEnv, process.platform);
   const npmOptions = npmPath === null || process.platform === "win32" && providerToolchain === null ? null : {
     command: npmPath,

package/alan-holder.cjs

@@ -42000,8 +42000,9 @@ var init_driver = __esm({
 });
 
 // src/holder/drivers/persistent.ts
-function sessionContextFor(opened, inputs) {
-  return opened.fresh ? inputs.agentContext?.full : inputs.agentContext?.update;
+async function sessionContextFor(opened, inputs) {
+  const text2 = await inputs.agentContext;
+  return opened.fresh ? text2?.full : text2?.update;
 }
 function steerEcho(request2) {
   return {
@@ -42250,7 +42251,7 @@ function createPersistentDriver(provider4, options) {
       };
       signal.addEventListener("abort", onAbort, { once: true });
       try {
-        const contextPrefix = [sessionContextFor(opened, inputs), opened.contextPrefix].filter((part) => part !== void 0).join("\n\n");
+        const contextPrefix = [await sessionContextFor(opened, inputs), opened.contextPrefix].filter((part) => part !== void 0).join("\n\n");
         const input2 = await provider4.turnInput(spec, inputs, contextPrefix || void 0);
         if (signal.aborted) return { outcome: "aborted" };
         const timeoutMs = options.firstOutputTimeoutMs ?? FIRST_OUTPUT_TIMEOUT_MS;
@@ -48505,6 +48506,20 @@ async function readCheckoutStatus(git, cwd, signal) {
   );
   return output2.exitCode === 0 ? parseStatus(output2.stdout) : null;
 }
+async function currentBranch(git, cwd, signal) {
+  const output2 = await git.run(
+    { cwd, args: ["symbolic-ref", "--quiet", "--short", "HEAD"], readOnly: true },
+    signal
+  );
+  return output2.exitCode === 0 ? output2.stdout.trim() || null : null;
+}
+async function moveSnapshotTo(git, cwd, snapshot, tip, signal) {
+  const run = (args) => git.run({ cwd, args }, signal);
+  if ((await run(["switch", "--quiet", "--detach", tip])).exitCode !== 0) return false;
+  const moved = await run(["update-ref", `refs/heads/${snapshot.branch}`, tip, snapshot.head]);
+  const back = await run(["switch", "--quiet", snapshot.branch]);
+  return moved.exitCode === 0 && back.exitCode === 0;
+}
 async function isCheckout(path) {
   return (0, import_promises8.stat)((0, import_node_path4.join)(path, ".git")).then(
     () => true,
@@ -48884,7 +48899,6 @@ function runtimePaths(stateDir) {
 
 // src/platform/process-memory.ts
 var import_node_child_process4 = require("child_process");
-var import_node_fs6 = require("fs");
 var import_promises12 = require("fs/promises");
 var import_node_os2 = require("os");
 var import_node_util3 = require("util");
@@ -48924,45 +48938,6 @@ async function readProcessRss(pid) {
     return null;
   }
 }
-function parseDarwinVmStat(output2) {
-  const pageSize = Number(/page size of (\d+) bytes/.exec(output2)?.[1]);
-  if (!Number.isFinite(pageSize) || pageSize <= 0) return null;
-  const pages = (name) => {
-    const match = new RegExp(`^Pages ${name}:\\s+(\\d+)\\.?$`, "m").exec(output2);
-    return match ? Number(match[1]) : null;
-  };
-  const free = pages("free");
-  if (free === null) return null;
-  return (free + (pages("inactive") ?? 0) + (pages("speculative") ?? 0)) * pageSize;
-}
-function parseLinuxMemInfo(output2) {
-  const kilobytes = /^MemAvailable:\s+(\d+)\s+kB$/m.exec(output2)?.[1];
-  return kilobytes === void 0 ? null : Number(kilobytes) * 1024;
-}
-var CAPACITY_PROBE_TTL_MS = 2e3;
-var AvailableMemoryProbe = class {
-  cached = null;
-  read(now) {
-    if (this.cached !== null && now - this.cached.at < CAPACITY_PROBE_TTL_MS) {
-      return this.cached.bytes;
-    }
-    let bytes = null;
-    try {
-      if (process.platform === "darwin") {
-        bytes = parseDarwinVmStat(
-          (0, import_node_child_process4.execFileSync)("vm_stat", { encoding: "utf8", timeout: PROBE_TIMEOUT_MS })
-        );
-      } else if (process.platform === "linux") {
-        bytes = parseLinuxMemInfo((0, import_node_fs6.readFileSync)("/proc/meminfo", "utf8"));
-      }
-    } catch {
-      bytes = null;
-    }
-    this.cached = { at: now, bytes };
-    return bytes;
-  }
-};
-var availableMemoryProbe = new AvailableMemoryProbe();
 async function processMemoryRows() {
   if (process.platform === "win32") {
     const { stdout: stdout2 } = await execFileAsync3(
@@ -49063,7 +49038,7 @@ var systemExec = (request2) => new Promise((resolve8) => {
 init_alan_code();
 
 // src/capabilities/providers/commands.ts
-var import_node_fs7 = require("fs");
+var import_node_fs6 = require("fs");
 var import_promises17 = require("fs/promises");
 var import_node_path9 = require("path");
 var PROVIDER_COMMANDS = [
@@ -49101,7 +49076,7 @@ function pathDelimiter(platform) {
 async function isRunnable(path, platform) {
   try {
     if (!(await (0, import_promises17.stat)(path)).isFile()) return false;
-    if (platform !== "win32") await (0, import_promises17.access)(path, import_node_fs7.constants.X_OK);
+    if (platform !== "win32") await (0, import_promises17.access)(path, import_node_fs6.constants.X_OK);
     return true;
   } catch {
     return false;
@@ -49751,7 +49726,7 @@ async function inspectIndexedSkill(directory, contentHash) {
 
 // src/capabilities/skills/native-index.ts
 var import_node_crypto10 = require("crypto");
-var import_node_fs8 = require("fs");
+var import_node_fs7 = require("fs");
 var import_promises21 = require("fs/promises");
 var import_node_path13 = require("path");
 var ALAN_SKILLS_PLUGIN_NAME = "alan";
@@ -49765,7 +49740,7 @@ var PLUGIN_MANIFEST = `${JSON.stringify(
 )}
 `;
 function installedSkillFolders(layout) {
-  return (0, import_node_fs8.existsSync)((0, import_node_path13.join)(layout.pluginDir, ".claude-plugin", "plugin.json")) ? { pluginDir: layout.pluginDir, skillsDir: layout.pluginSkillsDir } : null;
+  return (0, import_node_fs7.existsSync)((0, import_node_path13.join)(layout.pluginDir, ".claude-plugin", "plugin.json")) ? { pluginDir: layout.pluginDir, skillsDir: layout.pluginSkillsDir } : null;
 }
 
 // src/capabilities/workspace/index.ts
@@ -50382,20 +50357,20 @@ async function prepareRunInputs(spec, { source, tmpDir, signal, skills = [] }) {
 
 // src/holder/serve.ts
 var import_node_crypto15 = require("crypto");
-var import_node_fs12 = require("fs");
+var import_node_fs11 = require("fs");
 var import_node_net2 = require("net");
 var import_node_path29 = require("path");
 init_runtime_v2();
 
 // src/holder/admission.ts
-var import_node_fs10 = require("fs");
+var import_node_fs9 = require("fs");
 var import_promises35 = require("fs/promises");
 var import_node_os6 = require("os");
 var import_node_path25 = require("path");
 init_constants();
 
 // ../shared/dist/node/local-workspace.js
-var import_node_fs9 = require("fs");
+var import_node_fs8 = require("fs");
 var import_node_os5 = require("os");
 var import_node_path20 = require("path");
 function resolveAlanDefaultWorkspacePath(homeDirectory = (0, import_node_os5.homedir)()) {
@@ -50623,18 +50598,16 @@ async function switchTo(checkout, current, operationId, deps, signal) {
 async function applyRequestedCheckout(checkout, spec, deps, signal) {
   try {
     if (!await isCheckout(checkout.path)) return await clone2(checkout, deps, signal);
-    const status = await readCheckoutStatus(deps.git, checkout.path, signal);
-    if (status === null) return notSwitched(checkout, null, "git status failed");
-    if (status.branch === checkout.branch) return { kind: "on_branch" };
-    if (status.dirty) return notSwitched(checkout, status.branch, "it has uncommitted changes");
+    const branch = await currentBranch(deps.git, checkout.path, signal);
+    if (branch === checkout.branch) return { kind: "on_branch" };
     if (!await claimFirstLease(deps.dir, checkout.path)) {
       return notSwitched(
         checkout,
-        status.branch,
+        branch,
         "an earlier conversation on this machine already uses it"
       );
     }
-    return await switchTo(checkout, status.branch, `checkout-${spec.runId}`, deps, signal);
+    return await switchTo(checkout, branch, `checkout-${spec.runId}`, deps, signal);
   } catch (error62) {
     return noted(
       `could not be put on ${checkout.branch}, the branch picked for this chat`,
@@ -50665,15 +50638,13 @@ async function fastForward(freshness, operationId, deps, signal) {
     const attempt = await deps.locks.tryExclusive(snapshot.commonDir, operationId);
     if (attempt.kind === "busy") return false;
     const _lock = __using(_stack, attempt.lock, true);
-    const now = await readCheckoutStatus(deps.git, cwd, signal);
-    if (now === null || now.dirty || now.head !== snapshot.head || now.branch !== snapshot.branch) {
-      return false;
-    }
-    const git = (args) => deps.git.run({ cwd, args }, signal);
-    if ((await git(["switch", "--quiet", "--detach", tip])).exitCode !== 0) return false;
-    const moved = await git(["update-ref", `refs/heads/${snapshot.branch}`, tip, snapshot.head]);
-    const back = await git(["switch", "--quiet", snapshot.branch]);
-    return moved.exitCode === 0 && back.exitCode === 0;
+    const head = await deps.git.run(
+      { cwd, args: ["rev-parse", "--verify", "HEAD"], readOnly: true },
+      signal
+    );
+    if (head.exitCode !== 0 || head.stdout.trim() !== snapshot.head) return false;
+    if (await currentBranch(deps.git, cwd, signal) !== snapshot.branch) return false;
+    return moveSnapshotTo(deps.git, cwd, snapshot, tip, signal);
   } catch (_) {
     var _error = _, _hasError = true;
   } finally {
@@ -50724,13 +50695,15 @@ async function applyRequestedCheckouts(spec, deps, signal) {
   const settled2 = /* @__PURE__ */ new Set();
   const problems = [];
   for (const checkout of requestedCheckoutsOf(spec, deps.log)) {
+    const startedAt = Date.now();
     const outcome2 = await applyRequestedCheckout(checkout, spec, deps, signal);
     deps.log.info("workspace.requested_checkout", {
       runId: spec.runId,
       path: checkout.path,
       branch: checkout.branch,
       outcome: outcome2.kind,
-      ...outcome2.kind === "moved" ? { how: outcome2.how } : {}
+      ...outcome2.kind === "moved" ? { how: outcome2.how } : {},
+      ms: Date.now() - startedAt
     });
     if (outcome2.kind === "on_branch") continue;
     settled2.add((0, import_node_path24.resolve)(checkout.path));
@@ -50746,6 +50719,7 @@ async function refreshSnapshotCheckouts(spec, targets, settled2, deps, signal) {
     if (settled2.has((0, import_node_path24.resolve)(target))) continue;
     const freshness = await readCheckoutFreshness(deps.dir, target);
     if (freshness === null) continue;
+    const startedAt = Date.now();
     const outcome2 = await atFirstLease(freshness, spec, deps, signal).catch(
       () => "noted"
     );
@@ -50754,7 +50728,8 @@ async function refreshSnapshotCheckouts(spec, targets, settled2, deps, signal) {
       runId: spec.runId,
       path: freshness.path,
       state: freshness.state,
-      outcome: outcome2
+      outcome: outcome2,
+      ms: Date.now() - startedAt
     });
   }
   return problems;
@@ -50815,7 +50790,7 @@ async function inspectReadiness(path) {
     if (!(await (0, import_promises35.stat)(path)).isDirectory()) {
       return { ready: false, missing: true, message: MESSAGES.missing };
     }
-    await (0, import_promises35.access)(path, import_node_fs10.constants.R_OK | import_node_fs10.constants.W_OK | import_node_fs10.constants.X_OK);
+    await (0, import_promises35.access)(path, import_node_fs9.constants.R_OK | import_node_fs9.constants.W_OK | import_node_fs9.constants.X_OK);
     return { ready: true };
   } catch (error62) {
     const code = errnoCode(error62) ?? "";
@@ -50860,7 +50835,7 @@ async function admitDefaultWorkspace(spec, context, skills) {
   const path = resolveAlanDefaultWorkspacePath(env.HOME || env.USERPROFILE || (0, import_node_os6.homedir)());
   try {
     await (0, import_promises35.mkdir)(path, { recursive: true, mode: 448 });
-    await (0, import_promises35.access)(path, import_node_fs10.constants.R_OK | import_node_fs10.constants.W_OK | import_node_fs10.constants.X_OK);
+    await (0, import_promises35.access)(path, import_node_fs9.constants.R_OK | import_node_fs9.constants.W_OK | import_node_fs9.constants.X_OK);
     return { kind: "admitted", spec: { ...spec, projectPath: path }, skills };
   } catch (error62) {
     const code = errnoCode(error62);
@@ -51199,13 +51174,13 @@ function runEnded(input2) {
 var decoder = new TextDecoder();
 
 // src/run-log/writer.ts
-var import_node_fs11 = require("fs");
+var import_node_fs10 = require("fs");
 var import_node_path28 = require("path");
 init_runtime_v2();
 function lastSeq(fd, size) {
   for (const length of tailWindows(size)) {
     const buffer = Buffer.alloc(length);
-    (0, import_node_fs11.readSync)(fd, buffer, 0, length, size - length);
+    (0, import_node_fs10.readSync)(fd, buffer, 0, length, size - length);
     const last = lastLine(buffer.toString("utf8").trimEnd(), length === size);
     if (last === void 0) continue;
     if (last.length === 0) return 0;
@@ -51216,13 +51191,13 @@ function lastSeq(fd, size) {
   throw new RuntimeFault("record_too_large", "Run log tail record is larger than any record");
 }
 function openRunLog(path, clock) {
-  (0, import_node_fs11.mkdirSync)((0, import_node_path28.dirname)(path), { recursive: true, mode: 448 });
-  const fd = (0, import_node_fs11.openSync)(path, "a+", 384);
-  let size = (0, import_node_fs11.fstatSync)(fd).size;
+  (0, import_node_fs10.mkdirSync)((0, import_node_path28.dirname)(path), { recursive: true, mode: 448 });
+  const fd = (0, import_node_fs10.openSync)(path, "a+", 384);
+  let size = (0, import_node_fs10.fstatSync)(fd).size;
   let seq = lastSeq(fd, size);
   let dirty = false;
   const sync = () => {
-    (0, import_node_fs11.fsyncSync)(fd);
+    (0, import_node_fs10.fsyncSync)(fd);
     dirty = false;
   };
   return {
@@ -51236,7 +51211,7 @@ function openRunLog(path, clock) {
       };
       const line = Buffer.from(`${JSON.stringify(record2)}
 `, "utf8");
-      (0, import_node_fs11.writeSync)(fd, line);
+      (0, import_node_fs10.writeSync)(fd, line);
       size += line.length;
       dirty = true;
       if (isRunLifecycleKind(update.sessionUpdate)) sync();
@@ -51248,7 +51223,7 @@ function openRunLog(path, clock) {
     },
     [Symbol.dispose]: () => {
       if (dirty) sync();
-      (0, import_node_fs11.closeSync)(fd);
+      (0, import_node_fs10.closeSync)(fd);
     }
   };
 }
@@ -51311,20 +51286,17 @@ async function runWithInputs({ spec, skills }, context, sink, signal) {
         message: `Could not fetch this run's attachments or provider credential: ${error62 instanceof Error ? error62.message : String(error62)}`
       };
     }
-    const agentContext = await sessionContext;
     const prepared = __using(_stack, inputs, true);
-    const result = await context.driver.runTurn(
-      spec,
-      sink,
-      signal,
-      agentContext === void 0 ? prepared : {
-        ...prepared,
-        agentContext: {
-          full: agentContext.full,
-          ...agentContext.update ? { update: agentContext.update } : {}
+    const result = await context.driver.runTurn(spec, sink, signal, {
+      ...prepared,
+      agentContext: sessionContext.then(
+        (agentContext2) => agentContext2 === void 0 ? void 0 : {
+          full: agentContext2.full,
+          ...agentContext2.update ? { update: agentContext2.update } : {}
         }
-      }
-    );
+      )
+    });
+    const agentContext = await sessionContext;
     if (agentContext !== void 0 && result.outcome !== "rejected") {
       await agentContext.save().catch((error62) => {
         context.log.warn("holder.agent_context_save_failed", { runId: spec.runId, error: error62 });
@@ -51692,7 +51664,7 @@ async function runHolder({
     for (const client of holder.clients) client.end();
     await new Promise((resolve8) => server.close(() => resolve8()));
     await statusWrites;
-    (0, import_node_fs12.rmSync)(launch.statusPath, { force: true });
+    (0, import_node_fs11.rmSync)(launch.statusPath, { force: true });
     log.info("holder.suspended", { conversationId: launch.conversationId });
   } catch (_) {
     var _error = _, _hasError = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alan-ai-hq/agent-manager-linux-arm64",
-  "version": "0.1.161",
+  "version": "0.1.163",
   "description": "Alan machine runtime (alan-agent) for one platform: the official Node.js binary, the runtime bundle and its launcher. Installed by @alan-ai-hq/agent-manager.",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://tryalan.ai",