@adhdev/daemon-core 0.9.82-rc.143 → 0.9.82-rc.145

package/src/commands/chat-commands.ts

@@ -904,7 +904,7 @@ function supportsCliNativeTranscript(providerType: string, provider?: ProviderMo
     // provider.json. We trust that declaration regardless of the legacy
     // allow-list. A2 will additionally require canonicalHistory.contractVersion
     // to be a supported value (transcript-v2.ts).
-    if (provider?.category === 'cli' && isNativeSourceCanonicalHistory(provider?.canonicalHistory)) {
+    if (provider?.category === 'cli' && isNativeSourceCanonicalHistory(provider?.nativeHistory)) {
         return true;
     }
     // Last-resort fallback for early call sites where the provider module is
@@ -1429,7 +1429,7 @@ function summarizeProviderForDebug(provider: ProviderModule | undefined): Record
         name: provider.name,
         category: provider.category,
         version: (provider as any).version,
-        canonicalHistory: provider.canonicalHistory,
+        canonicalHistory: provider.nativeHistory,
         historyBehavior: provider.historyBehavior,
         webviewMatchText: provider.webviewMatchText,
         scriptNames: scripts,
@@ -1677,6 +1677,9 @@ export async function handleGetChatDebugBundle(h: CommandHelpers, args: any): Pr
             ready: typeof adapter.isReady === 'function' ? adapter.isReady() : undefined,
             processing: typeof adapter.isProcessing === 'function' ? adapter.isProcessing() : undefined,
             debugSnapshot: adapterDebugSnapshot,
+            scriptInvocationTrace: typeof (adapter as any).getScriptInvocationTrace === 'function'
+                ? (adapter as any).getScriptInvocationTrace()
+                : undefined,
         } : null,
         readChat,
         frontend: args?.frontendSnapshot && typeof args.frontendSnapshot === 'object' ? args.frontendSnapshot : null,
@@ -1806,9 +1809,9 @@ export async function handleChatHistory(h: CommandHelpers, args: any): Promise<C
             || (typeof args?.historySessionId === 'string' && args.historySessionId.trim())
             || (typeof args?.providerSessionId === 'string' && args.providerSessionId.trim())
         );
-        const result = supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.canonicalHistory)
+        const result = supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.nativeHistory)
             ? readCliProviderNativeHistory(agentStr, {
-                canonicalHistory: provider?.canonicalHistory,
+                canonicalHistory: provider?.nativeHistory,
                 historySessionId,
                 workspace,
                 offset: offset || 0,
@@ -1818,7 +1821,7 @@ export async function handleChatHistory(h: CommandHelpers, args: any): Promise<C
                 scripts: provider?.scripts as any,
             })
             : readProviderChatHistory(agentStr, {
-                canonicalHistory: provider?.canonicalHistory,
+                canonicalHistory: provider?.nativeHistory,
                 historySessionId,
                 workspace,
                 offset: offset || 0,
@@ -1827,7 +1830,7 @@ export async function handleChatHistory(h: CommandHelpers, args: any): Promise<C
                 historyBehavior: provider?.historyBehavior,
                 scripts: provider?.scripts as any,
             });
