@hydra-acp/cli 0.1.9 → 0.1.11

package/dist/cli.js

@@ -306,7 +306,7 @@ var init_config = __esm({
       })
     });
     HydraConfigReadOnly = HydraConfig.extend({
-      daemon: DaemonConfig.omit({ authToken: true })
+      daemon: DaemonConfig.omit({ authToken: true }).default({})
     });
   }
 });
@@ -563,6 +563,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);
       }
@@ -8227,7 +8236,7 @@ async function runSession(term, config, opts, exitHint) {
     const frozenBodyStyle = stoppedReason !== null ? "tool-status-fail" : "dim";
     const lines = [
       {
-        prefix: "\u2692 ",
+        prefix: "\u2699 ",
         prefixStyle: pureThinking ? "tool-status-running" : frozenStyle,
         body: summary,
         bodyStyle: pureThinking ? "tool-status-running" : frozenBodyStyle
@@ -8642,6 +8651,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 +8680,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;
@@ -9741,6 +9766,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,
@@ -12880,6 +12906,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 +12925,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 +12942,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 +13103,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 +13124,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 +13155,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 +13174,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

@@ -1532,6 +1532,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): {

package/dist/index.js

@@ -162,7 +162,7 @@ var HydraConfig = z.object({
   })
 });
 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]) => ({
@@ -1162,6 +1162,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);
   }
@@ -3218,6 +3227,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,

package/package.json

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