very-happy-cli 0.2.120 → 0.2.121

package/dist/{AcpBackend-DiIJaJWG.mjs → AcpBackend-BxvQ6O4k.mjs}

@@ -1,7 +1,7 @@
 import { spawn } from 'node:child_process';
 import { ndJsonStream, ClientSideConnection } from '@agentclientprotocol/sdk';
 import { randomUUID } from 'node:crypto';
-import { l as logger, g as contentLogMetadata, h as errorLogMetadata, j as packageJson, k as delay } from './types-Di0o0BdV.mjs';
+import { l as logger, g as contentLogMetadata, h as errorLogMetadata, j as packageJson, k as delay } from './types-P2cJWD0E.mjs';
 
 const DEFAULT_TIMEOUTS = {
   /** Default initialization timeout: 60 seconds */

package/dist/{AcpBackend-tou8FQXI.cjs → AcpBackend-Cdj56ZfU.cjs}

@@ -3,7 +3,7 @@
 var node_child_process = require('node:child_process');
 var sdk = require('@agentclientprotocol/sdk');
 var node_crypto = require('node:crypto');
-var persistence = require('./types-7ZSxm6Pi.cjs');
+var persistence = require('./types-COOYpI8_.cjs');
 
 const DEFAULT_TIMEOUTS = {
   /** Default initialization timeout: 60 seconds */

package/dist/{AcpSessionManager-fF_HFB98.cjs → AcpSessionManager-DahCU78z.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var cuid2 = require('@paralleldrive/cuid2');
-var persistence = require('./types-7ZSxm6Pi.cjs');
+var persistence = require('./types-COOYpI8_.cjs');
 
 function turnOptions(turnId, time) {
   return turnId ? { turn: turnId, time } : { time };
@@ -38,11 +38,24 @@ function parseThinkingPayload(payload) {
 class AcpSessionManager {
   currentTurnId = null;
   acpCallToSessionCall = /* @__PURE__ */ new Map();
+  stream;
   /** Monotonic clock: max(lastTime + 1, Date.now()) */
   lastTime = 0;
   /** Pending text waiting to be flushed when the stream type changes */
   pendingText = "";
   pendingType = null;
+  /**
+   * Draft identity of the pending block: `<turn id>:<block index>`. There is
+   * no API message id on this path, so the turn id plays that role and the
+   * index counts blocks within the turn. Null while no turn is open — text
+   * outside a turn (pi's startup banner) is persisted as before but never
+   * drafted, since the web only paints drafts for a live turn anyway.
+   */
+  pendingKey = null;
+  blockCursor = 0;
+  constructor(options = {}) {
+    this.stream = options.stream ?? null;
+  }
   nextTime() {
     this.lastTime = Math.max(this.lastTime + 1, Date.now());
     return this.lastTime;
@@ -56,8 +69,34 @@ class AcpSessionManager {
     this.acpCallToSessionCall.set(acpCallId, created);
     return created;
   }
+  /**
+   * Route one streamed delta into the pending block, opening a new block (and
+   * flushing the previous one) when the kind changes. Returns the envelopes
+   * the switch flushed.
+   */
+  accumulate(type, text) {
+    const flushed = this.pendingType !== type ? this.flush() : [];
+    if (this.pendingType === null) {
+      this.pendingType = type;
+      if (this.currentTurnId && this.stream) {
+        this.pendingKey = { mid: this.currentTurnId, idx: this.blockCursor++ };
+        this.stream.openBlock(this.pendingKey.mid, this.pendingKey.idx, type === "thinking" ? "thinking" : "text");
+      }
+    }
+    this.pendingText += text;
+    if (this.pendingKey && this.stream) {
+      this.stream.appendDelta(this.pendingKey.mid, this.pendingKey.idx, text);
+    }
+    return flushed;
+  }
   flush() {
+    const key = this.pendingKey;
+    this.pendingKey = null;
+    if (key && this.stream) {
+      this.stream.closeBlock(key.mid, key.idx);
+    }
     if (!this.pendingText || !this.pendingType) {
+      this.pendingType = null;
       return [];
     }
     const text = this.pendingText.replace(/^\n+|\n+$/g, "");
@@ -67,18 +106,25 @@ class AcpSessionManager {
     if (!text) {
       return [];
     }
+    const options = {
+      ...turnOptions(this.currentTurnId, this.nextTime()),
+      ...key ? { streamKey: persistence.streamKeyOf(key.mid, key.idx) } : {}
+    };
     if (type === "thinking") {
-      return [persistence.createEnvelope("agent", { t: "text", text, thinking: true }, turnOptions(this.currentTurnId, this.nextTime()))];
+      return [persistence.createEnvelope("agent", { t: "text", text, thinking: true }, options)];
     }
-    return [persistence.createEnvelope("agent", { t: "text", text }, turnOptions(this.currentTurnId, this.nextTime()))];
+    return [persistence.createEnvelope("agent", { t: "text", text }, options)];
   }
   startTurn() {
     if (this.currentTurnId) {
       return [];
     }
+    const flushed = this.flush();
     this.currentTurnId = cuid2.createId();
     this.acpCallToSessionCall.clear();
+    this.blockCursor = 0;
     return [
+      ...flushed,
       persistence.createEnvelope("agent", { t: "turn-start" }, { turn: this.currentTurnId, time: this.nextTime() })
     ];
   }
@@ -102,10 +148,7 @@ class AcpSessionManager {
         return [];
       }
       if (streaming) {
-        const flushed = this.pendingType !== "thinking" ? this.flush() : [];
-        this.pendingType = "thinking";
-        this.pendingText += text;
-        return flushed;
+        return this.accumulate("thinking", text);
       }
       const trimmed = text.replace(/^\n+|\n+$/g, "");
       if (!trimmed) {
@@ -124,10 +167,7 @@ class AcpSessionManager {
       if (!text) {
         return [];
       }
-      const flushed = this.pendingType !== "output" ? this.flush() : [];
-      this.pendingType = "output";
-      this.pendingText += text;
-      return flushed;
+      return this.accumulate("output", text);
     }
     if (msg.type === "tool-call") {
       const flushed = this.flush();

package/dist/{AcpSessionManager-CZ0Az0GG.mjs → AcpSessionManager-DlWlQVhw.mjs}

@@ -1,5 +1,5 @@
 import { createId } from '@paralleldrive/cuid2';
-import { b as createEnvelope } from './types-Di0o0BdV.mjs';
+import { s as streamKeyOf, b as createEnvelope } from './types-P2cJWD0E.mjs';
 
 function turnOptions(turnId, time) {
   return turnId ? { turn: turnId, time } : { time };
@@ -36,11 +36,24 @@ function parseThinkingPayload(payload) {
 class AcpSessionManager {
   currentTurnId = null;
   acpCallToSessionCall = /* @__PURE__ */ new Map();
+  stream;
   /** Monotonic clock: max(lastTime + 1, Date.now()) */
   lastTime = 0;
   /** Pending text waiting to be flushed when the stream type changes */
   pendingText = "";
   pendingType = null;
+  /**
+   * Draft identity of the pending block: `<turn id>:<block index>`. There is
+   * no API message id on this path, so the turn id plays that role and the
+   * index counts blocks within the turn. Null while no turn is open — text
+   * outside a turn (pi's startup banner) is persisted as before but never
+   * drafted, since the web only paints drafts for a live turn anyway.
+   */
+  pendingKey = null;
+  blockCursor = 0;
+  constructor(options = {}) {
+    this.stream = options.stream ?? null;
+  }
   nextTime() {
     this.lastTime = Math.max(this.lastTime + 1, Date.now());
     return this.lastTime;
@@ -54,8 +67,34 @@ class AcpSessionManager {
     this.acpCallToSessionCall.set(acpCallId, created);
     return created;
   }
+  /**
+   * Route one streamed delta into the pending block, opening a new block (and
+   * flushing the previous one) when the kind changes. Returns the envelopes
+   * the switch flushed.
+   */
+  accumulate(type, text) {
+    const flushed = this.pendingType !== type ? this.flush() : [];
+    if (this.pendingType === null) {
+      this.pendingType = type;
+      if (this.currentTurnId && this.stream) {
+        this.pendingKey = { mid: this.currentTurnId, idx: this.blockCursor++ };
+        this.stream.openBlock(this.pendingKey.mid, this.pendingKey.idx, type === "thinking" ? "thinking" : "text");
+      }
+    }
+    this.pendingText += text;
+    if (this.pendingKey && this.stream) {
+      this.stream.appendDelta(this.pendingKey.mid, this.pendingKey.idx, text);
+    }
+    return flushed;
+  }
   flush() {
+    const key = this.pendingKey;
+    this.pendingKey = null;
+    if (key && this.stream) {
+      this.stream.closeBlock(key.mid, key.idx);
+    }
     if (!this.pendingText || !this.pendingType) {
+      this.pendingType = null;
       return [];
     }
     const text = this.pendingText.replace(/^\n+|\n+$/g, "");
@@ -65,18 +104,25 @@ class AcpSessionManager {
     if (!text) {
       return [];
     }
+    const options = {
+      ...turnOptions(this.currentTurnId, this.nextTime()),
+      ...key ? { streamKey: streamKeyOf(key.mid, key.idx) } : {}
+    };
     if (type === "thinking") {
-      return [createEnvelope("agent", { t: "text", text, thinking: true }, turnOptions(this.currentTurnId, this.nextTime()))];
+      return [createEnvelope("agent", { t: "text", text, thinking: true }, options)];
     }
-    return [createEnvelope("agent", { t: "text", text }, turnOptions(this.currentTurnId, this.nextTime()))];
+    return [createEnvelope("agent", { t: "text", text }, options)];
   }
   startTurn() {
     if (this.currentTurnId) {
       return [];
     }
+    const flushed = this.flush();
     this.currentTurnId = createId();
     this.acpCallToSessionCall.clear();
+    this.blockCursor = 0;
     return [
+      ...flushed,
       createEnvelope("agent", { t: "turn-start" }, { turn: this.currentTurnId, time: this.nextTime() })
     ];
   }
@@ -100,10 +146,7 @@ class AcpSessionManager {
         return [];
       }
       if (streaming) {
-        const flushed = this.pendingType !== "thinking" ? this.flush() : [];
-        this.pendingType = "thinking";
-        this.pendingText += text;
-        return flushed;
+        return this.accumulate("thinking", text);
       }
       const trimmed = text.replace(/^\n+|\n+$/g, "");
       if (!trimmed) {
@@ -122,10 +165,7 @@ class AcpSessionManager {
       if (!text) {
         return [];
       }
-      const flushed = this.pendingType !== "output" ? this.flush() : [];
-      this.pendingType = "output";
-      this.pendingText += text;
-      return flushed;
+      return this.accumulate("output", text);
     }
     if (msg.type === "tool-call") {
       const flushed = this.flush();

package/dist/{config-CEbOao_0.cjs → config-DxOhdFEx.cjs}

@@ -4,8 +4,8 @@ var fs = require('fs');
 var path = require('path');
 var os = require('os');
 var child_process = require('child_process');
-var persistence = require('./types-7ZSxm6Pi.cjs');
-var index = require('./index-BlkIz9BQ.cjs');
+var persistence = require('./types-COOYpI8_.cjs');
+var index = require('./index-DObePs_K.cjs');
 require('axios');
 require('chalk');
 require('node:util');

package/dist/{config-CGDxsTZg.mjs → config-osO37dR1.mjs}

@@ -2,8 +2,8 @@ import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs';
 import { join } from 'path';
 import { homedir } from 'os';
 import { execSync } from 'child_process';
-import { l as logger } from './types-Di0o0BdV.mjs';
-import { j as DEFAULT_GEMINI_MODEL, G as GEMINI_MODEL_ENV } from './index-CUJ6faw1.mjs';
+import { l as logger } from './types-P2cJWD0E.mjs';
+import { j as DEFAULT_GEMINI_MODEL, G as GEMINI_MODEL_ENV } from './index-Iz-M3qbz.mjs';
 import 'axios';
 import 'chalk';
 import 'node:util';

package/dist/{index-D4_LW69g.mjs → index-BcwAnM9k.mjs}

@@ -1,10 +1,10 @@
-import { D as DefaultTransport, A as AcpBackend } from './AcpBackend-DiIJaJWG.mjs';
-export { a as DEFAULT_IDLE_TIMEOUT_MS, b as DEFAULT_TOOL_CALL_TIMEOUT_MS, e as extractErrorDetail, f as formatDuration, c as formatDurationMinutes, h as handleAgentMessageChunk, d as handleAgentThoughtChunk, g as handleLegacyMessageChunk, i as handlePlanUpdate, j as handleThinkingUpdate, k as handleToolCall, l as handleToolCallUpdate, p as parseArgsFromContent } from './AcpBackend-DiIJaJWG.mjs';
-import { d as connectionState, A as ApiClient, e as readSettings, f as encodeBase64, l as logger, p as projectPath } from './types-Di0o0BdV.mjs';
-import { A as AcpSessionManager } from './AcpSessionManager-CZ0Az0GG.mjs';
+import { D as DefaultTransport, A as AcpBackend } from './AcpBackend-BxvQ6O4k.mjs';
+export { a as DEFAULT_IDLE_TIMEOUT_MS, b as DEFAULT_TOOL_CALL_TIMEOUT_MS, e as extractErrorDetail, f as formatDuration, c as formatDurationMinutes, h as handleAgentMessageChunk, d as handleAgentThoughtChunk, g as handleLegacyMessageChunk, i as handlePlanUpdate, j as handleThinkingUpdate, k as handleToolCall, l as handleToolCallUpdate, p as parseArgsFromContent } from './AcpBackend-BxvQ6O4k.mjs';
+import { d as connectionState, A as ApiClient, e as readSettings, f as encodeBase64, l as logger, p as projectPath } from './types-P2cJWD0E.mjs';
+import { A as AcpSessionManager } from './AcpSessionManager-DlWlQVhw.mjs';
 import { randomUUID } from 'node:crypto';
 import { join } from 'node:path';
-import { n as initialMachineMetadata, o as createSessionMetadata, u as setupOfflineReconnection, v as notifyDaemonSessionStarted, x as MessageQueue2, y as hashObject, z as startHappyServer, T as TitleGenerator, B as registerKillSessionHandler, C as BasePermissionHandler, E as writeSessionModeFile, F as normalizeAcpPermissionMode, H as removeSessionModeFile } from './index-CUJ6faw1.mjs';
+import { n as initialMachineMetadata, o as createSessionMetadata, u as setupOfflineReconnection, v as notifyDaemonSessionStarted, x as StreamRelay, y as MessageQueue2, z as hashObject, B as startHappyServer, T as TitleGenerator, C as registerKillSessionHandler, E as BasePermissionHandler, F as writeSessionModeFile, H as normalizeAcpPermissionMode, I as removeSessionModeFile } from './index-Iz-M3qbz.mjs';
 import 'node:child_process';
 import '@agentclientprotocol/sdk';
 import 'axios';
@@ -636,7 +636,11 @@ async function runAcp(opts) {
   }
   permissionHandler = new GenericAcpPermissionHandler(session, opts.agentName);
   permissionHandler.reset("Previous CLI process exited before responding");
-  const sessionManager = new AcpSessionManager();
+  const streamingEnabled = process.env.HAPPY_SESSION_STREAM_DISABLED !== "1";
+  const streamRelay = new StreamRelay({
+    send: (frame) => session.sendStreamFrame(frame)
+  });
+  const sessionManager = new AcpSessionManager(streamingEnabled ? { stream: streamRelay } : {});
   const messageQueue = new MessageQueue2((mode) => hashObject(mode));
   let currentPermissionMode;
   let currentModel;
@@ -690,6 +694,13 @@ async function runAcp(opts) {
     verbose
   });
   let thinking = false;
+  const setThinking = (next) => {
+    if (thinking === next) {
+      return;
+    }
+    thinking = next;
+    session.keepAlive(thinking, "remote");
+  };
   let acpSessionId = null;
   let shouldExit = false;
   let abortController = new AbortController();
@@ -934,11 +945,6 @@ async function runAcp(opts) {
       const suffix = msg.detail ? `: ${msg.detail}` : "";
       const statusLine = `Status: ${msg.status}${suffix}`;
       logAcp("muted", statusLine);
-      const nextThinking = msg.status === "running";
-      if (thinking !== nextThinking) {
-        thinking = nextThinking;
-        session.keepAlive(thinking, "remote");
-      }
       if (msg.status === "idle") {
         clearPendingTurn();
       }
@@ -1051,6 +1057,7 @@ async function runAcp(opts) {
       }
       logAcp("incoming", `Incoming prompt: ${formatUnknownForConsole(batch.message, ACP_EVENT_PREVIEW_CHARS)}`);
       sendEnvelopes(sessionManager.startTurn());
+      setThinking(true);
       const turnEnded = waitForTurnEnd();
       try {
         if (typeof batch.mode.permissionMode === "string" && batch.mode.permissionMode.length > 0) {
@@ -1062,12 +1069,16 @@ async function runAcp(opts) {
         await backend.sendPrompt(acpSessionId, batch.message);
         await turnEnded;
         sendEnvelopes(sessionManager.endTurn("completed"));
+        streamRelay.endTurn();
+        setThinking(false);
         session.sendSessionEvent({ type: "ready" });
         if (verbose) {
           logAcp("muted", `Outgoing prompt completion from ${opts.agentName}`);
         }
       } catch (error) {
         sendEnvelopes(sessionManager.endTurn("failed"));
+        streamRelay.endTurn();
+        setThinking(false);
         session.sendSessionEvent({ type: "ready" });
         logAcp("error", `Prompt error from ${opts.agentName}: ${error instanceof Error ? error.message : String(error)}`);
         clearPendingTurn(error instanceof Error ? error : new Error(String(error)));
@@ -1075,7 +1086,10 @@ async function runAcp(opts) {
       }
     }
   } finally {
+    setThinking(false);
     clearInterval(keepAliveInterval);
+    streamRelay.endTurn();
+    streamRelay.dispose();
     reconnectionHandle?.cancel();
     clearPendingTurn(new Error("ACP runner shutting down"));
     try {

package/dist/{index-HKcuQ_fQ.cjs → index-Bv53Zygv.cjs}

@@ -1,11 +1,11 @@
 'use strict';
 
-var AcpBackend = require('./AcpBackend-tou8FQXI.cjs');
-var persistence = require('./types-7ZSxm6Pi.cjs');
-var AcpSessionManager = require('./AcpSessionManager-fF_HFB98.cjs');
+var AcpBackend = require('./AcpBackend-Cdj56ZfU.cjs');
+var persistence = require('./types-COOYpI8_.cjs');
+var AcpSessionManager = require('./AcpSessionManager-DahCU78z.cjs');
 var node_crypto = require('node:crypto');
 var path = require('node:path');
-var index = require('./index-BlkIz9BQ.cjs');
+var index = require('./index-DObePs_K.cjs');
 require('node:child_process');
 require('@agentclientprotocol/sdk');
 require('axios');
@@ -637,7 +637,11 @@ async function runAcp(opts) {
   }
   permissionHandler = new GenericAcpPermissionHandler(session, opts.agentName);
   permissionHandler.reset("Previous CLI process exited before responding");
-  const sessionManager = new AcpSessionManager.AcpSessionManager();
+  const streamingEnabled = process.env.HAPPY_SESSION_STREAM_DISABLED !== "1";
+  const streamRelay = new index.StreamRelay({
+    send: (frame) => session.sendStreamFrame(frame)
+  });
+  const sessionManager = new AcpSessionManager.AcpSessionManager(streamingEnabled ? { stream: streamRelay } : {});
   const messageQueue = new index.MessageQueue2((mode) => index.hashObject(mode));
   let currentPermissionMode;
   let currentModel;
@@ -691,6 +695,13 @@ async function runAcp(opts) {
     verbose
   });
   let thinking = false;
+  const setThinking = (next) => {
+    if (thinking === next) {
+      return;
+    }
+    thinking = next;
+    session.keepAlive(thinking, "remote");
+  };
   let acpSessionId = null;
   let shouldExit = false;
   let abortController = new AbortController();
@@ -935,11 +946,6 @@ async function runAcp(opts) {
       const suffix = msg.detail ? `: ${msg.detail}` : "";
       const statusLine = `Status: ${msg.status}${suffix}`;
       logAcp("muted", statusLine);
-      const nextThinking = msg.status === "running";
-      if (thinking !== nextThinking) {
-        thinking = nextThinking;
-        session.keepAlive(thinking, "remote");
-      }
       if (msg.status === "idle") {
         clearPendingTurn();
       }
@@ -1052,6 +1058,7 @@ async function runAcp(opts) {
       }
       logAcp("incoming", `Incoming prompt: ${formatUnknownForConsole(batch.message, ACP_EVENT_PREVIEW_CHARS)}`);
       sendEnvelopes(sessionManager.startTurn());
+      setThinking(true);
       const turnEnded = waitForTurnEnd();
       try {
         if (typeof batch.mode.permissionMode === "string" && batch.mode.permissionMode.length > 0) {
@@ -1063,12 +1070,16 @@ async function runAcp(opts) {
         await backend.sendPrompt(acpSessionId, batch.message);
         await turnEnded;
         sendEnvelopes(sessionManager.endTurn("completed"));
+        streamRelay.endTurn();
+        setThinking(false);
         session.sendSessionEvent({ type: "ready" });
         if (verbose) {
           logAcp("muted", `Outgoing prompt completion from ${opts.agentName}`);
         }
       } catch (error) {
         sendEnvelopes(sessionManager.endTurn("failed"));
+        streamRelay.endTurn();
+        setThinking(false);
         session.sendSessionEvent({ type: "ready" });
         logAcp("error", `Prompt error from ${opts.agentName}: ${error instanceof Error ? error.message : String(error)}`);
         clearPendingTurn(error instanceof Error ? error : new Error(String(error)));
@@ -1076,7 +1087,10 @@ async function runAcp(opts) {
       }
     }
   } finally {
+    setThinking(false);
     clearInterval(keepAliveInterval);
+    streamRelay.endTurn();
+    streamRelay.dispose();
     reconnectionHandle?.cancel();
     clearPendingTurn(new Error("ACP runner shutting down"));
     try {