@hydra-acp/cli 0.1.2 → 0.1.3

package/dist/index.d.ts

@@ -92,10 +92,13 @@ declare const HydraConfig: z.ZodObject<{
     }>>>;
     tui: z.ZodDefault<z.ZodObject<{
         repaintThrottleMs: z.ZodDefault<z.ZodNumber>;
+        maxScrollbackLines: z.ZodDefault<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
         repaintThrottleMs: number;
+        maxScrollbackLines: number;
     }, {
         repaintThrottleMs?: number | undefined;
+        maxScrollbackLines?: number | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
     daemon: {
@@ -117,6 +120,7 @@ declare const HydraConfig: z.ZodObject<{
     }>;
     tui: {
         repaintThrottleMs: number;
+        maxScrollbackLines: number;
     };
     registry: {
         url: string;
@@ -145,6 +149,7 @@ declare const HydraConfig: z.ZodObject<{
     }> | undefined;
     tui?: {
         repaintThrottleMs?: number | undefined;
+        maxScrollbackLines?: number | undefined;
     } | undefined;
     registry?: {
         url?: string | undefined;
@@ -1250,9 +1255,12 @@ interface SessionInit {
     currentModel?: string;
     currentMode?: string;
     agentCommands?: AdvertisedCommand[];
+    firstPromptSeeded?: boolean;
 }
 interface CloseOptions {
     deleteRecord?: boolean;
+    regenTitle?: boolean;
+    regenTitleTimeoutMs?: number;
 }
 declare class Session {
     readonly sessionId: string;
@@ -1294,6 +1302,7 @@ declare class Session {
         upstreamSessionId: string;
     }) => void): void;
     get attachedCount(): number;
+    get turnStartedAt(): number | undefined;
     getHistorySnapshot(): CachedNotification[];
     onBroadcast(handler: (entry: CachedNotification) => void): () => void;
     attach(client: AttachedClient, historyPolicy: HistoryPolicy): CachedNotification[];
@@ -1447,6 +1456,7 @@ declare class SessionManager {
         cwd?: string;
     }): Promise<SessionListEntry[]>;
     deleteRecord(sessionId: string): Promise<boolean>;
+    hasRecord(sessionId: string): Promise<boolean>;
     private persistTitle;
     private persistAgentChange;
     private persistSnapshot;
@@ -1530,7 +1540,8 @@ declare const paths: {
     extensionsDir: () => string;
     extensionLogFile: (name: string) => string;
     extensionPidFile: (name: string) => string;
-    tuiHistoryFile: () => string;
+    tuiHistoryFile: (id: string) => string;
+    tuiLogFile: () => string;
 };
 
 export { type AgentCapabilities, AgentInstance, HistoryPolicy, HydraConfig, type InitializeResult, JsonRpcConnection, type MessageStream, Registry, Session, SessionAttachParams, type SessionCapabilities, SessionDetachParams, SessionListEntry, SessionListParams, SessionListResult, SessionManager, defaultConfig, ensureConfig, generateAuthToken, loadConfig, ndjsonStreamFromStdio, paths, planSpawn, startDaemon, writeConfig, wsToMessageStream };

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/daemon/server.ts
-import * as fs6 from "fs";
+import * as fs7 from "fs";
 import * as fsp2 from "fs/promises";
 import Fastify from "fastify";
 import websocketPlugin from "@fastify/websocket";
@@ -20,6 +20,11 @@ function hydraHome() {
   if (override && override.length > 0) {
     return path.resolve(override);
   }
+  if (process.env.VITEST) {
+    throw new Error(
+      "HYDRA_ACP_HOME is unset under VITEST; vitest.setup.ts must run first"
+    );
+  }
   return path.join(os.homedir(), ".hydra-acp");
 }
 var paths = {
@@ -41,7 +46,8 @@ var paths = {
   extensionsDir: () => path.join(hydraHome(), "extensions"),
   extensionLogFile: (name) => path.join(hydraHome(), "extensions", `${name}.log`),
   extensionPidFile: (name) => path.join(hydraHome(), "extensions", `${name}.pid`),
-  tuiHistoryFile: () => path.join(hydraHome(), "tui-history")
+  tuiHistoryFile: (id) => path.join(hydraHome(), "sessions", id, "prompt-history"),
+  tuiLogFile: () => path.join(hydraHome(), "tui.log")
 };
 
 // src/core/config.ts
@@ -69,7 +75,11 @@ var TuiConfig = z.object({
   // /clear, ^L, resize — bypass this throttle. Default 1000 (1 Hz) keeps
   // CPU low during heavy streaming; bump to 250 for 4 Hz, 100 for ~10 Hz,
   // or 0 to disable throttling entirely.
-  repaintThrottleMs: z.number().int().nonnegative().default(1e3)
+  repaintThrottleMs: z.number().int().nonnegative().default(1e3),
+  // Cap on logical lines retained in the in-memory scrollback render
+  // buffer. Oldest lines are dropped on overflow. The on-disk session
+  // history is unaffected; this only bounds the TUI's local view buffer.
+  maxScrollbackLines: z.number().int().positive().default(1e4)
 });
 var ExtensionName = z.string().min(1).regex(/^[A-Za-z0-9._-]+$/, "extension name must be filename-safe");
 var ExtensionBody = z.object({
@@ -94,7 +104,7 @@ var HydraConfig = z.object({
   // recency and truncated to this count. `--all` overrides in the CLI.
   sessionListColdLimit: z.number().int().nonnegative().default(20),
   extensions: z.record(ExtensionName, ExtensionBody).default({}),
-  tui: TuiConfig.default({ repaintThrottleMs: 1e3 })
+  tui: TuiConfig.default({ repaintThrottleMs: 1e3, maxScrollbackLines: 1e4 })
 });
 function extensionList(config) {
   return Object.entries(config.extensions).map(([name, body]) => ({
@@ -337,6 +347,9 @@ function planSpawn(agent, extraArgs = []) {
   throw new Error(`Agent ${agent.id} has no usable distribution method.`);
 }
 
+// src/core/session-manager.ts
+import * as fs5 from "fs/promises";
+
 // src/core/agent-instance.ts
 import { spawn } from "child_process";
 
@@ -421,6 +434,9 @@ function extractHydraMeta(meta) {
   if (typeof obj.currentMode === "string") {
     out.currentMode = obj.currentMode;
   }
+  if (typeof obj.turnStartedAt === "number" && obj.turnStartedAt > 0) {
+    out.turnStartedAt = obj.turnStartedAt;
+  }
   if (Array.isArray(obj.availableCommands)) {
     const cmds = [];
     for (const raw of obj.availableCommands) {
@@ -877,6 +893,9 @@ var Session = class {
     }
     this.idleTimeoutMs = init.idleTimeoutMs ?? 0;
     this.spawnReplacementAgent = init.spawnReplacementAgent;
+    if (init.firstPromptSeeded) {
+      this.firstPromptSeeded = true;
+    }
     this.historyStore = init.historyStore;
     if (init.seedHistory && init.seedHistory.length > 0) {
       this.history = [...init.seedHistory];
@@ -941,6 +960,29 @@ var Session = class {
   get attachedCount() {
     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.
+  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;
+  }
   // 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
@@ -1018,13 +1060,19 @@ var Session = class {
     this.broadcastPromptReceived(client, params);
     this.maybeSeedTitleFromPrompt(params);
     return this.enqueuePrompt(async () => {
-      const response = await this.agent.connection.request(
-        "session/prompt",
-        {
-          ...params,
-          sessionId: this.upstreamSessionId
-        }
-      );
+      let response;
+      try {
+        response = await this.agent.connection.request(
+          "session/prompt",
+          {
+            ...params,
+            sessionId: this.upstreamSessionId
+          }
+        );
+      } catch (err) {
+        this.broadcastTurnComplete(client.clientId, { stopReason: "error" });
+        throw err;
+      }
       this.broadcastTurnComplete(client.clientId, response);
       return response;
     });
@@ -1112,6 +1160,13 @@ var Session = class {
       return;
     }
     this.cancelIdleTimer();
+    if (opts.regenTitle && this.firstPromptSeeded) {
+      const timeoutMs = opts.regenTitleTimeoutMs ?? 5e3;
+      await Promise.race([
+        this.runTitleRegen().catch(() => void 0),
+        new Promise((r) => setTimeout(r, timeoutMs).unref?.())
+      ]);
+    }
     await this.agent.kill().catch(() => void 0);
     this.markClosed({ deleteRecord: opts.deleteRecord ?? false });
   }
@@ -1160,7 +1215,7 @@ var Session = class {
     }
     const promptParams = params ?? {};
     const text = extractPromptText(promptParams.prompt);
-    const seed = firstLine(text, 80);
+    const seed = firstLine(text, 200);
     if (!seed) {
       return;
     }
@@ -1539,7 +1594,8 @@ _(switched from \`${oldAgentId}\` to \`${newAgentId}\`)_
     }
     this.idleTimer = setTimeout(() => {
       this.idleTimer = void 0;
-      void this.close({ deleteRecord: false }).catch(() => void 0);
+      const opts = this.firstPromptSeeded ? { deleteRecord: false, regenTitle: true } : { deleteRecord: true };
+      void this.close(opts).catch(() => void 0);
     }, this.idleTimeoutMs);
     if (typeof this.idleTimer.unref === "function") {
       this.idleTimer.unref();
@@ -2139,7 +2195,8 @@ var SessionManager = class {
       seedHistory: params.seedHistory,
       currentModel: params.currentModel,
       currentMode: params.currentMode,
-      agentCommands: params.agentCommands
+      agentCommands: params.agentCommands,
+      firstPromptSeeded: true
     });
     await this.attachManagerHooks(session);
     return session;
@@ -2310,13 +2367,14 @@ var SessionManager = class {
         continue;
       }
       liveIds.add(session.sessionId);
+      const used = await historyMtimeIso(session.sessionId) ?? new Date(session.updatedAt).toISOString();
       entries.push({
         sessionId: session.sessionId,
         upstreamSessionId: session.upstreamSessionId,
         cwd: session.cwd,
         title: session.title,
         agentId: session.agentId,
-        updatedAt: new Date(session.updatedAt).toISOString(),
+        updatedAt: used,
         attachedClients: session.attachedCount,
         status: "live"
       });
@@ -2329,13 +2387,14 @@ var SessionManager = class {
       if (filter.cwd && r.cwd !== filter.cwd) {
         continue;
       }
+      const used = await historyMtimeIso(r.sessionId) ?? r.updatedAt;
       entries.push({
         sessionId: r.sessionId,
         upstreamSessionId: r.upstreamSessionId,
         cwd: r.cwd,
         title: r.title,
         agentId: r.agentId,
-        updatedAt: r.updatedAt,
+        updatedAt: used,
         attachedClients: 0,
         status: "cold"
       });
@@ -2351,6 +2410,10 @@ var SessionManager = class {
     await this.store.delete(sessionId).catch(() => void 0);
     return true;
   }
+  async hasRecord(sessionId) {
+    const record = await this.store.read(sessionId).catch(() => void 0);
+    return record !== void 0;
+  }
   // Persist a title update from Session.setTitle. The on-disk record
   // was written at create time; updating it here keeps the session
   // record's title in sync with what was broadcast to clients so a
@@ -2425,10 +2488,18 @@ var SessionManager = class {
     this.sessions.clear();
   }
 };
+async function historyMtimeIso(sessionId) {
+  try {
+    const st = await fs5.stat(paths.historyFile(sessionId));
+    return new Date(st.mtimeMs).toISOString();
+  } catch {
+    return void 0;
+  }
+}
 
 // src/core/extensions.ts
 import { spawn as spawn2 } from "child_process";
-import * as fs5 from "fs";
+import * as fs6 from "fs";
 import * as fsp from "fs/promises";
 import * as path3 from "path";
 var RESTART_BASE_MS = 1e3;
@@ -2711,7 +2782,7 @@ var ExtensionManager = class {
     }
     const ext = entry.config;
     const command = ext.command.length > 0 ? ext.command : [ext.name];
-    const logStream = fs5.createWriteStream(paths.extensionLogFile(ext.name), {
+    const logStream = fs6.createWriteStream(paths.extensionLogFile(ext.name), {
       flags: "a"
     });
     logStream.write(
@@ -2761,7 +2832,7 @@ var ExtensionManager = class {
     }
     if (typeof child.pid === "number") {
       try {
-        fs5.writeFileSync(paths.extensionPidFile(ext.name), `${child.pid}
+        fs6.writeFileSync(paths.extensionPidFile(ext.name), `${child.pid}
 `, {
           encoding: "utf8",
           mode: 384
@@ -2786,7 +2857,7 @@ var ExtensionManager = class {
     });
     child.on("exit", (code, signal) => {
       try {
-        fs5.unlinkSync(paths.extensionPidFile(ext.name));
+        fs6.unlinkSync(paths.extensionPidFile(ext.name));
       } catch {
       }
       logStream.write(
@@ -2920,6 +2991,22 @@ function registerSessionRoutes(app, manager, defaults) {
       reply.code(500).send({ error: err.message });
     }
   });
+  app.post("/v1/sessions/:id/kill", async (request, reply) => {
+    const raw = request.params.id;
+    const id = await manager.resolveCanonicalId(raw) ?? raw;
+    const session = manager.get(id);
+    if (session) {
+      await session.close({ deleteRecord: false });
+      reply.code(204).send();
+      return;
+    }
+    const exists = await manager.hasRecord(id);
+    if (!exists) {
+      reply.code(404).send({ error: "session not found" });
+      return;
+    }
+    reply.code(204).send();
+  });
   app.delete("/v1/sessions/:id", async (request, reply) => {
     const raw = request.params.id;
     const id = await manager.resolveCanonicalId(raw) ?? raw;
@@ -3127,6 +3214,16 @@ function parseRegisterBody(body) {
   };
 }
 
+// src/daemon/routes/config.ts
+function registerConfigRoutes(app, defaults) {
+  app.get("/v1/config", async () => {
+    return {
+      defaultAgent: defaults.defaultAgent,
+      defaultCwd: defaults.defaultCwd
+    };
+  });
+}
+
 // src/daemon/acp-ws.ts
 import { nanoid as nanoid2 } from "nanoid";
 
@@ -3450,6 +3547,9 @@ function buildResponseMeta(session) {
   if (commands.length > 0) {
     ours.availableCommands = commands;
   }
+  if (session.turnStartedAt !== void 0) {
+    ours.turnStartedAt = session.turnStartedAt;
+  }
   return mergeMeta(session.agentMeta, ours);
 }
 function buildInitializeResult() {
@@ -3535,6 +3635,10 @@ async function startDaemon(config) {
   });
   registerAgentRoutes(app, registry);
   registerExtensionRoutes(app, extensions);
+  registerConfigRoutes(app, {
+    defaultAgent: config.defaultAgent,
+    defaultCwd: config.defaultCwd
+  });
   registerAcpWsEndpoint(app, {
     config,
     manager,
@@ -3570,7 +3674,7 @@ async function startDaemon(config) {
     await manager.closeAll();
     await app.close();
     try {
-      fs6.unlinkSync(paths.pidFile());
+      fs7.unlinkSync(paths.pidFile());
     } catch {
     }
     try {

package/package.json

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