@hydra-acp/cli 0.1.10 → 0.1.12

package/dist/cli.js

@@ -264,7 +264,13 @@ var init_config = __esm({
       // Width cap on the cwd column in the `sessions list` output and the
       // TUI picker. Set higher if you keep deeply-nested working directories
       // and want them visible; the elastic title column shrinks to make room.
-      cwdColumnMaxWidth: z.number().int().positive().default(24)
+      cwdColumnMaxWidth: z.number().int().positive().default(24),
+      // When true (default), emit OSC 9;4 progress-bar control codes so the
+      // host terminal can show an indeterminate busy indicator (taskbar pulse
+      // on Windows Terminal, dock badge on KDE/Konsole, etc.) while a turn is
+      // running. Set false if your terminal renders this obnoxiously or you
+      // just don't want it.
+      progressIndicator: z.boolean().default(true)
     });
     ExtensionName = z.string().min(1).regex(/^[A-Za-z0-9._-]+$/, "extension name must be filename-safe");
     ExtensionBody = z.object({
@@ -302,11 +308,12 @@ var init_config = __esm({
         maxScrollbackLines: 1e4,
         mouse: true,
         logMaxBytes: 5 * 1024 * 1024,
-        cwdColumnMaxWidth: 24
+        cwdColumnMaxWidth: 24,
+        progressIndicator: true
       })
     });
     HydraConfigReadOnly = HydraConfig.extend({
-      daemon: DaemonConfig.omit({ authToken: true })
+      daemon: DaemonConfig.omit({ authToken: true }).default({})
     });
   }
 });
