@adhdev/daemon-core 0.8.58 → 0.8.60

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

@@ -50,6 +50,7 @@ import type { ProviderModule, ContentBlock, InputEnvelope, InputPart, ToolCallIn
 import { normalizeContent, flattenContent, normalizeInputEnvelope } from './contracts.js';
 import type { ProviderInstance, ProviderState, AcpProviderState, ProviderErrorReason, ProviderEvent, InstanceContext } from './provider-instance.js';
 import { StatusMonitor } from './status-monitor.js';
+import { buildLegacyModelModeSummaryMetadata } from './summary-metadata.js';
 import { LOG } from '../logging/logger.js';
 
 // ─── Internal Display Types (for dashboard) ────────────────────────────
@@ -84,6 +85,8 @@ interface AcpMode {
     description?: string;
 }
 
+type SelectionCategory = 'model' | 'mode';
+
 interface PromptCapabilityFlags {
     image: boolean;
     audio: boolean;
@@ -223,8 +226,7 @@ export class AcpProviderInstance implements ProviderInstance {
     private lastStatus: string = 'starting';
     private generatingStartedAt = 0;
     private agentCapabilities: Record<string, any> = {};
-    private currentModel: string | undefined;
-    private currentMode: string | undefined;
+    private currentSelections: Partial<Record<SelectionCategory, string>> = {};
     private activeToolCalls: AcpToolCall[] = [];
     private stopReason: string | null = null;
     private partialContent = '';
@@ -332,8 +334,6 @@ export class AcpProviderInstance implements ProviderInstance {
                 inputContent: '',
             },
             workspace: this.workingDir,
-            currentModel: this.currentModel,
-            currentPlan: this.currentMode,
             instanceId: this.instanceId,
             lastUpdated: Date.now(),
             settings: this.settings,
@@ -344,11 +344,9 @@ export class AcpProviderInstance implements ProviderInstance {
  // Error details for dashboard display
             errorMessage: this.errorMessage || undefined,
             errorReason: this.errorReason || undefined,
-            controlValues: {
-                ...(this.currentModel ? { model: this.currentModel } : {}),
-                ...(this.currentMode ? { mode: this.currentMode } : {}),
-            },
+            controlValues: this.getSelectionControlValues(),
             providerControls: this.provider.controls,
+            summaryMetadata: this.buildSelectionSummaryMetadata(),
         };
     }
 
@@ -386,6 +384,61 @@ export class AcpProviderInstance implements ProviderInstance {
         return this.instanceId;
     }
 
+    private resolveConfigOptionLabel(category: string, value: string | undefined): string | undefined {
+        if (!value) return undefined;
+        const option = this.configOptions.find((entry) => entry.category === category);
+        return option?.options.find((candidate) => candidate.value === value)?.name || value;
+    }
+
+    private resolveModeLabel(modeId: string | undefined): string | undefined {
+        if (!modeId) return undefined;
+        return this.availableModes.find((mode) => mode.id === modeId)?.name || modeId;
+    }
+
+    private getCurrentSelection(category: SelectionCategory): string | undefined {
+        return this.currentSelections[category];
+    }
+
+    private setCurrentSelection(category: SelectionCategory, value: string | null | undefined): void {
+        const normalized = typeof value === 'string' ? value.trim() : '';
+        if (normalized) {
+            this.currentSelections[category] = normalized;
+            return;
+        }
+        delete this.currentSelections[category];
+    }
+
+    private getSelectionControlValues(): Record<string, string> {
+        const model = this.getCurrentSelection('model');
+        const mode = this.getCurrentSelection('mode');
+        return {
+            ...(model ? { model } : {}),
+            ...(mode ? { mode } : {}),
+        };
+    }
+
+    private resolveSelectionLabel(category: SelectionCategory, value: string | undefined): string | undefined {
+        if (!value) return undefined;
+        const configLabel = this.resolveConfigOptionLabel(category, value);
+        if (configLabel && configLabel !== value) return configLabel;
+        if (category === 'mode') {
+            const modeLabel = this.resolveModeLabel(value);
+            if (modeLabel) return modeLabel;
+        }
+        return configLabel || value;
+    }
+
+    private buildSelectionSummaryMetadata() {
+        const model = this.getCurrentSelection('model');
+        const mode = this.getCurrentSelection('mode');
+        return buildLegacyModelModeSummaryMetadata({
+            model,
+            mode,
+            modelLabel: this.resolveSelectionLabel('model', model),
+            modeLabel: this.resolveSelectionLabel('mode', mode),
+        });
+    }
+
  // ─── ACP Config Options & Modes ─────────────────────
 
     private parseConfigOptions(raw: any): void {
@@ -425,15 +478,17 @@ export class AcpProviderInstance implements ProviderInstance {
 
             this.configOptions.push({ category: category as 'model' | 'mode' | 'thought_level' | 'other', configId, currentValue, options: flatOptions });
 
- // Auto-set currentModel/currentMode from config
-            if (category === 'model' && currentValue) this.currentModel = currentValue;
+ // Auto-set current selections from config
+            if (category === 'model' || category === 'mode') {
+                this.setCurrentSelection(category, currentValue);
+            }
         }
     }
 
     private parseModes(raw: any): void {
         if (!raw) return;
  // modes: { currentModeId, availableModes: [{ id, name, description }] }
-        if (raw.currentModeId) this.currentMode = raw.currentModeId;
+        this.setCurrentSelection('mode', raw.currentModeId);
         if (Array.isArray(raw.availableModes)) {
             this.availableModes = raw.availableModes.map((m: any) => ({
                 id: m.id, name: m.name || m.id, description: m.description,
@@ -454,8 +509,7 @@ export class AcpProviderInstance implements ProviderInstance {
         if (this.useStaticConfig) {
             opt.currentValue = value;
             this.selectedConfig[opt.configId] = value;
-            if (category === 'model') this.currentModel = value;
-            if (category === 'mode') this.currentMode = value;
+            if (category === 'model' || category === 'mode') this.setCurrentSelection(category, value);
             this.log.info(`[${this.type}] Static config ${category} set to: ${value} — restarting agent`);
             await this.restartWithNewConfig();
             return;
@@ -476,7 +530,7 @@ export class AcpProviderInstance implements ProviderInstance {
             });
  // Update local state
             opt.currentValue = value;
-            if (category === 'model') this.currentModel = value;
+            if (category === 'model' || category === 'mode') this.setCurrentSelection(category, value);
  // Response may include updated configOptions
             if (result?.configOptions) this.parseConfigOptions(result.configOptions);
             this.log.info(`[${this.type}] Config ${category} set to: ${value} | response: ${JSON.stringify(result)?.slice(0, 300)}`);
@@ -495,7 +549,7 @@ export class AcpProviderInstance implements ProviderInstance {
                 opt.currentValue = modeId;
                 this.selectedConfig[opt.configId] = modeId;
             }
-            this.currentMode = modeId;
+            this.setCurrentSelection('mode', modeId);
             this.log.info(`[${this.type}] Static mode set to: ${modeId} — restarting agent`);
             await this.restartWithNewConfig();
             return;
@@ -512,7 +566,7 @@ export class AcpProviderInstance implements ProviderInstance {
                 sessionId: this.sessionId,
                 modeId,
             });
-            this.currentMode = modeId;
+            this.setCurrentSelection('mode', modeId);
             this.log.info(`[${this.type}] Mode set to: ${modeId}`);
         } catch (e: any) {
             const message = e?.message || 'Unknown ACP mode error';
@@ -845,8 +899,8 @@ export class AcpProviderInstance implements ProviderInstance {
             this.parseModes(result?.modes);
 
  // Legacy: models.currentModelId (some agent compat)
-            if (!this.currentModel && result?.models?.currentModelId) {
-                this.currentModel = result.models.currentModelId;
+            if (!this.getCurrentSelection('model') && result?.models?.currentModelId) {
+                this.setCurrentSelection('model', result.models.currentModelId);
             }
 
  // ─── Static config fallback (for agents without config/* support) ───
@@ -862,14 +916,17 @@ export class AcpProviderInstance implements ProviderInstance {
                     });
                     if (defaultVal) {
                         this.selectedConfig[sc.configId] = defaultVal;
-                        if (sc.category === 'model') this.currentModel = defaultVal;
-                        if (sc.category === 'mode') this.currentMode = defaultVal;
+                        if (sc.category === 'model' || sc.category === 'mode') {
+                            this.setCurrentSelection(sc.category, defaultVal);
+                        }
                     }
                 }
                 this.log.info(`[${this.type}] Using static configOptions (${this.configOptions.length} options)`);
             }
 
-            this.log.info(`[${this.type}] Session created: ${this.sessionId}${this.currentModel ? ` (model: ${this.currentModel})` : ''}${this.currentMode ? ` (mode: ${this.currentMode})` : ''}`);
+            const currentModel = this.getCurrentSelection('model');
+            const currentMode = this.getCurrentSelection('mode');
+            this.log.info(`[${this.type}] Session created: ${this.sessionId}${currentModel ? ` (model: ${currentModel})` : ''}${currentMode ? ` (mode: ${currentMode})` : ''}`);
             if (this.configOptions.length > 0) {
                 this.log.info(`[${this.type}] Config options: ${this.configOptions.map(c => `${c.category}(${c.options.length})`).join(', ')}`);
             }
@@ -1073,7 +1130,7 @@ export class AcpProviderInstance implements ProviderInstance {
                 break;
             }
             case 'current_mode_update': {
-                this.currentMode = update.currentModeId;
+                this.setCurrentSelection('mode', update.currentModeId);
                 break;
             }
             case 'config_option_update': {
@@ -1162,7 +1219,7 @@ export class AcpProviderInstance implements ProviderInstance {
 
  // Legacy: model info
         if (params.model) {
-            this.currentModel = params.model;
+            this.setCurrentSelection('model', params.model);
         }
     }
 

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

@@ -19,9 +19,10 @@ import { StatusMonitor } from './status-monitor.js';
 import { ChatHistoryWriter, readChatHistory } from '../config/chat-history.js';
 import { LOG } from '../logging/logger.js';
 import type { ChatMessage } from '../types.js';
-import { extractProviderControlValues, normalizeProviderEffects } from './control-effects.js';
+import { normalizeProviderEffects } from './control-effects.js';
 import { formatAutoApprovalMessage, pickApprovalButton } from './approval-utils.js';
 import { getCliScriptCommand, parseCliScriptResult } from './cli-script-results.js';
+import { mergeProviderPatchState, resolveProviderStateSurface } from './provider-patch-state.js';
 
 let CachedDatabaseSync: (new (path: string, options?: { readOnly?: boolean }) => {
     prepare(sql: string): { get(...params: Array<string | number>): unknown };
@@ -104,6 +105,7 @@ export class CliProviderInstance implements ProviderInstance {
     private generatingDebouncePending: { chatTitle: string; timestamp: number } | null = null;
     private lastApprovalEventAt = 0;
     private controlValues: Record<string, string | number | boolean> = {};
+    private summaryMetadata: unknown = undefined;
     private appliedEffectKeys = new Set<string>();
     private historyWriter: ChatHistoryWriter;
     private runtimeMessages: Array<{ key: string; message: ChatMessage }> = [];
@@ -317,21 +319,7 @@ export class CliProviderInstance implements ProviderInstance {
                 ? parsedMessages.slice(-historyMessageCount)
                 : [];
         }
-        const controlValues = extractProviderControlValues(this.provider.controls, parsedStatus);
-        if (controlValues) {
-            this.controlValues = { ...this.controlValues, ...controlValues };
-        }
         const mergedMessages = this.mergeConversationMessages(parsedMessages);
-        const currentModel = typeof parsedStatus?.model === 'string' && parsedStatus.model.trim()
-            ? parsedStatus.model.trim()
-            : (typeof this.controlValues.model === 'string' && this.controlValues.model.trim()
-                ? this.controlValues.model.trim()
-                : undefined);
-        const currentPlan = typeof parsedStatus?.mode === 'string' && parsedStatus.mode.trim()
-            ? parsedStatus.mode.trim()
-            : (typeof this.controlValues.mode === 'string' && this.controlValues.mode.trim()
-                ? this.controlValues.mode.trim()
-                : undefined);
 
         const dirName = this.workingDir.split('/').filter(Boolean).pop() || 'session';
 
@@ -359,6 +347,10 @@ export class CliProviderInstance implements ProviderInstance {
         }
 
         this.applyProviderResponse(parsedStatus, { phase: 'immediate' });
+        const surface = resolveProviderStateSurface({
+            summaryMetadata: this.summaryMetadata as any,
+            controlValues: this.controlValues,
+        });
 
         return {
             type: this.type,
@@ -377,8 +369,6 @@ export class CliProviderInstance implements ProviderInstance {
                 inputContent: '',
             },
             workspace: this.workingDir,
-            currentModel,
-            currentPlan,
             instanceId: this.instanceId,
             providerSessionId: this.providerSessionId,
             lastUpdated: Date.now(),
@@ -393,8 +383,9 @@ export class CliProviderInstance implements ProviderInstance {
                 attachedClients: runtime.attachedClients || [],
             } : undefined,
             resume: this.provider.resume,
-            controlValues: this.controlValues,
+            controlValues: surface.controlValues,
             providerControls: this.provider.controls,
+            summaryMetadata: surface.summaryMetadata as any,
         };
     }
 
@@ -617,10 +608,14 @@ export class CliProviderInstance implements ProviderInstance {
             this.adapter.clearHistory();
         }
 
-        const controlValues = extractProviderControlValues(this.provider.controls, data);
-        if (controlValues) {
-            this.controlValues = { ...this.controlValues, ...controlValues };
-        }
+        const patchedState = mergeProviderPatchState({
+            providerControls: this.provider.controls,
+            data,
+            currentControlValues: this.controlValues,
+            currentSummaryMetadata: this.summaryMetadata,
+        });
+        this.controlValues = patchedState.controlValues;
+        this.summaryMetadata = patchedState.summaryMetadata;
 
         const effects = normalizeProviderEffects(data);
         for (const effect of effects) {

package/src/providers/contracts.d.ts

@@ -6,6 +6,7 @@
  * - Common across all categories (cli, ide, extension)
  * - User custom providers use the same contracts
  */
+import type { ProviderSummaryMetadata } from '../shared-types.js';
 export interface ReadChatResult {
     messages: ChatMessage[];
     status: AgentStatus;
@@ -21,10 +22,10 @@ export interface ReadChatResult {
     isVisible?: boolean;
     isWelcomeScreen?: boolean;
     inputContent?: string;
-    model?: string;
-    autoApprove?: string;
     /** Explicit dynamic control values returned by the provider */
     controlValues?: Record<string, string | number | boolean>;
+    /** Flexible always-visible metadata for compact/live surfaces. */
+    summaryMetadata?: ProviderSummaryMetadata;
     /** Provider-driven UI effects derived from chat state */
     effects?: ProviderEffect[];
 }

package/src/providers/contracts.ts

@@ -9,6 +9,8 @@
 
 // ─── readChat() return value ───────────────────────────
 
+import type { ProviderSummaryMetadata } from '../shared-types.js';
+
 export interface ReadChatResult {
   messages: ChatMessage[];
   status: AgentStatus;
@@ -20,15 +22,15 @@ export interface ReadChatResult {
   agentType?: string;
   agentName?: string;
   extensionId?: string;
- /** Status metadata */
+  /** Status metadata */
   isVisible?: boolean;
   isWelcomeScreen?: boolean;
   inputContent?: string;
-  model?: string;
-  autoApprove?: string;
   /** Explicit dynamic control values returned by the provider */
   controlValues?: Record<string, string | number | boolean>;
-  /** Provider-driven UI effects derived from chat state */
+  /** Flexible always-visible metadata for compact/live surfaces. */
+  summaryMetadata?: ProviderSummaryMetadata;
+/** Provider-driven UI effects derived from chat state */
   effects?: ProviderEffect[];
 }
 

package/src/providers/control-effects.ts

@@ -32,9 +32,6 @@ export function extractProviderControlValues(
         values[ctrl.id] = normalizeControlValue(rawValue);
     }
 
-    if (data.model !== undefined && values.model === undefined) values.model = normalizeControlValue(data.model);
-    if (data.mode !== undefined && values.mode === undefined) values.mode = normalizeControlValue(data.mode);
-
     return Object.keys(values).length > 0 ? values : undefined;
 }
 
@@ -171,7 +168,9 @@ function normalizeControlOption(option: unknown): ProviderControlOption | null {
     const record = option as Record<string, unknown>;
     const value = typeof record.value === 'string'
         ? record.value
-        : (typeof record.id === 'string' ? record.id : null);
+        : (typeof record.id === 'string'
+            ? record.id
+            : (typeof record.name === 'string' ? record.name : null));
     if (!value) return null;
     const label = typeof record.label === 'string'
         ? record.label

package/src/providers/extension-provider-instance.d.ts

@@ -18,9 +18,8 @@ export declare class ExtensionProviderInstance implements ProviderInstance {
     private messages;
     private prevMessageHashes;
     private activeModal;
-    private currentModel;
-    private currentMode;
     private controlValues;
+    private summaryMetadata;
     private appliedEffectKeys;
     private runtimeMessages;
     private lastAgentStatus;

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

@@ -8,9 +8,10 @@
 import type { ProviderModule } from './contracts.js';
 import type { ProviderInstance, ProviderState, ProviderEvent, InstanceContext } from './provider-instance.js';
 import { StatusMonitor } from './status-monitor.js';
-import { extractProviderControlValues, normalizeProviderEffects } from './control-effects.js';
+import { normalizeProviderEffects } from './control-effects.js';
 import { ChatHistoryWriter } from '../config/chat-history.js';
 import type { ChatMessage } from '../types.js';
+import { mergeProviderPatchState, resolveProviderStateSurface } from './provider-patch-state.js';
 
 export class ExtensionProviderInstance implements ProviderInstance {
     readonly type: string;
@@ -27,9 +28,8 @@ export class ExtensionProviderInstance implements ProviderInstance {
     private messages: any[] = [];
     private prevMessageHashes = new Map<string, number>();
     private activeModal: any = null;
-    private currentModel: string = '';
-    private currentMode: string = '';
     private controlValues: Record<string, string | number | boolean> = {};
+    private summaryMetadata: unknown = undefined;
     private appliedEffectKeys = new Set<string>();
     private runtimeMessages: Array<{ key: string; message: ChatMessage }> = [];
     private lastAgentStatus: string = 'idle';
@@ -76,6 +76,11 @@ export class ExtensionProviderInstance implements ProviderInstance {
     }
 
     getState(): ProviderState {
+        const surface = resolveProviderStateSurface({
+            summaryMetadata: this.summaryMetadata as any,
+            controlValues: this.controlValues,
+        })
+
         return {
             type: this.type,
             name: this.provider.name,
@@ -89,10 +94,9 @@ export class ExtensionProviderInstance implements ProviderInstance {
                 activeModal: this.activeModal,
                 inputContent: '',
             } : null,
-            currentModel: this.currentModel || undefined,
-            currentPlan: this.currentMode || undefined,
-            controlValues: this.controlValues,
+            controlValues: surface.controlValues,
             providerControls: this.provider.controls,
+            summaryMetadata: surface.summaryMetadata as any,
             agentStreams: this.agentStreams,
             instanceId: this.instanceId,
             lastUpdated: Date.now(),
@@ -107,10 +111,14 @@ export class ExtensionProviderInstance implements ProviderInstance {
             if (data?.streams) this.agentStreams = data.streams;
             if (data?.messages) this.messages = this.assignReceivedAt(data.messages);
             if (data?.activeModal !== undefined) this.activeModal = data.activeModal;
-            if (data?.model) this.currentModel = data.model;
-            if (data?.mode) this.currentMode = data.mode;
-            const controlValues = extractProviderControlValues(this.provider.controls, data) || data?.controlValues;
-            if (controlValues) this.controlValues = controlValues;
+            const patchedState = mergeProviderPatchState({
+                providerControls: this.provider.controls,
+                data,
+                currentControlValues: this.controlValues,
+                currentSummaryMetadata: this.summaryMetadata,
+            });
+            this.controlValues = patchedState.controlValues;
+            this.summaryMetadata = patchedState.summaryMetadata;
             if (typeof data?.sessionId === 'string' && data.sessionId.trim()) this.chatId = data.sessionId;
             if (typeof data?.title === 'string' && data.title.trim()) this.chatTitle = data.title;
             if (typeof data?.agentName === 'string' && data.agentName.trim()) this.agentName = data.agentName;
@@ -231,8 +239,14 @@ export class ExtensionProviderInstance implements ProviderInstance {
     private applyProviderResponse(data: any, options: { phase: 'immediate' | 'turn_completed' }): void {
         if (!data || typeof data !== 'object') return;
 
-        const controlValues = extractProviderControlValues(this.provider.controls, data);
-        if (controlValues) this.controlValues = { ...this.controlValues, ...controlValues };
+        const patchedState = mergeProviderPatchState({
+            providerControls: this.provider.controls,
+            data,
+            currentControlValues: this.controlValues,
+            currentSummaryMetadata: this.summaryMetadata,
+        });
+        this.controlValues = patchedState.controlValues;
+        this.summaryMetadata = patchedState.summaryMetadata;
 
         const effects = normalizeProviderEffects(data);
         for (const effect of effects) {
@@ -406,8 +420,6 @@ export class ExtensionProviderInstance implements ProviderInstance {
         this.messages = [];
         this.prevMessageHashes.clear();
         this.activeModal = null;
-        this.currentModel = '';
-        this.currentMode = '';
         this.controlValues = {};
         this.currentStatus = 'idle';
         this.chatId = null;

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

@@ -17,9 +17,10 @@ import { ExtensionProviderInstance } from './extension-provider-instance.js';
 import { StatusMonitor } from './status-monitor.js';
 import { ChatHistoryWriter } from '../config/chat-history.js';
 import { LOG } from '../logging/logger.js';
-import { extractProviderControlValues, normalizeProviderEffects } from './control-effects.js';
+import { normalizeProviderEffects } from './control-effects.js';
 import type { ChatMessage } from '../types.js';
 import { formatAutoApprovalMessage, pickApprovalButton } from './approval-utils.js';
+import { mergeProviderPatchState, resolveProviderStateSurface } from './provider-patch-state.js';
 
 type ReadChatModal = {
     message?: string;
@@ -134,6 +135,11 @@ export class IdeProviderInstance implements ProviderInstance {
             extensionStates.push(ext.getState());
         }
 
+        const surface = resolveProviderStateSurface({
+            summaryMetadata: this.cachedChat?.summaryMetadata,
+            controlValues: this.cachedChat?.controlValues,
+        });
+
         return {
             type: this.type,
             name: this.provider.name,
@@ -152,11 +158,9 @@ export class IdeProviderInstance implements ProviderInstance {
             workspace: this.workspace || null,
             extensions: extensionStates,
             cdpConnected: cdp?.isConnected || false,
-            currentModel: this.cachedChat?.model || undefined,
-            currentPlan: this.cachedChat?.mode || undefined,
-            currentAutoApprove: this.cachedChat?.autoApprove || undefined,
-            controlValues: this.cachedChat?.controlValues || undefined,
+            controlValues: surface.controlValues,
             providerControls: this.provider.controls,
+            summaryMetadata: surface.summaryMetadata as any,
             instanceId: this.instanceId,
             lastUpdated: Date.now(),
             settings: this.settings,
@@ -348,8 +352,13 @@ export class IdeProviderInstance implements ProviderInstance {
                 }
             }
 
-            const controlValues = extractProviderControlValues(this.provider.controls, chat);
-            if (controlValues) chat.controlValues = controlValues;
+            const patchedState = mergeProviderPatchState({
+                providerControls: this.provider.controls,
+                data: chat,
+                mergeWithCurrent: false,
+            });
+            chat.controlValues = Object.keys(patchedState.controlValues).length > 0 ? patchedState.controlValues : undefined;
+            chat.summaryMetadata = patchedState.summaryMetadata;
 
             this.cachedChat = { ...chat, activeModal };
             this.detectAgentTransitions(chat, now);
@@ -464,14 +473,18 @@ export class IdeProviderInstance implements ProviderInstance {
     private applyProviderResponse(data: any, options: { phase: 'immediate' | 'turn_completed' }): void {
         if (!data || typeof data !== 'object') return;
 
-        const controlValues = extractProviderControlValues(this.provider.controls, data);
-        if (controlValues) {
-            this.cachedChat = {
-                ...(this.cachedChat || {}),
-                ...data,
-                controlValues: { ...(this.cachedChat?.controlValues || {}), ...controlValues },
-            };
-        }
+        const patchedState = mergeProviderPatchState({
+            providerControls: this.provider.controls,
+            data,
+            currentControlValues: this.cachedChat?.controlValues,
+            currentSummaryMetadata: this.cachedChat?.summaryMetadata,
+        });
+        this.cachedChat = {
+            ...(this.cachedChat || {}),
+            ...data,
+            controlValues: Object.keys(patchedState.controlValues).length > 0 ? patchedState.controlValues : undefined,
+            summaryMetadata: patchedState.summaryMetadata,
+        };
 
         const effects = normalizeProviderEffects(data);
         for (const effect of effects) {

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

@@ -8,7 +8,7 @@
  * Each Instance manages its own status.
  */
 import type { ProviderResumeCapability } from './contracts.js';
-import type { AcpConfigOption, AcpMode, ProviderControlSchema } from '../shared-types.js';
+import type { AcpConfigOption, AcpMode, ProviderControlSchema, ProviderSummaryMetadata } from '../shared-types.js';
 import type { ChatMessage } from '../types.js';
 export type ProviderStatus = 'idle' | 'generating' | 'waiting_approval' | 'error' | 'stopped' | 'starting';
 export interface ProviderRuntimeWriteOwner {
@@ -54,8 +54,6 @@ interface ProviderStateBase {
     /** Workspace — project path or name (all categories) */
     workspace?: string | null;
     /** Runtime info (real-time detection) */
-    currentModel?: string;
-    currentPlan?: string;
     /** Error details (when status === 'error') */
     errorMessage?: string;
     errorReason?: ProviderErrorReason;
@@ -72,6 +70,8 @@ interface ProviderStateBase {
     controlValues?: Record<string, string | number | boolean>;
     /** Provider-declared controls schema (from provider.controls) */
     providerControls?: ProviderControlSchema[];
+    /** Flexible always-visible metadata for compact/live surfaces. */
+    summaryMetadata?: ProviderSummaryMetadata;
 }
 /** IDE provider state */
 export interface IdeProviderState extends ProviderStateBase {
@@ -79,7 +79,6 @@ export interface IdeProviderState extends ProviderStateBase {
     cdpConnected: boolean;
     /** IDE child Extension Instance status */
     extensions: ProviderState[];
-    currentAutoApprove?: string;
 }
 /** CLI provider state */
 export interface CliProviderState extends ProviderStateBase {

package/src/providers/provider-instance.ts

@@ -9,7 +9,7 @@
  */
 
 import type { ProviderModule, ProviderSettingDef, ProviderResumeCapability } from './contracts.js';
-import type { AcpConfigOption, AcpMode, ProviderControlSchema } from '../shared-types.js';
+import type { AcpConfigOption, AcpMode, ProviderControlSchema, ProviderSummaryMetadata } from '../shared-types.js';
 import type { ChatMessage } from '../types.js';
 
 // ─── ProviderState — Discriminated union by category ─────────────
@@ -68,10 +68,8 @@ interface ProviderStateBase {
     activeChat: ActiveChatData | null;
  /** Workspace — project path or name (all categories) */
     workspace?: string | null;
- /** Runtime info (real-time detection) */
-    currentModel?: string;
-    currentPlan?: string;
- /** Error details (when status === 'error') */
+    /** Runtime info (real-time detection) */
+    /** Error details (when status === 'error') */
     errorMessage?: string;
     errorReason?: ProviderErrorReason;
  /** meta */
@@ -85,8 +83,10 @@ interface ProviderStateBase {
     resume?: ProviderResumeCapability;
  /** Dynamic control current values */
     controlValues?: Record<string, string | number | boolean>;
- /** Provider-declared controls schema (from provider.controls) */
+    /** Provider-declared controls schema (from provider.controls) */
     providerControls?: ProviderControlSchema[];
+    /** Flexible always-visible metadata for compact/live surfaces. */
+    summaryMetadata?: ProviderSummaryMetadata;
 }
 
 /** IDE provider state */
@@ -95,7 +95,6 @@ export interface IdeProviderState extends ProviderStateBase {
     cdpConnected: boolean;
  /** IDE child Extension Instance status */
     extensions: ProviderState[];
-    currentAutoApprove?: string;
 }
 
 /** CLI provider state */