@adhdev/daemon-core 0.9.76-rc.55 → 0.9.76-rc.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.76-rc.55",
+  "version": "0.9.76-rc.56",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/commands/chat-commands.ts

@@ -320,19 +320,23 @@ function buildReadChatCommandResult(payload: Record<string, any>, args: any): Co
     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,
-    };
+    const returnedDebugReadChat = debugReadChat
+        ? {
+            ...debugReadChat,
+            fullMsgCount: typeof debugReadChat.fullMsgCount === 'number'
+                ? debugReadChat.fullMsgCount
+                : messages.length,
+            visibleMsgCount: visibleMessages.length,
+            hiddenMsgCount,
+            returnedMsgCount: sync.messages.length,
+        }
+        : undefined;
     return {
         success: true,
         ...validatedPayload,
         messages: sync.messages,
         totalMessages: sync.totalMessages,
-        debugReadChat: nextDebugReadChat,
+        ...(returnedDebugReadChat ? { debugReadChat: returnedDebugReadChat } : {}),
     };
 }
 

package/src/providers/chat-message-normalization.ts

@@ -179,25 +179,44 @@ function readMessageMeta(message: ChatMessage): Record<string, unknown> | null {
     : null;
 }
 
-function isExplicitlyHiddenFromTranscript(meta: Record<string, unknown> | null): boolean {
-  if (!meta) return false;
-  const visibility = typeof meta.transcriptVisibility === 'string'
-    ? meta.transcriptVisibility.trim().toLowerCase()
-    : '';
-  return visibility === 'hidden'
-    || visibility === 'debug'
-    || meta.internal === true
-    || meta.debug === true
-    || meta.statusOnly === true
-    || meta.controlOnly === true;
+function readStringField(value: unknown): string {
+  return typeof value === 'string' ? value.trim().toLowerCase() : '';
 }
 
-function isExplicitlyVisibleInTranscript(meta: Record<string, unknown> | null): boolean {
-  if (!meta) return false;
-  const visibility = typeof meta.transcriptVisibility === 'string'
-    ? meta.transcriptVisibility.trim().toLowerCase()
-    : '';
-  return visibility === 'visible' || meta.userFacing === true;
+function isExplicitlyHiddenFromTranscript(message: ChatMessage, meta: Record<string, unknown> | null): boolean {
+  const record = message as ChatMessage & Record<string, unknown>;
+  const visibility = readStringField(record.visibility || meta?.visibility || meta?.transcriptVisibility);
+  const audience = readStringField(record.audience || meta?.audience);
+  const source = readStringField(record.source || meta?.source);
+
+  return visibility === 'hidden'
+    || visibility === 'debug'
+    || visibility === 'internal'
+    || audience === 'debug'
+    || audience === 'trace'
+    || audience === 'internal'
+    || source === 'runtime_status'
+    || source === 'provider_chrome'
+    || source === 'control'
+    || record.internal === true
+    || record.isInternal === true
+    || record.debug === true
+    || meta?.internal === true
+    || meta?.isInternal === true
+    || meta?.debug === true
+    || meta?.statusOnly === true
+    || meta?.controlOnly === true;
+}
+
+function isExplicitlyVisibleInTranscript(message: ChatMessage, meta: Record<string, unknown> | null): boolean {
+  const record = message as ChatMessage & Record<string, unknown>;
+  const visibility = readStringField(record.visibility || meta?.visibility || meta?.transcriptVisibility);
+  const audience = readStringField(record.audience || meta?.audience);
+  return visibility === 'visible'
+    || visibility === 'user'
+    || audience === 'chat'
+    || record.userFacing === true
+    || meta?.userFacing === true;
 }
 
 /**
@@ -212,8 +231,8 @@ function isExplicitlyVisibleInTranscript(meta: Record<string, unknown> | null):
 export function isUserFacingChatMessage(message: ChatMessage | null | undefined): boolean {
   if (!message) return false;
   const meta = readMessageMeta(message);
-  if (isExplicitlyHiddenFromTranscript(meta)) return false;
-  if (isExplicitlyVisibleInTranscript(meta)) return true;
+  if (isExplicitlyHiddenFromTranscript(message, meta)) return false;
+  if (isExplicitlyVisibleInTranscript(message, meta)) return true;
 
   const role = typeof message.role === 'string' ? message.role.trim().toLowerCase() : '';
   const kind = resolveChatMessageKind(message);

package/src/providers/cli-provider-instance.ts

@@ -25,7 +25,7 @@ import { formatAutoApprovalMessage, pickApprovalButton } from './approval-utils.
 import { getCliScriptCommand, parseCliScriptResult } from './cli-script-results.js';
 import { mergeProviderPatchState, resolveProviderStateSurface } from './provider-patch-state.js';
 import { normalizeProviderSessionId } from './provider-session-id.js';
-import { buildChatMessage, buildRuntimeSystemChatMessage, normalizeChatMessages, resolveChatMessageKind } from './chat-message-normalization.js';
+import { buildChatMessage, buildRuntimeSystemChatMessage, isUserFacingChatMessage, normalizeChatMessages, resolveChatMessageKind } from './chat-message-normalization.js';
 
 type PersistableCliHistoryMessage = {
     role: string;
@@ -1031,14 +1031,11 @@ export class CliProviderInstance implements ProviderInstance {
         const getRole = (message: ChatMessage): string => typeof message.role === 'string'
             ? message.role.trim().toLowerCase()
             : '';
-        const isAutoApprovalRuntimeOverlay = (entry: MergeEntry): boolean => {
+        const isRuntimeOverlay = (entry: MergeEntry): boolean => {
             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:');
+            return !isUserFacingChatMessage(entry.message);
         };
         const shouldKeepParsedBeforeUntimedRuntime = (message: ChatMessage): boolean => {
             const role = getRole(message);
@@ -1059,7 +1056,7 @@ export class CliProviderInstance implements ProviderInstance {
                 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 (parsedEntry && runtimeEntry && isRuntimeOverlay(runtimeEntry) && getTime(parsedEntry.message) === 0 && getTime(runtimeEntry.message) > 0) {
                         if (shouldKeepParsedBeforeUntimedRuntime(parsedEntry.message)) {
                             return a.source === 'parsed' ? -1 : 1;
                         }
@@ -1072,8 +1069,8 @@ export class CliProviderInstance implements ProviderInstance {
                 // do not carry timestamps on parsed messages. In that case there is no safe
                 // clock basis for interleaving timestamped runtime/system messages into the
                 // provider transcript. Keep user prompts before runtime overlays, but do not
-                // let timed runtime/system overlays become the final chat turns after an
-                // untimed parsed assistant transcript.
+                // let timed runtime/system/tool/internal overlays become the final chat turns
+                // after an untimed parsed assistant transcript.
                 return a.index - b.index;
             })
             .map((entry) => entry.message));