@@ -483,6 +490,11 @@ var init_types = __esm({
       // 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(),
+      // Origin host (and origin upstream id) for imported sessions. Picker
+      // uses the host to fill in the UPSTREAM cell pre-first-attach;
+      // future "connect back to origin" callers would dial both.
+      importedFromMachine: z3.string().optional(),
+      importedFromUpstreamSessionId: z3.string().optional(),
       updatedAt: z3.string(),
       attachedClients: z3.number().int().nonnegative(),
       status: z3.enum(["live", "cold"]).default("live"),
@@ -563,6 +575,15 @@ var init_connection = __esm({
           }
         }
       }
+      // Discard any notifications buffered for the given method without firing
+      // handlers. Used by the resurrect path to drop the agent's session/load
+      // replay: that replay is the agent re-emitting our own history back at
+      // us, and if we flushed it through wireAgent's session/update handler
+      // every entry would be re-appended to history.jsonl, doubling the log
+      // each time the session was woken up.
+      drainBuffered(method) {
+        this.bufferedNotifications.delete(method);
+      }
       onClose(handler) {
         this.closeHandlers.push(handler);
       }
@@ -997,6 +1018,7 @@ var init_session = __esm({
       // and noisy state churn keep a quiet session alive forever.
       lastRecordedAt;
       spawnReplacementAgent;
+      logger;
       agentChangeHandlers = [];
       // Last available_commands_update we observed from the agent. Stored
       // so we can re-broadcast a merged (hydra ∪ agent) list whenever
@@ -1028,6 +1050,7 @@ var init_session = __esm({
         }
         this.idleTimeoutMs = init.idleTimeoutMs ?? 0;
         this.spawnReplacementAgent = init.spawnReplacementAgent;
+        this.logger = init.logger;
         if (init.firstPromptSeeded) {
           this.firstPromptSeeded = true;
         }
@@ -1357,6 +1380,9 @@ var init_session = __esm({
         if (this.closed) {
           return;
         }
+        this.logger?.info(
+          `session ${this.sessionId} closing deleteRecord=${opts.deleteRecord ?? false} regenTitle=${opts.regenTitle ?? false}`
+        );
         this.cancelIdleTimer();
         if (opts.regenTitle && this.firstPromptSeeded) {
           const timeoutMs = opts.regenTitleTimeoutMs ?? 5e3;
@@ -1911,6 +1937,10 @@ _(switched from \`${oldAgentId}\` to \`${newAgentId}\`)_
           return;
         }
         const opts = this.firstPromptSeeded ? { deleteRecord: false, regenTitle: true } : { deleteRecord: true };
+        const idleSec = Math.round(idle / 1e3);
+        this.logger?.info(
+          `session ${this.sessionId} idle timeout fired after ${idleSec}s (window=${Math.round(this.idleTimeoutMs / 1e3)}s) \u2014 closing`
+        );
         void this.close(opts).catch(() => void 0);
       }
       cancelIdleTimer() {
@@ -2087,6 +2117,8 @@ function recordFromMemorySession(args) {
     lineageId: args.lineageId,
     upstreamSessionId: args.upstreamSessionId,
     importedFromSessionId: args.importedFromSessionId,
+    importedFromUpstreamSessionId: args.importedFromUpstreamSessionId,
+    importedFromMachine: args.importedFromMachine,
     agentId: args.agentId,
     cwd: args.cwd,
     title: args.title,
@@ -2134,6 +2166,16 @@ var init_session_store = __esm({
       // 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(),
+      // Origin's agent-side session id at export time. Carried as a
+      // breadcrumb and as the handle a future "connect back to origin"
+      // feature would dial. Absent when the origin record had no upstream
+      // bound (re-export of an imported, not-yet-attached session).
+      importedFromUpstreamSessionId: z4.string().optional(),
+      // Hostname of the machine that exported the bundle we imported
+      // (i.e. the most recent hop, not necessarily the true multi-hop
+      // origin). Surfaced in the picker so imported rows don't look like
+      // they materialized from nowhere.
+      importedFromMachine: z4.string().optional(),
       agentId: z4.string(),
       cwd: z4.string(),
       title: z4.string().optional(),
@@ -2349,6 +2391,7 @@ function encodeBundle(params) {
     session: {
       sessionId: params.record.sessionId,
       lineageId: params.record.lineageId,
+      ...params.record.upstreamSessionId ? { upstreamSessionId: params.record.upstreamSessionId } : {},
       agentId: params.record.agentId,
       cwd: params.record.cwd,
       ...params.record.title !== void 0 ? { title: params.record.title } : {},
@@ -2386,6 +2429,12 @@ var init_bundle = __esm({
       // Required on bundles — the export path backfills if the source
       // record was written before lineageId existed.
       lineageId: z5.string(),
+      // The exporter's agent-side session id at export time. Carried so
+      // importers can persist it as a breadcrumb (and, eventually, as the
+      // handle a "connect back to origin" feature would need). Omitted on
+      // bundles whose source record never bound to an agent (e.g. a
+      // re-export of an imported, not-yet-attached session).
+      upstreamSessionId: z5.string().optional(),
       agentId: z5.string(),
       cwd: z5.string(),
       title: z5.string().optional(),
@@ -2599,7 +2648,7 @@ var init_agent_display = __esm({
 function toRow(s, now = Date.now()) {
   return {
     session: stripHydraSessionPrefix(s.sessionId),
-    upstream: s.upstreamSessionId ?? "-",
+    upstream: formatUpstreamCell(s.upstreamSessionId, s.importedFromMachine),
     state: formatState(s.status, s.attachedClients),
     agent: formatAgentCell(s.agentId, s.currentUsage),
     age: formatRelativeAge(s.updatedAt, now),
@@ -2607,6 +2656,15 @@ function toRow(s, now = Date.now()) {
     cwd: shortenHomePath(s.cwd)
   };
 }
+function formatUpstreamCell(upstreamSessionId, importedFromMachine) {
+  if (upstreamSessionId && upstreamSessionId.length > 0) {
+    return upstreamSessionId;
+  }
+  if (importedFromMachine && importedFromMachine.length > 0) {
+    return `\u2190 ${importedFromMachine}`;
+  }
+  return "-";
+}
 function formatState(status, clients) {
   if (status === "cold") {
     return "COLD";
@@ -2946,11 +3004,11 @@ async function runSessionsImport(file, opts = {}) {
 function bundleToSummary(parsed) {
   return {
     sessionId: parsed.session.sessionId,
-    upstreamSessionId: "-",
     cwd: parsed.session.cwd,
     agentId: parsed.session.agentId,
     currentUsage: parsed.session.currentUsage,
     title: parsed.session.title,
+    importedFromMachine: parsed.exportedFrom.machine,
     attachedClients: 0,
     updatedAt: parsed.session.updatedAt,
     status: "cold"
@@ -2971,10 +3029,13 @@ function printBundleInfo(raw, cwdColumnMaxWidth) {
   const maxWidth = process.stdout.isTTY ? process.stdout.columns : void 0;
   process.stdout.write(formatRow(HEADER, widths, maxWidth, cwdColumnMaxWidth) + "\n");
   process.stdout.write(formatRow(row, widths, maxWidth, cwdColumnMaxWidth) + "\n");
+  const originUpstream = parsed.session.upstreamSessionId ?? "-";
   process.stdout.write(
     `
 lineage: ${parsed.session.lineageId}
 exported: ${parsed.exportedAt} from ${parsed.exportedFrom.machine} (hydra ${parsed.exportedFrom.hydraVersion})
+origin session: ${parsed.session.sessionId}
+origin upstream: ${originUpstream}
 history entries: ${parsed.history.length}` + (parsed.promptHistory ? `, prompt history: ${parsed.promptHistory.length}
 ` : "\n")
   );
@@ -3275,7 +3336,9 @@ async function listSessions(config, opts = {}, fetchImpl = fetch) {
     agentId: s.agentId,
     currentModel: s.currentModel,
     currentUsage: s.currentUsage,
-    title: s.title
+    title: s.title,
+    importedFromMachine: s.importedFromMachine,
+    importedFromUpstreamSessionId: s.importedFromUpstreamSessionId
   }));
 }
 async function killSession(config, id, fetchImpl = fetch) {
@@ -4427,6 +4490,12 @@ var init_screen = __esm({
       pasteBuffer = "";
       rawStdinHandler;
       mouseEnabled;
+      progressIndicatorEnabled;
+      // Last OSC 9;4 state we wrote (3 = indeterminate, 0 = remove). Used to
+      // suppress redundant writes when setBanner runs but `status` didn't
+      // actually change, and to re-emit on start() if a picker round-trip
+      // cleared the host terminal's indicator.
+      lastProgressState = 0;
       constructor(opts) {
         this.term = opts.term;
         this.dispatcher = opts.dispatcher;
@@ -4434,6 +4503,7 @@ var init_screen = __esm({
         this.contentRepaintThrottleMs = opts.repaintThrottleMs ?? DEFAULT_CONTENT_REPAINT_THROTTLE_MS;
         this.maxScrollbackLines = opts.maxScrollbackLines ?? DEFAULT_MAX_SCROLLBACK_LINES;
         this.mouseEnabled = opts.mouse ?? true;
+        this.progressIndicatorEnabled = opts.progressIndicator ?? true;
         this.resizeHandler = () => this.repaint();
         this.keyHandler = (name, _matches, data) => this.handleKey(name, data);
         this.mouseHandler = (name) => this.handleMouse(name);
@@ -4462,6 +4532,8 @@ var init_screen = __esm({
         }
         this.term.on("resize", this.resizeHandler);
         this.installBracketedPaste();
+        this.lastProgressState = 0;
+        this.writeProgressIndicator(this.banner.status === "busy" ? 3 : 0);
         this.repaint();
       }
       stop() {
@@ -4482,6 +4554,7 @@ var init_screen = __esm({
         this.term.grabInput(false);
         this.term.hideCursor(false);
         process.stdout.write("\x1B[?7h");
+        this.writeProgressIndicator(0);
         this.term.fullscreen(false);
         this.term("\n");
       }
@@ -4770,9 +4843,26 @@ var init_screen = __esm({
       }
       setBanner(banner) {
         this.banner = { ...this.banner, ...banner };
+        this.writeProgressIndicator(this.banner.status === "busy" ? 3 : 0);
         this.drawBanner();
         this.placeCursor();
       }
+      // OSC 9;4 progress-bar control. State 3 = indeterminate (pulsing
+      // taskbar / dock badge while a turn is running); state 0 = remove.
+      // ConEmu-flavor sequence — supported by Windows Terminal, WezTerm,
+      // Ghostty, Konsole, Black Box, Rio, and others; ignored harmlessly
+      // by terminals that don't implement it. Disabled entirely when
+      // tui.progressIndicator is false.
+      writeProgressIndicator(state) {
+        if (!this.progressIndicatorEnabled) {
+          return;
+        }
+        if (state === this.lastProgressState) {
+          return;
+        }
+        this.lastProgressState = state;
+        process.stdout.write(`\x1B]9;4;${state}\x1B\\`);
+      }
       // Transient right-side banner message. Cleared automatically after
       // durationMs (default 4s). Each call resets the timer, so rapid
       // successive notifications coalesce on the latest text. Active
@@ -7502,6 +7592,7 @@ async function runSession(term, config, opts, exitHint) {
     repaintThrottleMs: config.tui.repaintThrottleMs,
     maxScrollbackLines: config.tui.maxScrollbackLines,
     mouse: config.tui.mouse,
+    progressIndicator: config.tui.progressIndicator,
     onKey: (events) => {
       for (const ev of events) {
         if (pendingPermission && tryHandlePermissionKey(ev)) {
@@ -8642,6 +8733,17 @@ import { fileURLToPath as fileURLToPath2 } from "url";
 import { dirname as dirname6, resolve as resolve4 } from "path";
 
 // src/cli/parse-args.ts
+var KNOWN_BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
+  "all",
+  "foreground",
+  "help",
+  "info",
+  "new",
+  "reattach",
+  "replace",
+  "rotate-token",
+  "version"
+]);
 function parseArgs(argv) {
   const positional = [];
   const flags = {};
@@ -8660,6 +8762,11 @@ function parseArgs(argv) {
         continue;
       }
       const key = token.slice(2);
+      if (KNOWN_BOOLEAN_FLAGS.has(key)) {
+        flags[key] = true;
+        i += 1;
+        continue;
+      }
       const next = argv[i + 1];
       if (next !== void 0 && !next.startsWith("--")) {
         flags[key] = next;
@@ -9383,12 +9490,14 @@ var AgentInstance = class _AgentInstance {
   killed = false;
   stderrTail = "";
   stderrTailBytes;
+  logger;
   exitHandlers = [];
   constructor(opts, child) {
     this.agentId = opts.agentId;
     this.cwd = opts.cwd;
     this.child = child;
     this.stderrTailBytes = opts.stderrTailBytes ?? DEFAULT_STDERR_TAIL_BYTES;
+    this.logger = opts.logger;
     if (!child.stdout || !child.stdin) {
       throw new Error("agent subprocess missing stdio");
     }
@@ -9397,7 +9506,15 @@ var AgentInstance = class _AgentInstance {
     child.stderr?.setEncoding("utf8");
     child.stderr?.on("data", (chunk) => {
       this.stderrTail = (this.stderrTail + chunk).slice(-this.stderrTailBytes);
-      process.stderr.write(`[${opts.agentId}] ${chunk}`);
+      if (this.logger) {
+        for (const line of chunk.split(/\r?\n/)) {
+          if (line.length > 0) {
+            this.logger.info(`[${opts.agentId}] ${line}`);
+          }
+        }
+      } else {
+        process.stderr.write(`[${opts.agentId}] ${chunk}`);
+      }
     });
     child.on("error", (err) => {
       const msg = this.formatFailure(err.message);
@@ -9405,9 +9522,16 @@ var AgentInstance = class _AgentInstance {
     });
     child.on("exit", (code, signal) => {
       this.exited = true;
-      if (!this.killed) {
+      if (this.killed) {
+        this.logger?.info(
+          `agent ${opts.agentId} pid=${child.pid} exited after kill code=${code} signal=${signal}`
+        );
+      } else {
         const reason = `agent ${opts.agentId} exited before responding (code=${code} signal=${signal})`;
         this.connection.fail(new Error(this.formatFailure(reason)));
+        this.logger?.warn(
+          `agent ${opts.agentId} pid=${child.pid} exited unexpectedly code=${code} signal=${signal}`
+        );
       }
       for (const handler of this.exitHandlers) {
         handler(code, signal);
@@ -9428,7 +9552,15 @@ stderr: ${tail}` : reason;
     const child = spawn3(opts.plan.command, opts.plan.args, {
       cwd: opts.cwd,
       env,
-      stdio: ["pipe", "pipe", "pipe"]
+      stdio: ["pipe", "pipe", "pipe"],
+      // setsid the agent into its own session/process group. The daemon
+      // already runs in its own setsid'd session, but macOS terminals
+      // (iTerm2, Terminal.app) sometimes still reach inherited child
+      // processes when the user closes a window — putting the agent
+      // one more session-boundary away keeps it alive across terminal
+      // restarts. The daemon still owns the pipes, so this.kill()
+      // continues to terminate it cleanly on idle/close.
+      detached: true
     });
     return new _AgentInstance(opts, child);
   }
@@ -9443,6 +9575,9 @@ stderr: ${tail}` : reason;
       return;
     }
     this.killed = true;
+    this.logger?.info(
+      `agent ${this.agentId} pid=${this.child.pid} kill requested signal=${signal}`
+    );
     await this.connection.close().catch(() => void 0);
     this.child.kill(signal);
   }
@@ -9628,6 +9763,7 @@ var SessionManager = class {
     this.histories = new HistoryStore({ maxEntries: this.sessionHistoryMaxEntries });
     this.idleTimeoutMs = options.idleTimeoutMs ?? 0;
     this.defaultModels = options.defaultModels ?? {};
+    this.logger = options.logger;
   }
   registry;
   sessions = /* @__PURE__ */ new Map();
@@ -9642,6 +9778,7 @@ var SessionManager = class {
   // concurrent snapshot updates (e.g. an agent emitting model + mode
   // back-to-back) don't lose writes via interleaved reads.
   metaWriteQueues = /* @__PURE__ */ new Map();
+  logger;
   async create(params) {
     const fresh = await this.bootstrapAgent({
       agentId: params.agentId,
@@ -9659,6 +9796,7 @@ var SessionManager = class {
       title: params.title,
       agentArgs: params.agentArgs,
       idleTimeoutMs: this.idleTimeoutMs,
+      logger: this.logger,
       spawnReplacementAgent: (p) => this.bootstrapAgent({ ...p, mcpServers: [] }),
       historyStore: this.histories,
       historyMaxEntries: this.sessionHistoryMaxEntries,
@@ -9741,6 +9879,7 @@ var SessionManager = class {
       await agent.kill().catch(() => void 0);
       return this.doResurrectFromImport(params);
     }
+    agent.connection.drainBuffered("session/update");
     const session = new Session({
       sessionId: params.hydraSessionId,
       cwd: params.cwd,
@@ -9751,6 +9890,7 @@ var SessionManager = class {
       title: params.title,
       agentArgs: params.agentArgs,
       idleTimeoutMs: this.idleTimeoutMs,
+      logger: this.logger,
       spawnReplacementAgent: (p) => this.bootstrapAgent({ ...p, mcpServers: [] }),
       historyStore: this.histories,
       historyMaxEntries: this.sessionHistoryMaxEntries,
@@ -9797,6 +9937,7 @@ var SessionManager = class {
       title: params.title,
       agentArgs: params.agentArgs,
       idleTimeoutMs: this.idleTimeoutMs,
+      logger: this.logger,
       spawnReplacementAgent: (p) => this.bootstrapAgent({ ...p, mcpServers: [] }),
       historyStore: this.histories,
       historyMaxEntries: this.sessionHistoryMaxEntries,
@@ -10061,6 +10202,8 @@ var SessionManager = class {
         agentId: r.agentId,
         currentModel: r.currentModel,
         currentUsage: r.currentUsage,
+        importedFromMachine: r.importedFromMachine,
+        importedFromUpstreamSessionId: r.importedFromUpstreamSessionId,
         updatedAt: used,
         attachedClients: 0,
         status: "cold"
@@ -10168,6 +10311,8 @@ var SessionManager = class {
         lineageId: args.bundle.session.lineageId,
         upstreamSessionId: "",
         importedFromSessionId: args.bundle.session.sessionId,
+        importedFromUpstreamSessionId: args.bundle.session.upstreamSessionId,
+        importedFromMachine: args.bundle.exportedFrom.machine,
         agentId: args.bundle.session.agentId,
         cwd: args.cwd ?? args.bundle.session.cwd,
         title: args.bundle.session.title,
@@ -10290,6 +10435,8 @@ function mergeForPersistence(session, existing) {
     lineageId: existing?.lineageId ?? generateLineageId(),
     upstreamSessionId: session.upstreamSessionId,
     importedFromSessionId: existing?.importedFromSessionId,
+    importedFromUpstreamSessionId: existing?.importedFromUpstreamSessionId,
+    importedFromMachine: existing?.importedFromMachine,
     agentId: session.agentId,
     cwd: session.cwd,
     title: session.title,
@@ -11569,11 +11716,20 @@ async function startDaemon(config) {
     await auth(request, reply);
   });
   const registry = new Registry(config);
-  const spawner = (opts) => AgentInstance.spawn({ ...opts, stderrTailBytes: config.daemon.agentStderrTailBytes });
+  const agentLogger = {
+    info: (msg) => app.log.info(msg),
+    warn: (msg) => app.log.warn(msg)
+  };
+  const spawner = (opts) => AgentInstance.spawn({
+    ...opts,
+    stderrTailBytes: config.daemon.agentStderrTailBytes,
+    logger: agentLogger
+  });
   const manager = new SessionManager(registry, spawner, void 0, {
     idleTimeoutMs: config.daemon.sessionIdleTimeoutSeconds * 1e3,
     defaultModels: config.defaultModels,
-    sessionHistoryMaxEntries: config.daemon.sessionHistoryMaxEntries
+    sessionHistoryMaxEntries: config.daemon.sessionHistoryMaxEntries,
+    logger: agentLogger
   });
   const extensions = new ExtensionManager(extensionList(config));
   registerHealthRoutes(app, HYDRA_VERSION);
@@ -11810,6 +11966,7 @@ async function runDaemonStart(flags = {}) {
     };
     process.on("SIGINT", () => void shutdown());
     process.on("SIGTERM", () => void shutdown());
+    process.on("SIGHUP", () => void 0);
     return;
   }
   spawnDaemonDetached();
@@ -12880,6 +13037,17 @@ async function main() {
     const positionalAgentId = afterLaunch[0];
     const agentArgs = afterLaunch.slice(1);
     const { flags: flags2 } = parseArgs(beforeLaunch);
+    if (flags2.resume === true) {
+      bareResumeError();
+      return;
+    }
+    if (flags2.reattach === true) {
+      process.stderr.write(
+        "hydra-acp launch: --reattach is not valid here. Pass --resume <id> to attach to a specific session.\n"
+      );
+      process.exit(2);
+      return;
+    }
     const agentId = positionalAgentId ?? resolveOption(flags2, "agent");
     if (!agentId) {
       process.stderr.write(
@@ -12888,8 +13056,7 @@ async function main() {
       process.exit(2);
       return;
     }
-    const launchResume = flags2.resume;
-    const sessionId2 = typeof launchResume === "string" ? launchResume : resolveOption(flags2, "session-id");
+    const sessionId2 = typeof flags2.resume === "string" ? flags2.resume : resolveOption(flags2, "session-id");
     const name2 = resolveOption(flags2, "name");
     const model2 = resolveOption(flags2, "model");
     await runShim({ sessionId: sessionId2, agentId, agentArgs, name: name2, model: model2 });
@@ -12906,8 +13073,11 @@ async function main() {
     return;
   }
   const subcommand = positional[0];
-  const resumeFlag = flags.resume;
-  const sessionId = typeof resumeFlag === "string" ? resumeFlag : resolveOption(flags, "session-id");
+  if (flags.resume === true) {
+    bareResumeError();
+    return;
+  }
+  const sessionId = typeof flags.resume === "string" ? flags.resume : resolveOption(flags, "session-id");
   const name = resolveOption(flags, "name");
   const agentIdFromFlag = resolveOption(flags, "agent");
   const model = resolveOption(flags, "model");
@@ -13064,7 +13234,7 @@ async function main() {
 }
 async function dispatchTui(flags, base) {
   const cwd = resolveOption(flags, "cwd");
-  const resume = flags.resume === true;
+  const resume = flags.reattach === true;
   const forceNew = flags.new === true;
   const { runTui } = await Promise.resolve().then(() => (init_tui(), tui_exports));
   const tuiOpts = { resume, forceNew };
@@ -13085,6 +13255,12 @@ async function dispatchTui(flags, base) {
   }
   await runTui(tuiOpts);
 }
+function bareResumeError() {
+  process.stderr.write(
+    "hydra-acp: --resume requires a session id. Use --resume <id> to attach to a specific session, or --reattach to pick the most recent one in cwd.\n"
+  );
+  process.exit(2);
+}
 function readVersion() {
   try {
     const here = dirname6(fileURLToPath2(import.meta.url));
@@ -13110,6 +13286,7 @@ function printHelp() {
       "                                     from the registry. Args after <agent>",
       "                                     are forwarded to the agent's command.",
       "  hydra-acp --resume <id>            Attach to an existing session (TUI when in a terminal, shim otherwise)",
+      "  hydra-acp --reattach               Attach to the most-recent session for the current cwd (TUI/shim auto-pick)",
       "  hydra-acp init [--rotate-token]    Initialize ~/.hydra-acp/config.json",
       "  hydra-acp daemon start [--foreground]   Start daemon (detached by default; --foreground to attach)",
       "  hydra-acp daemon stop|restart|status",
@@ -13128,9 +13305,9 @@ 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: [--resume [<id>]] [--new] [--agent <id>] [--model <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 tui flags: [--resume <id>] [--reattach] [--new] [--agent <id>] [--model <id>] [--cwd <path>] [--name <label>]",
+      "                                     --resume <id> attaches to a specific session; --reattach picks the most-recent in cwd.",
+      "                                     Smart default (no flags): shows a picker when sessions exist, else new.",
       "  hydra-acp --version                Print version",
       "  hydra-acp --help                   Show this help",
       "",

package/dist/index.d.ts

@@ -103,18 +103,21 @@ declare const HydraConfig: z.ZodObject<{
         mouse: z.ZodDefault<z.ZodBoolean>;
         logMaxBytes: z.ZodDefault<z.ZodNumber>;
         cwdColumnMaxWidth: z.ZodDefault<z.ZodNumber>;
+        progressIndicator: z.ZodDefault<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
         repaintThrottleMs: number;
         maxScrollbackLines: number;
         mouse: boolean;
         logMaxBytes: number;
         cwdColumnMaxWidth: number;
+        progressIndicator: boolean;
     }, {
         repaintThrottleMs?: number | undefined;
         maxScrollbackLines?: number | undefined;
         mouse?: boolean | undefined;
         logMaxBytes?: number | undefined;
         cwdColumnMaxWidth?: number | undefined;
+        progressIndicator?: boolean | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
     daemon: {
@@ -142,6 +145,7 @@ declare const HydraConfig: z.ZodObject<{
         mouse: boolean;
         logMaxBytes: number;
         cwdColumnMaxWidth: number;
+        progressIndicator: boolean;
     };
     registry: {
         url: string;
@@ -177,6 +181,7 @@ declare const HydraConfig: z.ZodObject<{
         mouse?: boolean | undefined;
         logMaxBytes?: number | undefined;
         cwdColumnMaxWidth?: number | undefined;
+        progressIndicator?: boolean | undefined;
     } | undefined;
     registry?: {
         url?: string | undefined;
@@ -1330,6 +1335,8 @@ declare const SessionListEntry: z.ZodObject<{
         costAmount?: number | undefined;
         costCurrency?: string | undefined;
     }>>;
+    importedFromMachine: z.ZodOptional<z.ZodString>;
+    importedFromUpstreamSessionId: z.ZodOptional<z.ZodString>;
     updatedAt: z.ZodString;
     attachedClients: z.ZodNumber;
     status: z.ZodDefault<z.ZodEnum<["live", "cold"]>>;
@@ -1351,6 +1358,8 @@ declare const SessionListEntry: z.ZodObject<{
         costAmount?: number | undefined;
         costCurrency?: string | undefined;
     } | undefined;
+    importedFromMachine?: string | undefined;
+    importedFromUpstreamSessionId?: string | undefined;
 }, {
     cwd: string;
     sessionId: string;
@@ -1368,6 +1377,8 @@ declare const SessionListEntry: z.ZodObject<{
         costAmount?: number | undefined;
         costCurrency?: string | undefined;
     } | undefined;
+    importedFromMachine?: string | undefined;
+    importedFromUpstreamSessionId?: string | undefined;
 }>;
 type SessionListEntry = z.infer<typeof SessionListEntry>;
 declare const SessionListResult: z.ZodObject<{
@@ -1394,6 +1405,8 @@ declare const SessionListResult: z.ZodObject<{
             costAmount?: number | undefined;
             costCurrency?: string | undefined;
         }>>;
+        importedFromMachine: z.ZodOptional<z.ZodString>;
+        importedFromUpstreamSessionId: z.ZodOptional<z.ZodString>;
         updatedAt: z.ZodString;
         attachedClients: z.ZodNumber;
         status: z.ZodDefault<z.ZodEnum<["live", "cold"]>>;
@@ -1415,6 +1428,8 @@ declare const SessionListResult: z.ZodObject<{
             costAmount?: number | undefined;
             costCurrency?: string | undefined;
         } | undefined;
+        importedFromMachine?: string | undefined;
+        importedFromUpstreamSessionId?: string | undefined;
     }, {
         cwd: string;
         sessionId: string;
@@ -1432,6 +1447,8 @@ declare const SessionListResult: z.ZodObject<{
             costAmount?: number | undefined;
             costCurrency?: string | undefined;
         } | undefined;
+        importedFromMachine?: string | undefined;
+        importedFromUpstreamSessionId?: string | undefined;
     }>, "many">;
     nextCursor: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
@@ -1452,6 +1469,8 @@ declare const SessionListResult: z.ZodObject<{
             costAmount?: number | undefined;
             costCurrency?: string | undefined;
         } | undefined;
+        importedFromMachine?: string | undefined;
+        importedFromUpstreamSessionId?: string | undefined;
     }[];
     nextCursor?: string | undefined;
 }, {
@@ -1472,6 +1491,8 @@ declare const SessionListResult: z.ZodObject<{
             costAmount?: number | undefined;
             costCurrency?: string | undefined;
         } | undefined;
+        importedFromMachine?: string | undefined;
+        importedFromUpstreamSessionId?: string | undefined;
     }[];
     nextCursor?: string | undefined;
 }>;
@@ -1532,6 +1553,7 @@ declare class JsonRpcConnection {
     onRequest(method: string, handler: RequestHandler): void;
     setDefaultHandler(handler: RequestHandler): void;
     onNotification(method: string, handler: NotificationHandler): void;
+    drainBuffered(method: string): void;
     onClose(handler: (err?: Error) => void): void;
     request<T = unknown>(method: string, params?: unknown): Promise<T>;
     requestWithId<T = unknown>(method: string, params?: unknown): {
@@ -1555,6 +1577,11 @@ interface AgentInstanceOptions {
     plan: SpawnPlan;
     extraEnv?: Record<string, string>;
     stderrTailBytes?: number;
+    logger?: AgentLogger;
+}
+interface AgentLogger {
+    info: (msg: string) => void;
+    warn: (msg: string) => void;
 }
 declare class AgentInstance {
     readonly agentId: string;
@@ -1565,6 +1592,7 @@ declare class AgentInstance {
     private killed;
     private stderrTail;
     private stderrTailBytes;
+    private logger?;
     private exitHandlers;
     private constructor();
     private formatFailure;
@@ -1635,6 +1663,10 @@ interface SessionInit {
     agentMeta?: Record<string, unknown>;
     agentArgs?: string[];
     idleTimeoutMs?: number;
+    logger?: {
+        info: (msg: string) => void;
+        warn: (msg: string) => void;
+    };
     spawnReplacementAgent?: SpawnReplacementAgent;
     historyStore?: HistoryStore;
     historyMaxEntries?: number;
@@ -1683,6 +1715,7 @@ declare class Session {
     private idleTimer;
     private lastRecordedAt;
     private spawnReplacementAgent;
+    private logger;
     private agentChangeHandlers;
     private agentAdvertisedCommands;
     private agentCommandsHandlers;
@@ -1766,6 +1799,8 @@ declare const SessionRecord: z.ZodObject<{
     lineageId: z.ZodOptional<z.ZodString>;
     upstreamSessionId: z.ZodString;
     importedFromSessionId: z.ZodOptional<z.ZodString>;
+    importedFromUpstreamSessionId: z.ZodOptional<z.ZodString>;
+    importedFromMachine: z.ZodOptional<z.ZodString>;
     agentId: z.ZodString;
     cwd: z.ZodString;
     title: z.ZodOptional<z.ZodString>;
@@ -1818,6 +1853,8 @@ declare const SessionRecord: z.ZodObject<{
         costAmount?: number | undefined;
         costCurrency?: string | undefined;
     } | undefined;
+    importedFromMachine?: string | undefined;
+    importedFromUpstreamSessionId?: string | undefined;
     lineageId?: string | undefined;
     importedFromSessionId?: string | undefined;
     agentCommands?: {
@@ -1842,6 +1879,8 @@ declare const SessionRecord: z.ZodObject<{
         costAmount?: number | undefined;
         costCurrency?: string | undefined;
     } | undefined;
+    importedFromMachine?: string | undefined;
+    importedFromUpstreamSessionId?: string | undefined;
     lineageId?: string | undefined;
     importedFromSessionId?: string | undefined;
     agentCommands?: {
@@ -1874,6 +1913,7 @@ declare const Bundle: z.ZodObject<{
     session: z.ZodObject<{
         sessionId: z.ZodString;
         lineageId: z.ZodString;
+        upstreamSessionId: z.ZodOptional<z.ZodString>;
         agentId: z.ZodString;
         cwd: z.ZodString;
         title: z.ZodOptional<z.ZodString>;
@@ -1914,6 +1954,7 @@ declare const Bundle: z.ZodObject<{
         updatedAt: string;
         lineageId: string;
         createdAt: string;
+        upstreamSessionId?: string | undefined;
         title?: string | undefined;
         currentModel?: string | undefined;
         currentMode?: string | undefined;
@@ -1934,6 +1975,7 @@ declare const Bundle: z.ZodObject<{
         updatedAt: string;
         lineageId: string;
         createdAt: string;
+        upstreamSessionId?: string | undefined;
         title?: string | undefined;
         currentModel?: string | undefined;
         currentMode?: string | undefined;
@@ -1976,6 +2018,7 @@ declare const Bundle: z.ZodObject<{
         updatedAt: string;
         lineageId: string;
         createdAt: string;
+        upstreamSessionId?: string | undefined;
         title?: string | undefined;
         currentModel?: string | undefined;
         currentMode?: string | undefined;
@@ -2010,6 +2053,7 @@ declare const Bundle: z.ZodObject<{
         updatedAt: string;
         lineageId: string;
         createdAt: string;
+        upstreamSessionId?: string | undefined;
         title?: string | undefined;
         currentModel?: string | undefined;
         currentMode?: string | undefined;
@@ -2059,6 +2103,7 @@ interface SessionManagerOptions {
     idleTimeoutMs?: number;
     defaultModels?: Record<string, string>;
     sessionHistoryMaxEntries?: number;
+    logger?: AgentLogger;
 }
 declare class SessionManager {
     private registry;
@@ -2071,6 +2116,7 @@ declare class SessionManager {
     private defaultModels;
     private sessionHistoryMaxEntries;
     private metaWriteQueues;
+    private logger?;
     constructor(registry: Registry, spawner?: AgentSpawner, store?: SessionStore, options?: SessionManagerOptions);
     create(params: CreateSessionParams): Promise<Session>;
     resurrect(params: ResurrectParams): Promise<Session>;

package/dist/index.js

@@ -120,7 +120,13 @@ var TuiConfig = z.object({
   // Width cap on the cwd column in the `sessions list` output and the
   // TUI picker. Set higher if you keep deeply-nested working directories
   // and want them visible; the elastic title column shrinks to make room.
-  cwdColumnMaxWidth: z.number().int().positive().default(24)
+  cwdColumnMaxWidth: z.number().int().positive().default(24),
+  // When true (default), emit OSC 9;4 progress-bar control codes so the
+  // host terminal can show an indeterminate busy indicator (taskbar pulse
+  // on Windows Terminal, dock badge on KDE/Konsole, etc.) while a turn is
+  // running. Set false if your terminal renders this obnoxiously or you
+  // just don't want it.
+  progressIndicator: z.boolean().default(true)
 });
 var ExtensionName = z.string().min(1).regex(/^[A-Za-z0-9._-]+$/, "extension name must be filename-safe");
 var ExtensionBody = z.object({
@@ -158,11 +164,12 @@ var HydraConfig = z.object({
     maxScrollbackLines: 1e4,
     mouse: true,
     logMaxBytes: 5 * 1024 * 1024,
-    cwdColumnMaxWidth: 24
+    cwdColumnMaxWidth: 24,
+    progressIndicator: true
   })
 });
 var HydraConfigReadOnly = HydraConfig.extend({
-  daemon: DaemonConfig.omit({ authToken: true })
+  daemon: DaemonConfig.omit({ authToken: true }).default({})
 });
 function extensionList(config) {
   return Object.entries(config.extensions).map(([name, body]) => ({
@@ -1013,6 +1020,11 @@ var SessionListEntry = z3.object({
   // 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(),
+  // Origin host (and origin upstream id) for imported sessions. Picker
+  // uses the host to fill in the UPSTREAM cell pre-first-attach;
+  // future "connect back to origin" callers would dial both.
+  importedFromMachine: z3.string().optional(),
+  importedFromUpstreamSessionId: z3.string().optional(),
   updatedAt: z3.string(),
   attachedClients: z3.number().int().nonnegative(),
   status: z3.enum(["live", "cold"]).default("live"),
@@ -1162,6 +1174,15 @@ var JsonRpcConnection = class _JsonRpcConnection {
       }
     }
   }
+  // Discard any notifications buffered for the given method without firing
+  // handlers. Used by the resurrect path to drop the agent's session/load
+  // replay: that replay is the agent re-emitting our own history back at
+  // us, and if we flushed it through wireAgent's session/update handler
+  // every entry would be re-appended to history.jsonl, doubling the log
+  // each time the session was woken up.
+  drainBuffered(method) {
+    this.bufferedNotifications.delete(method);
+  }
   onClose(handler) {
     this.closeHandlers.push(handler);
   }
@@ -1314,12 +1335,14 @@ var AgentInstance = class _AgentInstance {
   killed = false;
   stderrTail = "";
   stderrTailBytes;
+  logger;
   exitHandlers = [];
   constructor(opts, child) {
     this.agentId = opts.agentId;
     this.cwd = opts.cwd;
     this.child = child;
     this.stderrTailBytes = opts.stderrTailBytes ?? DEFAULT_STDERR_TAIL_BYTES;
+    this.logger = opts.logger;
     if (!child.stdout || !child.stdin) {
       throw new Error("agent subprocess missing stdio");
     }
@@ -1328,7 +1351,15 @@ var AgentInstance = class _AgentInstance {
     child.stderr?.setEncoding("utf8");
     child.stderr?.on("data", (chunk) => {
       this.stderrTail = (this.stderrTail + chunk).slice(-this.stderrTailBytes);
-      process.stderr.write(`[${opts.agentId}] ${chunk}`);
+      if (this.logger) {
+        for (const line of chunk.split(/\r?\n/)) {
+          if (line.length > 0) {
+            this.logger.info(`[${opts.agentId}] ${line}`);
+          }
+        }
+      } else {
+        process.stderr.write(`[${opts.agentId}] ${chunk}`);
+      }
     });
     child.on("error", (err) => {
       const msg = this.formatFailure(err.message);
@@ -1336,9 +1367,16 @@ var AgentInstance = class _AgentInstance {
     });
     child.on("exit", (code, signal) => {
       this.exited = true;
-      if (!this.killed) {
+      if (this.killed) {
+        this.logger?.info(
+          `agent ${opts.agentId} pid=${child.pid} exited after kill code=${code} signal=${signal}`
+        );
+      } else {
         const reason = `agent ${opts.agentId} exited before responding (code=${code} signal=${signal})`;
         this.connection.fail(new Error(this.formatFailure(reason)));
+        this.logger?.warn(
+          `agent ${opts.agentId} pid=${child.pid} exited unexpectedly code=${code} signal=${signal}`
+        );
       }
       for (const handler of this.exitHandlers) {
         handler(code, signal);
@@ -1359,7 +1397,15 @@ stderr: ${tail}` : reason;
     const child = spawn3(opts.plan.command, opts.plan.args, {
       cwd: opts.cwd,
       env,
-      stdio: ["pipe", "pipe", "pipe"]
+      stdio: ["pipe", "pipe", "pipe"],
+      // setsid the agent into its own session/process group. The daemon
+      // already runs in its own setsid'd session, but macOS terminals
+      // (iTerm2, Terminal.app) sometimes still reach inherited child
+      // processes when the user closes a window — putting the agent
+      // one more session-boundary away keeps it alive across terminal
+      // restarts. The daemon still owns the pipes, so this.kill()
+      // continues to terminate it cleanly on idle/close.
+      detached: true
     });
     return new _AgentInstance(opts, child);
   }
@@ -1374,6 +1420,9 @@ stderr: ${tail}` : reason;
       return;
     }
     this.killed = true;
+    this.logger?.info(
+      `agent ${this.agentId} pid=${this.child.pid} kill requested signal=${signal}`
+    );
     await this.connection.close().catch(() => void 0);
     this.child.kill(signal);
   }
@@ -1486,6 +1535,7 @@ var Session = class {
   // and noisy state churn keep a quiet session alive forever.
   lastRecordedAt;
   spawnReplacementAgent;
+  logger;
   agentChangeHandlers = [];
   // Last available_commands_update we observed from the agent. Stored
   // so we can re-broadcast a merged (hydra ∪ agent) list whenever
@@ -1517,6 +1567,7 @@ var Session = class {
     }
     this.idleTimeoutMs = init.idleTimeoutMs ?? 0;
     this.spawnReplacementAgent = init.spawnReplacementAgent;
+    this.logger = init.logger;
     if (init.firstPromptSeeded) {
       this.firstPromptSeeded = true;
     }
@@ -1846,6 +1897,9 @@ var Session = class {
     if (this.closed) {
       return;
     }
+    this.logger?.info(
+      `session ${this.sessionId} closing deleteRecord=${opts.deleteRecord ?? false} regenTitle=${opts.regenTitle ?? false}`
+    );
     this.cancelIdleTimer();
     if (opts.regenTitle && this.firstPromptSeeded) {
       const timeoutMs = opts.regenTitleTimeoutMs ?? 5e3;
@@ -2400,6 +2454,10 @@ _(switched from \`${oldAgentId}\` to \`${newAgentId}\`)_
       return;
     }
     const opts = this.firstPromptSeeded ? { deleteRecord: false, regenTitle: true } : { deleteRecord: true };
+    const idleSec = Math.round(idle / 1e3);
+    this.logger?.info(
+      `session ${this.sessionId} idle timeout fired after ${idleSec}s (window=${Math.round(this.idleTimeoutMs / 1e3)}s) \u2014 closing`
+    );
     void this.close(opts).catch(() => void 0);
   }
   cancelIdleTimer() {
@@ -2768,6 +2826,16 @@ var SessionRecord = z4.object({
   // 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(),
+  // Origin's agent-side session id at export time. Carried as a
+  // breadcrumb and as the handle a future "connect back to origin"
+  // feature would dial. Absent when the origin record had no upstream
+  // bound (re-export of an imported, not-yet-attached session).
+  importedFromUpstreamSessionId: z4.string().optional(),
+  // Hostname of the machine that exported the bundle we imported
+  // (i.e. the most recent hop, not necessarily the true multi-hop
+  // origin). Surfaced in the picker so imported rows don't look like
+  // they materialized from nowhere.
+  importedFromMachine: z4.string().optional(),
   agentId: z4.string(),
   cwd: z4.string(),
   title: z4.string().optional(),
@@ -2888,6 +2956,8 @@ function recordFromMemorySession(args) {
     lineageId: args.lineageId,
     upstreamSessionId: args.upstreamSessionId,
     importedFromSessionId: args.importedFromSessionId,
+    importedFromUpstreamSessionId: args.importedFromUpstreamSessionId,
+    importedFromMachine: args.importedFromMachine,
     agentId: args.agentId,
     cwd: args.cwd,
     title: args.title,
@@ -3105,6 +3175,7 @@ var SessionManager = class {
     this.histories = new HistoryStore({ maxEntries: this.sessionHistoryMaxEntries });
     this.idleTimeoutMs = options.idleTimeoutMs ?? 0;
     this.defaultModels = options.defaultModels ?? {};
+    this.logger = options.logger;
   }
   registry;
   sessions = /* @__PURE__ */ new Map();
@@ -3119,6 +3190,7 @@ var SessionManager = class {
   // concurrent snapshot updates (e.g. an agent emitting model + mode
   // back-to-back) don't lose writes via interleaved reads.
   metaWriteQueues = /* @__PURE__ */ new Map();
+  logger;
   async create(params) {
     const fresh = await this.bootstrapAgent({
       agentId: params.agentId,
@@ -3136,6 +3208,7 @@ var SessionManager = class {
       title: params.title,
       agentArgs: params.agentArgs,
       idleTimeoutMs: this.idleTimeoutMs,
+      logger: this.logger,
       spawnReplacementAgent: (p) => this.bootstrapAgent({ ...p, mcpServers: [] }),
       historyStore: this.histories,
       historyMaxEntries: this.sessionHistoryMaxEntries,
@@ -3218,6 +3291,7 @@ var SessionManager = class {
       await agent.kill().catch(() => void 0);
       return this.doResurrectFromImport(params);
     }
+    agent.connection.drainBuffered("session/update");
     const session = new Session({
       sessionId: params.hydraSessionId,
       cwd: params.cwd,
@@ -3228,6 +3302,7 @@ var SessionManager = class {
       title: params.title,
       agentArgs: params.agentArgs,
       idleTimeoutMs: this.idleTimeoutMs,
+      logger: this.logger,
       spawnReplacementAgent: (p) => this.bootstrapAgent({ ...p, mcpServers: [] }),
       historyStore: this.histories,
       historyMaxEntries: this.sessionHistoryMaxEntries,
@@ -3274,6 +3349,7 @@ var SessionManager = class {
       title: params.title,
       agentArgs: params.agentArgs,
       idleTimeoutMs: this.idleTimeoutMs,
+      logger: this.logger,
       spawnReplacementAgent: (p) => this.bootstrapAgent({ ...p, mcpServers: [] }),
       historyStore: this.histories,
       historyMaxEntries: this.sessionHistoryMaxEntries,
@@ -3538,6 +3614,8 @@ var SessionManager = class {
         agentId: r.agentId,
         currentModel: r.currentModel,
         currentUsage: r.currentUsage,
+        importedFromMachine: r.importedFromMachine,
+        importedFromUpstreamSessionId: r.importedFromUpstreamSessionId,
         updatedAt: used,
         attachedClients: 0,
         status: "cold"
@@ -3645,6 +3723,8 @@ var SessionManager = class {
         lineageId: args.bundle.session.lineageId,
         upstreamSessionId: "",
         importedFromSessionId: args.bundle.session.sessionId,
+        importedFromUpstreamSessionId: args.bundle.session.upstreamSessionId,
+        importedFromMachine: args.bundle.exportedFrom.machine,
         agentId: args.bundle.session.agentId,
         cwd: args.cwd ?? args.bundle.session.cwd,
         title: args.bundle.session.title,
@@ -3767,6 +3847,8 @@ function mergeForPersistence(session, existing) {
     lineageId: existing?.lineageId ?? generateLineageId(),
     upstreamSessionId: session.upstreamSessionId,
     importedFromSessionId: existing?.importedFromSessionId,
+    importedFromUpstreamSessionId: existing?.importedFromUpstreamSessionId,
+    importedFromMachine: existing?.importedFromMachine,
     agentId: session.agentId,
     cwd: session.cwd,
     title: session.title,
@@ -4352,6 +4434,12 @@ var BundleSession = z5.object({
   // Required on bundles — the export path backfills if the source
   // record was written before lineageId existed.
   lineageId: z5.string(),
+  // The exporter's agent-side session id at export time. Carried so
+  // importers can persist it as a breadcrumb (and, eventually, as the
+  // handle a "connect back to origin" feature would need). Omitted on
+  // bundles whose source record never bound to an agent (e.g. a
+  // re-export of an imported, not-yet-attached session).
+  upstreamSessionId: z5.string().optional(),
   agentId: z5.string(),
   cwd: z5.string(),
   title: z5.string().optional(),
@@ -4384,6 +4472,7 @@ function encodeBundle(params) {
     session: {
       sessionId: params.record.sessionId,
       lineageId: params.record.lineageId,
+      ...params.record.upstreamSessionId ? { upstreamSessionId: params.record.upstreamSessionId } : {},
       agentId: params.record.agentId,
       cwd: params.record.cwd,
       ...params.record.title !== void 0 ? { title: params.record.title } : {},
@@ -5175,11 +5264,20 @@ async function startDaemon(config) {
     await auth(request, reply);
   });
   const registry = new Registry(config);
-  const spawner = (opts) => AgentInstance.spawn({ ...opts, stderrTailBytes: config.daemon.agentStderrTailBytes });
+  const agentLogger = {
+    info: (msg) => app.log.info(msg),
+    warn: (msg) => app.log.warn(msg)
+  };
+  const spawner = (opts) => AgentInstance.spawn({
+    ...opts,
+    stderrTailBytes: config.daemon.agentStderrTailBytes,
+    logger: agentLogger
+  });
   const manager = new SessionManager(registry, spawner, void 0, {
     idleTimeoutMs: config.daemon.sessionIdleTimeoutSeconds * 1e3,
     defaultModels: config.defaultModels,
-    sessionHistoryMaxEntries: config.daemon.sessionHistoryMaxEntries
+    sessionHistoryMaxEntries: config.daemon.sessionHistoryMaxEntries,
+    logger: agentLogger
   });
   const extensions = new ExtensionManager(extensionList(config));
   registerHealthRoutes(app, HYDRA_VERSION);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydra-acp/cli",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "Multi-client ACP session daemon: spawn agents, attach over WSS, multiplex sessions across editors.",
   "license": "MIT",
   "type": "module",