@hydra-acp/cli 0.1.3 → 0.1.4

package/dist/cli.js

@@ -89,8 +89,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.
 `
@@ -99,9 +98,23 @@ async function ensureConfig() {
   }
   return loadConfig();
 }
-async function writeConfig(config) {
+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(config, null, 2) + "\n", {
+  await fs.writeFile(paths.config(), JSON.stringify(minimal, null, 2) + "\n", {
+    encoding: "utf8",
+    mode: 384
+  });
+  return HydraConfig.parse(minimal);
+}
+async function updateConfigField(mutate) {
+  const path6 = paths.config();
+  const text = await fs.readFile(path6, "utf8");
+  const raw = JSON.parse(text);
+  mutate(raw);
+  HydraConfig.parse(raw);
+  await fs.writeFile(path6, JSON.stringify(raw, null, 2) + "\n", {
     encoding: "utf8",
     mode: 384
   });
@@ -115,13 +128,6 @@ function generateAuthToken() {
   }
   return `hydra_token_${hex}`;
 }
-function defaultConfig() {
-  return HydraConfig.parse({
-    daemon: {
-      authToken: generateAuthToken()
-    }
-  });
-}
 function expandHome(p) {
   if (p === "~" || p === "$HOME") {
     return homedir2();
@@ -150,7 +156,7 @@ var init_config = __esm({
       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)
     });
     RegistryConfig = z.object({
       url: z.string().url().default(REGISTRY_URL_DEFAULT),
@@ -277,7 +283,8 @@ var init_types = __esm({
       SessionNotFound: -32001,
       PermissionDenied: -32002,
       AlreadyAttached: -32003,
-      AgentNotInstalled: -32005
+      AgentNotInstalled: -32005,
+      BundleAlreadyImported: -32010
     };
     InitializeParams = z3.object({
       protocolVersion: z3.number().optional(),
@@ -401,9 +408,9 @@ var init_connection = __esm({
         }
         const id = nanoid();
         const message = { jsonrpc: "2.0", id, method, params };
-        const response = new Promise((resolve2, reject) => {
+        const response = new Promise((resolve4, reject) => {
           this.pending.set(id, {
-            resolve: (result) => resolve2(result),
+            resolve: (result) => resolve4(result),
             reject
           });
           this.stream.send(message).catch((err) => {
@@ -627,7 +634,7 @@ function firstLine(text, max) {
   }
   return void 0;
 }
-var HYDRA_ID_ALPHABET, generateHydraId, HYDRA_SESSION_PREFIX, Session, STATE_UPDATE_KINDS;
+var HYDRA_ID_ALPHABET, generateHydraId, HYDRA_SESSION_PREFIX, MAX_HISTORY_ENTRIES, COMPACT_EVERY, Session, STATE_UPDATE_KINDS;
 var init_session = __esm({
   "src/core/session.ts"() {
     "use strict";
@@ -636,6 +643,8 @@ var init_session = __esm({
     HYDRA_ID_ALPHABET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
     generateHydraId = customAlphabet(HYDRA_ID_ALPHABET, 16);
     HYDRA_SESSION_PREFIX = "hydra_session_";
+    MAX_HISTORY_ENTRIES = 1e3;
+    COMPACT_EVERY = 200;
     Session = class {
       sessionId;
       cwd;
@@ -655,8 +664,8 @@ var init_session = __esm({
       currentModel;
       currentMode;
       updatedAt;
+      createdAt;
       clients = /* @__PURE__ */ new Map();
-      history = [];
       historyStore;
       promptQueue = [];
       promptInFlight = false;
@@ -672,6 +681,15 @@ var init_session = __esm({
       // 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
@@ -686,6 +704,12 @@ var init_session = __esm({
       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
@@ -720,11 +744,11 @@ var init_session = __esm({
           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 = [
@@ -784,34 +808,20 @@ var init_session = __esm({
         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/
@@ -827,6 +837,10 @@ var init_session = __esm({
           }
         };
       }
+      // 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(
@@ -842,14 +856,10 @@ var init_session = __esm({
         }
         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
@@ -863,7 +873,6 @@ var init_session = __esm({
       detach(clientId) {
         if (this.clients.delete(clientId)) {
           this.updatedAt = Date.now();
-          this.maybeStartIdleTimer();
         }
       }
       async prompt(clientId, params) {
@@ -909,6 +918,7 @@ var init_session = __esm({
         if (client.clientInfo?.version) {
           sentBy.version = client.clientInfo.version;
         }
+        this.promptStartedAt = Date.now();
         this.recordAndBroadcast(
           "session/update",
           {
@@ -945,6 +955,7 @@ var init_session = __esm({
         if (stopReason !== void 0) {
           update.stopReason = stopReason;
         }
+        this.promptStartedAt = void 0;
         this.recordAndBroadcast(
           "session/update",
           {
@@ -1130,6 +1141,12 @@ var init_session = __esm({
       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
@@ -1261,7 +1278,7 @@ var init_session = __esm({
         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,
@@ -1293,15 +1310,20 @@ var init_session = __esm({
           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;
           }
@@ -1355,29 +1377,53 @@ var init_session = __esm({
         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 switch 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
+      // (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 switch'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", {
@@ -1408,22 +1454,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);
@@ -1448,17 +1527,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
               );
             }
@@ -1469,6 +1545,7 @@ _(switched from \`${oldAgentId}\` to \`${newAgentId}\`)_
             } catch {
             }
           }
+          this.scheduleIdleCheck();
         }
         this.updatedAt = Date.now();
         for (const client of this.clients.values()) {
@@ -1487,7 +1564,7 @@ _(switched from \`${oldAgentId}\` to \`${newAgentId}\`)_
           );
         }
         const clientParams = this.rewriteForClient(params);
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve4, reject) => {
           let settled = false;
           const outbound = [];
           const entry = { addClient: sendTo };
@@ -1522,7 +1599,7 @@ _(switched from \`${oldAgentId}\` to \`${newAgentId}\`)_
                     result
                   }).catch(() => void 0);
                 }
-                resolve2(result);
+                resolve4(result);
               });
             }).catch((err) => {
               settle(() => reject(err));
@@ -1534,11 +1611,11 @@ _(switched from \`${oldAgentId}\` to \`${newAgentId}\`)_
         });
       }
       async enqueuePrompt(task) {
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve4, reject) => {
           const run = async () => {
             try {
               const result = await task();
-              resolve2(result);
+              resolve4(result);
             } catch (err) {
               reject(err);
             }
@@ -1573,6 +1650,64 @@ _(switched from \`${oldAgentId}\` to \`${newAgentId}\`)_
   }
 });
 
+// src/tui/history.ts
+import { promises as fs6 } from "fs";
+import * as path3 from "path";
+async function loadHistory(file) {
+  let text;
+  try {
+    text = await fs6.readFile(file, "utf8");
+  } catch (err) {
+    if (err.code === "ENOENT") {
+      return [];
+    }
+    throw err;
+  }
+  return parseHistory(text);
+}
+function parseHistory(text) {
+  const out = [];
+  for (const rawLine of text.split("\n")) {
+    if (rawLine.length === 0) {
+      continue;
+    }
+    try {
+      const decoded = JSON.parse(rawLine);
+      if (typeof decoded === "string") {
+        out.push(decoded);
+      }
+    } catch {
+    }
+  }
+  return out;
+}
+function appendEntry(history, entry) {
+  const trimmed = entry.replace(/\n+$/, "");
+  if (trimmed.length === 0) {
+    return history;
+  }
+  if (history.length > 0 && history[history.length - 1] === trimmed) {
+    return history;
+  }
+  const out = history.concat(trimmed);
+  if (out.length > HISTORY_CAP) {
+    return out.slice(out.length - HISTORY_CAP);
+  }
+  return out;
+}
+async function saveHistory(file, history) {
+  await fs6.mkdir(path3.dirname(file), { recursive: true });
+  const lines = history.map((entry) => JSON.stringify(entry));
+  await fs6.writeFile(file, lines.length > 0 ? lines.join("\n") + "\n" : "");
+}
+var HISTORY_CAP;
+var init_history = __esm({
+  "src/tui/history.ts"() {
+    "use strict";
+    HISTORY_CAP = 500;
+  }
+});
+
 // src/acp/ws-stream.ts
 function wsToMessageStream(ws) {
   const messageHandlers = [];
@@ -1618,13 +1753,13 @@ function wsToMessageStream(ws) {
         throw new Error("ws is closed");
       }
       const text = JSON.stringify(message);
-      await new Promise((resolve2, reject) => {
+      await new Promise((resolve4, reject) => {
         ws.send(text, (err) => {
           if (err) {
             reject(err);
             return;
           }
-          resolve2();
+          resolve4();
         });
       });
     },
@@ -1845,6 +1980,8 @@ var init_session_row = __esm({
 });
 
 // src/cli/commands/sessions.ts
+import * as fs11 from "fs/promises";
+import * as path5 from "path";
 async function runSessionsList(opts = {}) {
   const config = await loadConfig();
   const baseUrl = httpBase(config.daemon.host, config.daemon.port, !!config.daemon.tls);
@@ -1933,6 +2070,111 @@ async function runSessionsRm(id) {
   process.stdout.write(`Removed ${id}
 `);
 }
+async function runSessionsExport(id, outPath) {
+  if (!id) {
+    process.stderr.write(
+      "Usage: hydra-acp sessions export <session-id> [--out <file>]\n"
+    );
+    process.exit(2);
+  }
+  const config = await loadConfig();
+  const baseUrl = httpBase(config.daemon.host, config.daemon.port, !!config.daemon.tls);
+  const response = await fetch(
+    `${baseUrl}/v1/sessions/${encodeURIComponent(id)}/export`,
+    {
+      headers: { Authorization: `Bearer ${config.daemon.authToken}` }
+    }
+  );
+  if (!response.ok) {
+    const text = await response.text().catch(() => "");
+    process.stderr.write(`Daemon returned HTTP ${response.status}: ${text}
+`);
+    process.exit(1);
+  }
+  const body = await response.text();
+  if (!outPath) {
+    process.stdout.write(body);
+    if (!body.endsWith("\n")) {
+      process.stdout.write("\n");
+    }
+    return;
+  }
+  const resolved = outPath === "." ? deriveFilenameFrom(response, id) : outPath;
+  await fs11.mkdir(path5.dirname(path5.resolve(resolved)), { recursive: true });
+  await fs11.writeFile(resolved, body, { encoding: "utf8", mode: 384 });
+  process.stdout.write(`Wrote ${resolved}
+`);
+}
+async function runSessionsImport(file, opts = {}) {
+  if (!file) {
+    process.stderr.write(
+      "Usage: hydra-acp sessions import <file>|- [--replace]\n"
+    );
+    process.exit(2);
+  }
+  let body;
+  if (file === "-") {
+    body = await readStdin();
+  } else {
+    body = await fs11.readFile(file, "utf8");
+  }
+  let bundle;
+  try {
+    bundle = JSON.parse(body);
+  } catch (err) {
+    process.stderr.write(`Failed to parse bundle: ${err.message}
+`);
+    process.exit(1);
+  }
+  const config = await loadConfig();
+  const baseUrl = httpBase(config.daemon.host, config.daemon.port, !!config.daemon.tls);
+  const response = await fetch(`${baseUrl}/v1/sessions/import`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${config.daemon.authToken}`
+    },
+    body: JSON.stringify({ bundle, replace: opts.replace === true })
+  });
+  if (response.status === 409) {
+    const detail = await response.json().catch(() => ({}));
+    process.stderr.write(
+      `Bundle already imported as ${detail.existingSessionId ?? "unknown"}. Use --replace to overwrite.
+`
+    );
+    process.exit(1);
+  }
+  if (!response.ok) {
+    const text = await response.text().catch(() => "");
+    process.stderr.write(`Daemon returned HTTP ${response.status}: ${text}
+`);
+    process.exit(1);
+  }
+  const result = await response.json();
+  process.stdout.write(
+    result.replaced ? `Replaced ${result.sessionId} (from ${result.importedFromSessionId})
+` : `Imported as ${result.sessionId} (from ${result.importedFromSessionId})
+`
+  );
+}
+async function readStdin() {
+  const chunks = [];
+  for await (const chunk of process.stdin) {
+    chunks.push(typeof chunk === "string" ? Buffer.from(chunk) : chunk);
+  }
+  return Buffer.concat(chunks).toString("utf8");
+}
+function deriveFilenameFrom(response, id) {
+  const cd = response.headers.get("content-disposition");
+  if (cd) {
+    const match = cd.match(/filename="([^"]+)"/);
+    if (match) {
+      return match[1];
+    }
+  }
+  const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+  return `hydra-${id}-${stamp}.hydra`;
+}
 function httpBase(host, port, tls) {
   const protocol = tls ? "https" : "http";
   return `${protocol}://${host}:${port}`;
@@ -1952,11 +2194,11 @@ function isResponse(msg) {
   return !("method" in msg) && "id" in msg && msg.id !== void 0;
 }
 async function openWs(url, subprotocols) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve4, reject) => {
     const ws = new WebSocket(url, subprotocols);
     const onOpen = () => {
       ws.off("error", onError);
-      resolve2(wsToMessageStream(ws));
+      resolve4(wsToMessageStream(ws));
     };
     const onError = (err) => {
       ws.off("open", onOpen);
@@ -2027,8 +2269,8 @@ var init_resilient_ws = __esm({
           throw new Error("resilient ws stream not connected");
         }
         const id = message.id;
-        const promise = new Promise((resolve2, reject) => {
-          this.pendingRequests.set(id, { resolve: resolve2, reject });
+        const promise = new Promise((resolve4, reject) => {
+          this.pendingRequests.set(id, { resolve: resolve4, reject });
         });
         try {
           await this.current.send(message);
@@ -2056,8 +2298,8 @@ var init_resilient_ws = __esm({
             this.bindStream(stream);
             const wasFirst = this.firstConnect;
             this.firstConnect = false;
-            this.connectGate = new Promise((resolve2) => {
-              this.releaseConnectGate = resolve2;
+            this.connectGate = new Promise((resolve4) => {
+              this.releaseConnectGate = resolve4;
             });
             try {
               if (this.opts.onConnect) {
@@ -2180,64 +2422,6 @@ var init_resilient_ws = __esm({
   }
 });
 
-// src/tui/history.ts
-import { promises as fs10 } from "fs";
-import * as path4 from "path";
-async function loadHistory(file) {
-  let text;
-  try {
-    text = await fs10.readFile(file, "utf8");
-  } catch (err) {
-    if (err.code === "ENOENT") {
-      return [];
-    }
-    throw err;
-  }
-  return parseHistory(text);
-}
-function parseHistory(text) {
-  const out = [];
-  for (const rawLine of text.split("\n")) {
-    if (rawLine.length === 0) {
-      continue;
-    }
-    try {
-      const decoded = JSON.parse(rawLine);
-      if (typeof decoded === "string") {
-        out.push(decoded);
-      }
-    } catch {
-    }
-  }
-  return out;
-}
-function appendEntry(history, entry) {
-  const trimmed = entry.replace(/\n+$/, "");
-  if (trimmed.length === 0) {
-    return history;
-  }
-  if (history.length > 0 && history[history.length - 1] === trimmed) {
-    return history;
-  }
-  const out = history.concat(trimmed);
-  if (out.length > HISTORY_CAP) {
-    return out.slice(out.length - HISTORY_CAP);
-  }
-  return out;
-}
-async function saveHistory(file, history) {
-  await fs10.mkdir(path4.dirname(file), { recursive: true });
-  const lines = history.map((entry) => JSON.stringify(entry));
-  await fs10.writeFile(file, lines.length > 0 ? lines.join("\n") + "\n" : "");
-}
-var HISTORY_CAP;
-var init_history = __esm({
-  "src/tui/history.ts"() {
-    "use strict";
-    HISTORY_CAP = 500;
-  }
-});
-
 // src/tui/discovery.ts
 async function listSessions(config, opts = {}, fetchImpl = fetch) {
   const base = httpBase(config.daemon.host, config.daemon.port, !!config.daemon.tls);
@@ -2468,7 +2652,7 @@ async function pickSession(term, opts) {
   };
   renderFromScratch();
   term.hideCursor();
-  return await new Promise((resolve2) => {
+  return await new Promise((resolve4) => {
     let resolved = false;
     const onResize = () => {
       if (resolved) {
@@ -2590,6 +2774,11 @@ async function pickSession(term, opts) {
       }
       clearTransient();
       if (data?.isCharacter) {
+        if (name === "r" || name === "R") {
+          const currentId = selectedIdx > 0 ? visible[selectedIdx - 1]?.sessionId : void 0;
+          void refresh(currentId);
+          return;
+        }
         if ((name === "k" || name === "K") && selectedIdx > 0) {
           const session = visible[selectedIdx - 1];
           if (!session) {
@@ -2650,12 +2839,12 @@ async function pickSession(term, opts) {
         case "KP_ENTER": {
           cleanup();
           if (selectedIdx === 0) {
-            resolve2({ kind: "new" });
+            resolve4({ kind: "new" });
             return;
           }
           const session = visible[selectedIdx - 1];
           if (!session) {
-            resolve2({ kind: "abort" });
+            resolve4({ kind: "abort" });
             return;
           }
           const result = {
@@ -2665,13 +2854,13 @@ async function pickSession(term, opts) {
           if (session.agentId !== void 0) {
             result.agentId = session.agentId;
           }
-          resolve2(result);
+          resolve4(result);
           return;
         }
         case "ESCAPE":
         case "CTRL_C":
           cleanup();
-          resolve2({ kind: "abort" });
+          resolve4({ kind: "abort" });
           return;
       }
     };
@@ -2853,6 +3042,12 @@ function wrap(text, width) {
   if (text.length === 0) {
     return [""];
   }
+  if (!NON_ASCII.test(text)) {
+    return wrapAscii(text, width);
+  }
+  return wrapVisible(text, width);
+}
+function wrapAscii(text, width) {
   const out = [];
   let remaining = text;
   while (remaining.length > width) {
@@ -2875,14 +3070,78 @@ function wrap(text, width) {
   out.push(remaining);
   return out;
 }
+function wrapVisible(text, width) {
+  const out = [];
+  const graphemes = [];
+  for (const { segment } of SEGMENTER.segment(text)) {
+    graphemes.push({ seg: segment, w: stringWidth(segment) });
+  }
+  let i = 0;
+  while (i < graphemes.length) {
+    let chunk = "";
+    let chunkW = 0;
+    let lastSpaceI = -1;
+    let chunkAtLastSpace = "";
+    while (i < graphemes.length) {
+      const g = graphemes[i];
+      if (chunkW + g.w > width) {
+        break;
+      }
+      if (g.seg === " ") {
+        lastSpaceI = i;
+        chunkAtLastSpace = chunk;
+      }
+      chunk += g.seg;
+      chunkW += g.w;
+      i += 1;
+    }
+    if (i >= graphemes.length) {
+      out.push(chunk);
+      break;
+    }
+    if (lastSpaceI >= 0) {
+      out.push(chunkAtLastSpace);
+      i = lastSpaceI + 1;
+    } else if (chunk.length === 0) {
+      out.push(graphemes[i].seg);
+      i += 1;
+    } else {
+      out.push(chunk);
+    }
+  }
+  return out;
+}
 function truncate(text, max) {
-  if (text.length <= max) {
+  if (max <= 0) {
+    return "";
+  }
+  if (text.length <= max && !NON_ASCII.test(text)) {
+    return text;
+  }
+  const visible = stringWidth(text);
+  if (visible <= max) {
     return text;
   }
   if (max <= 1) {
-    return text.slice(0, max);
+    return takeByWidth(text, max);
   }
-  return text.slice(0, max - 1) + "\u2026";
+  return takeByWidth(text, max - 1) + "\u2026";
+}
+function takeByWidth(text, budget) {
+  if (budget <= 0) {
+    return "";
+  }
+  let out = "";
+  let used = 0;
+  for (const { segment } of SEGMENTER.segment(text)) {
+    const w = stringWidth(segment);
+    if (used + w > budget) {
+      break;
+    }
+    out += segment;
+    used += w;
+  }
+  return out;
 }
 function firstLine2(text) {
   const idx = text.indexOf("\n");
@@ -2997,7 +3256,7 @@ function mapKeyName(name) {
       return null;
   }
 }
-var HEADER_ROWS, BANNER_ROWS, SEPARATOR_ROWS, MAX_PROMPT_ROWS, MAX_QUEUED_ROWS, MAX_PERMISSION_ROWS, MAX_COMPLETION_ROWS, CONFIRM_PROMPT_ROWS, DEFAULT_CONTENT_REPAINT_THROTTLE_MS, DEFAULT_MAX_SCROLLBACK_LINES, Screen, shortId;
+var HEADER_ROWS, BANNER_ROWS, SEPARATOR_ROWS, MAX_PROMPT_ROWS, MAX_QUEUED_ROWS, MAX_PERMISSION_ROWS, MAX_COMPLETION_ROWS, CONFIRM_PROMPT_ROWS, DEFAULT_CONTENT_REPAINT_THROTTLE_MS, DEFAULT_MAX_SCROLLBACK_LINES, Screen, NON_ASCII, SEGMENTER, shortId;
 var init_screen = __esm({
   "src/tui/screen.ts"() {
     "use strict";
@@ -3100,6 +3359,11 @@ var init_screen = __esm({
         }
         this.started = true;
         this.term.fullscreen(true);
+        this.lastFrameRows.clear();
+        this.lastFrameW = 0;
+        this.lastFrameH = 0;
+        this.lastWindowTitle = null;
+        process.stdout.write("\x1B[?7l");
         this.term.grabInput({ mouse: "button" });
         this.term.hideCursor(false);
         this.term.on("key", this.keyHandler);
@@ -3119,6 +3383,7 @@ var init_screen = __esm({
         this.term.off("resize", this.resizeHandler);
         this.term.grabInput(false);
         this.term.hideCursor(false);
+        process.stdout.write("\x1B[?7h");
         this.term.fullscreen(false);
         this.term("\n");
       }
@@ -3430,6 +3695,22 @@ var init_screen = __esm({
       redraw() {
         this.repaint();
       }
+      // Forced clean-slate repaint. Drops the per-row signature cache, the
+      // window-title cache, the wrap cache, and clears the terminal before
+      // painting. Wired to ^L so the user can recover when something has
+      // corrupted the visible state and the per-row sig check otherwise
+      // short-circuits the re-emit.
+      fullRedraw() {
+        this.lastFrameRows.clear();
+        this.lastFrameW = 0;
+        this.lastFrameH = 0;
+        this.lastWindowTitle = null;
+        this.wrapCache.clear();
+        this.wrapCacheWidth = 0;
+        process.stdout.write("\x1B[?7l");
+        this.term.clear();
+        this.repaint();
+      }
       // While paused, append* methods buffer state but don't repaint. Calls are
       // counter-based so they nest safely. Resume triggers exactly one repaint
       // if any was requested while paused.
@@ -4083,6 +4364,8 @@ var init_screen = __esm({
         }
       }
     };
+    NON_ASCII = /[^\x20-\x7e]/;
+    SEGMENTER = new Intl.Segmenter(void 0, { granularity: "grapheme" });
     shortId = stripHydraSessionPrefix;
   }
 });
@@ -4500,10 +4783,28 @@ function mapUpdate(update) {
 }
 function mapSessionInfo(u) {
   const title = readString(u, "title");
-  if (title === void 0) {
+  const meta = u._meta;
+  let agentId;
+  if (meta && typeof meta === "object" && !Array.isArray(meta)) {
+    const ns = meta["hydra-acp"];
+    if (ns && typeof ns === "object" && !Array.isArray(ns)) {
+      const candidate = ns.agentId;
+      if (typeof candidate === "string") {
+        agentId = candidate;
+      }
+    }
+  }
+  if (title === void 0 && agentId === void 0) {
     return null;
   }
-  return { kind: "session-info", title };
+  const event = { kind: "session-info" };
+  if (title !== void 0) {
+    event.title = title;
+  }
+  if (agentId !== void 0) {
+    event.agentId = agentId;
+  }
+  return event;
 }
 function mapAvailableCommands(u) {
   const list = u.availableCommands ?? u.commands;
@@ -4907,8 +5208,9 @@ function formatToolLine(state) {
     title = `${initial} \xB7 ${latest}`;
   }
   return {
-    prefix: "  ",
-    body: `${toolStatusIcon(state.status)} ${title}`,
+    prefix: `  ${toolStatusIcon(state.status)} `,
+    prefixStyle: toolIconStyle(state.status),
+    body: title,
     bodyStyle: toolStatusStyle(state.status)
   };
 }
@@ -4933,6 +5235,22 @@ function toolStatusIcon(status) {
       return "\u25D0";
   }
 }
+function toolIconStyle(status) {
+  switch (status) {
+    case "completed":
+    case "succeeded":
+    case "ok":
+      return "tool-status-ok";
+    case "failed":
+    case "error":
+    case "rejected":
+      return "tool-status-fail";
+    case "cancelled":
+      return "tool-status-cancelled";
+    default:
+      return "tool-status-running";
+  }
+}
 function formatPlan(event) {
   if (event.entries.length === 0) {
     return [
@@ -5019,12 +5337,18 @@ async function runTuiApp(opts) {
   const config = await ensureConfig();
   await ensureDaemonReachable(config);
   const term = termkit.terminal;
+  const exitHint = {};
   let nextOpts = opts;
   while (nextOpts !== null) {
-    nextOpts = await runSession(term, config, nextOpts);
+    nextOpts = await runSession(term, config, nextOpts, exitHint);
+  }
+  if (exitHint.sessionId) {
+    const short = stripHydraSessionPrefix(exitHint.sessionId);
+    process.stdout.write(`To resume: hydra-acp tui --resume ${short}
+`);
   }
 }
-async function runSession(term, config, opts) {
+async function runSession(term, config, opts, exitHint) {
   const ctx = await resolveSession(term, config, opts);
   if (!ctx) {
     term.grabInput(false);
@@ -5132,10 +5456,10 @@ async function runSession(term, config, opts) {
     if (pendingPermission.toolCallId && toolCallId && pendingPermission.toolCallId !== toolCallId) {
       return;
     }
-    const resolve2 = pendingPermission.resolve;
+    const resolve4 = pendingPermission.resolve;
     pendingPermission = null;
     screen.setPermissionPrompt(null);
-    resolve2(result ?? { outcome: { outcome: "cancelled" } });
+    resolve4(result ?? { outcome: { outcome: "cancelled" } });
   };
   const maybeDismissPermissionByToolUpdate = (update) => {
     if (!pendingPermission?.toolCallId) {
@@ -5168,14 +5492,14 @@ async function runSession(term, config, opts) {
     if (!pendingPermission) {
       return;
     }
-    const { options, resolve: resolve2 } = pendingPermission;
+    const { options, resolve: resolve4 } = pendingPermission;
     pendingPermission = null;
     screen.setPermissionPrompt(null);
     if (optionId === null) {
-      resolve2({ outcome: { outcome: "cancelled" } });
+      resolve4({ outcome: { outcome: "cancelled" } });
       return;
     }
-    resolve2({ outcome: { outcome: "selected", optionId } });
+    resolve4({ outcome: { outcome: "selected", optionId } });
     void options;
   };
   conn.onRequest("session/request_permission", async (params) => {
@@ -5193,12 +5517,12 @@ async function runSession(term, config, opts) {
       ]);
       return { outcome: { outcome: "cancelled" } };
     }
-    return new Promise((resolve2) => {
+    return new Promise((resolve4) => {
       pendingPermission = {
         title,
         options,
         selectedIndex: 0,
-        resolve: resolve2,
+        resolve: resolve4,
         toolCallId
       };
       refreshPermissionPrompt();
@@ -5236,6 +5560,7 @@ async function runSession(term, config, opts) {
       ...opts.name ? { _meta: { [HYDRA_META_KEY]: { name: opts.name } } } : {}
     });
     resolvedSessionId = created.sessionId;
+    exitHint.sessionId = resolvedSessionId;
     const hydraMeta = extractHydraMeta(created._meta ?? void 0);
     upstreamSessionId = hydraMeta.upstreamSessionId;
     if (hydraMeta.agentId) {
@@ -5262,6 +5587,7 @@ async function runSession(term, config, opts) {
       clientInfo: { name: "hydra-acp-tui", version: "0.1.0" }
     });
     resolvedSessionId = attached.sessionId;
+    exitHint.sessionId = resolvedSessionId;
     const hydraMeta = extractHydraMeta(attached._meta ?? void 0);
     upstreamSessionId = hydraMeta.upstreamSessionId;
     if (hydraMeta.agentId) {
@@ -5458,8 +5784,8 @@ async function runSession(term, config, opts) {
     screen.appendLines(formatEvent({ kind: "model-changed", model: initialModel }));
   }
   let finishSession = null;
-  const sessionDone = new Promise((resolve2) => {
-    finishSession = resolve2;
+  const sessionDone = new Promise((resolve4) => {
+    finishSession = resolve4;
   });
   const cancelRemoteTurn = () => {
     conn.notify("session/cancel", { sessionId: resolvedSessionId }).catch(() => void 0);
@@ -5631,7 +5957,7 @@ async function runSession(term, config, opts) {
         screen.setBanner({});
         return;
       case "redraw":
-        screen.redraw();
+        screen.fullRedraw();
         return;
       case "switch-session":
         void switchSession();
@@ -5957,6 +6283,10 @@ async function runSession(term, config, opts) {
       if (event.title !== void 0) {
         screen.setHeader({ title: event.title });
       }
+      if (event.agentId !== void 0 && event.agentId !== resolvedAgentId) {
+        resolvedAgentId = event.agentId;
+        screen.setHeader({ agent: event.agentId });
+      }
       return;
     }
     if (event.kind === "usage-update") {
@@ -6077,10 +6407,10 @@ async function runSession(term, config, opts) {
   }
   const resetInFlightUiState = () => {
     if (pendingPermission) {
-      const resolve2 = pendingPermission.resolve;
+      const resolve4 = pendingPermission.resolve;
       pendingPermission = null;
       screen.setPermissionPrompt(null);
-      resolve2({ outcome: { outcome: "cancelled" } });
+      resolve4({ outcome: { outcome: "cancelled" } });
     }
     closeAgentText();
     if (toolsBlockStartedAt !== null) {
@@ -6268,6 +6598,7 @@ var init_app = __esm({
     init_resilient_ws();
     init_config();
     init_daemon_bootstrap();
+    init_session();
     init_paths();
     init_history();
     init_discovery();
@@ -6293,6 +6624,11 @@ var init_tui = __esm({
   }
 });
 
+// src/cli.ts
+import { readFileSync } from "fs";
+import { fileURLToPath } from "url";
+import { dirname as dirname3, resolve as resolve3 } from "path";
+
 // src/cli/parse-args.ts
 function parseArgs(argv) {
   const positional = [];
@@ -6362,8 +6698,7 @@ async function runInit(flags) {
     existing = void 0;
   }
   if (!existing) {
-    const config = defaultConfig();
-    await writeConfig(config);
+    const config = await writeMinimalInitConfig();
     process.stdout.write(
       `Initialized ${paths.config()}
 Auth token: ${config.daemon.authToken}
@@ -6372,11 +6707,14 @@ Auth token: ${config.daemon.authToken}
     return;
   }
   if (flagBool(flags, "rotate-token")) {
-    existing.daemon.authToken = generateAuthToken();
-    await writeConfig(existing);
+    const newToken = generateAuthToken();
+    await updateConfigField((raw) => {
+      const daemon = raw.daemon ??= {};
+      daemon.authToken = newToken;
+    });
     process.stdout.write(
       `Rotated token in ${paths.config()}
-New token: ${existing.daemon.authToken}
+New token: ${newToken}
 `
     );
     return;
@@ -6394,7 +6732,7 @@ import { setTimeout as sleep2 } from "timers/promises";
 
 // src/daemon/server.ts
 init_config();
-import * as fs8 from "fs";
+import * as fs9 from "fs";
 import * as fsp2 from "fs/promises";
 import Fastify from "fastify";
 import websocketPlugin from "@fastify/websocket";
@@ -6567,7 +6905,8 @@ function planSpawn(agent, extraArgs = []) {
 }
 
 // src/core/session-manager.ts
-import * as fs6 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";
@@ -6626,13 +6965,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((resolve4, reject) => {
         stdin.write(line, (err) => {
           if (err) {
             reject(err);
             return;
           }
-          resolve2();
+          resolve4();
         });
       });
     },
@@ -6713,7 +7052,14 @@ init_session();
 init_paths();
 import * as fs4 from "fs/promises";
 import * as path2 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()
@@ -6721,7 +7067,20 @@ var PersistedAgentCommand = z4.object({
 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(),
@@ -6794,6 +7153,25 @@ 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 {
@@ -6819,7 +7197,9 @@ 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,
@@ -6868,6 +7248,36 @@ var HistoryStore = class {
       });
     });
   }
+  // 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
+      });
+    });
+  }
   async load(sessionId) {
     if (!SESSION_ID_PATTERN2.test(sessionId)) {
       return [];
@@ -6957,7 +7367,10 @@ var HistoryStore = class {
 
 // src/core/session-manager.ts
 init_paths();
+init_history();
 init_types();
+var HYDRA_ID_ALPHABET3 = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+var generateRawSessionId = customAlphabet3(HYDRA_ID_ALPHABET3, 16);
 var SessionManager = class {
   constructor(registry, spawner, store, options = {}) {
     this.registry = registry;
@@ -7036,6 +7449,9 @@ var SessionManager = class {
       err.code = JsonRpcErrorCodes.AgentNotInstalled;
       throw err;
     }
+    if (params.upstreamSessionId === "") {
+      return this.doResurrectFromImport(params);
+    }
     const plan = planSpawn(agentDef, params.agentArgs ?? []);
     const agent = this.spawner({
       agentId: params.agentId,
@@ -7072,15 +7488,55 @@ var SessionManager = class {
       idleTimeoutMs: this.idleTimeoutMs,
       spawnReplacementAgent: (p) => this.bootstrapAgent({ ...p, mcpServers: [] }),
       historyStore: this.histories,
-      seedHistory: params.seedHistory,
       currentModel: params.currentModel,
       currentMode: params.currentMode,
       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,
+      currentModel: params.currentModel,
+      currentMode: params.currentMode,
+      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
   // go through the same env / capabilities / error-handling.
@@ -7160,28 +7616,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) {
@@ -7194,20 +7642,41 @@ 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
+      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);
   }
@@ -7282,6 +7751,111 @@ 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,
+        agentCommands: args.bundle.session.agentCommands,
+        createdAt: args.preservedCreatedAt ?? now,
+        updatedAt: now
+      });
+    });
+  }
   async deleteRecord(sessionId) {
     const record = await this.store.read(sessionId);
     if (!record) {
@@ -7367,10 +7941,64 @@ 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,
+    agentCommands,
+    createdAt: existing?.createdAt ?? new Date(session.createdAt).toISOString()
+  });
+}
+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 fs6.stat(paths.historyFile(sessionId));
+    const st = await fs7.stat(paths.historyFile(sessionId));
     return new Date(st.mtimeMs).toISOString();
   } catch {
     return void 0;
@@ -7380,9 +8008,9 @@ async function historyMtimeIso(sessionId) {
 // src/core/extensions.ts
 init_paths();
 import { spawn as spawn2 } from "child_process";
-import * as fs7 from "fs";
+import * as fs8 from "fs";
 import * as fsp from "fs/promises";
-import * as path3 from "path";
+import * as path4 from "path";
 var RESTART_BASE_MS = 1e3;
 var RESTART_CAP_MS = 6e4;
 var STOP_GRACE_MS = 3e3;
@@ -7429,9 +8057,9 @@ var ExtensionManager = class {
       } catch {
       }
       tasks.push(
-        new Promise((resolve2) => {
+        new Promise((resolve4) => {
           if (child.exitCode !== null || child.signalCode !== null) {
-            resolve2();
+            resolve4();
             return;
           }
           const timer = setTimeout(() => {
@@ -7439,11 +8067,11 @@ var ExtensionManager = class {
               child.kill("SIGKILL");
             } catch {
             }
-            resolve2();
+            resolve4();
           }, STOP_GRACE_MS);
           child.on("exit", () => {
             clearTimeout(timer);
-            resolve2();
+            resolve4();
           });
         })
       );
@@ -7551,8 +8179,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((resolve4) => {
+      entry.exitWaiters.push(resolve4);
     });
     try {
       child.kill("SIGTERM");
@@ -7624,7 +8252,7 @@ var ExtensionManager = class {
       if (!entry.endsWith(".pid")) {
         continue;
       }
-      const pidPath = path3.join(paths.extensionsDir(), entry);
+      const pidPath = path4.join(paths.extensionsDir(), entry);
       let pid;
       try {
         const raw = await fsp.readFile(pidPath, "utf8");
@@ -7663,7 +8291,7 @@ var ExtensionManager = class {
     }
     const ext = entry.config;
     const command = ext.command.length > 0 ? ext.command : [ext.name];
-    const logStream = fs7.createWriteStream(paths.extensionLogFile(ext.name), {
+    const logStream = fs8.createWriteStream(paths.extensionLogFile(ext.name), {
       flags: "a"
     });
     logStream.write(
@@ -7713,7 +8341,7 @@ var ExtensionManager = class {
     }
     if (typeof child.pid === "number") {
       try {
-        fs7.writeFileSync(paths.extensionPidFile(ext.name), `${child.pid}
+        fs8.writeFileSync(paths.extensionPidFile(ext.name), `${child.pid}
 `, {
           encoding: "utf8",
           mode: 384
@@ -7738,7 +8366,7 @@ var ExtensionManager = class {
     });
     child.on("exit", (code, signal) => {
       try {
-        fs7.unlinkSync(paths.extensionPidFile(ext.name));
+        fs8.unlinkSync(paths.extensionPidFile(ext.name));
       } catch {
       }
       logStream.write(
@@ -7749,8 +8377,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 resolve4 of waiters) {
+        resolve4();
       }
       if (this.stopping || entry.manuallyStopped) {
         try {
@@ -7851,6 +8479,76 @@ function constantTimeEqual(a, b) {
 
 // src/daemon/routes/sessions.ts
 init_config();
+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(),
+  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.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
+init_types();
+var HYDRA_VERSION = "0.1.0";
 function registerSessionRoutes(app, manager, defaults) {
   app.get("/v1/sessions", async (request) => {
     const query = request.query;
@@ -7908,6 +8606,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;
@@ -7916,16 +8669,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) {
@@ -7937,9 +8696,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;
@@ -8114,7 +8887,7 @@ init_connection();
 init_ws_stream();
 init_types();
 import { nanoid as nanoid2 } from "nanoid";
-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) => {
@@ -8160,7 +8933,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
@@ -8179,14 +8952,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`
@@ -8202,13 +8983,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);
@@ -8304,7 +9085,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
@@ -8370,7 +9151,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
@@ -8409,7 +9190,7 @@ 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 ? {
@@ -8443,7 +9224,7 @@ async function startDaemon(config) {
     idleTimeoutMs: config.daemon.sessionIdleTimeoutSeconds * 1e3
   });
   const extensions = new ExtensionManager(extensionList(config));
-  registerHealthRoutes(app, HYDRA_VERSION2);
+  registerHealthRoutes(app, HYDRA_VERSION3);
   registerSessionRoutes(app, manager, {
     agentId: config.defaultAgent,
     cwd: config.defaultCwd
@@ -8487,9 +9268,10 @@ async function startDaemon(config) {
   const shutdown = async () => {
     await extensions.stop();
     await manager.closeAll();
+    await manager.flushMetaWrites();
     await app.close();
     try {
-      fs8.unlinkSync(paths.pidFile());
+      fs9.unlinkSync(paths.pidFile());
     } catch {
     }
     try {
@@ -8528,7 +9310,7 @@ function ensureLoopbackOrTls(config) {
 init_daemon_bootstrap();
 
 // src/cli/commands/log-tail.ts
-import * as fs9 from "fs";
+import * as fs10 from "fs";
 import * as fsp3 from "fs/promises";
 async function runLogTail(logPath, argv, notFoundMessage) {
   const opts = parseLogTailFlags(argv);
@@ -8552,7 +9334,7 @@ async function runLogTail(logPath, argv, notFoundMessage) {
   process.stdout.write(`-- following ${logPath} --
 `);
   let pending = false;
-  const watcher = fs9.watch(logPath, () => {
+  const watcher = fs10.watch(logPath, () => {
     if (pending) {
       return;
     }
@@ -8580,10 +9362,10 @@ async function runLogTail(logPath, argv, notFoundMessage) {
       }
     });
   });
-  await new Promise((resolve2) => {
+  await new Promise((resolve4) => {
     const finish = () => {
       watcher.close();
-      resolve2();
+      resolve4();
     };
     process.once("SIGINT", finish);
     process.once("SIGTERM", finish);
@@ -9655,14 +10437,16 @@ async function main() {
       process.exit(2);
       return;
     }
-    const sessionId2 = resolveOption(flags2, "session-id");
+    const launchResume = flags2.resume;
+    const sessionId2 = typeof launchResume === "string" ? launchResume : resolveOption(flags2, "session-id");
     const name2 = resolveOption(flags2, "name");
     await runShim({ sessionId: sessionId2, agentId, agentArgs, name: name2 });
     return;
   }
   const { positional, flags } = parseArgs(argv);
   if (flags.version === true || positional[0] === "--version") {
-    process.stdout.write("hydra-acp 0.1.0\n");
+    process.stdout.write(`hydra-acp ${readVersion()}
+`);
     return;
   }
   if (flags.help === true) {
@@ -9670,7 +10454,8 @@ async function main() {
     return;
   }
   const subcommand = positional[0];
-  const sessionId = resolveOption(flags, "session-id");
+  const resumeFlag = flags.resume;
+  const sessionId = typeof resumeFlag === "string" ? resumeFlag : resolveOption(flags, "session-id");
   const name = resolveOption(flags, "name");
   const agentIdFromFlag = resolveOption(flags, "agent-id");
   if (!subcommand) {
@@ -9735,6 +10520,17 @@ async function main() {
         await runSessionsRm(positional[2]);
         return;
       }
+      if (sub === "export") {
+        const out = resolveOption(flags, "out");
+        await runSessionsExport(positional[2], out);
+        return;
+      }
+      if (sub === "import") {
+        await runSessionsImport(positional[2], {
+          replace: flags.replace === true
+        });
+        return;
+      }
       process.stderr.write(`Unknown sessions subcommand: ${sub}
 `);
       process.exit(2);
@@ -9828,6 +10624,17 @@ async function dispatchTui(flags, base) {
   }
   await runTui(tuiOpts);
 }
+function readVersion() {
+  try {
+    const here = dirname3(fileURLToPath(import.meta.url));
+    const pkg = JSON.parse(
+      readFileSync(resolve3(here, "../package.json"), "utf8")
+    );
+    return pkg.version ?? "unknown";
+  } catch {
+    return "unknown";
+  }
+}
 function printHelp() {
   process.stdout.write(
     [
@@ -9841,13 +10648,17 @@ function printHelp() {
       "                                     Shim mode, force daemon to spawn <agent-id>",
       "                                     from the registry. Args after <agent-id>",
       "                                     are forwarded to the agent's command.",
-      "  hydra-acp --session-id <id>        Attach to an existing session (TUI when in a terminal, shim otherwise)",
+      "  hydra-acp --resume <id>            Attach to an existing session (TUI when in a terminal, shim otherwise)",
       "  hydra-acp init [--rotate-token]    Initialize ~/.hydra-acp/config.json",
       "  hydra-acp daemon start|stop|restart|status",
       "  hydra-acp daemon logs [-f] [-n N]  Tail or follow the daemon log",
       "  hydra-acp sessions [list] [--all]  List sessions (live + 20 most-recent cold; --all for everything)",
       "  hydra-acp sessions kill <id>       Demote a live session to cold (keeps the on-disk record)",
       "  hydra-acp sessions rm <id>         Remove a session entirely (live or cold)",
+      "  hydra-acp sessions export <id> [--out <file>|.]",
+      "                                     Write a session bundle to <file>, to a default-named file when --out=., or to stdout",
+      "  hydra-acp sessions import <file>|- [--replace]",
+      "                                     Import a bundle from <file> or stdin (-); --replace overwrites a lineage match (kills it if live)",
       "  hydra-acp extensions list                   List configured extensions and live state",
       "  hydra-acp extensions add <name> [opts]      Add an extension to config",
       "  hydra-acp extensions remove <name>          Remove an extension from config",
@@ -9855,15 +10666,16 @@ function printHelp() {
       "  hydra-acp extensions logs <name> [-f] [-n N]Tail or follow an extension's log",
       "  hydra-acp agents [list]                     List agents in the cached registry",
       "  hydra-acp agents refresh                    Force a registry re-fetch",
-      "  hydra-acp tui flags: [--session-id <id>] [--resume] [--new] [--agent-id <id>] [--cwd <path>] [--name <label>]",
-      "                                     Smart default: picks an existing live session if any exist in cwd, else creates a new one",
+      "  hydra-acp tui flags: [--resume [<id>]] [--new] [--agent-id <id>] [--cwd <path>] [--name <label>]",
+      "                                     --resume <id> attaches to a specific session; bare --resume picks the most-recent",
+      "                                     in cwd. Smart default (no flags): picks if any live sessions exist, else new.",
       "  hydra-acp --version                Print version",
       "  hydra-acp --help                   Show this help",
       "",
       "Config knob flags accept env-var equivalents (flag wins):",
-      "  --agent-id    HYDRA_ACP_AGENT_ID",
-      "  --session-id  HYDRA_ACP_SESSION_ID",
-      "  --name        HYDRA_ACP_NAME",
+      "  --agent-id              HYDRA_ACP_AGENT_ID",
+      "  --resume / --session-id HYDRA_ACP_SESSION_ID",
+      "  --name                  HYDRA_ACP_NAME",
       ""
     ].join("\n")
   );