adhdev 0.9.76-rc.53 → 0.9.76-rc.55

package/dist/cli/index.js

@@ -5732,6 +5732,34 @@ function normalizeChatMessage(message) {
 function normalizeChatMessages(messages) {
   return (Array.isArray(messages) ? messages : []).map((message) => normalizeChatMessage(message));
 }
+function readMessageMeta(message) {
+  const meta3 = message?.meta;
+  return meta3 && typeof meta3 === "object" && !Array.isArray(meta3) ? meta3 : null;
+}
+function isExplicitlyHiddenFromTranscript(meta3) {
+  if (!meta3) return false;
+  const visibility = typeof meta3.transcriptVisibility === "string" ? meta3.transcriptVisibility.trim().toLowerCase() : "";
+  return visibility === "hidden" || visibility === "debug" || meta3.internal === true || meta3.debug === true || meta3.statusOnly === true || meta3.controlOnly === true;
+}
+function isExplicitlyVisibleInTranscript(meta3) {
+  if (!meta3) return false;
+  const visibility = typeof meta3.transcriptVisibility === "string" ? meta3.transcriptVisibility.trim().toLowerCase() : "";
+  return visibility === "visible" || meta3.userFacing === true;
+}
+function isUserFacingChatMessage(message) {
+  if (!message) return false;
+  const meta3 = readMessageMeta(message);
+  if (isExplicitlyHiddenFromTranscript(meta3)) return false;
+  if (isExplicitlyVisibleInTranscript(meta3)) return true;
+  const role = typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
+  const kind = resolveChatMessageKind(message);
+  if (role === "user" || role === "human") return kind === "standard" || kind === "";
+  if (role === "assistant") return kind === "standard" || kind === "";
+  return false;
+}
+function filterUserFacingChatMessages(messages) {
+  return (Array.isArray(messages) ? messages : []).filter((message) => isUserFacingChatMessage(message));
+}
 var BUILTIN_CHAT_MESSAGE_KINDS, KNOWN_CHAT_MESSAGE_KINDS, CHAT_MESSAGE_KIND_ALIASES;
 var init_chat_message_normalization = __esm({
   "../../oss/packages/daemon-core/src/providers/chat-message-normalization.ts"() {
@@ -9814,7 +9842,7 @@ function normalizeReadChatTailLimit(args) {
 }
 function normalizeReadChatMessages(payload) {
   const messages = Array.isArray(payload.messages) ? payload.messages : [];
-  return messages;
+  return normalizeChatMessages(messages);
 }
 function deriveHistoryDedupKey(message) {
   const unitKey = typeof message._unitKey === "string" ? message._unitKey.trim() : "";
@@ -9908,13 +9936,22 @@ function buildReadChatCommandResult(payload, args) {
     return { success: false, error: error48?.message || String(error48) };
   }
   const messages = normalizeReadChatMessages(validatedPayload);
-  const sync = buildFullTail(messages, normalizeReadChatTailLimit(args));
+  const visibleMessages = filterUserFacingChatMessages(messages);
+  const sync = buildFullTail(visibleMessages, normalizeReadChatTailLimit(args));
+  const hiddenMsgCount = Math.max(0, messages.length - visibleMessages.length);
+  const nextDebugReadChat = {
+    ...debugReadChat || {},
+    fullMsgCount: messages.length,
+    visibleMsgCount: visibleMessages.length,
+    hiddenMsgCount,
+    returnedMsgCount: sync.messages.length
+  };
   return {
     success: true,
     ...validatedPayload,
     messages: sync.messages,
     totalMessages: sync.totalMessages,
-    ...debugReadChat ? { debugReadChat } : {}
+    debugReadChat: nextDebugReadChat
   };
 }
 function truncateDebugString(value, maxLength) {
@@ -11260,6 +11297,7 @@ var init_chat_commands = __esm({
     init_logger();
     init_debug_trace();
     init_chat_signatures();
+    init_chat_message_normalization();
     RECENT_SEND_WINDOW_MS = 1200;
     READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS = 25e3;
     HERMES_CLI_STARTING_SEND_SETTLE_MS = 2e3;
@@ -17625,16 +17663,47 @@ ${effect.notification.body || ""}`.trim();
         const runtimeEntries = this.runtimeMessages.map((entry, index) => ({
           message: entry.message,
           index: parsedMessages.length + index,
-          source: "runtime"
+          source: "runtime",
+          runtimeKey: entry.key
         }));
         const getTime = (message) => {
           const value = typeof message.receivedAt === "number" ? message.receivedAt : typeof message.timestamp === "number" ? message.timestamp : 0;
           return Number.isFinite(value) && value > 0 ? value : 0;
         };
+        const getRole = (message) => typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
+        const isAutoApprovalRuntimeOverlay = (entry) => {
+          if (entry.source !== "runtime") return false;
+          const key = typeof entry.runtimeKey === "string" ? entry.runtimeKey.trim().toLowerCase() : "";
+          if (key.startsWith("auto_approval:")) return true;
+          const content = typeof entry.message.content === "string" ? entry.message.content.trim().toLowerCase() : flattenContent(entry.message.content).trim().toLowerCase();
+          return content.startsWith("auto-approved:");
+        };
+        const shouldKeepParsedBeforeUntimedRuntime = (message) => {
+          const role = getRole(message);
+          return role === "user" || role === "human";
+        };
+        const shouldKeepParsedAfterUntimedRuntime = (message) => {
+          const role = getRole(message);
+          if (role !== "assistant") return false;
+          const kind = resolveChatMessageKind(message);
+          return kind === "standard" || kind === "terminal";
+        };
         return normalizeChatMessages([...parsedEntries, ...runtimeEntries].sort((a, b) => {
           const aTime = getTime(a.message);
           const bTime = getTime(b.message);
           if (aTime && bTime && aTime !== bTime) return aTime - bTime;
+          if (a.source !== b.source && aTime !== bTime) {
+            const parsedEntry = a.source === "parsed" ? a : b.source === "parsed" ? b : null;
+            const runtimeEntry = a.source === "runtime" ? a : b.source === "runtime" ? b : null;
+            if (parsedEntry && runtimeEntry && isAutoApprovalRuntimeOverlay(runtimeEntry) && getTime(parsedEntry.message) === 0 && getTime(runtimeEntry.message) > 0) {
+              if (shouldKeepParsedBeforeUntimedRuntime(parsedEntry.message)) {
+                return a.source === "parsed" ? -1 : 1;
+              }
+              if (shouldKeepParsedAfterUntimedRuntime(parsedEntry.message)) {
+                return a.source === "parsed" ? 1 : -1;
+              }
+            }
+          }
           return a.index - b.index;
         }).map((entry) => entry.message));
       }
@@ -53632,6 +53701,7 @@ __export(src_exports, {
   detectIDEs: () => detectIDEs,
   ensureSessionHostReady: () => ensureSessionHostReady,
   execNpmCommandSync: () => execNpmCommandSync,
+  filterUserFacingChatMessages: () => filterUserFacingChatMessages,
   findCdpManager: () => findCdpManager,
   flattenMessageParts: () => flattenMessageParts,
   forwardAgentStreamsToIdeInstance: () => forwardAgentStreamsToIdeInstance,
@@ -53673,6 +53743,7 @@ __export(src_exports, {
   isSessionHostLiveRuntime: () => isSessionHostLiveRuntime,
   isSessionHostRecoverySnapshot: () => isSessionHostRecoverySnapshot,
   isSetupComplete: () => isSetupComplete,
+  isUserFacingChatMessage: () => isUserFacingChatMessage,
   killIdeProcess: () => killIdeProcess,
   launchIDE: () => launchIDE,
   launchWithCdp: () => launchWithCdp,
@@ -93973,7 +94044,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.76-rc.53" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.76-rc.55" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;