@adhdev/daemon-core 0.6.76 → 0.6.79

package/src/commands/chat-commands.ts

@@ -71,8 +71,8 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
         // Alternative: AgentStreamManager (script fail when)
         if (h.agentStream) {
             const cdp = h.getCdp();
-            if (cdp) {
-                const streams = await h.agentStream.collectAgentStreams(cdp);
+            if (cdp && h.currentIdeType) {
+                const streams = await h.agentStream.collectAgentStreams(cdp, h.currentIdeType);
                 const stream = streams.find((s: any) => s.agentType === provider.type);
                 if (stream) {
                     h.historyWriter.appendNewMessages(
@@ -197,8 +197,8 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
             _log(`Extension script error: ${e.message}`);
         }
         // Method 2: AgentStreamManager
-        if (h.agentStream && h.getCdp()) {
-            const ok = await h.agentStream.sendToAgent(h.getCdp()!, provider.type, text, h.currentIdeType);
+        if (h.agentStream && h.getCdp() && h.currentIdeType) {
+            const ok = await h.agentStream.sendToAgent(h.getCdp()!, h.currentIdeType, provider.type, text, h.currentIdeType);
             if (ok) {
                 _log(`AgentStreamManager sent OK`);
                 return _logSendSuccess('agent-stream');
@@ -318,9 +318,9 @@ export async function handleListChats(h: CommandHelpers, args: any): Promise<Com
     const provider = h.getProvider(args?.agentType);
 
     // Extension: via AgentStreamManager
-    if (provider?.category === 'extension' && h.agentStream && h.getCdp()) {
+    if (provider?.category === 'extension' && h.agentStream && h.getCdp() && h.currentIdeType) {
         try {
-            const chats = await h.agentStream.listAgentChats(h.getCdp()!, provider.type);
+            const chats = await h.agentStream.listAgentChats(h.getCdp()!, h.currentIdeType, provider.type);
             LOG.info('Command', `[list_chats] Extension: ${chats.length} chats`);
             return { success: true, chats };
         } catch (e: any) {
@@ -377,8 +377,8 @@ export async function handleNewChat(h: CommandHelpers, args: any): Promise<Comma
         return { success: false, error: 'new_chat not supported by this CLI provider' };
     }
 
-    if (provider?.category === 'extension' && h.agentStream && h.getCdp()) {
-        const ok = await h.agentStream.newAgentSession(h.getCdp()!, provider.type, h.currentIdeType);
+    if (provider?.category === 'extension' && h.agentStream && h.getCdp() && h.currentIdeType) {
+        const ok = await h.agentStream.newAgentSession(h.getCdp()!, h.currentIdeType, provider.type, h.currentIdeType);
         return { success: ok };
     }
 
@@ -412,8 +412,8 @@ export async function handleSwitchChat(h: CommandHelpers, args: any): Promise<Co
     if (!sessionId) return { success: false, error: 'sessionId required' };
     LOG.info('Command', `[switch_chat] sessionId=${sessionId}, ideType=${ideType}`);
 
-    if (provider?.category === 'extension' && h.agentStream && h.getCdp()) {
-        const ok = await h.agentStream.switchAgentSession(h.getCdp()!, provider.type, sessionId);
+    if (provider?.category === 'extension' && h.agentStream && h.getCdp() && h.currentIdeType) {
+        const ok = await h.agentStream.switchAgentSession(h.getCdp()!, h.currentIdeType, provider.type, sessionId);
         return { success: ok, result: ok ? 'switched' : 'failed' };
     }
 
@@ -681,9 +681,9 @@ export async function handleResolveAction(h: CommandHelpers, args: any): Promise
     }
 
     // 1. Extension: via AgentStreamManager
-    if (provider?.category === 'extension' && h.agentStream && h.getCdp()) {
+    if (provider?.category === 'extension' && h.agentStream && h.getCdp() && h.currentIdeType) {
         const ok = await h.agentStream.resolveAgentAction(
-            h.getCdp()!, provider.type, action, h.currentIdeType
+            h.getCdp()!, h.currentIdeType, provider.type, action, h.currentIdeType
         );
         return { success: ok };
     }

package/src/commands/handler.ts

@@ -97,7 +97,7 @@ export class DaemonCommandHandler implements CommandHelpers {
         // 1. Try instanceIdMap (UUID → managerKey)
         const resolved = this._ctx.instanceIdMap?.get(key) || key;
         // 2. Use findCdpManager (exact + prefix match)
-        const m = findCdpManager(this._ctx.cdpManagers, resolved.toLowerCase());
+        const m = findCdpManager(this._ctx.cdpManagers, resolved);
         if (m?.isConnected) return m;
         return null;
     }
@@ -148,11 +148,11 @@ export class DaemonCommandHandler implements CommandHelpers {
 
         // Extension: evaluateInSession
         if (provider?.category === 'extension') {
-            let sessionId = this.getExtensionSessionId(provider);
-            if (!sessionId && this._agentStream) {
-                await this._agentStream.switchActiveAgent(cdp, provider.type);
-                await this._agentStream.syncAgentSessions(cdp);
-                sessionId = this.getExtensionSessionId(provider);
+            let sessionId = this.getExtensionSessionId(provider, this._currentIdeType);
+            if (!sessionId && this._agentStream && this._currentIdeType) {
+                await this._agentStream.switchActiveAgent(cdp, this._currentIdeType, provider.type);
+                await this._agentStream.syncAgentSessions(cdp, this._currentIdeType);
+                sessionId = this.getExtensionSessionId(provider, this._currentIdeType);
             }
             if (!sessionId) return null;
             const result = await cdp.evaluateInSessionFrame(sessionId, script, timeout);
@@ -194,18 +194,48 @@ export class DaemonCommandHandler implements CommandHelpers {
 
     // ─── Private helpers ──────────────────────────────
 
-    private getExtensionSessionId(provider: ProviderModule): string | null {
-        if (provider.category !== 'extension' || !this._agentStream) return null;
-        const managed = this._agentStream.getManagedAgent(provider.type);
+    private getExtensionSessionId(provider: ProviderModule, scopeKey?: string): string | null {
+        if (provider.category !== 'extension' || !this._agentStream || !scopeKey) return null;
+        const managed = this._agentStream.getManagedAgent(provider.type, scopeKey);
         return managed?.sessionId || null;
     }
 
+    private resolveManagerKeyFromInstanceId(instanceId: string): string | undefined {
+        const mapped = this._ctx.instanceIdMap?.get(instanceId);
+        if (mapped) return mapped;
+
+        const entries = (this._ctx.instanceManager as any)?.instances?.entries?.();
+        if (!entries) return undefined;
+
+        for (const [instanceKey, instance] of entries as Iterable<[string, any]>) {
+            if (typeof instanceKey !== 'string' || !instanceKey.startsWith('ide:')) continue;
+
+            if (typeof instance?.getInstanceId === 'function' && instance.getInstanceId() === instanceId) {
+                const managerKey = instanceKey.slice(4);
+                this._ctx.instanceIdMap?.set(instanceId, managerKey);
+                return managerKey;
+            }
+
+            if (typeof instance?.getExtensionInstances === 'function') {
+                for (const ext of instance.getExtensionInstances() || []) {
+                    if (typeof ext?.getInstanceId === 'function' && ext.getInstanceId() === instanceId) {
+                        const managerKey = instanceKey.slice(4);
+                        this._ctx.instanceIdMap?.set(instanceId, managerKey);
+                        return managerKey;
+                    }
+                }
+            }
+        }
+
+        return undefined;
+    }
+
     /** Extract ideType from _targetInstance or explicit ideType */
     private extractIdeType(args: any): string | undefined {
         // Also accept explicit ideType from args (P2P input, agentType for extensions)
         if (args?.ideType) {
             // UUID → managerKey via instanceIdMap (P2P sends UUID instance IDs)
-            const mappedKey = this._ctx.instanceIdMap?.get(args.ideType);
+            const mappedKey = this.resolveManagerKeyFromInstanceId(args.ideType);
             if (mappedKey) {
                 return mappedKey;
             }
@@ -232,8 +262,9 @@ export class DaemonCommandHandler implements CommandHelpers {
             else if (cliMatch) raw = cliMatch[1];
             else if (acpMatch) raw = acpMatch[1];
 
-            if (this._ctx.instanceIdMap?.has(raw)) {
-                return this._ctx.instanceIdMap.get(raw)!;
+            const mappedKey = this.resolveManagerKeyFromInstanceId(raw);
+            if (mappedKey) {
+                return mappedKey;
             }
 
             // Direct CDP manager key match (e.g. "cursor", "cursor_remote_vs")

package/src/commands/stream-commands.ts

@@ -11,15 +11,15 @@ import { LOG } from '../logging/logger.js';
 // ─── Agent Stream commands ───────────────────────
 
 export async function handleAgentStreamSwitch(h: CommandHelpers, args: any): Promise<CommandResult> {
-    if (!h.agentStream || !h.getCdp()) return { success: false, error: 'AgentStream or CDP not available' };
+    if (!h.agentStream || !h.getCdp() || !h.currentIdeType) return { success: false, error: 'AgentStream or CDP not available' };
     const agentType = args?.agentType || args?.agent || null;
-    await h.agentStream.switchActiveAgent(h.getCdp()!, agentType);
+    await h.agentStream.switchActiveAgent(h.getCdp()!, h.currentIdeType, agentType);
     return { success: true, activeAgent: agentType };
 }
 
 export async function handleAgentStreamRead(h: CommandHelpers, args: any): Promise<CommandResult> {
-    if (!h.agentStream || !h.getCdp()) return { success: false, error: 'AgentStream or CDP not available' };
-    const streams = await h.agentStream.collectAgentStreams(h.getCdp()!);
+    if (!h.agentStream || !h.getCdp() || !h.currentIdeType) return { success: false, error: 'AgentStream or CDP not available' };
+    const streams = await h.agentStream.collectAgentStreams(h.getCdp()!, h.currentIdeType);
     return { success: true, streams };
 }
 
@@ -46,52 +46,58 @@ export async function handleAgentStreamSend(h: CommandHelpers, args: any): Promi
 
     // CDP-based IDE agent routing
     if (!h.agentStream || !h.getCdp()) return { success: false, error: 'AgentStream or CDP not available' };
-    const resolvedAgent = agentType || h.agentStream.activeAgentType;
+    const resolvedAgent = agentType || (h.currentIdeType ? h.agentStream.getActiveAgentType(h.currentIdeType) : null);
     if (!resolvedAgent) return { success: false, error: 'agentType required' };
-    const ok = await h.agentStream.sendToAgent(h.getCdp()!, resolvedAgent, text, h.currentIdeType);
+    if (!h.currentIdeType) return { success: false, error: 'ideType required' };
+    const ok = await h.agentStream.sendToAgent(h.getCdp()!, h.currentIdeType, resolvedAgent, text, h.currentIdeType);
     return { success: ok };
 }
 
 export async function handleAgentStreamResolve(h: CommandHelpers, args: any): Promise<CommandResult> {
     if (!h.agentStream || !h.getCdp()) return { success: false, error: 'AgentStream or CDP not available' };
-    const agentType = args?.agentType || args?.agent || h.agentStream.activeAgentType;
+    const agentType = args?.agentType || args?.agent || (h.currentIdeType ? h.agentStream.getActiveAgentType(h.currentIdeType) : null);
     const action = args?.action as 'approve' | 'reject' || 'approve';
     if (!agentType) return { success: false, error: 'agentType required' };
-    const ok = await h.agentStream.resolveAgentAction(h.getCdp()!, agentType, action, h.currentIdeType);
+    if (!h.currentIdeType) return { success: false, error: 'ideType required' };
+    const ok = await h.agentStream.resolveAgentAction(h.getCdp()!, h.currentIdeType, agentType, action, h.currentIdeType);
     return { success: ok };
 }
 
 export async function handleAgentStreamNew(h: CommandHelpers, args: any): Promise<CommandResult> {
     if (!h.agentStream || !h.getCdp()) return { success: false, error: 'AgentStream or CDP not available' };
-    const agentType = args?.agentType || args?.agent || h.agentStream.activeAgentType;
+    const agentType = args?.agentType || args?.agent || (h.currentIdeType ? h.agentStream.getActiveAgentType(h.currentIdeType) : null);
     if (!agentType) return { success: false, error: 'agentType required' };
-    const ok = await h.agentStream.newAgentSession(h.getCdp()!, agentType, h.currentIdeType);
+    if (!h.currentIdeType) return { success: false, error: 'ideType required' };
+    const ok = await h.agentStream.newAgentSession(h.getCdp()!, h.currentIdeType, agentType, h.currentIdeType);
     return { success: ok };
 }
 
 export async function handleAgentStreamListChats(h: CommandHelpers, args: any): Promise<CommandResult> {
     if (!h.agentStream || !h.getCdp()) return { success: false, error: 'AgentStream or CDP not available' };
-    const agentType = args?.agentType || args?.agent || h.agentStream.activeAgentType;
+    const agentType = args?.agentType || args?.agent || (h.currentIdeType ? h.agentStream.getActiveAgentType(h.currentIdeType) : null);
     if (!agentType) return { success: false, error: 'agentType required' };
-    const chats = await h.agentStream.listAgentChats(h.getCdp()!, agentType);
+    if (!h.currentIdeType) return { success: false, error: 'ideType required' };
+    const chats = await h.agentStream.listAgentChats(h.getCdp()!, h.currentIdeType, agentType);
     return { success: true, chats };
 }
 
 export async function handleAgentStreamSwitchSession(h: CommandHelpers, args: any): Promise<CommandResult> {
     if (!h.agentStream || !h.getCdp()) return { success: false, error: 'AgentStream or CDP not available' };
-    const agentType = args?.agentType || args?.agent || h.agentStream.activeAgentType;
+    const agentType = args?.agentType || args?.agent || (h.currentIdeType ? h.agentStream.getActiveAgentType(h.currentIdeType) : null);
     const sessionId = args?.sessionId || args?.id;
     if (!agentType || !sessionId) return { success: false, error: 'agentType and sessionId required' };
-    const ok = await h.agentStream.switchAgentSession(h.getCdp()!, agentType, sessionId);
+    if (!h.currentIdeType) return { success: false, error: 'ideType required' };
+    const ok = await h.agentStream.switchAgentSession(h.getCdp()!, h.currentIdeType, agentType, sessionId);
     return { success: ok };
 }
 
 export async function handleAgentStreamFocus(h: CommandHelpers, args: any): Promise<CommandResult> {
     if (!h.agentStream || !h.getCdp()) return { success: false, error: 'AgentStream or CDP not available' };
-    const agentType = args?.agentType || args?.agent || h.agentStream.activeAgentType;
+    const agentType = args?.agentType || args?.agent || (h.currentIdeType ? h.agentStream.getActiveAgentType(h.currentIdeType) : null);
     if (!agentType) return { success: false, error: 'agentType required' };
     await h.agentStream.ensureAgentPanelOpen(agentType, h.currentIdeType);
-    const ok = await h.agentStream.focusAgentEditor(h.getCdp()!, agentType);
+    if (!h.currentIdeType) return { success: false, error: 'ideType required' };
+    const ok = await h.agentStream.focusAgentEditor(h.getCdp()!, h.currentIdeType, agentType);
     return { success: ok };
 }
 

package/src/daemon/dev-server.ts

@@ -2536,14 +2536,16 @@ export class DevServer {
     lines.push('| Status | When to use | How to detect |');
     lines.push('|---|---|---|');
     lines.push('| `idle` | AI is NOT generating, no approval needed | Default state. No stop button, no spinners, no approval pills/buttons |');
-    lines.push('| `generating` | AI is actively streaming/thinking | ANY of: (1) Stop/Cancel button visible, (2) CSS animation (animate-spin/pulse/bounce), (3) floating state text like Thinking/Generating/Sailing, (4) streaming indicator class |');
+    lines.push('| `generating` | AI is actively streaming/thinking | ANY of: (1) Submit button icon SVG changes (e.g. arrow→stop square, fill="none"→fill="currentColor"), (2) Stop/Cancel button visible, (3) CSS animation, (4) Structural markers (aria-labels that only appear during generation) |');
     lines.push('| `waiting_approval` | AI stopped and needs user action | Actionable buttons like Run/Skip/Accept/Reject are visible AND clickable |');
     lines.push('');
     lines.push('### ⚠️ Status Detection Gotchas (MUST READ!)');
-    lines.push('1. **FALSE POSITIVES from old messages**: Chat history may contain text like "Command Awaiting Approval" from PAST turns. If you search the entire chat panel for this text, you will get false matches from parent divs whose innerText includes ALL child text. ONLY match small leaf elements (under 80 chars) or use explicit button/pill selectors.');
-    lines.push('2. **Awaiting Approval pill without actions**: Some IDEs show a floating pill/banner saying "Awaiting Approval" that is just a scroll-to indicator (not an actual approval dialog). If this pill exists but NO actionable buttons (Run/Skip/Accept/Reject) exist anywhere in the panel, the status should be `idle`, NOT `waiting_approval`.');
-    lines.push('3. **generating detection must be multi-signal**: Do NOT rely on just one indicator. Check ALL of: stop buttons, CSS animations, floating state labels, streaming classes. IDEs differ widely.');
-    lines.push('4. **activeModal must include actions**: When `status` is `waiting_approval`, the `activeModal` object MUST include a non-empty `actions` array listing the button labels. If you cannot find any action buttons, the status is NOT `waiting_approval`.');
+    lines.push('1. **DO NOT rely on button text/labels in the user\'s language.** OS locale may be Korean, Japanese, etc. Button text like "Cancel" or "Stop" will be localized. Instead, detect STRUCTURAL indicators: SVG icon changes, CSS classes, aria-labels from the extension\'s own React/Radix UI (which stay in English regardless of OS locale).');
+    lines.push('2. **Use sendMessage to CREATE a generating state, then CAPTURE the DOM.** Send a LONG prompt (e.g. "Write an extremely detailed 5000-word essay...") so the AI takes 10+ seconds. Then periodically capture the DOM during generation to find which elements appear/change. Compare idle vs generating DOM snapshots to find reliable structural markers.');
+    lines.push('3. **Look for SVG icon changes in the submit button.** Many IDEs change the submit button icon from an arrow (send) to a square (stop) during generation. Check the SVG `fill` attribute or path data.');
+    lines.push('4. **FALSE POSITIVES from old messages**: Chat history may contain text like "Command Awaiting Approval" from PAST turns. ONLY match small leaf elements (under 80 chars) or use explicit button/pill selectors.');
+    lines.push('5. **Awaiting Approval pill without actions**: Some IDEs show a floating pill/banner that is just a scroll-to indicator. If NO actionable buttons exist, the status should be `idle`, NOT `waiting_approval`.');
+    lines.push('6. **activeModal must include actions**: When `status` is `waiting_approval`, the `activeModal` object MUST include a non-empty `actions` array.');
     lines.push('');
 
     lines.push('## Action');
@@ -2606,10 +2608,10 @@ export class DevServer {
     lines.push(`echo "$RESULT" | python3 -c "import sys,json; d=json.load(sys.stdin); r=d.get('result',d); r=json.loads(r) if isinstance(r,str) else r; assert r.get('status')=='idle', f'Expected idle, got {r.get(chr(34)+chr(115)+chr(116)+chr(97)+chr(116)+chr(117)+chr(115)+chr(34))}'; print('Step 1 PASS: status=idle')"`);
     lines.push('```');
     lines.push('');
-    lines.push('### Step 2: Send a message that triggers generation');
+    lines.push('### Step 2: Send a LONG message that triggers extended generation (10+ seconds)');
     lines.push('```bash');
-    lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/scripts/run -H "Content-Type: application/json" -d '{"script": "sendMessage", "type": "${type}", "ideType": "${type}", "args": {"message": "Say hello in one word"}}'`);
-    lines.push('sleep 2');
+    lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/scripts/run -H "Content-Type: application/json" -d '{"script": "sendMessage", "type": "${type}", "ideType": "${type}", "args": {"message": "Write an extremely detailed 5000-word essay about the history of artificial intelligence from Alan Turing to 2025. Be very thorough and verbose."}}'`);
+    lines.push('sleep 3');
     lines.push('```');
     lines.push('');
     lines.push('### Step 3: Check generating OR completed');

package/src/index.ts

@@ -76,6 +76,8 @@ export type { CommandRouterDeps, CommandRouterResult } from './commands/router.j
 export { DaemonStatusReporter } from './status/reporter.js';
 export { buildManagedIdes, buildManagedClis, buildManagedAcps, buildAllManagedEntries, findCdpManager, hasCdpManager, isCdpConnected } from './status/builders.js';
 export { buildStatusSnapshot } from './status/snapshot.js';
+export { normalizeManagedStatus, isManagedStatusWorking, isManagedStatusWaiting, normalizeActiveChatData } from './status/normalize.js';
+export type { ManagedStatus } from './status/normalize.js';
 export type { StatusSnapshotOptions, StatusSnapshot } from './status/snapshot.js';
 
 // ── Logger ──

package/src/status/builders.ts

@@ -16,6 +16,7 @@ import type {
     AcpProviderState,
     ProviderState,
 } from '../providers/provider-instance.js';
+import { normalizeActiveChatData, normalizeManagedStatus } from './normalize.js';
 
 // ─── CDP Manager lookup helpers ──────────────────────
 
@@ -100,13 +101,13 @@ export function buildManagedIdes(
             workspace: state.workspace || null,
             terminals: 0,
             aiAgents: [],
-            activeChat: state.activeChat,
+            activeChat: normalizeActiveChatData(state.activeChat),
             chats: [],
             agentStreams: state.extensions.map((ext) => ({
                 agentType: ext.type,
                 agentName: ext.name,
                 extensionId: ext.type,
-                status: ext.status || 'idle',
+                status: normalizeManagedStatus(ext.status, { activeModal: ext.activeChat?.activeModal || null }),
                 messages: ext.activeChat?.messages || [],
                 inputContent: ext.activeChat?.inputContent || '',
                 activeModal: ext.activeChat?.activeModal || null,
@@ -155,10 +156,10 @@ export function buildManagedClis(
         instanceId: s.instanceId,
         cliType: s.type,
         cliName: s.name,
-        status: s.status,
+        status: normalizeManagedStatus(s.status, { activeModal: s.activeChat?.activeModal || null }),
         mode: 'terminal' as const,
         workspace: s.workspace || '',
-        activeChat: s.activeChat,
+        activeChat: normalizeActiveChatData(s.activeChat),
     }));
 }
 
@@ -172,10 +173,10 @@ export function buildManagedAcps(
         id: s.instanceId,
         acpType: s.type,
         acpName: s.name,
-        status: s.status,
+        status: normalizeManagedStatus(s.status, { activeModal: s.activeChat?.activeModal || null }),
         mode: 'chat' as const,
         workspace: s.workspace || '',
-        activeChat: s.activeChat,
+        activeChat: normalizeActiveChatData(s.activeChat),
         currentModel: s.currentModel,
         currentPlan: s.currentPlan,
         acpConfigOptions: s.acpConfigOptions,

package/src/status/normalize.ts

@@ -0,0 +1,64 @@
+import type { ActiveChatData } from '../providers/provider-instance.js';
+
+export type ManagedStatus =
+    | 'idle'
+    | 'generating'
+    | 'waiting_approval'
+    | 'error'
+    | 'stopped'
+    | 'starting'
+    | 'panel_hidden'
+    | 'not_monitored'
+    | 'disconnected';
+
+const WORKING_STATUSES = new Set([
+    'generating',
+    'streaming',
+    'loading',
+    'loading_reference',
+    'thinking',
+    'active',
+]);
+
+function hasApprovalButtons(activeModal?: { buttons?: unknown[] | null } | null): boolean {
+    return (activeModal?.buttons?.length ?? 0) > 0;
+}
+
+export function normalizeManagedStatus(
+    status?: string | null,
+    opts?: { activeModal?: { buttons?: unknown[] | null } | null },
+): ManagedStatus {
+    if (hasApprovalButtons(opts?.activeModal)) return 'waiting_approval';
+
+    const normalized = String(status || 'idle').trim().toLowerCase();
+    if (normalized === 'waiting_approval') return 'waiting_approval';
+    if (WORKING_STATUSES.has(normalized)) return 'generating';
+    if (normalized === 'error') return 'error';
+    if (normalized === 'stopped') return 'stopped';
+    if (normalized === 'starting') return 'starting';
+    if (normalized === 'panel_hidden') return 'panel_hidden';
+    if (normalized === 'not_monitored') return 'not_monitored';
+    if (normalized === 'disconnected') return 'disconnected';
+    return 'idle';
+}
+
+export function isManagedStatusWorking(status?: string | null): boolean {
+    return normalizeManagedStatus(status) === 'generating';
+}
+
+export function isManagedStatusWaiting(
+    status?: string | null,
+    opts?: { activeModal?: { buttons?: unknown[] | null } | null },
+): boolean {
+    return normalizeManagedStatus(status, opts) === 'waiting_approval';
+}
+
+export function normalizeActiveChatData<T extends ActiveChatData | null | undefined>(
+    activeChat: T,
+): T {
+    if (!activeChat) return activeChat;
+    return {
+        ...activeChat,
+        status: normalizeManagedStatus(activeChat.status, { activeModal: activeChat.activeModal }),
+    } as T;
+}