adhdev 0.9.8 → 0.9.10

package/dist/cli/index.js

@@ -5813,6 +5813,18 @@ function validateRole(role, source, index) {
   }
   return role;
 }
+function validateBubbleState(state, source, index) {
+  if (typeof state !== "string" || !VALID_BUBBLE_STATES.includes(state)) {
+    throw new Error(`${source}: messages[${index}].bubbleState must be one of ${VALID_BUBBLE_STATES.join(", ")}`);
+  }
+  return state;
+}
+function validateTurnStatus(turnStatus, source) {
+  if (typeof turnStatus !== "string" || !VALID_TURN_STATUSES.includes(turnStatus)) {
+    throw new Error(`${source}: turnStatus must be one of ${VALID_TURN_STATUSES.join(", ")}`);
+  }
+  return turnStatus;
+}
 function validateMessageContent(content, source, index) {
   if (typeof content === "string") return content;
   if (Array.isArray(content)) return normalizeMessageParts(content);
@@ -5828,6 +5840,9 @@ function validateMessage(message, source, index) {
   };
   if (typeof message.kind === "string") normalized.kind = message.kind;
   if (typeof message.id === "string") normalized.id = message.id;
+  if (typeof message.bubbleId === "string") normalized.bubbleId = message.bubbleId;
+  if (typeof message.providerUnitKey === "string") normalized.providerUnitKey = message.providerUnitKey;
+  if (message.bubbleState !== void 0) normalized.bubbleState = validateBubbleState(message.bubbleState, source, index);
   if (isFiniteNumber(message.index)) normalized.index = message.index;
   if (isFiniteNumber(message.timestamp)) normalized.timestamp = message.timestamp;
   if (isFiniteNumber(message.receivedAt)) normalized.receivedAt = message.receivedAt;
@@ -5895,6 +5910,8 @@ function validateReadChatResultPayload(raw, source = "read_chat") {
   if (activeModal !== void 0) normalized.activeModal = activeModal;
   if (typeof raw.id === "string") normalized.id = raw.id;
   if (typeof raw.title === "string") normalized.title = raw.title;
+  if (typeof raw.currentTurnId === "string") normalized.currentTurnId = raw.currentTurnId;
+  if (raw.turnStatus !== void 0) normalized.turnStatus = validateTurnStatus(raw.turnStatus, source);
   if (typeof raw.agentType === "string") normalized.agentType = raw.agentType;
   if (typeof raw.agentName === "string") normalized.agentName = raw.agentName;
   if (typeof raw.extensionId === "string") normalized.extensionId = raw.extensionId;
@@ -5907,13 +5924,15 @@ function validateReadChatResultPayload(raw, source = "read_chat") {
   if (typeof raw.providerSessionId === "string") normalized.providerSessionId = raw.providerSessionId;
   return normalized;
 }
-var VALID_STATUSES, VALID_ROLES;
+var VALID_STATUSES, VALID_ROLES, VALID_BUBBLE_STATES, VALID_TURN_STATUSES;
 var init_read_chat_contract = __esm({
   "../../oss/packages/daemon-core/src/providers/read-chat-contract.ts"() {
     "use strict";
     init_contracts();
     VALID_STATUSES = ["idle", "generating", "waiting_approval", "error", "panel_hidden", "streaming", "long_generating"];
     VALID_ROLES = ["user", "assistant", "system", "human"];
+    VALID_BUBBLE_STATES = ["draft", "streaming", "final", "removed"];
+    VALID_TURN_STATUSES = ["open", "waiting_approval", "complete", "error"];
   }
 });
 
@@ -8026,7 +8045,7 @@ function didProviderConfirmSend(result) {
 }
 async function readExtensionChatState(h) {
   try {
-    const evalResult = await h.evaluateProviderScript("readChat", void 0, 5e4);
+    const evalResult = await h.evaluateProviderScript("readChat", void 0, READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS);
     if (!evalResult?.result) return null;
     const parsed = parseMaybeJson(evalResult.result);
     return parsed && typeof parsed === "object" ? parsed : null;
@@ -8114,7 +8133,7 @@ async function handleReadChat(h, args) {
       const title = typeof parsedRecord?.title === "string" ? parsedRecord.title : void 0;
       const providerSessionId = typeof parsedRecord?.providerSessionId === "string" ? parsedRecord.providerSessionId : void 0;
       if (status) {
-        LOG.info("Command", `[read_chat] cli-like resolved provider=${adapter.cliType} target=${String(args?.targetSessionId || "")} adapterStatus=${String(adapterStatus.status || "")} parsedStatus=${String(parsedRecord?.status || "")} shouldPreferAdapterMessages=${String(shouldPreferAdapterMessages)} adapterMsgCount=${Array.isArray(adapterStatus.messages) ? adapterStatus.messages.length : 0} parsedMsgCount=${Array.isArray(parsedRecord?.messages) ? parsedRecord.messages.length : 0} returnedMsgCount=${Array.isArray(status.messages) ? status.messages.length : 0}`);
+        LOG.debug("Command", `[read_chat] cli-like resolved provider=${adapter.cliType} target=${String(args?.targetSessionId || "")} adapterStatus=${String(adapterStatus.status || "")} parsedStatus=${String(parsedRecord?.status || "")} shouldPreferAdapterMessages=${String(shouldPreferAdapterMessages)} adapterMsgCount=${Array.isArray(adapterStatus.messages) ? adapterStatus.messages.length : 0} parsedMsgCount=${Array.isArray(parsedRecord?.messages) ? parsedRecord.messages.length : 0} returnedMsgCount=${Array.isArray(status.messages) ? status.messages.length : 0}`);
         return buildReadChatCommandResult({
           messages: status.messages || [],
           status: status.status,
@@ -8139,7 +8158,7 @@ async function handleReadChat(h, args) {
   }
   if (isExtensionTransport(transport)) {
     try {
-      const evalResult = await h.evaluateProviderScript("readChat", void 0, 5e4);
+      const evalResult = await h.evaluateProviderScript("readChat", void 0, READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS);
       if (evalResult?.result) {
         let parsed = evalResult.result;
         if (typeof parsed === "string") {
@@ -8243,7 +8262,7 @@ async function handleReadChat(h, args) {
   const script = h.getProviderScript("readChat") || h.getProviderScript("read_chat");
   if (script) {
     try {
-      const evalResult = await h.evaluateProviderScript("readChat", void 0, 5e4);
+      const evalResult = await h.evaluateProviderScript("readChat", void 0, READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS);
       if (evalResult?.result) {
         let parsed = evalResult.result;
         if (typeof parsed === "string") {
@@ -8947,7 +8966,7 @@ async function handleResolveAction(h, args) {
   }
   return { success: false, error: "resolveAction script not available for this provider" };
 }
-var RECENT_SEND_WINDOW_MS, recentSendByTarget;
+var RECENT_SEND_WINDOW_MS, READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS, recentSendByTarget;
 var init_chat_commands = __esm({
   "../../oss/packages/daemon-core/src/commands/chat-commands.ts"() {
     "use strict";
@@ -8960,6 +8979,7 @@ var init_chat_commands = __esm({
     init_chat_signatures();
     init_chat_message_normalization();
     RECENT_SEND_WINDOW_MS = 1200;
+    READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS = 25e3;
     recentSendByTarget = /* @__PURE__ */ new Map();
   }
 });
@@ -12764,7 +12784,7 @@ var init_provider_cli_adapter = __esm({
       sendDelayMs;
       sendKey;
       submitStrategy;
-      static SCRIPT_STATUS_DEBOUNCE_MS = 1e3;
+      static SCRIPT_STATUS_DEBOUNCE_MS = 3e3;
       /** Inject CLI scripts after construction (e.g. when resolved by ProviderLoader) */
       setCliScripts(scripts) {
         this.cliScripts = scripts;
@@ -14928,7 +14948,7 @@ var init_cli_provider_instance = __esm({
                 this.generatingDebouncePending = null;
               }
               this.generatingDebounceTimer = null;
-            }, 1e3);
+            }, 3e3);
           } else if (newStatus === "waiting_approval") {
             this.suppressIdleHistoryReplay = false;
             if (this.generatingDebouncePending) {
@@ -14984,7 +15004,7 @@ var init_cli_provider_instance = __esm({
                   this.generatingStartedAt = 0;
                 }
                 this.completedDebounceTimer = null;
-              }, 2e3);
+              }, 3e3);
             }
           } else if (newStatus === "stopped") {
             if (this.generatingDebounceTimer) {
@@ -87073,7 +87093,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.8" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.10" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -87097,6 +87117,7 @@ var init_adhdev_daemon = __esm({
       mandatoryUpgradeInFlight = false;
       debugConfig = resolveDebugRuntimeConfig();
       recentInteractionIdsBySession = /* @__PURE__ */ new Map();
+      ptyInputDropLogLastAt = /* @__PURE__ */ new Map();
       static MANDATORY_UPDATE_BLOCKED_COMMANDS = /* @__PURE__ */ new Set([
         "launch_ide",
         "launch_cli",
@@ -87148,6 +87169,14 @@ var init_adhdev_daemon = __esm({
         const mode = this.getCliPresentationMode(sessionId);
         return mode === "chat" || mode === "terminal";
       }
+      logPtyInputDrop(sessionId, reason) {
+        const key = `${sessionId || "(missing)"}:${reason}`;
+        const now = Date.now();
+        const last = this.ptyInputDropLogLastAt.get(key) || 0;
+        if (now - last < 3e4) return;
+        this.ptyInputDropLogLastAt.set(key, now);
+        LOG.warn("P2P", `PTY input dropped: session=${sessionId || "(missing)"} reason=${reason}`);
+      }
       getUpgradePackageName() {
         return process.argv[1]?.includes("daemon-standalone") ? "@adhdev/daemon-standalone" : "adhdev";
       }
@@ -87260,9 +87289,13 @@ var init_adhdev_daemon = __esm({
         });
       }
       getHotChatSessionIdsForP2PFlush() {
-        const snapshot = this.buildLiveStatusSnapshot();
+        const sessions = buildSessionEntries(
+          this.components.instanceManager.collectAllStates(),
+          this.components.cdpManagers,
+          { profile: "live" }
+        );
         const hotSessions = classifyHotChatSessionsForSubscriptionFlush(
-          snapshot.sessions,
+          sessions,
           this.hotP2PChatSessionIds
         );
         this.hotP2PChatSessionIds = hotSessions.active;
@@ -87587,10 +87620,23 @@ ${err?.stack || ""}`);
               }
             });
             this.p2p.onPtyInput((sessionId, data) => {
-              if (!this.isCliSession(sessionId)) return;
+              if (!this.isCliSession(sessionId)) {
+                this.logPtyInputDrop(sessionId, "not_cli_session");
+                return;
+              }
               const found = this.components.cliManager.findAdapter(sessionId, { instanceKey: sessionId });
-              if (found && typeof found.adapter.writeRaw === "function") {
+              if (!found) {
+                this.logPtyInputDrop(sessionId, "adapter_not_found");
+                return;
+              }
+              if (typeof found.adapter.writeRaw !== "function") {
+                this.logPtyInputDrop(sessionId, "writeRaw_missing");
+                return;
+              }
+              try {
                 found.adapter.writeRaw(data);
+              } catch {
+                this.logPtyInputDrop(sessionId, "write_failed");
               }
             });
             this.p2p.onPtyResize((sessionId, cols, rows) => {