@adhdev/daemon-core 0.8.57 → 0.8.59

package/src/config/saved-sessions.ts

@@ -1,6 +1,8 @@
 import * as path from 'path';
+import type { ProviderSummaryMetadata } from '../shared-types.js';
 import type { DaemonState } from './state-store.js';
 import { expandPath } from './workspaces.js';
+import { normalizePersistedSummaryMetadata } from '../providers/summary-metadata.js';
 
 export interface SavedProviderSessionEntry {
     id: string;
@@ -9,7 +11,7 @@ export interface SavedProviderSessionEntry {
     providerName: string;
     providerSessionId: string;
     workspace?: string | null;
-    currentModel?: string;
+    summaryMetadata?: ProviderSummaryMetadata;
     title?: string;
     createdAt: number;
     lastUsedAt: number;
@@ -46,7 +48,9 @@ export function upsertSavedProviderSession(
         providerName: entry.providerName,
         providerSessionId,
         workspace: entry.workspace ? normalizeWorkspace(entry.workspace) : undefined,
-        currentModel: entry.currentModel,
+        summaryMetadata: normalizePersistedSummaryMetadata({
+            summaryMetadata: entry.summaryMetadata,
+        }),
         title: entry.title,
         createdAt: existing?.createdAt || entry.createdAt || Date.now(),
         lastUsedAt: entry.lastUsedAt || Date.now(),
@@ -69,5 +73,11 @@ export function getSavedProviderSessions(
             if (filters?.kind && entry.kind !== filters.kind) return false;
             return true;
         })
+        .map(entry => ({
+            ...entry,
+            summaryMetadata: normalizePersistedSummaryMetadata({
+                summaryMetadata: entry.summaryMetadata,
+            }),
+        }))
         .sort((a, b) => b.lastUsedAt - a.lastUsedAt);
 }

package/src/daemon/dev-auto-implement.ts

@@ -141,19 +141,6 @@ export function resolveAutoImplWritableProviderDir(ctx: DevServerContext,
     return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
   }
 
-  try {
-    const providerData = JSON.parse(fs.readFileSync(providerJson, 'utf-8'));
-    if (providerData.disableUpstream !== true) {
-      providerData.disableUpstream = true;
-      fs.writeFileSync(providerJson, JSON.stringify(providerData, null, 2));
-    }
-  } catch (error) {
-    return {
-      dir: null,
-      reason: `Failed to update provider.json in writable provider directory: ${(error as Error).message}`,
-    };
-  }
-
   return { dir: desiredDir };
 }
 
@@ -901,7 +888,7 @@ export function buildAutoImplPrompt(ctx: DevServerContext,
   lines.push('## Required Return Format');
   lines.push('| Function | Return JSON |');
   lines.push('|---|---|');
-  lines.push('| readChat | `{ id, status, title, messages: [{role, content, index, kind?, meta?}], inputContent, activeModal }` — optional `kind`: standard, thought, tool, terminal; optional `meta`: e.g. `{ label, isRunning }` for dashboard |');
+  lines.push('| readChat | `{ id, status, title, messages: [{role, content, index, kind?, meta?}], inputContent, activeModal, controlValues?, summaryMetadata? }` — optional `kind`: standard, thought, tool, terminal; prefer explicit `controlValues` for current selections and `summaryMetadata` for compact always-visible UI metadata |');
   lines.push('| sendMessage | `{ sent: false, needsTypeAndSend: true, selector }` |');
   lines.push('| resolveAction | `{ resolved: true/false, clicked? }` |');
   lines.push('| listSessions | `{ sessions: [{ id, title, active, index }] }` |');

package/src/daemon/dev-cli-debug.ts

@@ -757,7 +757,6 @@ export async function handleCliStatus(ctx: DevServerContext, _req: http.Incoming
     lastMessage: s.activeChat?.messages?.slice(-1)[0] || null,
     activeModal: s.activeChat?.activeModal || null,
     pendingEvents: s.pendingEvents || [],
-    currentModel: s.currentModel,
     settings: s.settings,
   }));
   ctx.json(res, 200, { instances: result, count: result.length });

package/src/daemon/dev-server-types.ts