-        if (supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.canonicalHistory)) {
+        if (supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.nativeHistory)) {
             const lookup = (result as any).lookup === 'workspace' ? 'workspace' : 'session';
             const messages = Array.isArray((result as any).messages)
                 ? normalizeNativeHistoryMessages(agentStr, (result as any).messages as ChatMessage[], (result as any)?.providerSessionId)
@@ -1858,7 +1861,25 @@ export async function handleChatHistory(h: CommandHelpers, args: any): Promise<C
 }
 
 export async function handleReadChat(h: CommandHelpers, args: any): Promise<CommandResult> {
-    const provider = h.getProvider(args?.agentType || args?.providerType);
+    // Resolve provider in order: explicit agentType/providerType > registered session.
+    // Without this fallback, callers that only have a sessionId (e.g. a chat tail
+    // controller that just got handed a session ID over WS) get an empty result
+    // because getProvider(undefined) returns undefined and the rest of the pipeline
+    // bails. This makes the UI look like the session "disappeared".
+    let providerHint: string | undefined = args?.agentType || args?.providerType;
+    if (!providerHint) {
+        const targetSessionId = typeof args?.targetSessionId === 'string' ? args.targetSessionId.trim() : '';
+        if (targetSessionId) {
+            const session = (h.ctx as any)?.sessionRegistry?.get?.(targetSessionId);
+            if (session && typeof session.providerType === 'string') {
+                providerHint = session.providerType;
+            }
+        }
+        if (!providerHint && h.currentSession?.providerType) {
+            providerHint = h.currentSession.providerType;
+        }
+    }
+    const provider = h.getProvider(providerHint);
     const transport = getTargetTransport(h, provider);
     const historySessionId = getHistorySessionId(h, args);
 
@@ -1948,7 +1969,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
             // ───────────────────────────────────────────────────────────
 
             const supportsNative = supportsCliNativeTranscript(providerType, provider)
-                && isNativeSourceCanonicalHistory(provider?.canonicalHistory);
+                && isNativeSourceCanonicalHistory(provider?.nativeHistory);
             const agentStr = provider?.type || args?.agentType || getCurrentProviderType(h, adapter.cliType);
             const workspace = sessionWorkspace;
             const nativeHistoryLimit = Math.max(
@@ -1974,7 +1995,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
             if (supportsNative) {
                 try {
                     nativeHistory = readCliProviderNativeHistory(agentStr, {
-                        canonicalHistory: provider?.canonicalHistory,
+                        canonicalHistory: provider?.nativeHistory,
                         historySessionId: nativeHistorySessionId,
                         workspace,
                         offset: 0,
@@ -2068,7 +2089,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                     && (!historyProviderSessionId || historyProviderSessionId === nativeHistorySessionId || historyProviderSessionId === historySessionId);
                 const liveWorkspaceNativeHistory = mayProbeLiveCodexWorkspaceNative
                     ? readLiveCodexWorkspaceNativeHistory(agentStr, {
-                        canonicalHistory: provider?.canonicalHistory,
+                        canonicalHistory: provider?.nativeHistory,
                         workspace,
                         offset: 0,
                         limit: nativeHistoryLimit,
@@ -2179,7 +2200,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                     selectedMessageSource: (messageSource as any).selected,
                     messageSource,
                     shouldPreferAdapterMessages: supportsCliNativeTranscript(providerType, provider)
-                        && isNativeSourceCanonicalHistory(provider?.canonicalHistory)
+                        && isNativeSourceCanonicalHistory(provider?.nativeHistory)
                         && (messageSource as any).selected !== 'native-history'
                         && typeof (messageSource as any).fallbackReason === 'string'
                         && (messageSource as any).fallbackReason.startsWith('native_history_')
@@ -2208,10 +2229,10 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                 : undefined;
             const intendedWorkspace = typeof args?.workspace === 'string' ? args.workspace : undefined;
             const supportsNative = supportsCliNativeTranscript(agentStr, provider)
-                && isNativeSourceCanonicalHistory(provider?.canonicalHistory);
+                && isNativeSourceCanonicalHistory(provider?.nativeHistory);
             const history = supportsNative
                 ? readCliProviderNativeHistory(agentStr, {
-                    canonicalHistory: provider?.canonicalHistory,
+                    canonicalHistory: provider?.nativeHistory,
                     historySessionId,
                     workspace,
                     offset: 0,
@@ -2221,7 +2242,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                     scripts: provider?.scripts as any,
                 })
                 : readProviderChatHistory(agentStr, {
-                    canonicalHistory: provider?.canonicalHistory,
+                    canonicalHistory: provider?.nativeHistory,
                     historySessionId,
                     workspace,
                     offset: 0,

package/src/commands/cli-manager.ts

@@ -1154,6 +1154,45 @@ export class DaemonCliManager {
                 this.deps.onStatusChange();
                 return { success: true, id: found.key, mode };
             }
+            case 'record_provider_pty': {
+                const cliType = args?.type || args?.cliType;
+                if (!cliType) {
+                    return { success: false, error: '`type` (provider type) is required', code: 'MISSING_TYPE' };
+                }
+                const targetSessionId = typeof args?.targetSessionId === 'string' ? args.targetSessionId : '';
+                const dir = args?.dir || '';
+                const found = (targetSessionId ? this.findAdapterBySessionId(targetSessionId) : null)
+                    || this.findAdapter(cliType, { instanceKey: targetSessionId, dir });
+                if (!found) {
+                    return {
+                        success: false,
+                        error: `No running ${cliType} session. Launch one first (adhdev launch ${cliType}) or pass --target-session-id.`,
+                        code: 'NO_RUNNING_SESSION',
+                    };
+                }
+                const instance = this.deps.getInstanceManager()?.getInstance(found.key);
+                if (!(instance instanceof CliProviderInstance)) {
+                    return { success: false, error: 'CLI instance not available', code: 'CLI_INSTANCE_NOT_FOUND' };
+                }
+                const adapter = instance.getAdapter();
+                if (!adapter || typeof (adapter as any).getAccumulatedRawBuffer !== 'function') {
+                    return { success: false, error: 'Adapter does not expose PTY buffer', code: 'ADAPTER_NOT_RECORDABLE' };
+                }
+                const buffer = (adapter as any).getAccumulatedRawBuffer() as { text: string; droppedChars: number };
+                const maxBytes = Number(args?.maxBytes) > 0 ? Number(args.maxBytes) : 262144;
+                const truncated = buffer.text.length > maxBytes;
+                const ptyBytes = truncated ? buffer.text.slice(-maxBytes) : buffer.text;
+                return {
+                    success: true,
+                    cliType,
+                    sessionId: found.key,
+                    ptyBytes,
+                    bytes: ptyBytes.length,
+                    truncated,
+                    droppedChars: buffer.droppedChars,
+                    capturedAt: Date.now(),
+                };
+            }
             case 'restart_session': {
                 const cliType = args?.cliType || args?.agentType || args?.ideType;
                 const cfg = loadConfig();