@adhdev/daemon-core 0.8.57 → 0.8.59

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[];
 }
 
@@ -414,6 +416,7 @@ export interface ProviderModule {
   /** How the CLI adapter decides when to submit typed input */
   submitStrategy?: 'wait_for_echo' | 'immediate';
   /** Keep this provider out of the upstream auto-updated bundle */
+  /** @deprecated Machine-level provider source policy now lives in config.providerSourceMode. Local overrides shadow upstream by root precedence and should not rely on provider-level disableUpstream. */
   disableUpstream?: boolean;
   approvalKeys?: Record<number, string>;
   patterns?: {

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 */

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

@@ -14,6 +14,7 @@
  */
 import { VersionArchive } from './version-archive.js';
 import type { ProviderModule, ProviderCategory, ProviderSettingSchema, ResolvedProvider } from './contracts.js';
+import type { ProviderSourceMode } from '../config/config.js';
 export declare class ProviderLoader {
     private providers;
     private providerAvailability;
@@ -31,7 +32,9 @@ export declare class ProviderLoader {
     constructor(options?: {
         userDir?: string;
         logFn?: (msg: string) => void;
-        /** Disable upstream auto-download (for dev/testing/OSS) */
+        /** Explicit machine-level provider source policy */
+        sourceMode?: ProviderSourceMode;
+        /** Deprecated alias for sourceMode='no-upstream' */
         disableUpstream?: boolean;
     });
     private log;

package/src/providers/provider-loader.ts

@@ -30,6 +30,8 @@ import type {
   ResolvedProvider,
 } from './contracts.js';
 import { validateProviderDefinition } from './provider-schema.js';
+import type { ProviderSourceMode } from '../config/config.js';
+import type { ProviderSourceConfigSnapshot } from '../config/provider-source-config.js';
 
 interface ProviderAvailabilityState {
   installed: boolean;
@@ -39,8 +41,11 @@ interface ProviderAvailabilityState {
 export class ProviderLoader {
   private providers = new Map<string, ProviderModule>();
   private providerAvailability = new Map<string, ProviderAvailabilityState>();
+  private defaultProvidersDir: string;
+  private explicitProviderDir: string | null = null;
   private userDir: string;
   private upstreamDir: string;
+  private sourceMode: ProviderSourceMode = 'normal';
   private disableUpstream: boolean;
   private watchers: any[] = [];
   private logFn: (msg: string) => void;
@@ -58,32 +63,24 @@ export class ProviderLoader {
   constructor(options?: {
     userDir?: string;
     logFn?: (msg: string) => void;
-    /** Disable upstream auto-download (for dev/testing/OSS) */
+    /** Explicit machine-level provider source policy */
+    sourceMode?: ProviderSourceMode;
+    /** Deprecated alias for sourceMode='no-upstream' */
     disableUpstream?: boolean;
   }) {
     this.logFn = options?.logFn || LOG.forComponent('Provider').asLogFn();
 
     // Default directory for auto-downloads
-    const defaultProvidersDir = path.join(os.homedir(), '.adhdev', 'providers');
-
-    if (options?.userDir) {
-        this.userDir = options.userDir;
-        this.log(`Config 'providerDir' applied: ${this.userDir}`);
-    } else {
-        // Local dev overrides: Auto-detect local adhdev-providers repo for speed
-        const localRepoPath = path.resolve(__dirname, '../../../../../adhdev-providers');
-        if (fs.existsSync(localRepoPath)) {
-            this.userDir = localRepoPath;
-            this.log(`Auto-detected local public repository: ${this.userDir} (Dev workspace speedup)`);
-        } else {
-            this.userDir = defaultProvidersDir;
-            this.log(`Using default user providers directory: ${this.userDir}`);
-        }
-    }
-
-    // Upstream auto-download directory is always in the default location
-    this.upstreamDir = path.join(defaultProvidersDir, '.upstream');
-    this.disableUpstream = options?.disableUpstream ?? false;
+    this.defaultProvidersDir = path.join(os.homedir(), '.adhdev', 'providers');
+    this.userDir = this.defaultProvidersDir;
+    this.upstreamDir = path.join(this.defaultProvidersDir, '.upstream');
+    this.disableUpstream = false;
+
+    this.applySourceConfig({
+      userDir: options?.userDir,
+      sourceMode: options?.sourceMode,
+      disableUpstream: options?.disableUpstream,
+    });
   }
 
   private log(msg: string): void {
@@ -114,6 +111,47 @@ export class ProviderLoader {
     return [this.userDir, this.upstreamDir];
   }
 
+  getSourceConfig(): ProviderSourceConfigSnapshot {
+    return {
+      sourceMode: this.sourceMode,
+      disableUpstream: this.disableUpstream,
+      explicitProviderDir: this.explicitProviderDir,
+      userDir: this.userDir,
+      upstreamDir: this.upstreamDir,
+      providerRoots: this.getProviderRoots(),
+    };
+  }
+
+  applySourceConfig(options?: {
+    userDir?: string;
+    sourceMode?: ProviderSourceMode;
+    disableUpstream?: boolean;
+  }): ProviderSourceConfigSnapshot {
+    const nextSourceMode = options?.sourceMode === 'no-upstream'
+      ? 'no-upstream'
+      : (options?.sourceMode === 'normal'
+        ? 'normal'
+        : (options?.disableUpstream ? 'no-upstream' : this.sourceMode || 'normal'));
+
+    if (options && Object.prototype.hasOwnProperty.call(options, 'userDir')) {
+      this.explicitProviderDir = options.userDir?.trim() ? options.userDir : null;
+    }
+
+    this.sourceMode = nextSourceMode;
+    this.userDir = this.explicitProviderDir || this.defaultProvidersDir;
+    this.upstreamDir = path.join(this.defaultProvidersDir, '.upstream');
+    this.disableUpstream = this.sourceMode === 'no-upstream';
+
+    if (this.explicitProviderDir) {
+      this.log(`Config 'providerDir' applied: ${this.userDir}`);
+    } else {
+      this.log(`Using default user providers directory: ${this.userDir}`);
+    }
+    this.log(`Provider source config: mode=${this.sourceMode} explicitProviderDir=${this.explicitProviderDir || '-'} userDir=${this.userDir} upstreamDir=${this.upstreamDir}`);
+
+    return this.getSourceConfig();
+  }
+
  /**
  * Canonical provider directory shape for a given root.
  */
@@ -171,7 +209,7 @@ export class ProviderLoader {
         this.log(`Loaded ${upstreamCount} upstream providers (auto-updated)`);
       }
     } else if (this.disableUpstream) {
-      this.log('Upstream loading disabled (disableUpstream=true)');
+      this.log('Upstream loading disabled (sourceMode=no-upstream)');
     }
 
  // 2. Load user custom (excluding .upstream — highest priority, never auto-updated)
@@ -760,7 +798,7 @@ export class ProviderLoader {
  */
   async fetchLatest(): Promise<{ updated: boolean; error?: string }> {
     if (this.disableUpstream) {
-      this.log('Upstream fetch skipped (disableUpstream=true)');
+      this.log('Upstream fetch skipped (sourceMode=no-upstream)');
       return { updated: false };
     }
     const https = require('https') as typeof import('https');

package/src/providers/provider-patch-state.ts

@@ -0,0 +1,91 @@
+import type { ProviderControlDef } from './contracts.js'
+import { extractProviderControlValues } from './control-effects.js'
+import { resolveProviderStateSummaryMetadata } from './summary-metadata.js'
+
+
+export type ProviderControlValue = string | number | boolean
+export type ProviderControlValueMap = Record<string, ProviderControlValue>
+
+function isControlValue(value: unknown): value is ProviderControlValue {
+  return typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean'
+}
+
+function asControlValueMap(value: unknown): ProviderControlValueMap | undefined {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return undefined
+
+  const result: ProviderControlValueMap = {}
+  for (const [entryKey, entryValue] of Object.entries(value as Record<string, unknown>)) {
+    if (isControlValue(entryValue)) result[entryKey] = entryValue
+  }
+
+  return Object.keys(result).length > 0 ? result : undefined
+}
+
+function getLegacyModelModeValues(data: any): ProviderControlValueMap | undefined {
+  if (!data || typeof data !== 'object') return undefined
+
+  const legacy: ProviderControlValueMap = {}
+  if (typeof data.model === 'string' && data.model.trim()) legacy.model = data.model.trim()
+  if (typeof data.mode === 'string' && data.mode.trim()) legacy.mode = data.mode.trim()
+
+  return Object.keys(legacy).length > 0 ? legacy : undefined
+}
+
+export function mergeProviderPatchState(params: {
+  providerControls?: ProviderControlDef[]
+  data: any
+  currentControlValues?: ProviderControlValueMap
+  currentSummaryMetadata?: unknown
+  mergeWithCurrent?: boolean
+}): {
+  controlValues: ProviderControlValueMap
+  summaryMetadata: unknown
+} {
+  const {
+    providerControls,
+    data,
+    currentControlValues,
+    currentSummaryMetadata,
+    mergeWithCurrent = true,
+  } = params
+
+  const sources = [
+    mergeWithCurrent ? asControlValueMap(currentControlValues) : undefined,
+    asControlValueMap(data?.controlValues),
+    asControlValueMap(extractProviderControlValues(providerControls, data)),
+    getLegacyModelModeValues(data),
+  ]
+
+  const controlValues = Object.assign({}, ...sources.filter(Boolean)) as ProviderControlValueMap
+  return {
+    controlValues,
+    summaryMetadata: data?.summaryMetadata !== undefined ? data.summaryMetadata : currentSummaryMetadata,
+  }
+}
+
+export function normalizeProviderStateControlValues(
+  controlValues: ProviderControlValueMap | undefined,
+): ProviderControlValueMap | undefined {
+  return controlValues && Object.keys(controlValues).length > 0 ? controlValues : undefined
+}
+
+export function resolveProviderStateSurface(params: {
+  controlValues?: ProviderControlValueMap
+  summaryMetadata?: unknown
+  modelLabel?: string | null
+  modeLabel?: string | null
+}): {
+  controlValues: ProviderControlValueMap | undefined
+  summaryMetadata: unknown
+} {
+  const controlValues = normalizeProviderStateControlValues(params.controlValues)
+  return {
+    controlValues,
+    summaryMetadata: resolveProviderStateSummaryMetadata({
+      summaryMetadata: params.summaryMetadata as any,
+      controlValues,
+      modelLabel: params.modelLabel,
+      modeLabel: params.modeLabel,
+    }),
+  }
+}

package/src/providers/provider-schema.ts

@@ -83,6 +83,9 @@ export function validateProviderDefinition(raw: unknown): ProviderValidationResu
       warnings.push(`Unknown provider field: ${key}`)
     }
   }
+  if (provider.disableUpstream !== undefined) {
+    warnings.push('disableUpstream is deprecated in provider definitions; use machine-level provider source policy instead')
+  }
 
   const category = provider.category
   if ((category === 'cli' || category === 'acp')) {