@hydra-acp/cli 0.1.3 → 0.1.5

package/dist/index.js

@@ -1,6 +1,6 @@
 // src/daemon/server.ts
-import * as fs7 from "fs";
-import * as fsp2 from "fs/promises";
+import * as fs9 from "fs";
+import * as fsp3 from "fs/promises";
 import Fastify from "fastify";
 import websocketPlugin from "@fastify/websocket";
 import pino from "pino";
@@ -35,7 +35,11 @@ var paths = {
   currentLogFile: () => path.join(hydraHome(), "current.log"),
   registryCache: () => path.join(hydraHome(), "registry.json"),
   agentsDir: () => path.join(hydraHome(), "agents"),
-  agentDir: (id) => path.join(hydraHome(), "agents", id),
+  // <platformKey>/<agentId>/<version>/ — platform at the top so a Hydra
+  // home shared between machines (NFS, rsync'd dotfiles) keeps each
+  // machine's binaries cleanly separated. `ls agents/` immediately
+  // shows which platforms have ever installed anything.
+  agentInstallDir: (id, platformKey, version) => path.join(hydraHome(), "agents", platformKey, id, version),
   sessionsDir: () => path.join(hydraHome(), "sessions"),
   // One directory per session id under sessions/. Co-locates the
   // session record, its transcript, and any future per-session state
@@ -62,7 +66,7 @@ var DaemonConfig = z.object({
   authToken: z.string().min(16),
   logLevel: z.enum(["debug", "info", "warn", "error"]).default("info"),
   tls: TlsConfig.optional(),
-  sessionIdleTimeoutSeconds: z.number().int().nonnegative().default(30)
+  sessionIdleTimeoutSeconds: z.number().int().nonnegative().default(3600)
 });
 var RegistryConfig = z.object({
   url: z.string().url().default(REGISTRY_URL_DEFAULT),
@@ -95,6 +99,14 @@ var HydraConfig = z.object({
   daemon: DaemonConfig,
   registry: RegistryConfig.default({ url: REGISTRY_URL_DEFAULT, ttlHours: 24 }),
   defaultAgent: z.string().default("claude-acp"),
+  // Optional per-agent default model id. When a brand-new agent process
+  // is spawned (session/new path), hydra issues session/set_model with
+  // the matching entry so the user lands on their preferred model from
+  // the first prompt. Not applied on resurrect — those sessions keep
+  // whatever the user last selected. Keys are agent ids; values are the
+  // raw model id strings the agent expects (claude-acp: "claude-opus-4-7",
+  // opencode: "openai/gpt-5-codex" or "ncp-anthropic/claude-opus-4-7", …).
+  defaultModels: z.record(z.string(), z.string()).default({}),
   // Where new sessions land when POST /v1/sessions omits cwd. Stored as
   // a literal string ("~", "~/dev", "$HOME/work") so the config file is
   // portable across machines; expanded via expandHome at use time.
@@ -137,8 +149,7 @@ async function ensureConfig() {
     if (e.code !== "ENOENT") {
       throw err;
     }
-    const config = defaultConfig();
-    await writeConfig(config);
+    const config = await writeMinimalInitConfig();
     process.stderr.write(
       `hydra-acp: initialized ${paths.config()} with a fresh auth token.
 `
@@ -154,6 +165,16 @@ async function writeConfig(config) {
     mode: 384
   });
 }
+async function writeMinimalInitConfig(authToken) {
+  const token = authToken ?? generateAuthToken();
+  const minimal = { daemon: { authToken: token } };
+  await fs.mkdir(paths.home(), { recursive: true });
+  await fs.writeFile(paths.config(), JSON.stringify(minimal, null, 2) + "\n", {
+    encoding: "utf8",
+    mode: 384
+  });
+  return HydraConfig.parse(minimal);
+}
 function generateAuthToken() {
   const bytes = new Uint8Array(32);
   crypto.getRandomValues(bytes);
@@ -184,8 +205,213 @@ function expandHome(p) {
 }
 
 // src/core/registry.ts
-import * as fs2 from "fs/promises";
+import * as fs3 from "fs/promises";
 import { z as z2 } from "zod";
+
+// src/core/binary-install.ts
+import * as fs2 from "fs";
+import * as fsp from "fs/promises";
+import * as path2 from "path";
+import { spawn } from "child_process";
+import { Readable } from "stream";
+function currentPlatformKey() {
+  const osPart = process.platform === "darwin" ? "darwin" : process.platform === "linux" ? "linux" : process.platform === "win32" ? "windows" : void 0;
+  const archPart = process.arch === "arm64" ? "aarch64" : process.arch === "x64" ? "x86_64" : void 0;
+  if (!osPart || !archPart) {
+    return void 0;
+  }
+  return `${osPart}-${archPart}`;
+}
+function pickBinaryTarget(distribution, platformKey = currentPlatformKey()) {
+  if (!platformKey) {
+    return void 0;
+  }
+  return distribution[platformKey];
+}
+var logSink = (msg) => {
+  process.stderr.write(msg + "\n");
+};
+function setBinaryInstallLogger(log) {
+  logSink = log ?? ((msg) => process.stderr.write(msg + "\n"));
+}
+async function ensureBinary(args) {
+  if (!args.target.archive) {
+    throw new Error(
+      `Agent ${args.agentId} has no archive URL for ${currentPlatformKey() ?? "this platform"}`
+    );
+  }
+  if (!args.target.cmd) {
+    throw new Error(`Agent ${args.agentId} has no cmd in its binary target`);
+  }
+  const platformKey = currentPlatformKey();
+  if (!platformKey) {
+    throw new Error(
+      `Agent ${args.agentId}: cannot determine platform key for ${process.platform}/${process.arch}`
+    );
+  }
+  const installDir = paths.agentInstallDir(
+    args.agentId,
+    platformKey,
+    args.version
+  );
+  const cmdPath = path2.resolve(installDir, args.target.cmd);
+  if (await fileExists(cmdPath)) {
+    return cmdPath;
+  }
+  await downloadAndExtract({
+    agentId: args.agentId,
+    archiveUrl: args.target.archive,
+    installDir
+  });
+  if (!await fileExists(cmdPath)) {
+    throw new Error(
+      `Agent ${args.agentId}: extracted archive did not contain ${args.target.cmd} (looked in ${installDir})`
+    );
+  }
+  if (process.platform !== "win32") {
+    await fsp.chmod(cmdPath, 493).catch(() => void 0);
+  }
+  return cmdPath;
+}
+async function downloadAndExtract(args) {
+  await fsp.mkdir(path2.dirname(args.installDir), { recursive: true });
+  const tempDir = await fsp.mkdtemp(`${args.installDir}.partial-`);
+  try {
+    logSink(`hydra-acp: downloading ${args.agentId} from ${args.archiveUrl}`);
+    const archivePath = await downloadTo({
+      url: args.archiveUrl,
+      dir: tempDir,
+      agentId: args.agentId
+    });
+    logSink(`hydra-acp: extracting ${args.agentId}`);
+    await extract(archivePath, tempDir);
+    await fsp.unlink(archivePath).catch(() => void 0);
+    try {
+      await fsp.rename(tempDir, args.installDir);
+    } catch (err) {
+      const e = err;
+      if ((e.code === "EEXIST" || e.code === "ENOTEMPTY") && await fileExists(args.installDir)) {
+        await fsp.rm(tempDir, { recursive: true, force: true }).catch(
+          () => void 0
+        );
+        return;
+      }
+      throw err;
+    }
+    logSink(`hydra-acp: installed ${args.agentId} to ${args.installDir}`);
+  } catch (err) {
+    await fsp.rm(tempDir, { recursive: true, force: true }).catch(() => void 0);
+    throw err;
+  }
+}
+async function downloadTo(args) {
+  const filename = inferArchiveName(args.url);
+  const dest = path2.join(args.dir, filename);
+  const response = await fetch(args.url, { redirect: "follow" });
+  if (!response.ok || !response.body) {
+    throw new Error(
+      `Failed to download ${args.url}: HTTP ${response.status} ${response.statusText}`
+    );
+  }
+  const total = Number(response.headers.get("content-length") ?? "0");
+  const out = fs2.createWriteStream(dest);
+  const nodeStream = Readable.fromWeb(response.body);
+  let received = 0;
+  let lastEmit = Date.now();
+  const EMIT_INTERVAL_MS = 2e3;
+  nodeStream.on("data", (chunk) => {
+    received += chunk.length;
+    const now = Date.now();
+    if (now - lastEmit < EMIT_INTERVAL_MS) {
+      return;
+    }
+    lastEmit = now;
+    logSink(formatProgress(args.agentId, received, total));
+  });
+  await new Promise((resolve3, reject) => {
+    nodeStream.on("error", reject);
+    out.on("error", reject);
+    out.on("finish", () => resolve3());
+    nodeStream.pipe(out);
+  });
+  logSink(formatProgress(
+    args.agentId,
+    received,
+    total,
+    /* done */
+    true
+  ));
+  return dest;
+}
+function formatProgress(agentId, received, total, done = false) {
+  const rxMb = (received / 1e6).toFixed(1);
+  if (total > 0) {
+    const totalMb = (total / 1e6).toFixed(1);
+    const pct = Math.min(100, Math.floor(received / total * 100));
+    const tag2 = done ? "downloaded" : "downloading";
+    return `hydra-acp: ${tag2} ${agentId} ${rxMb}/${totalMb} MB (${pct}%)`;
+  }
+  const tag = done ? "downloaded" : "downloading";
+  return `hydra-acp: ${tag} ${agentId} ${rxMb} MB`;
+}
+function inferArchiveName(url) {
+  const u = new URL(url);
+  const base = path2.posix.basename(u.pathname);
+  return base || "archive";
+}
+async function extract(archivePath, dest) {
+  const lower = archivePath.toLowerCase();
+  if (lower.endsWith(".tar.gz") || lower.endsWith(".tgz") || lower.endsWith(".tar")) {
+    await run("tar", ["-xf", archivePath, "-C", dest]);
+    return;
+  }
+  if (lower.endsWith(".zip")) {
+    if (await hasCommand("unzip")) {
+      await run("unzip", ["-q", archivePath, "-d", dest]);
+      return;
+    }
+    await run("tar", ["-xf", archivePath, "-C", dest]);
+    return;
+  }
+  throw new Error(`Unsupported archive format: ${archivePath}`);
+}
+function run(cmd, args) {
+  return new Promise((resolve3, reject) => {
+    const child = spawn(cmd, args, {
+      stdio: ["ignore", "ignore", "inherit"]
+    });
+    child.on("error", reject);
+    child.on("exit", (code, signal) => {
+      if (code === 0) {
+        resolve3();
+        return;
+      }
+      reject(
+        new Error(
+          `${cmd} ${args.join(" ")} exited with ${code !== null ? `code ${code}` : `signal ${signal}`}`
+        )
+      );
+    });
+  });
+}
+async function hasCommand(name) {
+  return new Promise((resolve3) => {
+    const finder = process.platform === "win32" ? "where" : "which";
+    const child = spawn(finder, [name], { stdio: "ignore" });
+    child.on("error", () => resolve3(false));
+    child.on("exit", (code) => resolve3(code === 0));
+  });
+}
+async function fileExists(p) {
+  try {
+    await fsp.access(p);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// src/core/registry.ts
 var NpxDistribution = z2.object({
   package: z2.string(),
   args: z2.array(z2.string()).optional(),
@@ -193,7 +419,9 @@ var NpxDistribution = z2.object({
 });
 var BinaryTarget = z2.object({
   archive: z2.string().url().optional(),
-  cmd: z2.string().optional()
+  cmd: z2.string().optional(),
+  args: z2.array(z2.string()).optional(),
+  env: z2.record(z2.string()).optional()
 });
 var BinaryDistribution = z2.object({
   "darwin-aarch64": BinaryTarget.optional(),
@@ -282,34 +510,59 @@ var Registry = class {
     if (!response.ok) {
       throw new Error(`Registry fetch failed: HTTP ${response.status}`);
     }
-    const json = await response.json();
-    const data = RegistryDocument.parse(json);
-    return { fetchedAt: Date.now(), data };
+    const raw = await response.json();
+    const data = RegistryDocument.parse(raw);
+    return { fetchedAt: Date.now(), raw, data };
   }
   async readDiskCache() {
+    let text;
     try {
-      const raw = await fs2.readFile(paths.registryCache(), "utf8");
-      const parsed = JSON.parse(raw);
-      if (typeof parsed.fetchedAt === "number" && parsed.data && Array.isArray(parsed.data.agents)) {
-        return parsed;
-      }
+      text = await fs3.readFile(paths.registryCache(), "utf8");
     } catch (err) {
       const e = err;
-      if (e.code !== "ENOENT") {
-        throw err;
+      if (e.code === "ENOENT") {
+        return void 0;
       }
+      throw err;
+    }
+    try {
+      const parsed = JSON.parse(text);
+      if (typeof parsed.fetchedAt !== "number" || parsed.data === void 0) {
+        return void 0;
+      }
+      const data = RegistryDocument.parse(parsed.data);
+      return { fetchedAt: parsed.fetchedAt, raw: parsed.data, data };
+    } catch {
+      return void 0;
     }
-    return void 0;
   }
+  // Atomic write: dump to a sibling temp path, then rename onto the
+  // target. POSIX rename is atomic within a filesystem, so readers
+  // either see the old file or the fully-written new file — never a
+  // truncated middle. This also makes simultaneous writers safe
+  // without a lock file: the loser of the rename race just gets its
+  // version replaced by the winner's.
   async writeDiskCache(cache) {
-    await fs2.mkdir(paths.home(), { recursive: true });
-    await fs2.writeFile(
-      paths.registryCache(),
-      JSON.stringify(cache, null, 2) + "\n",
-      "utf8"
-    );
+    await fs3.mkdir(paths.home(), { recursive: true });
+    const final = paths.registryCache();
+    const tmp = `${final}.tmp-${process.pid}-${randSuffix()}`;
+    const body = JSON.stringify(
+      { fetchedAt: cache.fetchedAt, data: cache.raw },
+      null,
+      2
+    ) + "\n";
+    try {
+      await fs3.writeFile(tmp, body, "utf8");
+      await fs3.rename(tmp, final);
+    } catch (err) {
+      await fs3.unlink(tmp).catch(() => void 0);
+      throw err;
+    }
   }
 };
+function randSuffix() {
+  return Math.random().toString(36).slice(2, 10);
+}
 function npxPackageBasename(agent) {
   const pkg = agent.distribution.npx?.package;
   if (!pkg) {
@@ -320,7 +573,7 @@ function npxPackageBasename(agent) {
   const atIdx = afterSlash.lastIndexOf("@");
   return atIdx <= 0 ? afterSlash : afterSlash.slice(0, atIdx);
 }
-function planSpawn(agent, extraArgs = []) {
+async function planSpawn(agent, extraArgs = []) {
   if (agent.distribution.npx) {
     const npx = agent.distribution.npx;
     const args = ["-y", npx.package, ...npx.args ?? [], ...extraArgs];
@@ -331,9 +584,22 @@ function planSpawn(agent, extraArgs = []) {
     };
   }
   if (agent.distribution.binary) {
-    throw new Error(
-      `Agent ${agent.id} uses binary distribution; not yet supported in hydra-acp. PRs welcome.`
-    );
+    const target = pickBinaryTarget(agent.distribution.binary);
+    if (!target) {
+      throw new Error(
+        `Agent ${agent.id} has no binary distribution for ${currentPlatformKey() ?? "this platform"}.`
+      );
+    }
+    const cmdPath = await ensureBinary({
+      agentId: agent.id,
+      version: agent.version ?? "current",
+      target
+    });
+    return {
+      command: cmdPath,
+      args: [...target.args ?? [], ...extraArgs],
+      env: target.env ?? {}
+    };
   }
   if (agent.distribution.uvx) {
     const uvx = agent.distribution.uvx;
@@ -348,10 +614,11 @@ function planSpawn(agent, extraArgs = []) {
 }
 
 // src/core/session-manager.ts
-import * as fs5 from "fs/promises";
+import * as fs7 from "fs/promises";
+import { customAlphabet as customAlphabet3 } from "nanoid";
 
 // src/core/agent-instance.ts
-import { spawn } from "child_process";
+import { spawn as spawn2 } from "child_process";
 
 // src/acp/types.ts
 import { z as z3 } from "zod";
@@ -364,7 +631,8 @@ var JsonRpcErrorCodes = {
   SessionNotFound: -32001,
   PermissionDenied: -32002,
   AlreadyAttached: -32003,
-  AgentNotInstalled: -32005
+  AgentNotInstalled: -32005,
+  BundleAlreadyImported: -32010
 };
 var InitializeParams = z3.object({
   protocolVersion: z3.number().optional(),
@@ -470,12 +738,24 @@ var SessionListParams = z3.object({
   cursor: z3.string().optional(),
   limit: z3.number().int().positive().max(200).optional()
 });
+var SessionListUsage = z3.object({
+  used: z3.number().optional(),
+  size: z3.number().optional(),
+  costAmount: z3.number().optional(),
+  costCurrency: z3.string().optional()
+});
 var SessionListEntry = z3.object({
   sessionId: z3.string(),
   upstreamSessionId: z3.string().optional(),
   cwd: z3.string(),
   title: z3.string().optional(),
   agentId: z3.string().optional(),
+  // Last-known model id, so list views can render `<agent>(<model>)`
+  // without resurrecting cold sessions to look it up.
+  currentModel: z3.string().optional(),
+  // Last-known usage snapshot so list views can show per-session cost
+  // (and tokens, in callers that care) without resurrecting cold sessions.
+  currentUsage: SessionListUsage.optional(),
   updatedAt: z3.string(),
   attachedClients: z3.number().int().nonnegative(),
   status: z3.enum(["live", "cold"]).default("live"),
@@ -557,13 +837,13 @@ function ndjsonStreamFromStdio(stdout, stdin) {
         throw new Error("stream is closed");
       }
       const line = JSON.stringify(message) + "\n";
-      await new Promise((resolve2, reject) => {
+      await new Promise((resolve3, reject) => {
         stdin.write(line, (err) => {
           if (err) {
             reject(err);
             return;
           }
-          resolve2();
+          resolve3();
         });
       });
     },
@@ -622,9 +902,9 @@ var JsonRpcConnection = class {
     }
     const id = nanoid();
     const message = { jsonrpc: "2.0", id, method, params };
-    const response = new Promise((resolve2, reject) => {
+    const response = new Promise((resolve3, reject) => {
       this.pending.set(id, {
-        resolve: (result) => resolve2(result),
+        resolve: (result) => resolve3(result),
         reject
       });
       this.stream.send(message).catch((err) => {
@@ -762,7 +1042,7 @@ var AgentInstance = class _AgentInstance {
       ...opts.plan.env,
       ...opts.extraEnv ?? {}
     };
-    const child = spawn(opts.plan.command, opts.plan.args, {
+    const child = spawn2(opts.plan.command, opts.plan.args, {
       cwd: opts.cwd,
       env,
       stdio: ["pipe", "pipe", "pipe"]
@@ -795,8 +1075,8 @@ var HYDRA_COMMANDS = [
     description: "Regenerate the session title via the agent (or set manually with an arg)"
   },
   {
-    verb: "switch",
-    name: "/hydra switch",
+    verb: "agent",
+    name: "/hydra agent",
     argsHint: "<agent>",
     description: "Swap the agent backing this session, preserving context"
   }
@@ -813,10 +1093,12 @@ function hydraCommandsAsAdvertised() {
 var HYDRA_ID_ALPHABET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 var generateHydraId = customAlphabet(HYDRA_ID_ALPHABET, 16);
 var HYDRA_SESSION_PREFIX = "hydra_session_";
+var MAX_HISTORY_ENTRIES = 1e3;
+var COMPACT_EVERY = 200;
 var Session = class {
   sessionId;
   cwd;
-  // agent / agentId / upstreamSessionId are mutable so /hydra switch can
+  // agent / agentId / upstreamSessionId are mutable so /hydra agent can
   // replace the underlying agent process while keeping the same Session
   // record. agentMeta is the metadata returned by the agent at session/new
   // time; it gets refreshed on switch too.
@@ -831,9 +1113,10 @@ var Session = class {
   // stale-prone for snapshot-shaped events).
   currentModel;
   currentMode;
+  currentUsage;
   updatedAt;
+  createdAt;
   clients = /* @__PURE__ */ new Map();
-  history = [];
   historyStore;
   promptQueue = [];
   promptInFlight = false;
@@ -849,6 +1132,15 @@ var Session = class {
   // True once we've observed our first session/prompt; gates the
   // first-prompt-seeded title so subsequent prompts don't churn it.
   firstPromptSeeded = false;
+  // Wall-clock when the active prompt started, undefined when idle.
+  // Bumped by broadcastPromptReceived, cleared by broadcastTurnComplete.
+  // Drives the mid-turn elapsed counter delivered to fresh attachers.
+  promptStartedAt;
+  // Counts appends since the last compaction. When it hits COMPACT_EVERY
+  // we ask the history store to trim the file to the most recent
+  // MAX_HISTORY_ENTRIES. Keeps file growth bounded without per-append
+  // file-size checks.
+  appendCount = 0;
   // Permission requests that have been broadcast to one or more
   // clients but have not yet resolved. Replayed to clients that
   // attach mid-flight so a late joiner sees the prompt instead of an
@@ -863,6 +1155,12 @@ var Session = class {
   internalPromptCapture;
   idleTimeoutMs;
   idleTimer;
+  // Time of the last recordable broadcast (or session creation, if
+  // none yet). Drives the inactivity-based idle close; deliberately
+  // does NOT include snapshot state pings (model/mode/title/commands)
+  // or attach/detach, which would otherwise let passive observers
+  // and noisy state churn keep a quiet session alive forever.
+  lastRecordedAt;
   spawnReplacementAgent;
   agentChangeHandlers = [];
   // Last available_commands_update we observed from the agent. Stored
@@ -877,6 +1175,7 @@ var Session = class {
   agentCommandsHandlers = [];
   modelHandlers = [];
   modeHandlers = [];
+  usageHandlers = [];
   constructor(init) {
     this.sessionId = init.sessionId ?? `${HYDRA_SESSION_PREFIX}${generateHydraId()}`;
     this.cwd = init.cwd;
@@ -888,6 +1187,7 @@ var Session = class {
     this.title = init.title;
     this.currentModel = init.currentModel;
     this.currentMode = init.currentMode;
+    this.currentUsage = init.currentUsage;
     if (init.agentCommands && init.agentCommands.length > 0) {
       this.agentAdvertisedCommands = [...init.agentCommands];
     }
@@ -897,11 +1197,11 @@ var Session = class {
       this.firstPromptSeeded = true;
     }
     this.historyStore = init.historyStore;
-    if (init.seedHistory && init.seedHistory.length > 0) {
-      this.history = [...init.seedHistory];
-    }
     this.updatedAt = Date.now();
+    this.createdAt = init.createdAt ?? this.updatedAt;
+    this.lastRecordedAt = this.updatedAt;
     this.wireAgent(this.agent);
+    this.scheduleIdleCheck();
   }
   broadcastMergedCommands() {
     const merged = [
@@ -917,7 +1217,7 @@ var Session = class {
     });
   }
   // Register session/update, session/request_permission, and onExit
-  // handlers on an agent connection. Re-run on every /hydra switch so
+  // handlers on an agent connection. Re-run on every /hydra agent so
   // the new agent is plumbed identically. The exit handler's identity
   // check is what makes switching safe: when the *old* agent exits as
   // part of a swap, this.agent has already been replaced, so we no-op
@@ -941,6 +1241,10 @@ var Session = class {
         this.recordAndBroadcast("session/update", params);
         return;
       }
+      if (this.maybeApplyAgentUsage(params)) {
+        this.recordAndBroadcast("session/update", params);
+        return;
+      }
       this.maybeApplyAgentSessionInfo(params);
       this.recordAndBroadcast("session/update", params);
     });
@@ -961,34 +1265,20 @@ var Session = class {
     return this.clients.size;
   }
   // Wall-clock when the in-flight agent turn began, or undefined when
-  // idle. Derived from history: the most recent prompt_received without
-  // a later turn_complete is the outstanding turn, and its recordedAt
-  // is when the prompt was first broadcast. Used by buildResponseMeta
-  // so a fresh client reattaching mid-turn boots up with the busy
-  // banner showing real elapsed time.
+  // idle. Tracked in-memory by broadcastPromptReceived/broadcastTurnComplete
+  // so the daemon can hand a fresh attacher mid-turn the right elapsed
+  // time without scanning history.
   get turnStartedAt() {
-    for (let i = this.history.length - 1; i >= 0; i--) {
-      const entry = this.history[i];
-      if (!entry) {
-        continue;
-      }
-      const params = entry.params;
-      const kind = params?.update?.sessionUpdate;
-      if (kind === "turn_complete") {
-        return void 0;
-      }
-      if (kind === "prompt_received") {
-        return entry.recordedAt;
-      }
-    }
-    return void 0;
+    return this.promptStartedAt;
   }
-  // Snapshot of the current in-memory replay history. Used by the
-  // HTTP history endpoint to deliver the "what's accumulated so far"
-  // prefix before optionally tailing with onBroadcast. Returns a copy
-  // so callers can't mutate our cache.
-  getHistorySnapshot() {
-    return [...this.history];
+  // Read the persisted history from disk. Returns [] if no history
+  // file exists (fresh session, never prompted). Used by attach() and
+  // the HTTP /history endpoint.
+  async getHistorySnapshot() {
+    if (!this.historyStore) {
+      return [];
+    }
+    return this.historyStore.load(this.sessionId).catch(() => []);
   }
   // Subscribe to recordable broadcast entries — fires once per entry
   // that lands in history (so snapshot-shaped session_info/model/mode/
@@ -1004,6 +1294,10 @@ var Session = class {
       }
     };
   }
+  // Register a client and (asynchronously) load the replay slice it
+  // should receive. Validation errors throw synchronously so callers
+  // can rely on either the registration being in effect or having
+  // thrown; the disk-load is the only async work.
   attach(client, historyPolicy) {
     if (this.closed) {
       throw withCode(
@@ -1019,14 +1313,10 @@ var Session = class {
     }
     this.clients.set(client.clientId, client);
     this.updatedAt = Date.now();
-    this.cancelIdleTimer();
-    if (historyPolicy === "none") {
-      return [];
-    }
-    if (historyPolicy === "pending_only") {
-      return [];
+    if (historyPolicy === "none" || historyPolicy === "pending_only") {
+      return Promise.resolve([]);
     }
-    return [...this.history];
+    return this.getHistorySnapshot();
   }
   // Dispatch in-flight permission requests to a freshly-attached
   // client. Called by the daemon's WS handler *after* it finishes
@@ -1040,7 +1330,6 @@ var Session = class {
   detach(clientId) {
     if (this.clients.delete(clientId)) {
       this.updatedAt = Date.now();
-      this.maybeStartIdleTimer();
     }
   }
   async prompt(clientId, params) {
@@ -1086,6 +1375,7 @@ var Session = class {
     if (client.clientInfo?.version) {
       sentBy.version = client.clientInfo.version;
     }
+    this.promptStartedAt = Date.now();
     this.recordAndBroadcast(
       "session/update",
       {
@@ -1122,6 +1412,7 @@ var Session = class {
     if (stopReason !== void 0) {
       update.stopReason = stopReason;
     }
+    this.promptStartedAt = void 0;
     this.recordAndBroadcast(
       "session/update",
       {
@@ -1271,6 +1562,49 @@ var Session = class {
     }
     return true;
   }
+  // usage_update carries any subset of {used, size, cost.amount,
+  // cost.currency}. Merge non-undefined fields onto currentUsage so a
+  // sparse update preserves prior values, and fire usage handlers only
+  // if something actually changed.
+  maybeApplyAgentUsage(params) {
+    const obj = params ?? {};
+    const update = obj.update ?? {};
+    if (update.sessionUpdate !== "usage_update") {
+      return false;
+    }
+    const next = { ...this.currentUsage ?? {} };
+    let changed = false;
+    if (typeof update.used === "number" && next.used !== update.used) {
+      next.used = update.used;
+      changed = true;
+    }
+    if (typeof update.size === "number" && next.size !== update.size) {
+      next.size = update.size;
+      changed = true;
+    }
+    if (update.cost && typeof update.cost === "object") {
+      const cost = update.cost;
+      if (typeof cost.amount === "number" && next.costAmount !== cost.amount) {
+        next.costAmount = cost.amount;
+        changed = true;
+      }
+      if (typeof cost.currency === "string" && next.costCurrency !== cost.currency) {
+        next.costCurrency = cost.currency;
+        changed = true;
+      }
+    }
+    if (!changed) {
+      return true;
+    }
+    this.currentUsage = next;
+    for (const handler of this.usageHandlers) {
+      try {
+        handler(next);
+      } catch {
+      }
+    }
+    return true;
+  }
   // Update the cached agent command list, fire persist handlers, and
   // broadcast the merged list to attached clients. Idempotent on a
   // structurally identical list so we don't churn meta.json on noisy
@@ -1301,12 +1635,21 @@ var Session = class {
   onModeChange(handler) {
     this.modeHandlers.push(handler);
   }
+  onUsageChange(handler) {
+    this.usageHandlers.push(handler);
+  }
   // Returns a freshly merged command list (hydra ∪ agent) for callers
   // that need a snapshot — notably acp-ws.ts's buildResponseMeta when
   // assembling the attach response.
   mergedAvailableCommands() {
     return [...hydraCommandsAsAdvertised(), ...this.agentAdvertisedCommands];
   }
+  // The agent's own advertised commands (not merged with hydra verbs).
+  // Used by SessionManager to persist into meta.json so cold resurrect
+  // can re-deliver via the attach response _meta.
+  agentOnlyAdvertisedCommands() {
+    return [...this.agentAdvertisedCommands];
+  }
   // Pick up an agent-emitted session_info_update and store its title
   // as our canonical record. The notification is also forwarded to
   // clients via the surrounding recordAndBroadcast call. Authoritative
@@ -1357,8 +1700,8 @@ var Session = class {
     switch (verb) {
       case "title":
         return this.runTitleCommand(arg);
-      case "switch":
-        return this.runSwitchCommand(arg);
+      case "agent":
+        return this.runAgentCommand(arg);
       default: {
         const err = new Error(
           `no dispatcher for /hydra verb ${verb}`
@@ -1394,7 +1737,7 @@ var Session = class {
   }
   // Send a prompt to the underlying agent and capture its reply chunks
   // privately (no fan-out to clients, no recording into history). Used
-  // by /hydra title's regen path and /hydra switch's transcript-injection
+  // by /hydra title's regen path and /hydra agent's transcript-injection
   // path. Returns the joined agent_message_chunk text.
   async runInternalPrompt(text) {
     if (this.internalPromptCapture) {
@@ -1416,10 +1759,10 @@ var Session = class {
   // record. Spawns the new agent first so a failure leaves the old one
   // intact; then injects a synthesized transcript so the new agent has
   // context for the next turn.
-  runSwitchCommand(newAgentId) {
+  runAgentCommand(newAgentId) {
     if (!newAgentId) {
       throw withCode(
-        new Error("/hydra switch requires an agent id"),
+        new Error("/hydra agent requires an agent id"),
         JsonRpcErrorCodes.InvalidParams
       );
     }
@@ -1438,7 +1781,7 @@ var Session = class {
     const spawnAgent = this.spawnReplacementAgent;
     return this.enqueuePrompt(async () => {
       const oldAgentId = this.agentId;
-      const transcript = this.buildSwitchTranscript(oldAgentId);
+      const transcript = await this.buildSwitchTranscript(oldAgentId);
       const fresh = await spawnAgent({
         agentId: newAgentId,
         cwd: this.cwd,
@@ -1470,15 +1813,20 @@ var Session = class {
       return { stopReason: "end_turn" };
     });
   }
-  // Walk this.history (rewritten-for-clients notification cache) and
-  // produce a labeled transcript suitable for handing to a fresh agent.
-  // Includes user prompts, agent replies, and tool-call outcomes; skips
-  // hydra-synthesized markers (so multi-hop switches don't accumulate
-  // banners) and other update kinds we don't think the next agent
-  // benefits from re-seeing (plans, thoughts, mode/model/usage).
-  buildSwitchTranscript(prevAgentId) {
+  // Walk the persisted history and produce a labeled transcript suitable
+  // for handing to a fresh agent. Includes user prompts, agent replies,
+  // and tool-call outcomes; skips hydra-synthesized markers (so multi-hop
+  // switches don't accumulate banners) and other update kinds we don't
+  // think the next agent benefits from re-seeing (plans, thoughts,
+  // mode/model/usage).
+  //
+  // The header text defaults to the agent-swap framing; callers like
+  // seedFromImport pass a custom header when the new agent is taking
+  // over an imported session rather than swapping mid-conversation.
+  async buildSwitchTranscript(prevAgentId, headerOverride) {
     const lines = [];
-    for (const note of this.history) {
+    const history = await this.getHistorySnapshot();
+    for (const note of history) {
       if (note.method !== "session/update") {
         continue;
       }
@@ -1532,29 +1880,53 @@ var Session = class {
     if (current) {
       coalesced.push(`<${current.speaker}>: ${current.text.trim()}`);
     }
+    const intro = headerOverride?.intro ?? `You are taking over this conversation from ${prevAgentId}. Below is the transcript so far.`;
+    const followup = headerOverride?.followup ?? `Each line is prefixed with its speaker. Continue from where ${prevAgentId} left off, responding to the user's most recent message.`;
     return [
-      `You are taking over this conversation from ${prevAgentId}. Below is the transcript so far.`,
-      `Each line is prefixed with its speaker. Continue from where ${prevAgentId} left off, responding to the user's most recent message.`,
+      intro,
+      followup,
       "",
       "--- begin transcript ---",
       ...coalesced,
       "--- end transcript ---"
     ].join("\n");
   }
+  // Replay the persisted history into a freshly-spawned agent so an
+  // imported session has context. Called by SessionManager.doResurrect
+  // on the first wake-up of a session whose meta.json has an empty
+  // upstreamSessionId (the import marker). Wrapped in enqueuePrompt so
+  // any user prompts arriving mid-seed queue behind it (mirrors the
+  // /hydra agent path so the agent isn't asked to respond to a user
+  // turn before it has absorbed the imported transcript). Best-effort:
+  // if the agent fails to absorb the transcript we still leave the
+  // session usable — the user just continues without context.
+  async seedFromImport() {
+    await this.enqueuePrompt(async () => {
+      const transcript = await this.buildSwitchTranscript(this.agentId, {
+        intro: "You are continuing a conversation that was imported from another hydra. Below is the transcript so far.",
+        followup: "Each line is prefixed with its speaker. Treat this as context for the next user message; do not re-respond to earlier turns."
+      });
+      if (!transcript) {
+        return void 0;
+      }
+      await this.runInternalPrompt(transcript).catch(() => void 0);
+      return void 0;
+    });
+  }
   // Tell every attached client (a) the agent identity has changed
-  // (session_info_update with an agentId field — clients that already
-  // listen for title updates pick this up; older clients ignore unknown
-  // fields harmlessly) and (b) drop a visible banner into the transcript
-  // so users see the switch rather than just suddenly getting answers
-  // from a different agent. Both updates carry _meta["hydra-acp"].synthetic
-  // so a future /hydra switch's transcript builder filters them out.
+  // (session_info_update carrying agentId inside _meta["hydra-acp"] —
+  // the ACP schema for session_info_update is just title/updatedAt/_meta,
+  // so non-hydra clients harmlessly ignore the extension; hydra-aware
+  // ones read it and relabel) and (b) drop a visible banner into the
+  // transcript so users see the switch rather than just suddenly getting
+  // answers from a different agent. Both updates carry synthetic=true
+  // so a future /hydra agent's transcript builder filters them out.
   broadcastAgentSwitch(oldAgentId, newAgentId) {
     this.recordAndBroadcast("session/update", {
       sessionId: this.sessionId,
       update: {
         sessionUpdate: "session_info_update",
-        agentId: newAgentId,
-        _meta: { "hydra-acp": { synthetic: true } }
+        _meta: { "hydra-acp": { synthetic: true, agentId: newAgentId } }
       }
     });
     this.recordAndBroadcast("session/update", {
@@ -1585,22 +1957,55 @@ _(switched from \`${oldAgentId}\` to \`${newAgentId}\`)_
       handler(opts);
     }
   }
-  maybeStartIdleTimer() {
-    if (this.closed || this.clients.size > 0 || this.idleTimeoutMs <= 0) {
+  // Last meaningful activity timestamp. Bumped only by recordable
+  // broadcasts in recordAndBroadcast — the same signal historyMtimeIso
+  // uses for the picker. Initialized at construction (and seeded from
+  // the newest entry on resurrect) so the inactivity window starts
+  // ticking from a sensible floor when there's no history yet.
+  get lastActivityAt() {
+    return this.lastRecordedAt;
+  }
+  // (Re-)arm the idle timer to fire when the inactivity window
+  // elapses past lastActivityAt. Called once at construction and after
+  // every recorded broadcast. The previous design gated on
+  // clients.size === 0; we drop that gate because extensions
+  // (slack/notifier/approver/browser) hold persistent attaches that
+  // would otherwise keep a quiet session alive forever.
+  scheduleIdleCheck() {
+    if (this.closed || this.idleTimeoutMs <= 0) {
       return;
     }
+    const dueAt = this.lastActivityAt + this.idleTimeoutMs;
+    this.armIdleTimer(Math.max(0, dueAt - Date.now()));
+  }
+  armIdleTimer(delay) {
     if (this.idleTimer) {
-      return;
+      clearTimeout(this.idleTimer);
     }
     this.idleTimer = setTimeout(() => {
       this.idleTimer = void 0;
-      const opts = this.firstPromptSeeded ? { deleteRecord: false, regenTitle: true } : { deleteRecord: true };
-      void this.close(opts).catch(() => void 0);
-    }, this.idleTimeoutMs);
+      this.checkIdle();
+    }, delay);
     if (typeof this.idleTimer.unref === "function") {
       this.idleTimer.unref();
     }
   }
+  checkIdle() {
+    if (this.closed || this.idleTimeoutMs <= 0) {
+      return;
+    }
+    if (this.turnStartedAt !== void 0 || this.inFlightPermissions.size > 0) {
+      this.armIdleTimer(this.idleTimeoutMs);
+      return;
+    }
+    const idle = Date.now() - this.lastActivityAt;
+    if (idle < this.idleTimeoutMs) {
+      this.armIdleTimer(this.idleTimeoutMs - idle);
+      return;
+    }
+    const opts = this.firstPromptSeeded ? { deleteRecord: false, regenTitle: true } : { deleteRecord: true };
+    void this.close(opts).catch(() => void 0);
+  }
   cancelIdleTimer() {
     if (this.idleTimer) {
       clearTimeout(this.idleTimer);
@@ -1625,17 +2030,14 @@ _(switched from \`${oldAgentId}\` to \`${newAgentId}\`)_
         params: rewritten,
         recordedAt: Date.now()
       };
-      this.history.push(entry);
-      let trimmed = false;
-      if (this.history.length > 1e3) {
-        this.history = this.history.slice(-500);
-        trimmed = true;
-      }
+      this.lastRecordedAt = entry.recordedAt;
+      this.appendCount += 1;
       if (this.historyStore) {
-        if (trimmed) {
-          void this.historyStore.rewrite(this.sessionId, [...this.history]).catch(() => void 0);
-        } else {
-          void this.historyStore.append(this.sessionId, entry).catch(
+        const store = this.historyStore;
+        void store.append(this.sessionId, entry).catch(() => void 0);
+        if (this.appendCount >= COMPACT_EVERY) {
+          this.appendCount = 0;
+          void store.compact(this.sessionId, MAX_HISTORY_ENTRIES).catch(
             () => void 0
           );
         }
@@ -1646,6 +2048,7 @@ _(switched from \`${oldAgentId}\` to \`${newAgentId}\`)_
         } catch {
         }
       }
+      this.scheduleIdleCheck();
     }
     this.updatedAt = Date.now();
     for (const client of this.clients.values()) {
@@ -1664,7 +2067,7 @@ _(switched from \`${oldAgentId}\` to \`${newAgentId}\`)_
       );
     }
     const clientParams = this.rewriteForClient(params);
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       let settled = false;
       const outbound = [];
       const entry = { addClient: sendTo };
@@ -1699,7 +2102,7 @@ _(switched from \`${oldAgentId}\` to \`${newAgentId}\`)_
                 result
               }).catch(() => void 0);
             }
-            resolve2(result);
+            resolve3(result);
           });
         }).catch((err) => {
           settle(() => reject(err));
@@ -1711,16 +2114,16 @@ _(switched from \`${oldAgentId}\` to \`${newAgentId}\`)_
     });
   }
   async enqueuePrompt(task) {
-    return new Promise((resolve2, reject) => {
-      const run = async () => {
+    return new Promise((resolve3, reject) => {
+      const run2 = async () => {
         try {
           const result = await task();
-          resolve2(result);
+          resolve3(result);
         } catch (err) {
           reject(err);
         }
       };
-      this.promptQueue.push(run);
+      this.promptQueue.push(run2);
       void this.drainQueue();
     });
   }
@@ -1749,7 +2152,8 @@ var STATE_UPDATE_KINDS = /* @__PURE__ */ new Set([
   "session_info_update",
   "current_model_update",
   "current_mode_update",
-  "available_commands_update"
+  "available_commands_update",
+  "usage_update"
 ]);
 function isStateUpdate(method, params) {
   if (method !== "session/update") {
@@ -1834,17 +2238,43 @@ function firstLine(text, max) {
 }
 
 // src/core/session-store.ts
-import * as fs3 from "fs/promises";
-import * as path2 from "path";
+import * as fs4 from "fs/promises";
+import * as path3 from "path";
+import { customAlphabet as customAlphabet2 } from "nanoid";
 import { z as z4 } from "zod";
+var HYDRA_ID_ALPHABET2 = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+var generateRawId = customAlphabet2(HYDRA_ID_ALPHABET2, 16);
+var HYDRA_LINEAGE_PREFIX = "hydra_lineage_";
+function generateLineageId() {
+  return `${HYDRA_LINEAGE_PREFIX}${generateRawId()}`;
+}
 var PersistedAgentCommand = z4.object({
   name: z4.string(),
   description: z4.string().optional()
 });
+var PersistedUsage = z4.object({
+  used: z4.number().optional(),
+  size: z4.number().optional(),
+  costAmount: z4.number().optional(),
+  costCurrency: z4.string().optional()
+});
 var SessionRecord = z4.object({
   version: z4.literal(1),
   sessionId: z4.string(),
+  // Optional for back-compat with records written before this field
+  // existed; mergeForPersistence generates one on next write so any
+  // touched session converges to having a lineageId. A record that
+  // never gets written again (truly cold and untouched) just won't
+  // participate in lineage-based dedup, which is correct — it was
+  // never exported, so no incoming bundle can claim its lineage.
+  lineageId: z4.string().optional(),
   upstreamSessionId: z4.string(),
+  // When non-empty, marks a session that was created by import and is
+  // waiting for its first attach to bootstrap a fresh upstream agent
+  // and replay the imported history as a takeover transcript. The
+  // origin's local id at export time, kept for debuggability and as a
+  // breadcrumb in `sessions list` (informational, not used for routing).
+  importedFromSessionId: z4.string().optional(),
   agentId: z4.string(),
   cwd: z4.string(),
   title: z4.string().optional(),
@@ -1855,6 +2285,7 @@ var SessionRecord = z4.object({
   // replay of a snapshot-shaped notification.
   currentModel: z4.string().optional(),
   currentMode: z4.string().optional(),
+  currentUsage: PersistedUsage.optional(),
   agentCommands: z4.array(PersistedAgentCommand).optional(),
   createdAt: z4.string(),
   updatedAt: z4.string()
@@ -1868,9 +2299,9 @@ function assertSafeId(id) {
 var SessionStore = class {
   async write(record) {
     assertSafeId(record.sessionId);
-    await fs3.mkdir(paths.sessionDir(record.sessionId), { recursive: true });
+    await fs4.mkdir(paths.sessionDir(record.sessionId), { recursive: true });
     const full = { version: 1, ...record };
-    await fs3.writeFile(
+    await fs4.writeFile(
       paths.sessionFile(record.sessionId),
       JSON.stringify(full, null, 2) + "\n",
       { encoding: "utf8", mode: 384 }
@@ -1882,7 +2313,7 @@ var SessionStore = class {
     }
     let raw;
     try {
-      raw = await fs3.readFile(paths.sessionFile(sessionId), "utf8");
+      raw = await fs4.readFile(paths.sessionFile(sessionId), "utf8");
     } catch (err) {
       const e = err;
       if (e.code === "ENOENT") {
@@ -1901,7 +2332,7 @@ var SessionStore = class {
       return;
     }
     try {
-      await fs3.unlink(paths.sessionFile(sessionId));
+      await fs4.unlink(paths.sessionFile(sessionId));
     } catch (err) {
       const e = err;
       if (e.code !== "ENOENT") {
@@ -1909,7 +2340,7 @@ var SessionStore = class {
       }
     }
     try {
-      await fs3.rmdir(paths.sessionDir(sessionId));
+      await fs4.rmdir(paths.sessionDir(sessionId));
     } catch (err) {
       const e = err;
       if (e.code !== "ENOENT" && e.code !== "ENOTEMPTY") {
@@ -1917,10 +2348,29 @@ var SessionStore = class {
       }
     }
   }
+  // Find a persisted session by lineageId. Used by SessionManager.import
+  // to detect bundles that have already been imported (lineageId match)
+  // so we can either error out or, with replace:true, overwrite.
+  // Returns undefined if no record has that lineageId. Records that
+  // pre-date the lineageId field simply don't match — which is
+  // correct: they were never exported, so no incoming bundle can
+  // legitimately claim their lineage.
+  async findByLineageId(lineageId) {
+    if (lineageId.length === 0) {
+      return void 0;
+    }
+    const all = await this.list().catch(() => []);
+    for (const record of all) {
+      if (record.lineageId === lineageId) {
+        return record;
+      }
+    }
+    return void 0;
+  }
   async list() {
     let entries;
     try {
-      entries = await fs3.readdir(paths.sessionsDir());
+      entries = await fs4.readdir(paths.sessionsDir());
     } catch (err) {
       const e = err;
       if (e.code === "ENOENT") {
@@ -1942,13 +2392,16 @@ function recordFromMemorySession(args) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   return {
     sessionId: args.sessionId,
+    lineageId: args.lineageId,
     upstreamSessionId: args.upstreamSessionId,
+    importedFromSessionId: args.importedFromSessionId,
     agentId: args.agentId,
     cwd: args.cwd,
     title: args.title,
     agentArgs: args.agentArgs,
     currentModel: args.currentModel,
     currentMode: args.currentMode,
+    currentUsage: args.currentUsage,
     agentCommands: args.agentCommands,
     createdAt: args.createdAt ?? now,
     updatedAt: args.updatedAt ?? now
@@ -1956,7 +2409,7 @@ function recordFromMemorySession(args) {
 }
 
 // src/core/history-store.ts
-import * as fs4 from "fs/promises";
+import * as fs5 from "fs/promises";
 var SESSION_ID_PATTERN2 = /^[A-Za-z0-9_-]+$/;
 var MAX_ENTRIES = 1e3;
 var HistoryStore = class {
@@ -1969,9 +2422,9 @@ var HistoryStore = class {
       return;
     }
     return this.enqueue(sessionId, async () => {
-      await fs4.mkdir(paths.sessionDir(sessionId), { recursive: true });
+      await fs5.mkdir(paths.sessionDir(sessionId), { recursive: true });
       const line = JSON.stringify(entry) + "\n";
-      await fs4.appendFile(paths.historyFile(sessionId), line, {
+      await fs5.appendFile(paths.historyFile(sessionId), line, {
         encoding: "utf8",
         mode: 384
       });
@@ -1982,9 +2435,39 @@ var HistoryStore = class {
       return;
     }
     return this.enqueue(sessionId, async () => {
-      await fs4.mkdir(paths.sessionDir(sessionId), { recursive: true });
+      await fs5.mkdir(paths.sessionDir(sessionId), { recursive: true });
       const body = entries.length === 0 ? "" : entries.map((e) => JSON.stringify(e)).join("\n") + "\n";
-      await fs4.writeFile(paths.historyFile(sessionId), body, {
+      await fs5.writeFile(paths.historyFile(sessionId), body, {
+        encoding: "utf8",
+        mode: 384
+      });
+    });
+  }
+  // Trim the on-disk history file to the most recent maxEntries lines.
+  // Runs through the same per-session write queue as append/rewrite so
+  // it's safe to invoke alongside ongoing writes; a no-op if the file is
+  // already at or below the cap.
+  async compact(sessionId, maxEntries) {
+    if (!SESSION_ID_PATTERN2.test(sessionId)) {
+      return;
+    }
+    return this.enqueue(sessionId, async () => {
+      let raw;
+      try {
+        raw = await fs5.readFile(paths.historyFile(sessionId), "utf8");
+      } catch (err) {
+        const e = err;
+        if (e.code === "ENOENT") {
+          return;
+        }
+        throw err;
+      }
+      const lines = raw.split("\n").filter((l) => l.length > 0);
+      if (lines.length <= maxEntries) {
+        return;
+      }
+      const trimmed = lines.slice(-maxEntries);
+      await fs5.writeFile(paths.historyFile(sessionId), trimmed.join("\n") + "\n", {
         encoding: "utf8",
         mode: 384
       });
@@ -2000,7 +2483,7 @@ var HistoryStore = class {
     }
     let raw;
     try {
-      raw = await fs4.readFile(paths.historyFile(sessionId), "utf8");
+      raw = await fs5.readFile(paths.historyFile(sessionId), "utf8");
     } catch (err) {
       const e = err;
       if (e.code === "ENOENT") {
@@ -2046,7 +2529,7 @@ var HistoryStore = class {
     }
     return this.enqueue(sessionId, async () => {
       try {
-        await fs4.unlink(paths.historyFile(sessionId));
+        await fs5.unlink(paths.historyFile(sessionId));
       } catch (err) {
         const e = err;
         if (e.code !== "ENOENT") {
@@ -2054,7 +2537,7 @@ var HistoryStore = class {
         }
       }
       try {
-        await fs4.rmdir(paths.sessionDir(sessionId));
+        await fs5.rmdir(paths.sessionDir(sessionId));
       } catch (err) {
         const e = err;
         if (e.code !== "ENOENT" && e.code !== "ENOTEMPTY") {
@@ -2077,7 +2560,18 @@ var HistoryStore = class {
   }
 };
 
+// src/tui/history.ts
+import { promises as fs6 } from "fs";
+import * as path4 from "path";
+async function saveHistory(file, history) {
+  await fs6.mkdir(path4.dirname(file), { recursive: true });
+  const lines = history.map((entry) => JSON.stringify(entry));
+  await fs6.writeFile(file, lines.length > 0 ? lines.join("\n") + "\n" : "");
+}
+
 // src/core/session-manager.ts
+var HYDRA_ID_ALPHABET3 = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+var generateRawSessionId = customAlphabet3(HYDRA_ID_ALPHABET3, 16);
 var SessionManager = class {
   constructor(registry, spawner, store, options = {}) {
     this.registry = registry;
@@ -2085,6 +2579,7 @@ var SessionManager = class {
     this.store = store ?? new SessionStore();
     this.histories = new HistoryStore();
     this.idleTimeoutMs = options.idleTimeoutMs ?? 0;
+    this.defaultModels = options.defaultModels ?? {};
   }
   registry;
   sessions = /* @__PURE__ */ new Map();
@@ -2093,6 +2588,7 @@ var SessionManager = class {
   store;
   histories;
   idleTimeoutMs;
+  defaultModels;
   // Serialize meta.json read-modify-write operations per session id so
   // concurrent snapshot updates (e.g. an agent emitting model + mode
   // back-to-back) don't lose writes via interleaved reads.
@@ -2114,7 +2610,8 @@ var SessionManager = class {
       agentArgs: params.agentArgs,
       idleTimeoutMs: this.idleTimeoutMs,
       spawnReplacementAgent: (p) => this.bootstrapAgent({ ...p, mcpServers: [] }),
-      historyStore: this.histories
+      historyStore: this.histories,
+      currentModel: fresh.initialModel
     });
     await this.attachManagerHooks(session);
     return session;
@@ -2156,7 +2653,10 @@ var SessionManager = class {
       err.code = JsonRpcErrorCodes.AgentNotInstalled;
       throw err;
     }
-    const plan = planSpawn(agentDef, params.agentArgs ?? []);
+    if (params.upstreamSessionId === "") {
+      return this.doResurrectFromImport(params);
+    }
+    const plan = await planSpawn(agentDef, params.agentArgs ?? []);
     const agent = this.spawner({
       agentId: params.agentId,
       cwd: params.cwd,
@@ -2169,11 +2669,14 @@ var SessionManager = class {
     });
     let loadResult;
     try {
-      loadResult = await agent.connection.request("session/load", {
-        sessionId: params.upstreamSessionId,
-        cwd: params.cwd,
-        mcpServers: []
-      });
+      loadResult = await agent.connection.request(
+        "session/load",
+        {
+          sessionId: params.upstreamSessionId,
+          cwd: params.cwd,
+          mcpServers: []
+        }
+      );
     } catch (err) {
       await agent.kill().catch(() => void 0);
       throw new Error(
@@ -2192,17 +2695,65 @@ var SessionManager = class {
       idleTimeoutMs: this.idleTimeoutMs,
       spawnReplacementAgent: (p) => this.bootstrapAgent({ ...p, mcpServers: [] }),
       historyStore: this.histories,
-      seedHistory: params.seedHistory,
-      currentModel: params.currentModel,
+      // Prefer what we previously stored from a current_model_update; if
+      // we never captured one (e.g. old opencode sessions on disk before
+      // this fix), fall back to the model the agent ships in its
+      // session/load response body.
+      currentModel: params.currentModel ?? extractInitialModel(loadResult ?? {}),
       currentMode: params.currentMode,
+      currentUsage: params.currentUsage,
       agentCommands: params.agentCommands,
-      firstPromptSeeded: true
+      // Only gate the first-prompt title heuristic when we actually have
+      // a title to preserve. A title-less session (lost to a write race
+      // or never seeded) should re-derive from the next prompt rather
+      // than stay stuck.
+      firstPromptSeeded: !!params.title,
+      createdAt: params.createdAt ? new Date(params.createdAt).getTime() : void 0
     });
     await this.attachManagerHooks(session);
     return session;
   }
+  // First-attach path for a session that was created via import(). The
+  // on-disk meta.json carries upstreamSessionId="" as the import
+  // marker; bootstrap a fresh agent (gets a real upstream id) and kick
+  // off seedFromImport so the agent absorbs the historical transcript.
+  // attachManagerHooks rewrites meta.json with the new upstreamSessionId,
+  // so subsequent resurrects of this session use the normal session/load
+  // path.
+  async doResurrectFromImport(params) {
+    const fresh = await this.bootstrapAgent({
+      agentId: params.agentId,
+      cwd: params.cwd,
+      agentArgs: params.agentArgs,
+      mcpServers: []
+    });
+    const session = new Session({
+      sessionId: params.hydraSessionId,
+      cwd: params.cwd,
+      agentId: params.agentId,
+      agent: fresh.agent,
+      upstreamSessionId: fresh.upstreamSessionId,
+      agentMeta: fresh.agentMeta,
+      title: params.title,
+      agentArgs: params.agentArgs,
+      idleTimeoutMs: this.idleTimeoutMs,
+      spawnReplacementAgent: (p) => this.bootstrapAgent({ ...p, mcpServers: [] }),
+      historyStore: this.histories,
+      // Prefer the stored value (set by a previous current_model_update);
+      // fall back to whatever the agent ships in its session/new response.
+      currentModel: params.currentModel ?? fresh.initialModel,
+      currentMode: params.currentMode,
+      currentUsage: params.currentUsage,
+      agentCommands: params.agentCommands,
+      firstPromptSeeded: !!params.title,
+      createdAt: params.createdAt ? new Date(params.createdAt).getTime() : void 0
+    });
+    await this.attachManagerHooks(session);
+    void session.seedFromImport().catch(() => void 0);
+    return session;
+  }
   // Bootstrap a fresh agent process: registry resolve → spawn → initialize
-  // → session/new. Shared by create() and the /hydra switch path so both
+  // → session/new. Shared by create() and the /hydra agent path so both
   // go through the same env / capabilities / error-handling.
   async bootstrapAgent(params) {
     const agentDef = await this.registry.getAgent(params.agentId);
@@ -2213,7 +2764,7 @@ var SessionManager = class {
       err.code = JsonRpcErrorCodes.AgentNotInstalled;
       throw err;
     }
-    const plan = planSpawn(agentDef, params.agentArgs ?? []);
+    const plan = await planSpawn(agentDef, params.agentArgs ?? []);
     const agent = this.spawner({
       agentId: params.agentId,
       cwd: params.cwd,
@@ -2225,14 +2776,36 @@ var SessionManager = class {
         clientCapabilities: {},
         clientInfo: { name: "hydra", version: "0.1.0" }
       });
-      const newResult = await agent.connection.request("session/new", {
-        cwd: params.cwd,
-        mcpServers: params.mcpServers ?? []
-      });
+      const newResult = await agent.connection.request(
+        "session/new",
+        {
+          cwd: params.cwd,
+          mcpServers: params.mcpServers ?? []
+        }
+      );
+      const sessionIdRaw = newResult.sessionId;
+      if (typeof sessionIdRaw !== "string") {
+        throw new Error(
+          `agent ${params.agentId} returned a non-string sessionId from session/new`
+        );
+      }
+      let initialModel = extractInitialModel(newResult);
+      const desired = this.defaultModels[params.agentId];
+      if (desired && desired !== initialModel) {
+        try {
+          await agent.connection.request("session/set_model", {
+            sessionId: sessionIdRaw,
+            modelId: desired
+          });
+          initialModel = desired;
+        } catch {
+        }
+      }
       return {
         agent,
-        upstreamSessionId: newResult.sessionId,
-        agentMeta: newResult._meta
+        upstreamSessionId: sessionIdRaw,
+        agentMeta: newResult._meta,
+        initialModel
       };
     } catch (err) {
       await agent.kill().catch(() => void 0);
@@ -2243,7 +2816,7 @@ var SessionManager = class {
   // bookkeeping. Called from both create() and resurrect() so the same
   // session record + lifecycle handlers are wired regardless of origin.
   // Returns once the initial disk record is written — callers should
-  // await so a subsequent /hydra switch's persistAgentChange (which
+  // await so a subsequent /hydra agent's persistAgentChange (which
   // does read-then-write) finds the file in place.
   async attachManagerHooks(session) {
     session.onClose(({ deleteRecord }) => {
@@ -2271,6 +2844,11 @@ var SessionManager = class {
         () => void 0
       );
     });
+    session.onUsageChange((usage) => {
+      void this.persistSnapshot(session.sessionId, {
+        currentUsage: usageSnapshotToPersisted(usage)
+      }).catch(() => void 0);
+    });
     session.onAgentCommandsChange((commands) => {
       void this.persistSnapshot(session.sessionId, {
         agentCommands: commands.map((c) => ({
@@ -2280,28 +2858,20 @@ var SessionManager = class {
       }).catch(() => void 0);
     });
     this.sessions.set(session.sessionId, session);
-    await this.store.write(
-      recordFromMemorySession({
-        sessionId: session.sessionId,
-        upstreamSessionId: session.upstreamSessionId,
-        agentId: session.agentId,
-        cwd: session.cwd,
-        title: session.title,
-        agentArgs: session.agentArgs,
-        currentModel: session.currentModel,
-        currentMode: session.currentMode
-      })
-    ).catch(() => void 0);
+    await this.enqueueMetaWrite(session.sessionId, async () => {
+      const existing = await this.store.read(session.sessionId);
+      const merged = mergeForPersistence(session, existing);
+      await this.store.write(merged);
+    }).catch(() => void 0);
   }
   // Resolve a session's recorded history without forcing a resurrect.
-  // Returns the in-memory snapshot if the session is hot, falls back
-  // to the on-disk history file otherwise. Returns undefined if the
-  // session id is unknown to both the live map and disk store, so the
-  // caller can distinguish "no history yet" (empty array) from "404".
+  // Always loads from disk — that's the source of truth whether the
+  // session is hot or cold. Returns undefined if the session id is
+  // unknown to both the live map and disk store, so the caller can
+  // distinguish "no history yet" (empty array) from "404".
   async getHistory(sessionId) {
-    const live = this.sessions.get(sessionId);
-    if (live) {
-      return live.getHistorySnapshot();
+    if (this.sessions.has(sessionId)) {
+      return this.histories.load(sessionId).catch(() => []);
     }
     const record = await this.store.read(sessionId);
     if (!record) {
@@ -2314,20 +2884,42 @@ var SessionManager = class {
     if (!record) {
       return void 0;
     }
-    const seedHistory = await this.histories.load(sessionId).catch(() => []);
+    let title = record.title;
+    if (!title) {
+      title = await this.deriveTitleFromHistory(sessionId);
+    }
     return {
       hydraSessionId: record.sessionId,
       upstreamSessionId: record.upstreamSessionId,
       agentId: record.agentId,
       cwd: record.cwd,
-      title: record.title,
+      title,
       agentArgs: record.agentArgs,
-      seedHistory: seedHistory.length > 0 ? seedHistory : void 0,
       currentModel: record.currentModel,
       currentMode: record.currentMode,
-      agentCommands: record.agentCommands
+      currentUsage: persistedUsageToSnapshot(record.currentUsage),
+      agentCommands: record.agentCommands,
+      createdAt: record.createdAt
     };
   }
+  // Best-effort: peek at the persisted history's first prompt and use
+  // its first line (capped to 200 chars) as a session title. Returns
+  // undefined if no usable prompt is found or any I/O fails.
+  async deriveTitleFromHistory(sessionId) {
+    const history = await this.histories.load(sessionId).catch(() => []);
+    for (const entry of history) {
+      const params = entry.params;
+      if (params?.update?.sessionUpdate !== "prompt_received") {
+        continue;
+      }
+      const text = extractPromptText(params.update.prompt);
+      const line = firstLine(text, 200);
+      if (line) {
+        return line;
+      }
+    }
+    return void 0;
+  }
   get(sessionId) {
     return this.sessions.get(sessionId);
   }
@@ -2374,6 +2966,8 @@ var SessionManager = class {
         cwd: session.cwd,
         title: session.title,
         agentId: session.agentId,
+        currentModel: session.currentModel,
+        currentUsage: session.currentUsage,
         updatedAt: used,
         attachedClients: session.attachedCount,
         status: "live"
@@ -2394,6 +2988,8 @@ var SessionManager = class {
         cwd: r.cwd,
         title: r.title,
         agentId: r.agentId,
+        currentModel: r.currentModel,
+        currentUsage: r.currentUsage,
         updatedAt: used,
         attachedClients: 0,
         status: "cold"
@@ -2402,6 +2998,112 @@ var SessionManager = class {
     entries.sort((a, b) => a.updatedAt < b.updatedAt ? 1 : -1);
     return entries;
   }
+  // Build an export bundle for a session, reading meta + history from
+  // disk. Backfills lineageId if the on-disk record pre-dates that
+  // field. Returns undefined if the session doesn't exist. Callers
+  // populate the bundle's exportedFrom metadata themselves.
+  async exportBundle(sessionId) {
+    const record = await this.store.read(sessionId);
+    if (!record) {
+      return void 0;
+    }
+    let withLineage;
+    if (record.lineageId) {
+      withLineage = record;
+    } else {
+      const lineageId = generateLineageId();
+      const backfilled = { ...record, lineageId };
+      await this.enqueueMetaWrite(sessionId, async () => {
+        const latest = await this.store.read(sessionId);
+        if (!latest) {
+          return;
+        }
+        if (latest.lineageId) {
+          return;
+        }
+        await this.store.write({ ...latest, lineageId });
+      }).catch(() => void 0);
+      withLineage = backfilled;
+    }
+    const history = await this.histories.load(sessionId).catch(() => []);
+    const promptHistory = await loadPromptHistorySafely(sessionId);
+    return { record: withLineage, history, promptHistory };
+  }
+  // Create a local session from an imported bundle. Without `replace`,
+  // a bundle with a lineageId we already have on disk throws
+  // BundleAlreadyImported citing the existing local id. With
+  // `replace: true`, the existing record is overwritten in-place (its
+  // local sessionId is preserved so bookmarks/Slack thread links still
+  // resolve), and any live in-memory session is closed so the next
+  // attach triggers the import-reseed path.
+  async importBundle(bundle, opts = {}) {
+    const existing = await this.store.findByLineageId(bundle.session.lineageId);
+    if (existing) {
+      if (!opts.replace) {
+        const err = new Error(
+          `bundle already imported as ${existing.sessionId}`
+        );
+        err.code = JsonRpcErrorCodes.BundleAlreadyImported;
+        err.existingSessionId = existing.sessionId;
+        throw err;
+      }
+      const live = this.sessions.get(existing.sessionId);
+      if (live) {
+        await live.close({ deleteRecord: false }).catch(() => void 0);
+      }
+      await this.writeImportedRecord({
+        sessionId: existing.sessionId,
+        bundle,
+        preservedCreatedAt: existing.createdAt
+      });
+      return {
+        sessionId: existing.sessionId,
+        importedFromSessionId: bundle.session.sessionId,
+        replaced: true
+      };
+    }
+    const newId = `${HYDRA_SESSION_PREFIX}${generateRawSessionId()}`;
+    await this.writeImportedRecord({ sessionId: newId, bundle });
+    return {
+      sessionId: newId,
+      importedFromSessionId: bundle.session.sessionId,
+      replaced: false
+    };
+  }
+  // Write the imported bundle's history.jsonl, prompt-history (if
+  // present), and meta.json. upstreamSessionId is left empty as the
+  // marker that the first attach should bootstrap a fresh agent and
+  // run seedFromImport rather than calling session/load.
+  async writeImportedRecord(args) {
+    await this.histories.rewrite(
+      args.sessionId,
+      args.bundle.history
+    );
+    if (args.bundle.promptHistory && args.bundle.promptHistory.length > 0) {
+      await saveHistory(
+        paths.tuiHistoryFile(args.sessionId),
+        args.bundle.promptHistory
+      ).catch(() => void 0);
+    }
+    const now = (/* @__PURE__ */ new Date()).toISOString();
+    await this.enqueueMetaWrite(args.sessionId, async () => {
+      await this.store.write({
+        sessionId: args.sessionId,
+        lineageId: args.bundle.session.lineageId,
+        upstreamSessionId: "",
+        importedFromSessionId: args.bundle.session.sessionId,
+        agentId: args.bundle.session.agentId,
+        cwd: args.bundle.session.cwd,
+        title: args.bundle.session.title,
+        currentModel: args.bundle.session.currentModel,
+        currentMode: args.bundle.session.currentMode,
+        currentUsage: args.bundle.session.currentUsage,
+        agentCommands: args.bundle.session.agentCommands,
+        createdAt: args.preservedCreatedAt ?? now,
+        updatedAt: now
+      });
+    });
+  }
   async deleteRecord(sessionId) {
     const record = await this.store.read(sessionId);
     if (!record) {
@@ -2431,7 +3133,7 @@ var SessionManager = class {
       });
     });
   }
-  // Persist an agent swap from /hydra switch. The on-disk record's
+  // Persist an agent swap from /hydra agent. The on-disk record's
   // agentId + upstreamSessionId both rotate so a daemon restart (and
   // later resurrect) brings the session back up on the agent the user
   // most recently switched to, not the one it was originally created on.
@@ -2463,6 +3165,7 @@ var SessionManager = class {
         ...record,
         ...update.currentModel !== void 0 ? { currentModel: update.currentModel } : {},
         ...update.currentMode !== void 0 ? { currentMode: update.currentMode } : {},
+        ...update.currentUsage !== void 0 ? { currentUsage: update.currentUsage } : {},
         ...update.agentCommands !== void 0 ? { agentCommands: update.agentCommands } : {},
         updatedAt: (/* @__PURE__ */ new Date()).toISOString()
       });
@@ -2487,10 +3190,124 @@ var SessionManager = class {
     await Promise.allSettled(sessions.map((s) => s.close()));
     this.sessions.clear();
   }
+  // Wait for every pending meta.json write to settle. Daemon shutdown
+  // hooks call this so a SIGTERM doesn't kill the process mid-write
+  // and lose a freshly-set title (or model/mode/commands).
+  async flushMetaWrites() {
+    const pending = [...this.metaWriteQueues.values()];
+    if (pending.length === 0) {
+      return;
+    }
+    await Promise.allSettled(pending);
+  }
 };
+function mergeForPersistence(session, existing) {
+  const persistedCommands = session.mergedAvailableCommands().length > 0 ? session.agentOnlyAdvertisedCommands().map((c) => {
+    if (c.description !== void 0) {
+      return { name: c.name, description: c.description };
+    }
+    return { name: c.name };
+  }) : void 0;
+  const agentCommands = persistedCommands ?? existing?.agentCommands;
+  return recordFromMemorySession({
+    sessionId: session.sessionId,
+    lineageId: existing?.lineageId ?? generateLineageId(),
+    upstreamSessionId: session.upstreamSessionId,
+    importedFromSessionId: existing?.importedFromSessionId,
+    agentId: session.agentId,
+    cwd: session.cwd,
+    title: session.title,
+    agentArgs: session.agentArgs,
+    currentModel: session.currentModel ?? existing?.currentModel,
+    currentMode: session.currentMode ?? existing?.currentMode,
+    currentUsage: usageSnapshotToPersisted(session.currentUsage) ?? existing?.currentUsage,
+    agentCommands,
+    createdAt: existing?.createdAt ?? new Date(session.createdAt).toISOString()
+  });
+}
+function usageSnapshotToPersisted(usage) {
+  if (!usage) {
+    return void 0;
+  }
+  const out = {};
+  if (usage.used !== void 0) {
+    out.used = usage.used;
+  }
+  if (usage.size !== void 0) {
+    out.size = usage.size;
+  }
+  if (usage.costAmount !== void 0) {
+    out.costAmount = usage.costAmount;
+  }
+  if (usage.costCurrency !== void 0) {
+    out.costCurrency = usage.costCurrency;
+  }
+  return Object.keys(out).length > 0 ? out : void 0;
+}
+function persistedUsageToSnapshot(usage) {
+  return usage ? { ...usage } : void 0;
+}
+function extractInitialModel(result) {
+  const direct = asString(result.currentModelId) ?? asString(result.currentModel) ?? asString(result.modelId) ?? asString(result.model);
+  if (direct) {
+    return direct;
+  }
+  const models = result.models;
+  if (models && typeof models === "object" && !Array.isArray(models)) {
+    const m = asString(models.currentModelId) ?? asString(models.currentModel);
+    if (m) {
+      return m;
+    }
+  }
+  const meta = result._meta;
+  if (meta && typeof meta === "object" && !Array.isArray(meta)) {
+    for (const [key, value] of Object.entries(
+      meta
+    )) {
+      if (key === "hydra-acp") {
+        continue;
+      }
+      if (value && typeof value === "object" && !Array.isArray(value)) {
+        const m = asString(value.modelId) ?? asString(value.model) ?? asString(value.currentModelId);
+        if (m) {
+          return m;
+        }
+      }
+    }
+  }
+  return void 0;
+}
+function asString(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
+}
+async function loadPromptHistorySafely(sessionId) {
+  try {
+    const raw = await fs7.readFile(paths.tuiHistoryFile(sessionId), "utf8");
+    const out = [];
+    for (const line of raw.split("\n")) {
+      if (line.length === 0) {
+        continue;
+      }
+      try {
+        const decoded = JSON.parse(line);
+        if (typeof decoded === "string") {
+          out.push(decoded);
+        }
+      } catch {
+      }
+    }
+    return out;
+  } catch {
+    return [];
+  }
+}
 async function historyMtimeIso(sessionId) {
   try {
-    const st = await fs5.stat(paths.historyFile(sessionId));
+    const st = await fs7.stat(paths.historyFile(sessionId));
     return new Date(st.mtimeMs).toISOString();
   } catch {
     return void 0;
@@ -2498,10 +3315,10 @@ async function historyMtimeIso(sessionId) {
 }
 
 // src/core/extensions.ts
-import { spawn as spawn2 } from "child_process";
-import * as fs6 from "fs";
-import * as fsp from "fs/promises";
-import * as path3 from "path";
+import { spawn as spawn3 } from "child_process";
+import * as fs8 from "fs";
+import * as fsp2 from "fs/promises";
+import * as path5 from "path";
 var RESTART_BASE_MS = 1e3;
 var RESTART_CAP_MS = 6e4;
 var STOP_GRACE_MS = 3e3;
@@ -2522,7 +3339,7 @@ var ExtensionManager = class {
     if (!this.context) {
       throw new Error("ExtensionManager: setContext must be called before start");
     }
-    await fsp.mkdir(paths.extensionsDir(), { recursive: true });
+    await fsp2.mkdir(paths.extensionsDir(), { recursive: true });
     await this.reapOrphans();
     for (const entry of this.entries.values()) {
       if (!entry.config.enabled) {
@@ -2548,9 +3365,9 @@ var ExtensionManager = class {
       } catch {
       }
       tasks.push(
-        new Promise((resolve2) => {
+        new Promise((resolve3) => {
           if (child.exitCode !== null || child.signalCode !== null) {
-            resolve2();
+            resolve3();
             return;
           }
           const timer = setTimeout(() => {
@@ -2558,11 +3375,11 @@ var ExtensionManager = class {
               child.kill("SIGKILL");
             } catch {
             }
-            resolve2();
+            resolve3();
           }, STOP_GRACE_MS);
           child.on("exit", () => {
             clearTimeout(timer);
-            resolve2();
+            resolve3();
           });
         })
       );
@@ -2670,8 +3487,8 @@ var ExtensionManager = class {
     if (child.exitCode !== null || child.signalCode !== null) {
       return;
     }
-    const exited = new Promise((resolve2) => {
-      entry.exitWaiters.push(resolve2);
+    const exited = new Promise((resolve3) => {
+      entry.exitWaiters.push(resolve3);
     });
     try {
       child.kill("SIGTERM");
@@ -2731,7 +3548,7 @@ var ExtensionManager = class {
   async reapOrphans() {
     let entries;
     try {
-      entries = await fsp.readdir(paths.extensionsDir());
+      entries = await fsp2.readdir(paths.extensionsDir());
     } catch (err) {
       const e = err;
       if (e.code === "ENOENT") {
@@ -2743,10 +3560,10 @@ var ExtensionManager = class {
       if (!entry.endsWith(".pid")) {
         continue;
       }
-      const pidPath = path3.join(paths.extensionsDir(), entry);
+      const pidPath = path5.join(paths.extensionsDir(), entry);
       let pid;
       try {
-        const raw = await fsp.readFile(pidPath, "utf8");
+        const raw = await fsp2.readFile(pidPath, "utf8");
         const parsed = Number.parseInt(raw.trim(), 10);
         if (Number.isInteger(parsed) && parsed > 0) {
           pid = parsed;
@@ -2769,7 +3586,7 @@ var ExtensionManager = class {
           }
         }
       }
-      await fsp.unlink(pidPath).catch(() => void 0);
+      await fsp2.unlink(pidPath).catch(() => void 0);
     }
   }
   spawn(entry, attempt) {
@@ -2782,7 +3599,7 @@ var ExtensionManager = class {
     }
     const ext = entry.config;
     const command = ext.command.length > 0 ? ext.command : [ext.name];
-    const logStream = fs6.createWriteStream(paths.extensionLogFile(ext.name), {
+    const logStream = fs8.createWriteStream(paths.extensionLogFile(ext.name), {
       flags: "a"
     });
     logStream.write(
@@ -2810,7 +3627,7 @@ var ExtensionManager = class {
     const args = [...baseArgs, ...ext.args];
     let child;
     try {
-      child = spawn2(cmd, args, {
+      child = spawn3(cmd, args, {
         env,
         stdio: ["ignore", "pipe", "pipe"],
         detached: false
@@ -2832,7 +3649,7 @@ var ExtensionManager = class {
     }
     if (typeof child.pid === "number") {
       try {
-        fs6.writeFileSync(paths.extensionPidFile(ext.name), `${child.pid}
+        fs8.writeFileSync(paths.extensionPidFile(ext.name), `${child.pid}
 `, {
           encoding: "utf8",
           mode: 384
@@ -2857,7 +3674,7 @@ var ExtensionManager = class {
     });
     child.on("exit", (code, signal) => {
       try {
-        fs6.unlinkSync(paths.extensionPidFile(ext.name));
+        fs8.unlinkSync(paths.extensionPidFile(ext.name));
       } catch {
       }
       logStream.write(
@@ -2868,8 +3685,8 @@ var ExtensionManager = class {
       entry.pid = void 0;
       entry.lastExitCode = typeof code === "number" ? code : void 0;
       const waiters = entry.exitWaiters.splice(0);
-      for (const resolve2 of waiters) {
-        resolve2();
+      for (const resolve3 of waiters) {
+        resolve3();
       }
       if (this.stopping || entry.manuallyStopped) {
         try {
@@ -2966,6 +3783,77 @@ function constantTimeEqual(a, b) {
 }
 
 // src/daemon/routes/sessions.ts
+import * as os2 from "os";
+
+// src/core/bundle.ts
+import { z as z5 } from "zod";
+var HistoryEntrySchema = z5.object({
+  method: z5.string(),
+  params: z5.unknown(),
+  recordedAt: z5.number()
+});
+var BundleSession = z5.object({
+  // The exporter's local id. Regenerated fresh on import (sessionId is
+  // the local namespace; lineageId is what survives across hops).
+  sessionId: z5.string(),
+  // Required on bundles — the export path backfills if the source
+  // record was written before lineageId existed.
+  lineageId: z5.string(),
+  agentId: z5.string(),
+  cwd: z5.string(),
+  title: z5.string().optional(),
+  currentModel: z5.string().optional(),
+  currentMode: z5.string().optional(),
+  currentUsage: PersistedUsage.optional(),
+  agentCommands: z5.array(PersistedAgentCommand).optional(),
+  createdAt: z5.string(),
+  updatedAt: z5.string()
+});
+var Bundle = z5.object({
+  version: z5.literal(1),
+  exportedAt: z5.string(),
+  exportedFrom: z5.object({
+    hydraVersion: z5.string(),
+    machine: z5.string()
+  }),
+  session: BundleSession,
+  history: z5.array(HistoryEntrySchema),
+  promptHistory: z5.array(z5.string()).optional()
+});
+function encodeBundle(params) {
+  const bundle = {
+    version: 1,
+    exportedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    exportedFrom: {
+      hydraVersion: params.hydraVersion,
+      machine: params.machine
+    },
+    session: {
+      sessionId: params.record.sessionId,
+      lineageId: params.record.lineageId,
+      agentId: params.record.agentId,
+      cwd: params.record.cwd,
+      ...params.record.title !== void 0 ? { title: params.record.title } : {},
+      ...params.record.currentModel !== void 0 ? { currentModel: params.record.currentModel } : {},
+      ...params.record.currentMode !== void 0 ? { currentMode: params.record.currentMode } : {},
+      ...params.record.currentUsage !== void 0 ? { currentUsage: params.record.currentUsage } : {},
+      ...params.record.agentCommands !== void 0 ? { agentCommands: params.record.agentCommands } : {},
+      createdAt: params.record.createdAt,
+      updatedAt: params.record.updatedAt
+    },
+    history: params.history
+  };
+  if (params.promptHistory !== void 0) {
+    bundle.promptHistory = params.promptHistory;
+  }
+  return bundle;
+}
+function decodeBundle(raw) {
+  return Bundle.parse(raw);
+}
+
+// src/daemon/routes/sessions.ts
+var HYDRA_VERSION = "0.1.0";
 function registerSessionRoutes(app, manager, defaults) {
   app.get("/v1/sessions", async (request) => {
     const query = request.query;
@@ -3023,6 +3911,61 @@ function registerSessionRoutes(app, manager, defaults) {
     }
     reply.code(204).send();
   });
+  app.get("/v1/sessions/:id/export", async (request, reply) => {
+    const raw = request.params.id;
+    const id = await manager.resolveCanonicalId(raw) ?? raw;
+    const exported = await manager.exportBundle(id);
+    if (!exported) {
+      reply.code(404).send({ error: "session not found" });
+      return;
+    }
+    const bundle = encodeBundle({
+      record: exported.record,
+      history: exported.history,
+      promptHistory: exported.promptHistory.length > 0 ? exported.promptHistory : void 0,
+      hydraVersion: HYDRA_VERSION,
+      machine: os2.hostname()
+    });
+    const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+    reply.header(
+      "Content-Disposition",
+      `attachment; filename="hydra-${id}-${stamp}.hydra"`
+    );
+    reply.code(200).send(bundle);
+  });
+  app.post("/v1/sessions/import", async (request, reply) => {
+    const body = request.body ?? {};
+    if (body.bundle === void 0) {
+      reply.code(400).send({ error: "missing bundle" });
+      return;
+    }
+    let bundle;
+    try {
+      bundle = decodeBundle(body.bundle);
+    } catch (err) {
+      reply.code(400).send({
+        error: "invalid bundle",
+        details: err.message
+      });
+      return;
+    }
+    try {
+      const result = await manager.importBundle(bundle, {
+        replace: body.replace === true
+      });
+      reply.code(201).send(result);
+    } catch (err) {
+      const e = err;
+      if (e.code === JsonRpcErrorCodes.BundleAlreadyImported) {
+        reply.code(409).send({
+          error: "bundle already imported",
+          existingSessionId: e.existingSessionId
+        });
+        return;
+      }
+      reply.code(500).send({ error: e.message });
+    }
+  });
   app.get("/v1/sessions/:id/history", async (request, reply) => {
     const raw = request.params.id;
     const query = request.query;
@@ -3031,16 +3974,22 @@ function registerSessionRoutes(app, manager, defaults) {
     const live = manager.get(id);
     let snapshot;
     let unsubscribe;
+    let snapshotDone = false;
+    const pending = [];
     if (live) {
-      snapshot = live.getHistorySnapshot();
       if (follow) {
         unsubscribe = live.onBroadcast((entry) => {
           if (reply.raw.writableEnded) {
             return;
           }
-          reply.raw.write(JSON.stringify(entry) + "\n");
+          if (snapshotDone) {
+            reply.raw.write(JSON.stringify(entry) + "\n");
+          } else {
+            pending.push(entry);
+          }
         });
       }
+      snapshot = await live.getHistorySnapshot();
     } else {
       const cold = await manager.getHistory(id);
       if (cold === void 0) {
@@ -3052,9 +4001,23 @@ function registerSessionRoutes(app, manager, defaults) {
     reply.raw.setHeader("Content-Type", "application/x-ndjson");
     reply.raw.setHeader("Cache-Control", "no-cache");
     reply.raw.statusCode = 200;
+    const snapshotKeys = /* @__PURE__ */ new Set();
     for (const entry of snapshot ?? []) {
       reply.raw.write(JSON.stringify(entry) + "\n");
+      const e = entry;
+      if (typeof e.recordedAt === "number") {
+        snapshotKeys.add(String(e.recordedAt));
+      }
+    }
+    for (const entry of pending) {
+      const e = entry;
+      const key = typeof e.recordedAt === "number" ? String(e.recordedAt) : "";
+      if (key && snapshotKeys.has(key)) {
+        continue;
+      }
+      reply.raw.write(JSON.stringify(entry) + "\n");
     }
+    snapshotDone = true;
     if (!unsubscribe) {
       reply.raw.end();
       return reply;
@@ -3272,13 +4235,13 @@ function wsToMessageStream(ws) {
         throw new Error("ws is closed");
       }
       const text = JSON.stringify(message);
-      await new Promise((resolve2, reject) => {
+      await new Promise((resolve3, reject) => {
         ws.send(text, (err) => {
           if (err) {
             reject(err);
             return;
           }
-          resolve2();
+          resolve3();
         });
       });
     },
@@ -3299,7 +4262,7 @@ function wsToMessageStream(ws) {
 }
 
 // src/daemon/acp-ws.ts
-var HYDRA_VERSION = "0.1.0";
+var HYDRA_VERSION2 = "0.1.0";
 var HYDRA_PROTOCOL_VERSION = 1;
 function registerAcpWsEndpoint(app, deps) {
   app.get("/acp", { websocket: true }, (socket, request) => {
@@ -3345,7 +4308,7 @@ function registerAcpWsEndpoint(app, deps) {
         agentArgs: hydraMeta.agentArgs
       });
       const client = bindClientToSession(connection, session, state);
-      session.attach(client, "full");
+      await session.attach(client, "full");
       state.attached.set(session.sessionId, {
         sessionId: session.sessionId,
         clientId: client.clientId
@@ -3364,14 +4327,22 @@ function registerAcpWsEndpoint(app, deps) {
       const lookupId = hydraHints ? params.sessionId : await deps.manager.resolveCanonicalId(params.sessionId) ?? params.sessionId;
       let session = deps.manager.get(lookupId);
       if (!session) {
-        let resurrectParams = hydraHints ? {
-          hydraSessionId: params.sessionId,
-          upstreamSessionId: hydraHints.upstreamSessionId,
-          agentId: hydraHints.agentId,
-          cwd: hydraHints.cwd,
-          title: hydraHints.title,
-          agentArgs: hydraHints.agentArgs
-        } : await deps.manager.loadFromDisk(lookupId);
+        const fromDisk = await deps.manager.loadFromDisk(lookupId);
+        let resurrectParams = fromDisk;
+        if (hydraHints) {
+          resurrectParams = {
+            hydraSessionId: params.sessionId,
+            upstreamSessionId: hydraHints.upstreamSessionId,
+            agentId: hydraHints.agentId,
+            cwd: hydraHints.cwd,
+            title: hydraHints.title ?? fromDisk?.title,
+            agentArgs: hydraHints.agentArgs ?? fromDisk?.agentArgs,
+            currentModel: fromDisk?.currentModel,
+            currentMode: fromDisk?.currentMode,
+            agentCommands: fromDisk?.agentCommands,
+            createdAt: fromDisk?.createdAt
+          };
+        }
         if (!resurrectParams) {
           const err = new Error(
             `session ${params.sessionId} not found and no resume hints provided`
@@ -3387,13 +4358,13 @@ function registerAcpWsEndpoint(app, deps) {
         state,
         params.clientInfo
       );
-      const replay = session.attach(client, params.historyPolicy);
+      const replay = await session.attach(client, params.historyPolicy);
       state.attached.set(session.sessionId, {
         sessionId: session.sessionId,
         clientId: client.clientId
       });
       app.log.info(
-        `session/attach OK sessionId=${session.sessionId} clientId=${client.clientId} attachedCount=${state.attached.size}`
+        `session/attach OK sessionId=${session.sessionId} clientId=${client.clientId} attachedCount=${state.attached.size} replayed=${replay.length}`
       );
       for (const note of replay) {
         await connection.notify(note.method, note.params);
@@ -3489,7 +4460,7 @@ function registerAcpWsEndpoint(app, deps) {
         session = await deps.manager.resurrect(fromDisk);
       }
       const client = bindClientToSession(connection, session, state);
-      const replay = session.attach(client, "pending_only");
+      const replay = await session.attach(client, "pending_only");
       state.attached.set(session.sessionId, {
         sessionId: session.sessionId,
         clientId: client.clientId
@@ -3555,7 +4526,7 @@ function buildResponseMeta(session) {
 function buildInitializeResult() {
   return {
     protocolVersion: HYDRA_PROTOCOL_VERSION,
-    agentInfo: { name: "hydra", version: HYDRA_VERSION },
+    agentInfo: { name: "hydra", version: HYDRA_VERSION2 },
     agentCapabilities: {
       // hydra is a transparent proxy: prompt blocks and MCP server configs are
       // forwarded to the underlying agent unchanged. We claim the union of
@@ -3594,14 +4565,14 @@ function bindClientToSession(connection, session, state, clientInfo) {
 }
 
 // src/daemon/server.ts
-var HYDRA_VERSION2 = "0.1.0";
+var HYDRA_VERSION3 = "0.1.0";
 async function startDaemon(config) {
   ensureLoopbackOrTls(config);
   const httpsOptions = config.daemon.tls ? {
-    key: await fsp2.readFile(config.daemon.tls.key),
-    cert: await fsp2.readFile(config.daemon.tls.cert)
+    key: await fsp3.readFile(config.daemon.tls.key),
+    cert: await fsp3.readFile(config.daemon.tls.cert)
   } : void 0;
-  await fsp2.mkdir(paths.home(), { recursive: true });
+  await fsp3.mkdir(paths.home(), { recursive: true });
   const { stream: logStream, fileStream } = await buildLogStream(
     config.daemon.logLevel
   );
@@ -3613,6 +4584,9 @@ async function startDaemon(config) {
     https: httpsOptions ?? null
   });
   await app.register(websocketPlugin);
+  setBinaryInstallLogger((msg) => {
+    app.log.info(msg);
+  });
   const auth = bearerAuth({ config });
   app.addHook("onRequest", async (request, reply) => {
     if (request.routeOptions.config?.skipAuth) {
@@ -3625,10 +4599,11 @@ async function startDaemon(config) {
   });
   const registry = new Registry(config);
   const manager = new SessionManager(registry, void 0, void 0, {
-    idleTimeoutMs: config.daemon.sessionIdleTimeoutSeconds * 1e3
+    idleTimeoutMs: config.daemon.sessionIdleTimeoutSeconds * 1e3,
+    defaultModels: config.defaultModels
   });
   const extensions = new ExtensionManager(extensionList(config));
-  registerHealthRoutes(app, HYDRA_VERSION2);
+  registerHealthRoutes(app, HYDRA_VERSION3);
   registerSessionRoutes(app, manager, {
     agentId: config.defaultAgent,
     cwd: config.defaultCwd
@@ -3647,8 +4622,8 @@ async function startDaemon(config) {
   await app.listen({ host: config.daemon.host, port: config.daemon.port });
   const address = app.server.address();
   const boundPort = address && typeof address === "object" ? address.port : config.daemon.port;
-  await fsp2.mkdir(paths.home(), { recursive: true });
-  await fsp2.writeFile(
+  await fsp3.mkdir(paths.home(), { recursive: true });
+  await fsp3.writeFile(
     paths.pidFile(),
     JSON.stringify({
       pid: process.pid,
@@ -3672,9 +4647,11 @@ async function startDaemon(config) {
   const shutdown = async () => {
     await extensions.stop();
     await manager.closeAll();
+    await manager.flushMetaWrites();
+    setBinaryInstallLogger(null);
     await app.close();
     try {
-      fs7.unlinkSync(paths.pidFile());
+      fs9.unlinkSync(paths.pidFile());
     } catch {
     }
     try {