@@ -20,6 +20,7 @@ export interface DevServerContext {
   readonly cdpManagers: Map<string, DaemonCdpManager>;
   readonly instanceManager: ProviderInstanceManager | null;
   readonly cliManager: DaemonCliManager | null;
+  readonly onProviderSourceConfigChanged?: (() => Promise<void> | void) | null;
 
   // Utilities
   getCdp(ideType?: string): DaemonCdpManager | null;

package/src/daemon/dev-server.ts

@@ -22,6 +22,8 @@ import * as os from 'os';
 import type { ProviderLoader } from '../providers/provider-loader.js';
 import type { ProviderCategory, ProviderModule, ProviderScripts, ProviderSettingDef } from '../providers/contracts.js';
 import { validateProviderDefinition } from '../providers/provider-schema.js';
+import { loadConfig, saveConfig } from '../config/config.js';
+import { parseProviderSourceConfigUpdate } from '../config/provider-source-config.js';
 import type { ChildProcess } from 'child_process';
 import type { DaemonCdpManager } from '../cdp/manager.js';
 import type { ProviderInstanceManager } from '../providers/provider-instance-manager.js';
@@ -100,6 +102,7 @@ export class DevServer implements DevServerContext {
   public cdpManagers: Map<string, DaemonCdpManager>;
   public instanceManager: ProviderInstanceManager | null;
   public cliManager: DaemonCliManager | null;
+  public onProviderSourceConfigChanged: (() => Promise<void> | void) | null;
   private logFn: (msg: string) => void;
   private sseClients: http.ServerResponse[] = [];
   private watchScriptPath: string | null = null;
@@ -120,11 +123,13 @@ export class DevServer implements DevServerContext {
     instanceManager?: ProviderInstanceManager;
     cliManager?: DaemonCliManager;
     logFn?: (msg: string) => void;
+    onProviderSourceConfigChanged?: () => Promise<void> | void;
   }) {
     this.providerLoader = options.providerLoader;
     this.cdpManagers = options.cdpManagers;
     this.instanceManager = options.instanceManager || null;
     this.cliManager = options.cliManager || null;
+    this.onProviderSourceConfigChanged = options.onProviderSourceConfigChanged || null;
     this.logFn = options.logFn || LOG.forComponent('DevServer').asLogFn();
   }
 
@@ -140,6 +145,8 @@ export class DevServer implements DevServerContext {
   }[] = [
     // Static routes
     { method: 'GET',  pattern: '/api/providers',          handler: (q, s) => this.handleListProviders(q, s) },
+    { method: 'GET',  pattern: '/api/providers/source-config', handler: (q, s) => this.handleGetProviderSourceConfig(q, s) },
+    { method: 'POST', pattern: '/api/providers/source-config', handler: (q, s) => this.handleSetProviderSourceConfig(q, s) },
     { method: 'GET',  pattern: '/api/providers/versions',  handler: (q, s) => this.handleDetectVersions(q, s) },
     { method: 'POST', pattern: '/api/providers/reload',    handler: (q, s) => this.handleReload(q, s) },
     { method: 'POST', pattern: '/api/cdp/evaluate',        handler: (q, s) => this.handleCdpEvaluate(q, s) },
@@ -273,7 +280,38 @@ export class DevServer implements DevServerContext {
 
   private async handleListProviders(_req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
     const providers = this.providerLoader.getAll().map(toProviderListEntry);
-    this.json(res, 200, { providers, count: providers.length });
+    this.json(res, 200, { providers, count: providers.length, sourceConfig: this.providerLoader.getSourceConfig() });
+  }
+
+  private async handleGetProviderSourceConfig(_req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
+    this.json(res, 200, { success: true, sourceConfig: this.providerLoader.getSourceConfig() });
+  }
+
+  private async handleSetProviderSourceConfig(req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
+    const body = await this.readBody(req);
+    const parsed = parseProviderSourceConfigUpdate(body || {});
+    if (!parsed.ok) {
+      this.json(res, 400, { success: false, error: parsed.error });
+      return;
+    }
+
+    const currentConfig = loadConfig();
+    const nextConfig = {
+      ...currentConfig,
+      ...(parsed.updates.providerSourceMode ? { providerSourceMode: parsed.updates.providerSourceMode } : {}),
+      ...(Object.prototype.hasOwnProperty.call(parsed.updates, 'providerDir') ? { providerDir: parsed.updates.providerDir } : {}),
+    };
+    saveConfig(nextConfig);
+
+    const sourceConfig = this.providerLoader.applySourceConfig({
+      sourceMode: nextConfig.providerSourceMode,
+      userDir: Object.prototype.hasOwnProperty.call(parsed.updates, 'providerDir') ? parsed.updates.providerDir : this.providerLoader.getSourceConfig().explicitProviderDir || undefined,
+    });
+    this.providerLoader.reload();
+    this.providerLoader.registerToDetector();
+    await this.onProviderSourceConfigChanged?.();
+
+    this.json(res, 200, { success: true, reloaded: true, sourceConfig });
   }
 
   private async handleProviderConfig(type: string, _req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
@@ -994,27 +1032,14 @@ export class DevServer implements DevServerContext {
       this.log(`Auto-implement writable copy created: ${desiredDir}`);
     }
 
-    const providerJson = path.join(desiredDir, 'provider.json');
-    if (!fs.existsSync(providerJson)) {
-      return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
-    }
-
-    try {
-      const providerData = JSON.parse(fs.readFileSync(providerJson, 'utf-8'));
-      if (providerData.disableUpstream !== true) {
-        providerData.disableUpstream = true;
-        fs.writeFileSync(providerJson, JSON.stringify(providerData, null, 2));
-      }
-    } catch (error) {
-      return {
-        dir: null,
-        reason: `Failed to update provider.json in writable provider directory: ${(error as Error).message}`,
-      };
-    }
-
-    return { dir: desiredDir };
+  const providerJson = path.join(desiredDir, 'provider.json');
+  if (!fs.existsSync(providerJson)) {
+    return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
   }
 
+  return { dir: desiredDir };
+}
+
 
   private async handleAutoImplement(type: string, req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
     return handleAutoImplement(this, type, req, res);
@@ -1186,7 +1211,7 @@ export class DevServer implements DevServerContext {
     lines.push('## Required Return Format');
     lines.push('| Function | Return JSON |');
     lines.push('|---|---|');
-    lines.push('| readChat | `{ id, status, title, messages: [{role, content, index, kind?, meta?}], inputContent, activeModal }` — optional `kind`: standard, thought, tool, terminal; optional `meta`: e.g. `{ label, isRunning }` for dashboard |');
+    lines.push('| readChat | `{ id, status, title, messages: [{role, content, index, kind?, meta?}], inputContent, activeModal, controlValues?, summaryMetadata? }` — optional `kind`: standard, thought, tool, terminal; prefer explicit `controlValues` for current selections and `summaryMetadata` for compact always-visible UI metadata |');
     lines.push('| sendMessage | `{ sent: false, needsTypeAndSend: true, selector }` |');
     lines.push('| resolveAction | `{ resolved: true/false, clicked? }` |');
     lines.push('| listSessions | `{ sessions: [{ id, title, active, index }] }` |');

package/src/daemon/scaffold-template.ts

@@ -178,7 +178,11 @@ module.exports.setMode = (params) => {
  *   5. Approval dialog detection (buttons, modal)
  *   6. Input field selector
  *
- * → { id, status, title, messages[], inputContent, activeModal }
+ * Preferred live-state surface:
+ *   - controlValues: explicit current control selections (model/mode/etc.)
+ *   - summaryMetadata: compact always-visible metadata for dashboard/recent views
+ * Legacy top-level model/mode output is no longer the preferred shape.
+ * → { id, status, title, messages[], inputContent, activeModal, controlValues?, summaryMetadata? }
  */
 (() => {
   try {
@@ -206,6 +210,9 @@ module.exports.setMode = (params) => {
       messages,
       inputContent,
       activeModal,
+      // TODO: Return explicit selections when available, e.g.
+      // controlValues: { model: selectedModel, mode: selectedMode },
+      // summaryMetadata: { items: [{ id: 'model', value: selectedModelLabel || selectedModel, shortValue: selectedModel, order: 10 }] },
     });
   } catch(e) {
     return JSON.stringify({ id: '', status: 'error', messages: [], error: e.message });

package/src/index.d.ts

@@ -4,7 +4,7 @@
  * Core logic for daemon: CDP, Provider, IDE detection, CLI/ACP adapters and more.
  */
 export type { ChatMessage, ExtensionInfo, CommandResult as CoreCommandResult, ProviderConfig, DaemonEvent, StatusResponse, SystemInfo, DetectedIde, ProviderInfo, AgentEntry, } from './types.js';
-export type { SessionEntry, CompactSessionEntry, CompactDaemonEntry, SessionTransport, SessionKind, SessionCapability, AgentSessionStream, ReadChatCursor, ReadChatSyncMode, ReadChatSyncResult, TransportTopic, SessionChatTailSubscriptionParams, MachineRuntimeSubscriptionParams, SessionHostDiagnosticsSubscriptionParams, SessionModalSubscriptionParams, DaemonMetadataSubscriptionParams, SessionChatTailUpdate, MachineRuntimeUpdate, SessionHostDiagnosticsUpdate, SessionModalUpdate, DaemonMetadataUpdate, TopicUpdateEnvelope, SubscribeRequest, UnsubscribeRequest, StandaloneWsStatusPayload, AvailableProviderInfo, AcpConfigOption, AcpMode, ProviderControlSchema, StatusReportPayload, MachineInfo, SessionHostDiagnosticsSnapshot, SessionHostRecord, SessionHostWriteOwner, SessionHostAttachedClient, SessionHostLogEntry, SessionHostRequestTrace, SessionHostRuntimeTransition, DetectedIdeInfo, WorkspaceEntry, ProviderState, ProviderStatus, ProviderErrorReason, ActiveChatData, IdeProviderState, CliProviderState, AcpProviderState, ExtensionProviderState, } from './shared-types.js';
+export type { SessionEntry, CompactSessionEntry, CompactDaemonEntry, SessionTransport, SessionKind, SessionCapability, AgentSessionStream, ReadChatCursor, ReadChatSyncMode, ReadChatSyncResult, TransportTopic, SessionChatTailSubscriptionParams, MachineRuntimeSubscriptionParams, SessionHostDiagnosticsSubscriptionParams, SessionModalSubscriptionParams, DaemonMetadataSubscriptionParams, SessionChatTailUpdate, MachineRuntimeUpdate, SessionHostDiagnosticsUpdate, SessionModalUpdate, DaemonMetadataUpdate, TopicUpdateEnvelope, SubscribeRequest, UnsubscribeRequest, StandaloneWsStatusPayload, AvailableProviderInfo, AcpConfigOption, AcpMode, ProviderControlSchema, StatusReportPayload, MachineInfo, SessionHostDiagnosticsSnapshot, SessionHostRecord, SessionHostWriteOwner, SessionHostAttachedClient, SessionHostLogEntry, SessionHostRequestTrace, SessionHostRuntimeTransition, DetectedIdeInfo, WorkspaceEntry, ProviderSummaryItem, ProviderSummaryMetadata, ProviderState, ProviderStatus, ProviderErrorReason, ActiveChatData, IdeProviderState, CliProviderState, AcpProviderState, ExtensionProviderState, } from './shared-types.js';
 import type { RuntimeWriteOwner as _RuntimeWriteOwner } from './shared-types-extra.js';
 import type { RuntimeAttachedClient as _RuntimeAttachedClient } from './shared-types-extra.js';
 import type { RecentLaunchEntry as _RecentLaunchEntry } from './shared-types.js';

package/src/index.ts

@@ -66,6 +66,8 @@ export type {
   SessionHostRuntimeTransition,
   DetectedIdeInfo,
   WorkspaceEntry,
+  ProviderSummaryItem,
+  ProviderSummaryMetadata,
   ProviderState,
   ProviderStatus,
   ProviderErrorReason,
@@ -195,6 +197,8 @@ export { IdeProviderInstance } from './providers/ide-provider-instance.js';
 export { CliProviderInstance } from './providers/cli-provider-instance.js';
 export { AcpProviderInstance } from './providers/acp-provider-instance.js';
 export type { ProviderModule, CdpTargetFilter, ProviderResumeCapability, InputEnvelope, InputPart, MessagePart, ControlListResult, ControlSetResult, ControlInvokeResult } from './providers/contracts.js';
+export type { ProviderSourceConfigSnapshot, ProviderSourceConfigUpdate } from './config/provider-source-config.js';
+export { parseProviderSourceConfigUpdate } from './config/provider-source-config.js';
 export { normalizeInputEnvelope, normalizeMessageParts, flattenMessageParts } from './providers/io-contracts.js';
 export { VersionArchive, detectAllVersions } from './providers/version-archive.js';
 export type { ProviderVersionInfo, VersionHistory } from './providers/version-archive.js';

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

@@ -34,8 +34,7 @@ export declare class AcpProviderInstance implements ProviderInstance {
     private lastStatus;
     private generatingStartedAt;
     private agentCapabilities;
-    private currentModel;
-    private currentMode;
+    private currentSelections;
     private activeToolCalls;
     private stopReason;
     private partialContent;
@@ -61,6 +60,13 @@ export declare class AcpProviderInstance implements ProviderInstance {
     getState(): AcpProviderState;
     onEvent(event: string, data?: any): void;
     getInstanceId(): string;
+    private resolveConfigOptionLabel;
+    private resolveModeLabel;
+    private getCurrentSelection;
+    private setCurrentSelection;
+    private getSelectionControlValues;
+    private resolveSelectionLabel;
+    private buildSelectionSummaryMetadata;
     private parseConfigOptions;
     private parseModes;
     setConfigOption(category: string, value: string): Promise<void>;

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 };
@@ -55,6 +56,9 @@ export function getForcedNewSessionScriptName(
     const controls = Array.isArray((provider as any).controls) ? (provider as any).controls : [];
     for (const control of controls) {
         if (control?.type !== 'action') continue;
+        if (typeof control?.confirmTitle === 'string' && control.confirmTitle.trim()) continue;
+        if (typeof control?.confirmMessage === 'string' && control.confirmMessage.trim()) continue;
+        if (typeof control?.confirmLabel === 'string' && control.confirmLabel.trim()) continue;
         const invokeScript = typeof control?.invokeScript === 'string' ? control.invokeScript.trim() : '';
         if (!invokeScript) continue;
         const controlId = typeof control?.id === 'string' ? control.id.trim() : '';
@@ -66,6 +70,26 @@ export function getForcedNewSessionScriptName(
     return null;
 }
 
+export async function waitForCliAdapterReady(
+    adapter: { isReady?: () => boolean; getStatus?: () => { status?: string } },
+    options?: { timeoutMs?: number; pollMs?: number },
+): Promise<void> {
+    const timeoutMs = Math.max(100, options?.timeoutMs ?? 15_000);
+    const pollMs = Math.max(10, options?.pollMs ?? 50);
+    const deadline = Date.now() + timeoutMs;
+
+    while (Date.now() < deadline) {
+        if (adapter?.isReady?.()) return;
+        const status = adapter?.getStatus?.()?.status;
+        if (status === 'stopped') {
+            throw new Error('CLI runtime stopped before it became ready');
+        }
+        await new Promise((resolve) => setTimeout(resolve, pollMs));
+    }
+
+    throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
+}
+
 export class CliProviderInstance implements ProviderInstance {
     readonly type: string;
     readonly category = 'cli' as const;
@@ -81,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 }> = [];
@@ -294,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';
 
@@ -336,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,
@@ -354,8 +369,6 @@ export class CliProviderInstance implements ProviderInstance {
                 inputContent: '',
             },
             workspace: this.workingDir,
-            currentModel,
-            currentPlan,
             instanceId: this.instanceId,
             providerSessionId: this.providerSessionId,
             lastUpdated: Date.now(),
@@ -370,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,
         };
     }
 
@@ -427,6 +441,7 @@ export class CliProviderInstance implements ProviderInstance {
         if (!scriptName) return;
 
         LOG.info('CLI', `[${this.type}] forcing fresh session launch via script: ${scriptName}`);
+        await waitForCliAdapterReady(this.adapter);
         const raw = await this.adapter.invokeScript(scriptName, {});
         const parsed = parseCliScriptResult(raw);
         if (!parsed.success) {
@@ -593,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) {
@@ -819,6 +838,7 @@ export class CliProviderInstance implements ProviderInstance {
         const previousProviderSessionId = this.providerSessionId;
         this.providerSessionId = nextSessionId;
         this.historyWriter.promoteHistorySession(this.type, previousHistorySessionId, nextSessionId);
+        this.historyWriter.writeSessionStart(this.type, nextSessionId, this.workingDir, this.instanceId);
         this.adapter.updateRuntimeMeta({ providerSessionId: nextSessionId });
         this.onProviderSessionResolved?.({
             instanceId: this.instanceId,