@xopcai/xopc 0.0.85 → 0.0.87

package/dist/src/agent/fallback/candidates.js.map

@@ -1 +1 @@
-{"version":3,"file":"candidates.js","names":["parseModelRefUtil"],"sources":["../../../../src/agent/fallback/candidates.ts"],"sourcesContent":["import type { Config } from '../../config/schema.js';\nimport { isProviderConfiguredSync } from '../../providers/index.js';\nimport { getDefaultModelSync } from '../../providers/index.js';\nimport { parseModelRef as parseModelRefUtil, normalizeProviderId } from '../models/selection.js';\n\nexport interface ModelCandidate {\n  provider: string;\n  model: string;\n}\n\nexport interface FallbackAttempt {\n  provider: string;\n  model: string;\n  error: string;\n  reason?: string;\n  status?: number;\n  code?: string;\n}\n\n// Get default model dynamically\nfunction getDefaultModelParts(config?: Config): { provider: string; model: string } {\n  const defaultModel = getDefaultModelSync(config);\n  const parts = defaultModel.split('/');\n  return {\n    provider: parts[0] || 'anthropic',\n    model: parts[1] || 'claude-sonnet-4-5',\n  };\n}\n\n/**\n * Parse model reference string into provider/model parts.\n * Uses the unified implementation from selection.ts.\n */\nfunction parseModelRef(raw: string, defaultProvider?: string): ModelCandidate | null {\n  const result = parseModelRefUtil(raw, defaultProvider);\n  if (!result) return null;\n  return {\n    provider: normalizeProviderId(result.provider),\n    model: result.model,\n  };\n}\n\nexport function resolveFallbackCandidates(params: {\n  cfg: Config | undefined;\n  provider: string;\n  model: string;\n  fallbacksOverride?: string[];\n}): ModelCandidate[] {\n  const { cfg, provider: inputProvider, model: inputModel, fallbacksOverride } = params;\n\n  const modelConfig = cfg?.agents?.defaults?.model;\n  const primaryRef = typeof modelConfig === 'string' ? modelConfig : modelConfig?.primary;\n  const fallbacks = fallbacksOverride ?? (typeof modelConfig === 'object' ? modelConfig.fallbacks : undefined);\n\n  const defaultParts = getDefaultModelParts(cfg);\n  const primaryResolved = parseModelRef(primaryRef || getDefaultModelSync(cfg));\n  const provider = inputProvider.trim() || primaryResolved?.provider || defaultParts.provider;\n  const model = inputModel.trim() || primaryResolved?.model || defaultParts.model;\n\n  const candidates: ModelCandidate[] = [];\n  const seen = new Set<string>();\n\n  const addCandidate = (c: ModelCandidate) => {\n    const key = `${c.provider}/${c.model}`.toLowerCase();\n    if (seen.has(key)) return;\n    // Skip providers that are not configured (no API key)\n    if (!isProviderConfiguredSync(c.provider)) return;\n    seen.add(key);\n    candidates.push(c);\n  };\n\n  addCandidate({ provider, model });\n\n  if (fallbacks) {\n    for (const fb of fallbacks) {\n      const resolved = parseModelRef(fb, provider);\n      if (resolved) addCandidate(resolved);\n    }\n  }\n\n  if (!fallbacksOverride && primaryResolved) {\n    addCandidate(primaryResolved);\n  }\n\n  return candidates;\n}\n"],"mappings":";;;gBACoE;AAmBpE,SAAS,qBAAqB,QAAsD;CAElF,MAAM,QADe,oBAAoB,OACf,CAAC,MAAM,IAAI;AACrC,QAAO;EACL,UAAU,MAAM,MAAM;EACtB,OAAO,MAAM,MAAM;EACpB;;;;;;AAOH,SAAS,cAAc,KAAa,iBAAiD;CACnF,MAAM,SAASA,gBAAkB,KAAK,gBAAgB;AACtD,KAAI,CAAC,OAAQ,QAAO;AACpB,QAAO;EACL,UAAU,oBAAoB,OAAO,SAAS;EAC9C,OAAO,OAAO;EACf;;AAGH,SAAgB,0BAA0B,QAKrB;CACnB,MAAM,EAAE,KAAK,UAAU,eAAe,OAAO,YAAY,sBAAsB;CAE/E,MAAM,cAAc,KAAK,QAAQ,UAAU;CAC3C,MAAM,aAAa,OAAO,gBAAgB,WAAW,cAAc,aAAa;CAChF,MAAM,YAAY,sBAAsB,OAAO,gBAAgB,WAAW,YAAY,YAAY,KAAA;CAElG,MAAM,eAAe,qBAAqB,IAAI;CAC9C,MAAM,kBAAkB,cAAc,cAAc,oBAAoB,IAAI,CAAC;CAC7E,MAAM,WAAW,cAAc,MAAM,IAAI,iBAAiB,YAAY,aAAa;CACnF,MAAM,QAAQ,WAAW,MAAM,IAAI,iBAAiB,SAAS,aAAa;CAE1E,MAAM,aAA+B,EAAE;CACvC,MAAM,uBAAO,IAAI,KAAa;CAE9B,MAAM,gBAAgB,MAAsB;EAC1C,MAAM,MAAM,GAAG,EAAE,SAAS,GAAG,EAAE,QAAQ,aAAa;AACpD,MAAI,KAAK,IAAI,IAAI,CAAE;AAEnB,MAAI,CAAC,yBAAyB,EAAE,SAAS,CAAE;AAC3C,OAAK,IAAI,IAAI;AACb,aAAW,KAAK,EAAE;;AAGpB,cAAa;EAAE;EAAU;EAAO,CAAC;AAEjC,KAAI,UACF,MAAK,MAAM,MAAM,WAAW;EAC1B,MAAM,WAAW,cAAc,IAAI,SAAS;AAC5C,MAAI,SAAU,cAAa,SAAS;;AAIxC,KAAI,CAAC,qBAAqB,gBACxB,cAAa,gBAAgB;AAG/B,QAAO"}
+{"version":3,"file":"candidates.js","names":["parseModelRefUtil"],"sources":["../../../../src/agent/fallback/candidates.ts"],"sourcesContent":["import type { Config } from '../../config/schema.js';\nimport { isProviderConfiguredSync } from '../../providers/index.js';\nimport { getDefaultModelSync } from '../../providers/index.js';\nimport { parseModelRef as parseModelRefUtil, normalizeProviderId } from '../models/selection.js';\n\nexport interface ModelCandidate {\n  provider: string;\n  model: string;\n}\n\nexport interface FallbackAttempt {\n  provider: string;\n  model: string;\n  error: string;\n  reason?: string;\n  status?: number;\n  code?: string;\n}\n\n// Get default model dynamically\nfunction getDefaultModelParts(config?: Config): { provider: string; model: string } {\n  const defaultModel = getDefaultModelSync(config);\n  const parts = defaultModel.split('/');\n  return {\n    provider: parts[0] || 'anthropic',\n    model: parts[1] || 'claude-sonnet-4-5',\n  };\n}\n\n/**\n * Parse model reference string into provider/model parts.\n * Uses the unified implementation from selection.ts.\n */\nfunction parseModelRef(raw: string, defaultProvider?: string): ModelCandidate | null {\n  const result = parseModelRefUtil(raw, defaultProvider);\n  if (!result) return null;\n  return {\n    provider: normalizeProviderId(result.provider),\n    model: result.model,\n  };\n}\n\nexport function resolveFallbackCandidates(params: {\n  cfg: Config | undefined;\n  provider: string;\n  model: string;\n  fallbacksOverride?: string[];\n}): ModelCandidate[] {\n  const { cfg, provider: inputProvider, model: inputModel, fallbacksOverride } = params;\n\n  const modelConfig = cfg?.agents?.defaults?.model;\n  const primaryRef = modelConfig?.primary;\n  const fallbacks = fallbacksOverride ?? modelConfig?.fallbacks;\n\n  const defaultParts = getDefaultModelParts(cfg);\n  const primaryResolved = parseModelRef(primaryRef || getDefaultModelSync(cfg));\n  const provider = inputProvider.trim() || primaryResolved?.provider || defaultParts.provider;\n  const model = inputModel.trim() || primaryResolved?.model || defaultParts.model;\n\n  const candidates: ModelCandidate[] = [];\n  const seen = new Set<string>();\n\n  const addCandidate = (c: ModelCandidate) => {\n    const key = `${c.provider}/${c.model}`.toLowerCase();\n    if (seen.has(key)) return;\n    // Skip providers that are not configured (no API key)\n    if (!isProviderConfiguredSync(c.provider)) return;\n    seen.add(key);\n    candidates.push(c);\n  };\n\n  addCandidate({ provider, model });\n\n  if (fallbacks) {\n    for (const fb of fallbacks) {\n      const resolved = parseModelRef(fb, provider);\n      if (resolved) addCandidate(resolved);\n    }\n  }\n\n  if (!fallbacksOverride && primaryResolved) {\n    addCandidate(primaryResolved);\n  }\n\n  return candidates;\n}\n"],"mappings":";;;gBACoE;AAmBpE,SAAS,qBAAqB,QAAsD;CAElF,MAAM,QADe,oBAAoB,OACf,CAAC,MAAM,IAAI;AACrC,QAAO;EACL,UAAU,MAAM,MAAM;EACtB,OAAO,MAAM,MAAM;EACpB;;;;;;AAOH,SAAS,cAAc,KAAa,iBAAiD;CACnF,MAAM,SAASA,gBAAkB,KAAK,gBAAgB;AACtD,KAAI,CAAC,OAAQ,QAAO;AACpB,QAAO;EACL,UAAU,oBAAoB,OAAO,SAAS;EAC9C,OAAO,OAAO;EACf;;AAGH,SAAgB,0BAA0B,QAKrB;CACnB,MAAM,EAAE,KAAK,UAAU,eAAe,OAAO,YAAY,sBAAsB;CAE/E,MAAM,cAAc,KAAK,QAAQ,UAAU;CAC3C,MAAM,aAAa,aAAa;CAChC,MAAM,YAAY,qBAAqB,aAAa;CAEpD,MAAM,eAAe,qBAAqB,IAAI;CAC9C,MAAM,kBAAkB,cAAc,cAAc,oBAAoB,IAAI,CAAC;CAC7E,MAAM,WAAW,cAAc,MAAM,IAAI,iBAAiB,YAAY,aAAa;CACnF,MAAM,QAAQ,WAAW,MAAM,IAAI,iBAAiB,SAAS,aAAa;CAE1E,MAAM,aAA+B,EAAE;CACvC,MAAM,uBAAO,IAAI,KAAa;CAE9B,MAAM,gBAAgB,MAAsB;EAC1C,MAAM,MAAM,GAAG,EAAE,SAAS,GAAG,EAAE,QAAQ,aAAa;AACpD,MAAI,KAAK,IAAI,IAAI,CAAE;AAEnB,MAAI,CAAC,yBAAyB,EAAE,SAAS,CAAE;AAC3C,OAAK,IAAI,IAAI;AACb,aAAW,KAAK,EAAE;;AAGpB,cAAa;EAAE;EAAU;EAAO,CAAC;AAEjC,KAAI,UACF,MAAK,MAAM,MAAM,WAAW;EAC1B,MAAM,WAAW,cAAc,IAAI,SAAS;AAC5C,MAAI,SAAU,cAAa,SAAS;;AAIxC,KAAI,CAAC,qBAAqB,gBACxB,cAAa,gBAAgB;AAG/B,QAAO"}

package/dist/src/agent/goals/persistent-goal-apis.d.ts

@@ -5,8 +5,6 @@ export interface PersistentGoalApis {
     getSessionMetadata(key: string): Promise<SessionMetadata | null>;
     updateSessionMetadata(key: string, updates: Partial<SessionMetadata>): Promise<void>;
     loadMessages(key: string): Promise<AgentMessage[]>;
-    /** @deprecated Prefer {@link appendAssistantReceipt} for runtime turns. */
-    saveMessages(key: string, messages: AgentMessage[]): Promise<void>;
     appendAssistantReceipt(sessionKey: string, text: string): Promise<void>;
     scheduleContinuation(sessionKey: string, message: string): void;
     /**

package/dist/src/agent/goals/persistent-goal-service.js

@@ -55,7 +55,6 @@ var PersistentGoalService = class {
 				this.opts.onSessionMetadataUpdated?.(k);
 			},
 			loadMessages: (k) => this.opts.sessionStore.loadMessages(k),
-			saveMessages: (k, m) => this.opts.sessionStore.saveMessages(k, m),
 			appendAssistantReceipt: async (k, text) => {
 				const trimmed = text.trim();
 				if (!trimmed) return;

package/dist/src/agent/goals/persistent-goal-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"persistent-goal-service.js","names":["parseRoutingSessionKey"],"sources":["../../../../src/agent/goals/persistent-goal-service.ts"],"sourcesContent":["/**\n * PersistentGoalService — owns the \"/goal\" runtime: continuation scheduling,\n * the `PersistentGoalApis` bag that command handlers receive, and the post-turn\n * verdict hook called from `OutboundCoordinator`.\n *\n * Previously this logic was scattered across `AgentService`:\n *   - `setPersistentGoalWebchatContinuationScheduler` + a private callback field\n *   - `schedulePersistentGoalContinuation` (bus vs webchat fork)\n *   - `getPersistentGoalApisForCommand` (~40-line API factory)\n *   - `recordPersistentGoalStreamOutcome` / `takePersistentGoalStreamOutcome`\n *   - the `/goal` half of `emitSessionTurnComplete` (delegated to\n *     `handlePersistentGoalPostTurn`)\n *\n * Concentrating it here gives the rest of `AgentService` a cleaner surface\n * (one collaborator instead of five methods) and makes the goal runtime\n * unit-testable in isolation.\n */\n\nimport type { AgentMessage } from '@earendil-works/pi-agent-core';\n\nimport type { Config } from '../../config/schema.js';\nimport type { MessageBus } from '../../infra/bus/index.js';\nimport type { ModelManager } from '../models/index.js';\nimport type { SessionStore } from '../../session/store.js';\nimport type { SessionStateBag } from '../session/index.js';\nimport { parseSessionKey as parseRoutingSessionKey } from '../../routing/session-key.js';\nimport { appendPiTranscriptMessage } from '../../session/parity/jsonl-transcript-io.js';\nimport { createLogger } from '../../utils/logger.js';\nimport type { PersistentGoalApis } from './persistent-goal-apis.js';\nimport { handlePersistentGoalPostTurn } from './post-turn.js';\n\nconst log = createLogger('PersistentGoalService');\n\nexport interface PersistentGoalRouting {\n  sessionKey: string;\n  channel: string;\n  chatId: string;\n  inboundMetadata?: Record<string, unknown>;\n}\n\nexport interface SessionTurnCompletionForGoal {\n  sessionKey: string;\n  channel: string;\n  chatId: string;\n  assistantPlainText: string;\n  aborted: boolean;\n  streamError?: string;\n  skipPersistentGoalPostTurn?: boolean;\n  outboundMetadata?: Record<string, unknown>;\n}\n\nexport interface PersistentGoalServiceOptions {\n  bus: MessageBus;\n  sessionStore: SessionStore;\n  modelManager: ModelManager;\n  sessionState: SessionStateBag;\n  /** Effective config snapshot accessor. */\n  getConfig: () => Config | undefined;\n  /** Resolve the workspace directory for `appendAssistantReceipt` writes. */\n  getResolvedWorkspaceForSession: (sessionKey: string) => string;\n  /** Notify the gateway UI after a metadata change (replaces the in-bag emit). */\n  onSessionMetadataUpdated?: (sessionKey: string) => void;\n  /** Push an assistant token + transcript refresh into a live webchat stream. */\n  notifyWebchatTranscriptAppend: (sessionKey: string, assistantText: string) => void;\n}\n\nexport class PersistentGoalService {\n  private readonly opts: PersistentGoalServiceOptions;\n  /** Gateway only: webchat continuations bypass the bus and reuse `runGatewayAgent`. */\n  private webchatContinuationScheduler?: (sessionKey: string, message: string) => void;\n\n  constructor(opts: PersistentGoalServiceOptions) {\n    this.opts = opts;\n  }\n\n  /** Register the gateway-side webchat continuation hook (set from `web-agent` wiring). */\n  setWebchatContinuationScheduler(\n    fn: ((sessionKey: string, message: string) => void) | undefined,\n  ): void {\n    this.webchatContinuationScheduler = fn;\n  }\n\n  /**\n   * Continue a session after `/goal` decides the previous turn needs follow-up.\n   * Webchat sessions go through the scheduler; bus-driven channels re-publish the\n   * follow-up message as an inbound bus event so the existing inbound loop picks it up.\n   */\n  scheduleContinuation(\n    sessionKey: string,\n    message: string,\n    routing: { channel: string; chatId: string; inboundMetadata?: Record<string, unknown> },\n  ): void {\n    const parsed = parseRoutingSessionKey(sessionKey);\n    if (parsed?.source === 'webchat' && this.webchatContinuationScheduler) {\n      this.webchatContinuationScheduler(sessionKey, message);\n      return;\n    }\n    queueMicrotask(() => {\n      void this.opts.bus\n        .publishInbound({\n          channel: routing.channel,\n          chat_id: routing.chatId,\n          sender_id: 'persistent-goal',\n          content: message,\n          metadata: { sessionKey, ...routing.inboundMetadata },\n        })\n        .catch((err) => {\n          log.warn({ err, sessionKey }, 'Persistent goal: publishInbound failed');\n        });\n    });\n  }\n\n  /** Build the per-command `PersistentGoalApis` bag (transcript writers + scheduler closures). */\n  buildApisForRouting(routing: PersistentGoalRouting): PersistentGoalApis {\n    return {\n      getSessionMetadata: (k) => this.opts.sessionStore.getMetadata(k),\n      updateSessionMetadata: async (k, u) => {\n        await this.opts.sessionStore.updateMetadata(k, u);\n        this.opts.onSessionMetadataUpdated?.(k);\n      },\n      loadMessages: (k) => this.opts.sessionStore.loadMessages(k),\n      saveMessages: (k, m) => this.opts.sessionStore.saveMessages(k, m),\n      appendAssistantReceipt: async (k, text) => {\n        const trimmed = text.trim();\n        if (!trimmed) return;\n        const { absPath } = await this.opts.sessionStore.resolveTranscriptPath(k);\n        const workspaceDir = this.opts.getResolvedWorkspaceForSession(k);\n        await appendPiTranscriptMessage({\n          absPath,\n          cwd: workspaceDir,\n          message: {\n            role: 'assistant',\n            content: [{ type: 'text', text: trimmed }],\n            timestamp: Date.now(),\n          } as AgentMessage,\n          sessionKey: k,\n        });\n        this.opts.notifyWebchatTranscriptAppend(k, trimmed);\n      },\n      scheduleContinuation: (sk, msg) => {\n        this.scheduleContinuation(sk, msg, {\n          channel: routing.channel,\n          chatId: routing.chatId,\n          inboundMetadata: routing.inboundMetadata,\n        });\n      },\n      inboundConcurrentDepth: (sk) => this.opts.sessionState.getInboundTurnDepth(sk),\n    };\n  }\n\n  recordStreamOutcome(sessionKey: string, outcome: { skipPersistentGoalPostTurn: boolean }): void {\n    this.opts.sessionState.recordPersistentGoalStreamOutcome(sessionKey, outcome);\n  }\n\n  takeStreamOutcome(sessionKey: string): { skipPersistentGoalPostTurn: boolean } | undefined {\n    return this.opts.sessionState.takePersistentGoalStreamOutcome(sessionKey);\n  }\n\n  /**\n   * Run the `/goal` post-turn verdict for a completed user turn (called from\n   * `OutboundCoordinator.emitSessionTurnComplete`).\n   */\n  async runPostTurn(payload: SessionTurnCompletionForGoal): Promise<void> {\n    const apis = this.buildApisForRouting({\n      sessionKey: payload.sessionKey,\n      channel: payload.channel,\n      chatId: payload.chatId,\n      inboundMetadata: payload.outboundMetadata,\n    });\n\n    const src = parseRoutingSessionKey(payload.sessionKey)?.source;\n    const isWebchat = src === 'webchat';\n    const publishVerdict =\n      !isWebchat && payload.channel !== 'cli'\n        ? async (text: string) => {\n            await this.opts.bus.publishOutbound({\n              channel: payload.channel,\n              chat_id: payload.chatId,\n              content: text,\n              type: 'message',\n              metadata: {\n                accountId: payload.outboundMetadata?.accountId,\n                threadId: payload.outboundMetadata?.threadId,\n              },\n            });\n          }\n        : undefined;\n\n    let runtimeSessionModelRef: string | undefined;\n    try {\n      runtimeSessionModelRef = this.opts.modelManager.getModelForSession(payload.sessionKey);\n    } catch {\n      runtimeSessionModelRef = undefined;\n    }\n\n    await handlePersistentGoalPostTurn({\n      apis,\n      sessionKey: payload.sessionKey,\n      assistantPlainText: payload.assistantPlainText,\n      aborted: payload.aborted,\n      ...(payload.streamError !== undefined ? { streamError: payload.streamError } : {}),\n      skipPersistentGoalPostTurn: payload.skipPersistentGoalPostTurn ?? false,\n      config: this.opts.getConfig(),\n      runtimeSessionModelRef,\n      publishVerdictToChannel: publishVerdict,\n    });\n  }\n}\n"],"mappings":";;;;;;kBAyByF;aAEpC;AAIrD,MAAM,MAAM,aAAa,wBAAwB;AAmCjD,IAAa,wBAAb,MAAmC;CACjC;;CAEA;CAEA,YAAY,MAAoC;AAC9C,OAAK,OAAO;;;CAId,gCACE,IACM;AACN,OAAK,+BAA+B;;;;;;;CAQtC,qBACE,YACA,SACA,SACM;AAEN,MADeA,gBAAuB,WAC5B,EAAE,WAAW,aAAa,KAAK,8BAA8B;AACrE,QAAK,6BAA6B,YAAY,QAAQ;AACtD;;AAEF,uBAAqB;AACd,QAAK,KAAK,IACZ,eAAe;IACd,SAAS,QAAQ;IACjB,SAAS,QAAQ;IACjB,WAAW;IACX,SAAS;IACT,UAAU;KAAE;KAAY,GAAG,QAAQ;KAAiB;IACrD,CAAC,CACD,OAAO,QAAQ;AACd,QAAI,KAAK;KAAE;KAAK;KAAY,EAAE,yCAAyC;KACvE;IACJ;;;CAIJ,oBAAoB,SAAoD;AACtE,SAAO;GACL,qBAAqB,MAAM,KAAK,KAAK,aAAa,YAAY,EAAE;GAChE,uBAAuB,OAAO,GAAG,MAAM;AACrC,UAAM,KAAK,KAAK,aAAa,eAAe,GAAG,EAAE;AACjD,SAAK,KAAK,2BAA2B,EAAE;;GAEzC,eAAe,MAAM,KAAK,KAAK,aAAa,aAAa,EAAE;GAC3D,eAAe,GAAG,MAAM,KAAK,KAAK,aAAa,aAAa,GAAG,EAAE;GACjE,wBAAwB,OAAO,GAAG,SAAS;IACzC,MAAM,UAAU,KAAK,MAAM;AAC3B,QAAI,CAAC,QAAS;IACd,MAAM,EAAE,YAAY,MAAM,KAAK,KAAK,aAAa,sBAAsB,EAAE;AAEzE,UAAM,0BAA0B;KAC9B;KACA,KAHmB,KAAK,KAAK,+BAA+B,EAG3C;KACjB,SAAS;MACP,MAAM;MACN,SAAS,CAAC;OAAE,MAAM;OAAQ,MAAM;OAAS,CAAC;MAC1C,WAAW,KAAK,KAAK;MACtB;KACD,YAAY;KACb,CAAC;AACF,SAAK,KAAK,8BAA8B,GAAG,QAAQ;;GAErD,uBAAuB,IAAI,QAAQ;AACjC,SAAK,qBAAqB,IAAI,KAAK;KACjC,SAAS,QAAQ;KACjB,QAAQ,QAAQ;KAChB,iBAAiB,QAAQ;KAC1B,CAAC;;GAEJ,yBAAyB,OAAO,KAAK,KAAK,aAAa,oBAAoB,GAAG;GAC/E;;CAGH,oBAAoB,YAAoB,SAAwD;AAC9F,OAAK,KAAK,aAAa,kCAAkC,YAAY,QAAQ;;CAG/E,kBAAkB,YAAyE;AACzF,SAAO,KAAK,KAAK,aAAa,gCAAgC,WAAW;;;;;;CAO3E,MAAM,YAAY,SAAsD;EACtE,MAAM,OAAO,KAAK,oBAAoB;GACpC,YAAY,QAAQ;GACpB,SAAS,QAAQ;GACjB,QAAQ,QAAQ;GAChB,iBAAiB,QAAQ;GAC1B,CAAC;EAIF,MAAM,iBACJ,EAHUA,gBAAuB,QAAQ,WAAW,EAAE,WAC9B,cAEV,QAAQ,YAAY,QAC9B,OAAO,SAAiB;AACtB,SAAM,KAAK,KAAK,IAAI,gBAAgB;IAClC,SAAS,QAAQ;IACjB,SAAS,QAAQ;IACjB,SAAS;IACT,MAAM;IACN,UAAU;KACR,WAAW,QAAQ,kBAAkB;KACrC,UAAU,QAAQ,kBAAkB;KACrC;IACF,CAAC;MAEJ,KAAA;EAEN,IAAI;AACJ,MAAI;AACF,4BAAyB,KAAK,KAAK,aAAa,mBAAmB,QAAQ,WAAW;UAChF;AACN,4BAAyB,KAAA;;AAG3B,QAAM,6BAA6B;GACjC;GACA,YAAY,QAAQ;GACpB,oBAAoB,QAAQ;GAC5B,SAAS,QAAQ;GACjB,GAAI,QAAQ,gBAAgB,KAAA,IAAY,EAAE,aAAa,QAAQ,aAAa,GAAG,EAAE;GACjF,4BAA4B,QAAQ,8BAA8B;GAClE,QAAQ,KAAK,KAAK,WAAW;GAC7B;GACA,yBAAyB;GAC1B,CAAC"}
+{"version":3,"file":"persistent-goal-service.js","names":["parseRoutingSessionKey"],"sources":["../../../../src/agent/goals/persistent-goal-service.ts"],"sourcesContent":["/**\n * PersistentGoalService — owns the \"/goal\" runtime: continuation scheduling,\n * the `PersistentGoalApis` bag that command handlers receive, and the post-turn\n * verdict hook called from `OutboundCoordinator`.\n *\n * Previously this logic was scattered across `AgentService`:\n *   - `setPersistentGoalWebchatContinuationScheduler` + a private callback field\n *   - `schedulePersistentGoalContinuation` (bus vs webchat fork)\n *   - `getPersistentGoalApisForCommand` (~40-line API factory)\n *   - `recordPersistentGoalStreamOutcome` / `takePersistentGoalStreamOutcome`\n *   - the `/goal` half of `emitSessionTurnComplete` (delegated to\n *     `handlePersistentGoalPostTurn`)\n *\n * Concentrating it here gives the rest of `AgentService` a cleaner surface\n * (one collaborator instead of five methods) and makes the goal runtime\n * unit-testable in isolation.\n */\n\nimport type { AgentMessage } from '@earendil-works/pi-agent-core';\n\nimport type { Config } from '../../config/schema.js';\nimport type { MessageBus } from '../../infra/bus/index.js';\nimport type { ModelManager } from '../models/index.js';\nimport type { SessionStore } from '../../session/store.js';\nimport type { SessionStateBag } from '../session/index.js';\nimport { parseSessionKey as parseRoutingSessionKey } from '../../routing/session-key.js';\nimport { appendPiTranscriptMessage } from '../../session/parity/jsonl-transcript-io.js';\nimport { createLogger } from '../../utils/logger.js';\nimport type { PersistentGoalApis } from './persistent-goal-apis.js';\nimport { handlePersistentGoalPostTurn } from './post-turn.js';\n\nconst log = createLogger('PersistentGoalService');\n\nexport interface PersistentGoalRouting {\n  sessionKey: string;\n  channel: string;\n  chatId: string;\n  inboundMetadata?: Record<string, unknown>;\n}\n\nexport interface SessionTurnCompletionForGoal {\n  sessionKey: string;\n  channel: string;\n  chatId: string;\n  assistantPlainText: string;\n  aborted: boolean;\n  streamError?: string;\n  skipPersistentGoalPostTurn?: boolean;\n  outboundMetadata?: Record<string, unknown>;\n}\n\nexport interface PersistentGoalServiceOptions {\n  bus: MessageBus;\n  sessionStore: SessionStore;\n  modelManager: ModelManager;\n  sessionState: SessionStateBag;\n  /** Effective config snapshot accessor. */\n  getConfig: () => Config | undefined;\n  /** Resolve the workspace directory for `appendAssistantReceipt` writes. */\n  getResolvedWorkspaceForSession: (sessionKey: string) => string;\n  /** Notify the gateway UI after a metadata change (replaces the in-bag emit). */\n  onSessionMetadataUpdated?: (sessionKey: string) => void;\n  /** Push an assistant token + transcript refresh into a live webchat stream. */\n  notifyWebchatTranscriptAppend: (sessionKey: string, assistantText: string) => void;\n}\n\nexport class PersistentGoalService {\n  private readonly opts: PersistentGoalServiceOptions;\n  /** Gateway only: webchat continuations bypass the bus and reuse `runGatewayAgent`. */\n  private webchatContinuationScheduler?: (sessionKey: string, message: string) => void;\n\n  constructor(opts: PersistentGoalServiceOptions) {\n    this.opts = opts;\n  }\n\n  /** Register the gateway-side webchat continuation hook (set from `web-agent` wiring). */\n  setWebchatContinuationScheduler(\n    fn: ((sessionKey: string, message: string) => void) | undefined,\n  ): void {\n    this.webchatContinuationScheduler = fn;\n  }\n\n  /**\n   * Continue a session after `/goal` decides the previous turn needs follow-up.\n   * Webchat sessions go through the scheduler; bus-driven channels re-publish the\n   * follow-up message as an inbound bus event so the existing inbound loop picks it up.\n   */\n  scheduleContinuation(\n    sessionKey: string,\n    message: string,\n    routing: { channel: string; chatId: string; inboundMetadata?: Record<string, unknown> },\n  ): void {\n    const parsed = parseRoutingSessionKey(sessionKey);\n    if (parsed?.source === 'webchat' && this.webchatContinuationScheduler) {\n      this.webchatContinuationScheduler(sessionKey, message);\n      return;\n    }\n    queueMicrotask(() => {\n      void this.opts.bus\n        .publishInbound({\n          channel: routing.channel,\n          chat_id: routing.chatId,\n          sender_id: 'persistent-goal',\n          content: message,\n          metadata: { sessionKey, ...routing.inboundMetadata },\n        })\n        .catch((err) => {\n          log.warn({ err, sessionKey }, 'Persistent goal: publishInbound failed');\n        });\n    });\n  }\n\n  /** Build the per-command `PersistentGoalApis` bag (transcript writers + scheduler closures). */\n  buildApisForRouting(routing: PersistentGoalRouting): PersistentGoalApis {\n    return {\n      getSessionMetadata: (k) => this.opts.sessionStore.getMetadata(k),\n      updateSessionMetadata: async (k, u) => {\n        await this.opts.sessionStore.updateMetadata(k, u);\n        this.opts.onSessionMetadataUpdated?.(k);\n      },\n      loadMessages: (k) => this.opts.sessionStore.loadMessages(k),\n      appendAssistantReceipt: async (k, text) => {\n        const trimmed = text.trim();\n        if (!trimmed) return;\n        const { absPath } = await this.opts.sessionStore.resolveTranscriptPath(k);\n        const workspaceDir = this.opts.getResolvedWorkspaceForSession(k);\n        await appendPiTranscriptMessage({\n          absPath,\n          cwd: workspaceDir,\n          message: {\n            role: 'assistant',\n            content: [{ type: 'text', text: trimmed }],\n            timestamp: Date.now(),\n          } as AgentMessage,\n          sessionKey: k,\n        });\n        this.opts.notifyWebchatTranscriptAppend(k, trimmed);\n      },\n      scheduleContinuation: (sk, msg) => {\n        this.scheduleContinuation(sk, msg, {\n          channel: routing.channel,\n          chatId: routing.chatId,\n          inboundMetadata: routing.inboundMetadata,\n        });\n      },\n      inboundConcurrentDepth: (sk) => this.opts.sessionState.getInboundTurnDepth(sk),\n    };\n  }\n\n  recordStreamOutcome(sessionKey: string, outcome: { skipPersistentGoalPostTurn: boolean }): void {\n    this.opts.sessionState.recordPersistentGoalStreamOutcome(sessionKey, outcome);\n  }\n\n  takeStreamOutcome(sessionKey: string): { skipPersistentGoalPostTurn: boolean } | undefined {\n    return this.opts.sessionState.takePersistentGoalStreamOutcome(sessionKey);\n  }\n\n  /**\n   * Run the `/goal` post-turn verdict for a completed user turn (called from\n   * `OutboundCoordinator.emitSessionTurnComplete`).\n   */\n  async runPostTurn(payload: SessionTurnCompletionForGoal): Promise<void> {\n    const apis = this.buildApisForRouting({\n      sessionKey: payload.sessionKey,\n      channel: payload.channel,\n      chatId: payload.chatId,\n      inboundMetadata: payload.outboundMetadata,\n    });\n\n    const src = parseRoutingSessionKey(payload.sessionKey)?.source;\n    const isWebchat = src === 'webchat';\n    const publishVerdict =\n      !isWebchat && payload.channel !== 'cli'\n        ? async (text: string) => {\n            await this.opts.bus.publishOutbound({\n              channel: payload.channel,\n              chat_id: payload.chatId,\n              content: text,\n              type: 'message',\n              metadata: {\n                accountId: payload.outboundMetadata?.accountId,\n                threadId: payload.outboundMetadata?.threadId,\n              },\n            });\n          }\n        : undefined;\n\n    let runtimeSessionModelRef: string | undefined;\n    try {\n      runtimeSessionModelRef = this.opts.modelManager.getModelForSession(payload.sessionKey);\n    } catch {\n      runtimeSessionModelRef = undefined;\n    }\n\n    await handlePersistentGoalPostTurn({\n      apis,\n      sessionKey: payload.sessionKey,\n      assistantPlainText: payload.assistantPlainText,\n      aborted: payload.aborted,\n      ...(payload.streamError !== undefined ? { streamError: payload.streamError } : {}),\n      skipPersistentGoalPostTurn: payload.skipPersistentGoalPostTurn ?? false,\n      config: this.opts.getConfig(),\n      runtimeSessionModelRef,\n      publishVerdictToChannel: publishVerdict,\n    });\n  }\n}\n"],"mappings":";;;;;;kBAyByF;aAEpC;AAIrD,MAAM,MAAM,aAAa,wBAAwB;AAmCjD,IAAa,wBAAb,MAAmC;CACjC;;CAEA;CAEA,YAAY,MAAoC;AAC9C,OAAK,OAAO;;;CAId,gCACE,IACM;AACN,OAAK,+BAA+B;;;;;;;CAQtC,qBACE,YACA,SACA,SACM;AAEN,MADeA,gBAAuB,WAC5B,EAAE,WAAW,aAAa,KAAK,8BAA8B;AACrE,QAAK,6BAA6B,YAAY,QAAQ;AACtD;;AAEF,uBAAqB;AACd,QAAK,KAAK,IACZ,eAAe;IACd,SAAS,QAAQ;IACjB,SAAS,QAAQ;IACjB,WAAW;IACX,SAAS;IACT,UAAU;KAAE;KAAY,GAAG,QAAQ;KAAiB;IACrD,CAAC,CACD,OAAO,QAAQ;AACd,QAAI,KAAK;KAAE;KAAK;KAAY,EAAE,yCAAyC;KACvE;IACJ;;;CAIJ,oBAAoB,SAAoD;AACtE,SAAO;GACL,qBAAqB,MAAM,KAAK,KAAK,aAAa,YAAY,EAAE;GAChE,uBAAuB,OAAO,GAAG,MAAM;AACrC,UAAM,KAAK,KAAK,aAAa,eAAe,GAAG,EAAE;AACjD,SAAK,KAAK,2BAA2B,EAAE;;GAEzC,eAAe,MAAM,KAAK,KAAK,aAAa,aAAa,EAAE;GAC3D,wBAAwB,OAAO,GAAG,SAAS;IACzC,MAAM,UAAU,KAAK,MAAM;AAC3B,QAAI,CAAC,QAAS;IACd,MAAM,EAAE,YAAY,MAAM,KAAK,KAAK,aAAa,sBAAsB,EAAE;AAEzE,UAAM,0BAA0B;KAC9B;KACA,KAHmB,KAAK,KAAK,+BAA+B,EAG3C;KACjB,SAAS;MACP,MAAM;MACN,SAAS,CAAC;OAAE,MAAM;OAAQ,MAAM;OAAS,CAAC;MAC1C,WAAW,KAAK,KAAK;MACtB;KACD,YAAY;KACb,CAAC;AACF,SAAK,KAAK,8BAA8B,GAAG,QAAQ;;GAErD,uBAAuB,IAAI,QAAQ;AACjC,SAAK,qBAAqB,IAAI,KAAK;KACjC,SAAS,QAAQ;KACjB,QAAQ,QAAQ;KAChB,iBAAiB,QAAQ;KAC1B,CAAC;;GAEJ,yBAAyB,OAAO,KAAK,KAAK,aAAa,oBAAoB,GAAG;GAC/E;;CAGH,oBAAoB,YAAoB,SAAwD;AAC9F,OAAK,KAAK,aAAa,kCAAkC,YAAY,QAAQ;;CAG/E,kBAAkB,YAAyE;AACzF,SAAO,KAAK,KAAK,aAAa,gCAAgC,WAAW;;;;;;CAO3E,MAAM,YAAY,SAAsD;EACtE,MAAM,OAAO,KAAK,oBAAoB;GACpC,YAAY,QAAQ;GACpB,SAAS,QAAQ;GACjB,QAAQ,QAAQ;GAChB,iBAAiB,QAAQ;GAC1B,CAAC;EAIF,MAAM,iBACJ,EAHUA,gBAAuB,QAAQ,WAAW,EAAE,WAC9B,cAEV,QAAQ,YAAY,QAC9B,OAAO,SAAiB;AACtB,SAAM,KAAK,KAAK,IAAI,gBAAgB;IAClC,SAAS,QAAQ;IACjB,SAAS,QAAQ;IACjB,SAAS;IACT,MAAM;IACN,UAAU;KACR,WAAW,QAAQ,kBAAkB;KACrC,UAAU,QAAQ,kBAAkB;KACrC;IACF,CAAC;MAEJ,KAAA;EAEN,IAAI;AACJ,MAAI;AACF,4BAAyB,KAAK,KAAK,aAAa,mBAAmB,QAAQ,WAAW;UAChF;AACN,4BAAyB,KAAA;;AAG3B,QAAM,6BAA6B;GACjC;GACA,YAAY,QAAQ;GACpB,oBAAoB,QAAQ;GAC5B,SAAS,QAAQ;GACjB,GAAI,QAAQ,gBAAgB,KAAA,IAAY,EAAE,aAAa,QAAQ,aAAa,GAAG,EAAE;GACjF,4BAA4B,QAAQ,8BAA8B;GAClE,QAAQ,KAAK,KAAK,WAAW;GAC7B;GACA,yBAAyB;GAC1B,CAAC"}

package/dist/src/agent/image/generation/normalization.js

@@ -16,19 +16,9 @@ import "../../media-generation/index.js";
 *
 * Decision table — see docs/image-generation-rearchitecture.md §6.3
 */
-/**
-* Narrow `provider.capabilities` to the new nested shape. The registry accepts
-* the legacy flat shape too, but normalization only understands the new one;
-* legacy fields surface here as `undefined`.
-*/
-function asNewCapabilities(caps) {
-	if (!caps) return {};
-	if (caps.supportsEdit !== void 0 && caps.generate === void 0 && caps.edit === void 0) return {};
-	return caps;
-}
 function resolveImageGenerationOverrides(params) {
 	const provider = params.provider;
-	const caps = asNewCapabilities(provider.capabilities);
+	const caps = provider.capabilities ?? {};
 	const isEdit = (params.inputImages?.length ?? 0) > 0;
 	assertEditSupported(provider, isEdit, params.inputImages);
 	const modeCaps = isEdit ? caps.edit : caps.generate;
@@ -159,7 +149,7 @@ function resolveGeometry(params) {
 }
 function assertEditSupported(provider, isEdit, inputImages) {
 	if (!isEdit) return;
-	const editCap = asNewCapabilities(provider.capabilities).edit;
+	const editCap = (provider.capabilities ?? {}).edit;
 	if (!(editCap?.enabled === true)) throw new Error(`${provider.id} image editing is not supported.`);
 	const max = editCap.maxInputImages;
 	if (typeof max === "number" && (inputImages?.length ?? 0) > max) throw new Error(`${provider.id} accepts at most ${max} input image(s); got ${inputImages?.length ?? 0}.`);

package/dist/src/agent/image/generation/normalization.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalization.js","names":[],"sources":["../../../../../src/agent/image/generation/normalization.ts"],"sourcesContent":["/**\n * Image-generation parameter normalization.\n *\n * Reconciles user-supplied geometry / output overrides against the active\n * provider's declared {@link ImageGenerationProviderCapabilities}. Returns:\n *   - the actually-applied values to forward to the provider\n *   - per-field {@link MediaNormalizationEntry} (requested / applied / derivedFrom)\n *   - a list of {@link ImageGenerationIgnoredOverride} entries for unsupported\n *     soft fields (so the LLM / UI can surface a Note)\n *\n * Hard errors (unsupported edit, too many input images) are thrown so the\n * caller can fail fast — they are NOT downgraded to ignored overrides.\n *\n * Decision table — see docs/image-generation-rearchitecture.md §6.3\n */\n\nimport {\n  resolveClosestAspectRatio,\n  resolveClosestResolution,\n  resolveClosestSize,\n} from '../../media-generation/index.js';\nimport type {\n  ImageGenerationBackground,\n  ImageGenerationCapabilitiesLegacy,\n  ImageGenerationGeometryCapability,\n  ImageGenerationIgnoredOverride,\n  ImageGenerationIgnoredOverrideKey,\n  ImageGenerationNormalization,\n  ImageGenerationOutputFormat,\n  ImageGenerationProvider,\n  ImageGenerationProviderCapabilities,\n  ImageGenerationQuality,\n  ImageGenerationResolution,\n  ImageGenerationSourceImage,\n} from './types.js';\n\n/**\n * Narrow `provider.capabilities` to the new nested shape. The registry accepts\n * the legacy flat shape too, but normalization only understands the new one;\n * legacy fields surface here as `undefined`.\n */\nfunction asNewCapabilities(\n  caps: ImageGenerationProviderCapabilities | ImageGenerationCapabilitiesLegacy | undefined,\n): ImageGenerationProviderCapabilities {\n  if (!caps) return {};\n  // Legacy flat shape exposes `supportsEdit` (boolean). When seen, treat as\n  // an empty new-shape capability map so normalization defaults kick in.\n  if ((caps as ImageGenerationCapabilitiesLegacy).supportsEdit !== undefined &&\n      (caps as ImageGenerationProviderCapabilities).generate === undefined &&\n      (caps as ImageGenerationProviderCapabilities).edit === undefined) {\n    return {};\n  }\n  return caps as ImageGenerationProviderCapabilities;\n}\n\nexport interface ResolveImageGenerationOverridesParams {\n  provider: ImageGenerationProvider;\n  size?: string;\n  aspectRatio?: string;\n  resolution?: ImageGenerationResolution;\n  quality?: ImageGenerationQuality;\n  outputFormat?: ImageGenerationOutputFormat;\n  background?: ImageGenerationBackground;\n  inputImages?: ImageGenerationSourceImage[];\n}\n\nexport interface ResolvedImageGenerationOverrides {\n  size?: string;\n  aspectRatio?: string;\n  resolution?: ImageGenerationResolution;\n  quality?: ImageGenerationQuality;\n  outputFormat?: ImageGenerationOutputFormat;\n  background?: ImageGenerationBackground;\n  ignoredOverrides: ImageGenerationIgnoredOverride[];\n  normalization?: ImageGenerationNormalization;\n}\n\nexport function resolveImageGenerationOverrides(\n  params: ResolveImageGenerationOverridesParams,\n): ResolvedImageGenerationOverrides {\n  const provider = params.provider;\n  const caps = asNewCapabilities(provider.capabilities);\n  const isEdit = (params.inputImages?.length ?? 0) > 0;\n\n  // Hard checks (throw, do not downgrade) ---------------------------------\n  assertEditSupported(provider, isEdit, params.inputImages);\n\n  const modeCaps = isEdit ? caps.edit : caps.generate;\n  const supportsSize = modeCaps?.supportsSize === true;\n  const supportsAspectRatio = modeCaps?.supportsAspectRatio === true;\n  const supportsResolution = caps.generate?.supportsResolution === true && !isEdit;\n\n  const ignoredOverrides: ImageGenerationIgnoredOverride[] = [];\n  const normalization: ImageGenerationNormalization = {};\n\n  // Geometry --------------------------------------------------------------\n  const { size, aspectRatio, resolution } = resolveGeometry({\n    requestedSize: params.size,\n    requestedAspectRatio: params.aspectRatio,\n    requestedResolution: params.resolution,\n    supportsSize,\n    supportsAspectRatio,\n    supportsResolution,\n    geometry: caps.geometry,\n    ignoredOverrides,\n    normalization,\n  });\n\n  // Soft fields (drop into ignoredOverrides on mismatch) -----------------\n  const quality = filterEnumOverride<'quality', ImageGenerationQuality>({\n    key: 'quality',\n    requested: params.quality,\n    supported: caps.output?.qualities,\n    ignoredOverrides,\n  });\n  const outputFormat = filterEnumOverride<'outputFormat', ImageGenerationOutputFormat>({\n    key: 'outputFormat',\n    requested: params.outputFormat,\n    supported: caps.output?.formats,\n    ignoredOverrides,\n  });\n  const background = filterEnumOverride<'background', ImageGenerationBackground>({\n    key: 'background',\n    requested: params.background,\n    supported: caps.output?.backgrounds,\n    ignoredOverrides,\n  });\n\n  return {\n    ...(size !== undefined ? { size } : {}),\n    ...(aspectRatio !== undefined ? { aspectRatio } : {}),\n    ...(resolution !== undefined ? { resolution } : {}),\n    ...(quality !== undefined ? { quality } : {}),\n    ...(outputFormat !== undefined ? { outputFormat } : {}),\n    ...(background !== undefined ? { background } : {}),\n    ignoredOverrides,\n    ...(hasAnyEntry(normalization) ? { normalization } : {}),\n  };\n}\n\n// ============================================\n// Geometry decision table (§6.3)\n// ============================================\n\ninterface ResolveGeometryParams {\n  requestedSize?: string;\n  requestedAspectRatio?: string;\n  requestedResolution?: ImageGenerationResolution;\n  supportsSize: boolean;\n  supportsAspectRatio: boolean;\n  supportsResolution: boolean;\n  geometry: ImageGenerationGeometryCapability | undefined;\n  ignoredOverrides: ImageGenerationIgnoredOverride[];\n  normalization: ImageGenerationNormalization;\n}\n\nfunction resolveGeometry(params: ResolveGeometryParams): {\n  size?: string;\n  aspectRatio?: string;\n  resolution?: ImageGenerationResolution;\n} {\n  const supportedSizes = params.geometry?.sizes;\n  const supportedAspectRatios = params.geometry?.aspectRatios;\n  const supportedResolutions = params.geometry?.resolutions;\n\n  let size: string | undefined;\n  let aspectRatio: string | undefined;\n  let resolution: ImageGenerationResolution | undefined;\n\n  // ----- size -----------------------------------------------------------\n  if (params.requestedSize) {\n    if (params.supportsSize) {\n      const applied = resolveClosestSize({\n        requestedSize: params.requestedSize,\n        supportedSizes,\n      });\n      if (applied) {\n        size = applied;\n        params.normalization.size = entry({\n          requested: params.requestedSize,\n          applied,\n          supportedValues: supportedSizes,\n        });\n      } else {\n        // No supported list → forward as-is.\n        size = params.requestedSize;\n      }\n    } else if (params.supportsAspectRatio) {\n      const derived = resolveClosestAspectRatio({\n        requestedSize: params.requestedSize,\n        supportedAspectRatios,\n      });\n      if (derived) {\n        aspectRatio = derived;\n        params.normalization.aspectRatio = entry({\n          applied: derived,\n          derivedFrom: 'size',\n          supportedValues: supportedAspectRatios,\n        });\n      } else {\n        ignored(params.ignoredOverrides, 'size', params.requestedSize);\n      }\n    } else {\n      ignored(params.ignoredOverrides, 'size', params.requestedSize);\n    }\n  }\n\n  // ----- aspectRatio -----------------------------------------------------\n  if (params.requestedAspectRatio) {\n    if (params.supportsAspectRatio) {\n      const applied = resolveClosestAspectRatio({\n        requestedAspectRatio: params.requestedAspectRatio,\n        supportedAspectRatios,\n      });\n      const finalApplied = applied ?? params.requestedAspectRatio;\n      aspectRatio = finalApplied;\n      params.normalization.aspectRatio = entry({\n        requested: params.requestedAspectRatio,\n        applied: finalApplied,\n        supportedValues: supportedAspectRatios,\n      });\n    } else if (params.supportsSize && size === undefined) {\n      const derived = resolveClosestSize({\n        requestedAspectRatio: params.requestedAspectRatio,\n        supportedSizes,\n      });\n      if (derived) {\n        size = derived;\n        params.normalization.size = entry({\n          applied: derived,\n          derivedFrom: 'aspectRatio',\n          supportedValues: supportedSizes,\n        });\n      } else {\n        ignored(params.ignoredOverrides, 'aspectRatio', params.requestedAspectRatio);\n      }\n    } else if (!params.supportsSize) {\n      ignored(params.ignoredOverrides, 'aspectRatio', params.requestedAspectRatio);\n    }\n    // else: size already supplied and provider only supports size → ignore\n    //       to avoid contradiction; record in ignoredOverrides as well.\n    if (\n      !params.supportsAspectRatio &&\n      params.supportsSize &&\n      size !== undefined &&\n      params.normalization.size?.derivedFrom !== 'aspectRatio'\n    ) {\n      ignored(params.ignoredOverrides, 'aspectRatio', params.requestedAspectRatio);\n    }\n  }\n\n  // ----- resolution ------------------------------------------------------\n  if (params.requestedResolution) {\n    if (params.supportsResolution) {\n      const applied = resolveClosestResolution({\n        requestedResolution: params.requestedResolution,\n        supportedResolutions,\n      });\n      const finalApplied = applied ?? params.requestedResolution;\n      resolution = finalApplied;\n      params.normalization.resolution = entry({\n        requested: params.requestedResolution,\n        applied: finalApplied,\n        supportedValues: supportedResolutions,\n      });\n    } else {\n      ignored(params.ignoredOverrides, 'resolution', params.requestedResolution);\n    }\n  }\n\n  return { size, aspectRatio, resolution };\n}\n\n// ============================================\n// Hard-check helpers\n// ============================================\n\nfunction assertEditSupported(\n  provider: ImageGenerationProvider,\n  isEdit: boolean,\n  inputImages: ImageGenerationSourceImage[] | undefined,\n): void {\n  if (!isEdit) return;\n  const caps = asNewCapabilities(provider.capabilities);\n  const editCap = caps.edit;\n  const enabled = editCap?.enabled === true;\n  if (!enabled) {\n    throw new Error(`${provider.id} image editing is not supported.`);\n  }\n  const max = editCap.maxInputImages;\n  if (typeof max === 'number' && (inputImages?.length ?? 0) > max) {\n    throw new Error(\n      `${provider.id} accepts at most ${max} input image(s); got ${inputImages?.length ?? 0}.`,\n    );\n  }\n}\n\n// ============================================\n// Tiny helpers\n// ============================================\n\ninterface FilterEnumOverrideParams<TKey extends ImageGenerationIgnoredOverrideKey, TValue extends string> {\n  key: TKey;\n  requested: TValue | undefined;\n  supported: ReadonlyArray<TValue> | undefined;\n  ignoredOverrides: ImageGenerationIgnoredOverride[];\n}\n\nfunction filterEnumOverride<TKey extends ImageGenerationIgnoredOverrideKey, TValue extends string>(\n  params: FilterEnumOverrideParams<TKey, TValue>,\n): TValue | undefined {\n  if (params.requested === undefined) return undefined;\n  if (!params.supported || params.supported.length === 0) {\n    // Provider declares no constraint → forward.\n    return params.requested;\n  }\n  if (params.supported.includes(params.requested)) return params.requested;\n  ignored(params.ignoredOverrides, params.key, params.requested);\n  return undefined;\n}\n\nfunction ignored(\n  list: ImageGenerationIgnoredOverride[],\n  key: ImageGenerationIgnoredOverrideKey,\n  value: string,\n): void {\n  list.push({ key, value });\n}\n\nfunction entry<T extends string>(init: {\n  requested?: T;\n  applied?: T;\n  derivedFrom?: 'size' | 'aspectRatio' | 'resolution';\n  supportedValues?: ReadonlyArray<T>;\n}) {\n  return {\n    ...(init.requested !== undefined ? { requested: init.requested } : {}),\n    ...(init.applied !== undefined ? { applied: init.applied } : {}),\n    ...(init.derivedFrom !== undefined ? { derivedFrom: init.derivedFrom } : {}),\n    ...(init.supportedValues ? { supportedValues: [...init.supportedValues] } : {}),\n  };\n}\n\nfunction hasAnyEntry(n: ImageGenerationNormalization): boolean {\n  return (\n    n.size !== undefined || n.aspectRatio !== undefined || n.resolution !== undefined\n  );\n}\n\n// Re-export for convenience so callers don't need a second import.\nexport type { ImageGenerationProviderCapabilities };\n"],"mappings":"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"}
+{"version":3,"file":"normalization.js","names":[],"sources":["../../../../../src/agent/image/generation/normalization.ts"],"sourcesContent":["/**\n * Image-generation parameter normalization.\n *\n * Reconciles user-supplied geometry / output overrides against the active\n * provider's declared {@link ImageGenerationProviderCapabilities}. Returns:\n *   - the actually-applied values to forward to the provider\n *   - per-field {@link MediaNormalizationEntry} (requested / applied / derivedFrom)\n *   - a list of {@link ImageGenerationIgnoredOverride} entries for unsupported\n *     soft fields (so the LLM / UI can surface a Note)\n *\n * Hard errors (unsupported edit, too many input images) are thrown so the\n * caller can fail fast — they are NOT downgraded to ignored overrides.\n *\n * Decision table — see docs/image-generation-rearchitecture.md §6.3\n */\n\nimport {\n  resolveClosestAspectRatio,\n  resolveClosestResolution,\n  resolveClosestSize,\n} from '../../media-generation/index.js';\nimport type {\n  ImageGenerationBackground,\n  ImageGenerationGeometryCapability,\n  ImageGenerationIgnoredOverride,\n  ImageGenerationIgnoredOverrideKey,\n  ImageGenerationNormalization,\n  ImageGenerationOutputFormat,\n  ImageGenerationProvider,\n  ImageGenerationProviderCapabilities,\n  ImageGenerationQuality,\n  ImageGenerationResolution,\n  ImageGenerationSourceImage,\n} from './types.js';\n\nexport interface ResolveImageGenerationOverridesParams {\n  provider: ImageGenerationProvider;\n  size?: string;\n  aspectRatio?: string;\n  resolution?: ImageGenerationResolution;\n  quality?: ImageGenerationQuality;\n  outputFormat?: ImageGenerationOutputFormat;\n  background?: ImageGenerationBackground;\n  inputImages?: ImageGenerationSourceImage[];\n}\n\nexport interface ResolvedImageGenerationOverrides {\n  size?: string;\n  aspectRatio?: string;\n  resolution?: ImageGenerationResolution;\n  quality?: ImageGenerationQuality;\n  outputFormat?: ImageGenerationOutputFormat;\n  background?: ImageGenerationBackground;\n  ignoredOverrides: ImageGenerationIgnoredOverride[];\n  normalization?: ImageGenerationNormalization;\n}\n\nexport function resolveImageGenerationOverrides(\n  params: ResolveImageGenerationOverridesParams,\n): ResolvedImageGenerationOverrides {\n  const provider = params.provider;\n  const caps = provider.capabilities ?? {};\n  const isEdit = (params.inputImages?.length ?? 0) > 0;\n\n  // Hard checks (throw, do not downgrade) ---------------------------------\n  assertEditSupported(provider, isEdit, params.inputImages);\n\n  const modeCaps = isEdit ? caps.edit : caps.generate;\n  const supportsSize = modeCaps?.supportsSize === true;\n  const supportsAspectRatio = modeCaps?.supportsAspectRatio === true;\n  const supportsResolution = caps.generate?.supportsResolution === true && !isEdit;\n\n  const ignoredOverrides: ImageGenerationIgnoredOverride[] = [];\n  const normalization: ImageGenerationNormalization = {};\n\n  // Geometry --------------------------------------------------------------\n  const { size, aspectRatio, resolution } = resolveGeometry({\n    requestedSize: params.size,\n    requestedAspectRatio: params.aspectRatio,\n    requestedResolution: params.resolution,\n    supportsSize,\n    supportsAspectRatio,\n    supportsResolution,\n    geometry: caps.geometry,\n    ignoredOverrides,\n    normalization,\n  });\n\n  // Soft fields (drop into ignoredOverrides on mismatch) -----------------\n  const quality = filterEnumOverride<'quality', ImageGenerationQuality>({\n    key: 'quality',\n    requested: params.quality,\n    supported: caps.output?.qualities,\n    ignoredOverrides,\n  });\n  const outputFormat = filterEnumOverride<'outputFormat', ImageGenerationOutputFormat>({\n    key: 'outputFormat',\n    requested: params.outputFormat,\n    supported: caps.output?.formats,\n    ignoredOverrides,\n  });\n  const background = filterEnumOverride<'background', ImageGenerationBackground>({\n    key: 'background',\n    requested: params.background,\n    supported: caps.output?.backgrounds,\n    ignoredOverrides,\n  });\n\n  return {\n    ...(size !== undefined ? { size } : {}),\n    ...(aspectRatio !== undefined ? { aspectRatio } : {}),\n    ...(resolution !== undefined ? { resolution } : {}),\n    ...(quality !== undefined ? { quality } : {}),\n    ...(outputFormat !== undefined ? { outputFormat } : {}),\n    ...(background !== undefined ? { background } : {}),\n    ignoredOverrides,\n    ...(hasAnyEntry(normalization) ? { normalization } : {}),\n  };\n}\n\n// ============================================\n// Geometry decision table (§6.3)\n// ============================================\n\ninterface ResolveGeometryParams {\n  requestedSize?: string;\n  requestedAspectRatio?: string;\n  requestedResolution?: ImageGenerationResolution;\n  supportsSize: boolean;\n  supportsAspectRatio: boolean;\n  supportsResolution: boolean;\n  geometry: ImageGenerationGeometryCapability | undefined;\n  ignoredOverrides: ImageGenerationIgnoredOverride[];\n  normalization: ImageGenerationNormalization;\n}\n\nfunction resolveGeometry(params: ResolveGeometryParams): {\n  size?: string;\n  aspectRatio?: string;\n  resolution?: ImageGenerationResolution;\n} {\n  const supportedSizes = params.geometry?.sizes;\n  const supportedAspectRatios = params.geometry?.aspectRatios;\n  const supportedResolutions = params.geometry?.resolutions;\n\n  let size: string | undefined;\n  let aspectRatio: string | undefined;\n  let resolution: ImageGenerationResolution | undefined;\n\n  // ----- size -----------------------------------------------------------\n  if (params.requestedSize) {\n    if (params.supportsSize) {\n      const applied = resolveClosestSize({\n        requestedSize: params.requestedSize,\n        supportedSizes,\n      });\n      if (applied) {\n        size = applied;\n        params.normalization.size = entry({\n          requested: params.requestedSize,\n          applied,\n          supportedValues: supportedSizes,\n        });\n      } else {\n        // No supported list → forward as-is.\n        size = params.requestedSize;\n      }\n    } else if (params.supportsAspectRatio) {\n      const derived = resolveClosestAspectRatio({\n        requestedSize: params.requestedSize,\n        supportedAspectRatios,\n      });\n      if (derived) {\n        aspectRatio = derived;\n        params.normalization.aspectRatio = entry({\n          applied: derived,\n          derivedFrom: 'size',\n          supportedValues: supportedAspectRatios,\n        });\n      } else {\n        ignored(params.ignoredOverrides, 'size', params.requestedSize);\n      }\n    } else {\n      ignored(params.ignoredOverrides, 'size', params.requestedSize);\n    }\n  }\n\n  // ----- aspectRatio -----------------------------------------------------\n  if (params.requestedAspectRatio) {\n    if (params.supportsAspectRatio) {\n      const applied = resolveClosestAspectRatio({\n        requestedAspectRatio: params.requestedAspectRatio,\n        supportedAspectRatios,\n      });\n      const finalApplied = applied ?? params.requestedAspectRatio;\n      aspectRatio = finalApplied;\n      params.normalization.aspectRatio = entry({\n        requested: params.requestedAspectRatio,\n        applied: finalApplied,\n        supportedValues: supportedAspectRatios,\n      });\n    } else if (params.supportsSize && size === undefined) {\n      const derived = resolveClosestSize({\n        requestedAspectRatio: params.requestedAspectRatio,\n        supportedSizes,\n      });\n      if (derived) {\n        size = derived;\n        params.normalization.size = entry({\n          applied: derived,\n          derivedFrom: 'aspectRatio',\n          supportedValues: supportedSizes,\n        });\n      } else {\n        ignored(params.ignoredOverrides, 'aspectRatio', params.requestedAspectRatio);\n      }\n    } else if (!params.supportsSize) {\n      ignored(params.ignoredOverrides, 'aspectRatio', params.requestedAspectRatio);\n    }\n    // else: size already supplied and provider only supports size → ignore\n    //       to avoid contradiction; record in ignoredOverrides as well.\n    if (\n      !params.supportsAspectRatio &&\n      params.supportsSize &&\n      size !== undefined &&\n      params.normalization.size?.derivedFrom !== 'aspectRatio'\n    ) {\n      ignored(params.ignoredOverrides, 'aspectRatio', params.requestedAspectRatio);\n    }\n  }\n\n  // ----- resolution ------------------------------------------------------\n  if (params.requestedResolution) {\n    if (params.supportsResolution) {\n      const applied = resolveClosestResolution({\n        requestedResolution: params.requestedResolution,\n        supportedResolutions,\n      });\n      const finalApplied = applied ?? params.requestedResolution;\n      resolution = finalApplied;\n      params.normalization.resolution = entry({\n        requested: params.requestedResolution,\n        applied: finalApplied,\n        supportedValues: supportedResolutions,\n      });\n    } else {\n      ignored(params.ignoredOverrides, 'resolution', params.requestedResolution);\n    }\n  }\n\n  return { size, aspectRatio, resolution };\n}\n\n// ============================================\n// Hard-check helpers\n// ============================================\n\nfunction assertEditSupported(\n  provider: ImageGenerationProvider,\n  isEdit: boolean,\n  inputImages: ImageGenerationSourceImage[] | undefined,\n): void {\n  if (!isEdit) return;\n  const caps = provider.capabilities ?? {};\n  const editCap = caps.edit;\n  const enabled = editCap?.enabled === true;\n  if (!enabled) {\n    throw new Error(`${provider.id} image editing is not supported.`);\n  }\n  const max = editCap.maxInputImages;\n  if (typeof max === 'number' && (inputImages?.length ?? 0) > max) {\n    throw new Error(\n      `${provider.id} accepts at most ${max} input image(s); got ${inputImages?.length ?? 0}.`,\n    );\n  }\n}\n\n// ============================================\n// Tiny helpers\n// ============================================\n\ninterface FilterEnumOverrideParams<TKey extends ImageGenerationIgnoredOverrideKey, TValue extends string> {\n  key: TKey;\n  requested: TValue | undefined;\n  supported: ReadonlyArray<TValue> | undefined;\n  ignoredOverrides: ImageGenerationIgnoredOverride[];\n}\n\nfunction filterEnumOverride<TKey extends ImageGenerationIgnoredOverrideKey, TValue extends string>(\n  params: FilterEnumOverrideParams<TKey, TValue>,\n): TValue | undefined {\n  if (params.requested === undefined) return undefined;\n  if (!params.supported || params.supported.length === 0) {\n    // Provider declares no constraint → forward.\n    return params.requested;\n  }\n  if (params.supported.includes(params.requested)) return params.requested;\n  ignored(params.ignoredOverrides, params.key, params.requested);\n  return undefined;\n}\n\nfunction ignored(\n  list: ImageGenerationIgnoredOverride[],\n  key: ImageGenerationIgnoredOverrideKey,\n  value: string,\n): void {\n  list.push({ key, value });\n}\n\nfunction entry<T extends string>(init: {\n  requested?: T;\n  applied?: T;\n  derivedFrom?: 'size' | 'aspectRatio' | 'resolution';\n  supportedValues?: ReadonlyArray<T>;\n}) {\n  return {\n    ...(init.requested !== undefined ? { requested: init.requested } : {}),\n    ...(init.applied !== undefined ? { applied: init.applied } : {}),\n    ...(init.derivedFrom !== undefined ? { derivedFrom: init.derivedFrom } : {}),\n    ...(init.supportedValues ? { supportedValues: [...init.supportedValues] } : {}),\n  };\n}\n\nfunction hasAnyEntry(n: ImageGenerationNormalization): boolean {\n  return (\n    n.size !== undefined || n.aspectRatio !== undefined || n.resolution !== undefined\n  );\n}\n\n// Re-export for convenience so callers don't need a second import.\nexport type { ImageGenerationProviderCapabilities };\n"],"mappings":"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"}

package/dist/src/agent/image/generation/provider-registry.d.ts

@@ -1,6 +1,6 @@
 import type { Config } from '../../../config/schema.js';
 import type { ImageProviderUiMetadata } from './image-provider-ui.js';
-import type { ImageGenerationCapabilitiesLegacy, ImageGenerationProviderCapabilities, ImageGenerationRequest, ImageGenerationResult } from './types.js';
+import type { ImageGenerationProviderCapabilities, ImageGenerationRequest, ImageGenerationResult } from './types.js';
 /** Lifecycle context for {@link ImageGenerationProvider#isConfigured}. */
 export interface ImageGenerationProviderConfiguredContext {
     cfg?: Config;
@@ -14,12 +14,8 @@ export interface ImageGenerationProvider {
     label?: string;
     defaultModel?: string;
     models?: string[];
-    /**
-     * New nested capability shape (Step 2). Legacy flat shape from Step 1
-     * is also accepted for backward compatibility while three vendor modules
-     * migrate.
-     */
-    capabilities?: ImageGenerationProviderCapabilities | ImageGenerationCapabilitiesLegacy;
+    /** Provider capability map. */
+    capabilities?: ImageGenerationProviderCapabilities;
     /**
      * Synchronous configuration check (Step 2 — was async in Step 1).
      * MUST NOT touch keychain or trigger OS prompts.
@@ -43,7 +39,7 @@ export interface ImageGenerationProviderSummary {
     defaultModel?: string;
     models: string[];
     aliases?: string[];
-    capabilities?: ImageGenerationProviderCapabilities | ImageGenerationCapabilitiesLegacy;
+    capabilities?: ImageGenerationProviderCapabilities;
     ui?: ImageProviderUiMetadata;
 }
 export declare function listImageGenerationProvidersSummary(cfg?: Config): ImageGenerationProviderSummary[];

package/dist/src/agent/image/generation/provider-registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider-registry.js","names":[],"sources":["../../../../../src/agent/image/generation/provider-registry.ts"],"sourcesContent":["import type { Config } from '../../../config/schema.js';\nimport type { ImageProviderUiMetadata } from './image-provider-ui.js';\nimport type {\n  ImageGenerationCapabilitiesLegacy,\n  ImageGenerationProviderCapabilities,\n  ImageGenerationRequest,\n  ImageGenerationResult,\n} from './types.js';\n\n/** Lifecycle context for {@link ImageGenerationProvider#isConfigured}. */\nexport interface ImageGenerationProviderConfiguredContext {\n  cfg?: Config;\n  agentDir?: string;\n}\n\nexport interface ImageGenerationProvider {\n  /** Lower-case provider id (registry key). */\n  id: string;\n  /** Optional aliases — alternate ids that resolve to this provider. */\n  aliases?: string[];\n  label?: string;\n  defaultModel?: string;\n  models?: string[];\n  /**\n   * New nested capability shape (Step 2). Legacy flat shape from Step 1\n   * is also accepted for backward compatibility while three vendor modules\n   * migrate.\n   */\n  capabilities?: ImageGenerationProviderCapabilities | ImageGenerationCapabilitiesLegacy;\n  /**\n   * Synchronous configuration check (Step 2 — was async in Step 1).\n   * MUST NOT touch keychain or trigger OS prompts.\n   */\n  isConfigured?: (ctx: ImageGenerationProviderConfiguredContext) => boolean;\n  /** Gateway console presets (regions / base URLs); defined by each bundled extension. */\n  ui?: ImageProviderUiMetadata;\n  generateImage(req: ImageGenerationRequest): Promise<ImageGenerationResult>;\n}\n\n/**\n * Provider ids that must never be registered (defensive — guards against\n * accidentally shadowing well-known internal namespaces / prototype keys).\n */\nconst UNSAFE_PROVIDER_IDS = new Set<string>(['__proto__', 'constructor', 'prototype']);\n\nconst registry = new Map<string, ImageGenerationProvider>();\nconst aliasIndex = new Map<string, string>();\n\nfunction normalizeId(id: string): string {\n  return id.trim().toLowerCase();\n}\n\nfunction isExtensionDisabled(cfg: Config | undefined, providerId: string): boolean {\n  if (!cfg) return false;\n  // `cfg.extensions[<id>].enabled === false` ⇒ skip the provider in listings.\n  // We keep the lookup in a defensively-typed shape; Step 4 may move this to\n  // a typed schema entry.\n  const extensions = (cfg as unknown as { extensions?: Record<string, unknown> } | undefined)?.extensions;\n  if (!extensions || typeof extensions !== 'object') return false;\n  const entry = (extensions as Record<string, unknown>)[providerId];\n  if (!entry || typeof entry !== 'object') return false;\n  const enabled = (entry as { enabled?: unknown }).enabled;\n  return enabled === false;\n}\n\nexport function registerImageGenerationProvider(provider: ImageGenerationProvider): void {\n  if (!provider.id?.trim()) {\n    throw new Error('Image generation provider id is required');\n  }\n  const id = normalizeId(provider.id);\n  if (UNSAFE_PROVIDER_IDS.has(id)) {\n    throw new Error(`Image generation provider id is reserved: ${provider.id}`);\n  }\n  // Drop any stale alias entries that pointed at the previous registration.\n  for (const [alias, target] of [...aliasIndex.entries()]) {\n    if (target === id) aliasIndex.delete(alias);\n  }\n  registry.set(id, provider);\n  for (const aliasRaw of provider.aliases ?? []) {\n    if (typeof aliasRaw !== 'string') continue;\n    const alias = normalizeId(aliasRaw);\n    if (!alias || alias === id) continue;\n    if (UNSAFE_PROVIDER_IDS.has(alias)) continue;\n    if (registry.has(alias)) continue; // Real ids always win over aliases.\n    aliasIndex.set(alias, id);\n  }\n}\n\n/**\n * Resolve a provider by id or alias.\n *\n * `cfg` is honoured to skip providers disabled via `cfg.extensions[<id>].enabled = false`.\n */\nexport function getImageGenerationProvider(\n  providerId: string,\n  cfg?: Config,\n): ImageGenerationProvider | undefined {\n  if (typeof providerId !== 'string') return undefined;\n  const id = normalizeId(providerId);\n  if (!id) return undefined;\n  const direct = registry.get(id);\n  if (direct) {\n    return isExtensionDisabled(cfg, direct.id) ? undefined : direct;\n  }\n  const aliasTarget = aliasIndex.get(id);\n  if (!aliasTarget) return undefined;\n  const aliased = registry.get(aliasTarget);\n  if (!aliased) return undefined;\n  return isExtensionDisabled(cfg, aliased.id) ? undefined : aliased;\n}\n\nexport function listImageGenerationProviders(cfg?: Config): ImageGenerationProvider[] {\n  const out: ImageGenerationProvider[] = [];\n  for (const provider of registry.values()) {\n    if (isExtensionDisabled(cfg, provider.id)) continue;\n    out.push(provider);\n  }\n  return out;\n}\n\nexport interface ImageGenerationProviderSummary {\n  id: string;\n  label?: string;\n  defaultModel?: string;\n  models: string[];\n  aliases?: string[];\n  capabilities?: ImageGenerationProviderCapabilities | ImageGenerationCapabilitiesLegacy;\n  ui?: ImageProviderUiMetadata;\n}\n\nexport function listImageGenerationProvidersSummary(\n  cfg?: Config,\n): ImageGenerationProviderSummary[] {\n  return listImageGenerationProviders(cfg).map((provider) => ({\n    id: provider.id,\n    ...(provider.label ? { label: provider.label } : {}),\n    ...(provider.defaultModel ? { defaultModel: provider.defaultModel } : {}),\n    models: provider.models ?? (provider.defaultModel ? [provider.defaultModel] : []),\n    ...(provider.aliases?.length ? { aliases: [...provider.aliases] } : {}),\n    ...(provider.capabilities ? { capabilities: provider.capabilities } : {}),\n    ...(provider.ui ? { ui: provider.ui } : {}),\n  }));\n}\n\nexport function clearImageGenerationRegistryForTests(): void {\n  registry.clear();\n  aliasIndex.clear();\n}\n"],"mappings":";;;;;AA2CA,MAAM,sBAAsB,IAAI,IAAY;CAAC;CAAa;CAAe;CAAY,CAAC;AAEtF,MAAM,2BAAW,IAAI,KAAsC;AAC3D,MAAM,6BAAa,IAAI,KAAqB;AAE5C,SAAS,YAAY,IAAoB;AACvC,QAAO,GAAG,MAAM,CAAC,aAAa;;AAGhC,SAAS,oBAAoB,KAAyB,YAA6B;AACjF,KAAI,CAAC,IAAK,QAAO;CAIjB,MAAM,aAAc,KAAyE;AAC7F,KAAI,CAAC,cAAc,OAAO,eAAe,SAAU,QAAO;CAC1D,MAAM,QAAS,WAAuC;AACtD,KAAI,CAAC,SAAS,OAAO,UAAU,SAAU,QAAO;AAEhD,QADiB,MAAgC,YAC9B;;AAGrB,SAAgB,gCAAgC,UAAyC;AACvF,KAAI,CAAC,SAAS,IAAI,MAAM,CACtB,OAAM,IAAI,MAAM,2CAA2C;CAE7D,MAAM,KAAK,YAAY,SAAS,GAAG;AACnC,KAAI,oBAAoB,IAAI,GAAG,CAC7B,OAAM,IAAI,MAAM,6CAA6C,SAAS,KAAK;AAG7E,MAAK,MAAM,CAAC,OAAO,WAAW,CAAC,GAAG,WAAW,SAAS,CAAC,CACrD,KAAI,WAAW,GAAI,YAAW,OAAO,MAAM;AAE7C,UAAS,IAAI,IAAI,SAAS;AAC1B,MAAK,MAAM,YAAY,SAAS,WAAW,EAAE,EAAE;AAC7C,MAAI,OAAO,aAAa,SAAU;EAClC,MAAM,QAAQ,YAAY,SAAS;AACnC,MAAI,CAAC,SAAS,UAAU,GAAI;AAC5B,MAAI,oBAAoB,IAAI,MAAM,CAAE;AACpC,MAAI,SAAS,IAAI,MAAM,CAAE;AACzB,aAAW,IAAI,OAAO,GAAG;;;;;;;;AAS7B,SAAgB,2BACd,YACA,KACqC;AACrC,KAAI,OAAO,eAAe,SAAU,QAAO,KAAA;CAC3C,MAAM,KAAK,YAAY,WAAW;AAClC,KAAI,CAAC,GAAI,QAAO,KAAA;CAChB,MAAM,SAAS,SAAS,IAAI,GAAG;AAC/B,KAAI,OACF,QAAO,oBAAoB,KAAK,OAAO,GAAG,GAAG,KAAA,IAAY;CAE3D,MAAM,cAAc,WAAW,IAAI,GAAG;AACtC,KAAI,CAAC,YAAa,QAAO,KAAA;CACzB,MAAM,UAAU,SAAS,IAAI,YAAY;AACzC,KAAI,CAAC,QAAS,QAAO,KAAA;AACrB,QAAO,oBAAoB,KAAK,QAAQ,GAAG,GAAG,KAAA,IAAY;;AAG5D,SAAgB,6BAA6B,KAAyC;CACpF,MAAM,MAAiC,EAAE;AACzC,MAAK,MAAM,YAAY,SAAS,QAAQ,EAAE;AACxC,MAAI,oBAAoB,KAAK,SAAS,GAAG,CAAE;AAC3C,MAAI,KAAK,SAAS;;AAEpB,QAAO;;AAaT,SAAgB,oCACd,KACkC;AAClC,QAAO,6BAA6B,IAAI,CAAC,KAAK,cAAc;EAC1D,IAAI,SAAS;EACb,GAAI,SAAS,QAAQ,EAAE,OAAO,SAAS,OAAO,GAAG,EAAE;EACnD,GAAI,SAAS,eAAe,EAAE,cAAc,SAAS,cAAc,GAAG,EAAE;EACxE,QAAQ,SAAS,WAAW,SAAS,eAAe,CAAC,SAAS,aAAa,GAAG,EAAE;EAChF,GAAI,SAAS,SAAS,SAAS,EAAE,SAAS,CAAC,GAAG,SAAS,QAAQ,EAAE,GAAG,EAAE;EACtE,GAAI,SAAS,eAAe,EAAE,cAAc,SAAS,cAAc,GAAG,EAAE;EACxE,GAAI,SAAS,KAAK,EAAE,IAAI,SAAS,IAAI,GAAG,EAAE;EAC3C,EAAE;;AAGL,SAAgB,uCAA6C;AAC3D,UAAS,OAAO;AAChB,YAAW,OAAO"}
+{"version":3,"file":"provider-registry.js","names":[],"sources":["../../../../../src/agent/image/generation/provider-registry.ts"],"sourcesContent":["import type { Config } from '../../../config/schema.js';\nimport type { ImageProviderUiMetadata } from './image-provider-ui.js';\nimport type {\n  ImageGenerationProviderCapabilities,\n  ImageGenerationRequest,\n  ImageGenerationResult,\n} from './types.js';\n\n/** Lifecycle context for {@link ImageGenerationProvider#isConfigured}. */\nexport interface ImageGenerationProviderConfiguredContext {\n  cfg?: Config;\n  agentDir?: string;\n}\n\nexport interface ImageGenerationProvider {\n  /** Lower-case provider id (registry key). */\n  id: string;\n  /** Optional aliases — alternate ids that resolve to this provider. */\n  aliases?: string[];\n  label?: string;\n  defaultModel?: string;\n  models?: string[];\n  /** Provider capability map. */\n  capabilities?: ImageGenerationProviderCapabilities;\n  /**\n   * Synchronous configuration check (Step 2 — was async in Step 1).\n   * MUST NOT touch keychain or trigger OS prompts.\n   */\n  isConfigured?: (ctx: ImageGenerationProviderConfiguredContext) => boolean;\n  /** Gateway console presets (regions / base URLs); defined by each bundled extension. */\n  ui?: ImageProviderUiMetadata;\n  generateImage(req: ImageGenerationRequest): Promise<ImageGenerationResult>;\n}\n\n/**\n * Provider ids that must never be registered (defensive — guards against\n * accidentally shadowing well-known internal namespaces / prototype keys).\n */\nconst UNSAFE_PROVIDER_IDS = new Set<string>(['__proto__', 'constructor', 'prototype']);\n\nconst registry = new Map<string, ImageGenerationProvider>();\nconst aliasIndex = new Map<string, string>();\n\nfunction normalizeId(id: string): string {\n  return id.trim().toLowerCase();\n}\n\nfunction isExtensionDisabled(cfg: Config | undefined, providerId: string): boolean {\n  if (!cfg) return false;\n  // `cfg.extensions[<id>].enabled === false` ⇒ skip the provider in listings.\n  // We keep the lookup in a defensively-typed shape; Step 4 may move this to\n  // a typed schema entry.\n  const extensions = (cfg as unknown as { extensions?: Record<string, unknown> } | undefined)?.extensions;\n  if (!extensions || typeof extensions !== 'object') return false;\n  const entry = (extensions as Record<string, unknown>)[providerId];\n  if (!entry || typeof entry !== 'object') return false;\n  const enabled = (entry as { enabled?: unknown }).enabled;\n  return enabled === false;\n}\n\nexport function registerImageGenerationProvider(provider: ImageGenerationProvider): void {\n  if (!provider.id?.trim()) {\n    throw new Error('Image generation provider id is required');\n  }\n  const id = normalizeId(provider.id);\n  if (UNSAFE_PROVIDER_IDS.has(id)) {\n    throw new Error(`Image generation provider id is reserved: ${provider.id}`);\n  }\n  // Drop any stale alias entries that pointed at the previous registration.\n  for (const [alias, target] of [...aliasIndex.entries()]) {\n    if (target === id) aliasIndex.delete(alias);\n  }\n  registry.set(id, provider);\n  for (const aliasRaw of provider.aliases ?? []) {\n    if (typeof aliasRaw !== 'string') continue;\n    const alias = normalizeId(aliasRaw);\n    if (!alias || alias === id) continue;\n    if (UNSAFE_PROVIDER_IDS.has(alias)) continue;\n    if (registry.has(alias)) continue; // Real ids always win over aliases.\n    aliasIndex.set(alias, id);\n  }\n}\n\n/**\n * Resolve a provider by id or alias.\n *\n * `cfg` is honoured to skip providers disabled via `cfg.extensions[<id>].enabled = false`.\n */\nexport function getImageGenerationProvider(\n  providerId: string,\n  cfg?: Config,\n): ImageGenerationProvider | undefined {\n  if (typeof providerId !== 'string') return undefined;\n  const id = normalizeId(providerId);\n  if (!id) return undefined;\n  const direct = registry.get(id);\n  if (direct) {\n    return isExtensionDisabled(cfg, direct.id) ? undefined : direct;\n  }\n  const aliasTarget = aliasIndex.get(id);\n  if (!aliasTarget) return undefined;\n  const aliased = registry.get(aliasTarget);\n  if (!aliased) return undefined;\n  return isExtensionDisabled(cfg, aliased.id) ? undefined : aliased;\n}\n\nexport function listImageGenerationProviders(cfg?: Config): ImageGenerationProvider[] {\n  const out: ImageGenerationProvider[] = [];\n  for (const provider of registry.values()) {\n    if (isExtensionDisabled(cfg, provider.id)) continue;\n    out.push(provider);\n  }\n  return out;\n}\n\nexport interface ImageGenerationProviderSummary {\n  id: string;\n  label?: string;\n  defaultModel?: string;\n  models: string[];\n  aliases?: string[];\n  capabilities?: ImageGenerationProviderCapabilities;\n  ui?: ImageProviderUiMetadata;\n}\n\nexport function listImageGenerationProvidersSummary(\n  cfg?: Config,\n): ImageGenerationProviderSummary[] {\n  return listImageGenerationProviders(cfg).map((provider) => ({\n    id: provider.id,\n    ...(provider.label ? { label: provider.label } : {}),\n    ...(provider.defaultModel ? { defaultModel: provider.defaultModel } : {}),\n    models: provider.models ?? (provider.defaultModel ? [provider.defaultModel] : []),\n    ...(provider.aliases?.length ? { aliases: [...provider.aliases] } : {}),\n    ...(provider.capabilities ? { capabilities: provider.capabilities } : {}),\n    ...(provider.ui ? { ui: provider.ui } : {}),\n  }));\n}\n\nexport function clearImageGenerationRegistryForTests(): void {\n  registry.clear();\n  aliasIndex.clear();\n}\n"],"mappings":";;;;;AAsCA,MAAM,sBAAsB,IAAI,IAAY;CAAC;CAAa;CAAe;CAAY,CAAC;AAEtF,MAAM,2BAAW,IAAI,KAAsC;AAC3D,MAAM,6BAAa,IAAI,KAAqB;AAE5C,SAAS,YAAY,IAAoB;AACvC,QAAO,GAAG,MAAM,CAAC,aAAa;;AAGhC,SAAS,oBAAoB,KAAyB,YAA6B;AACjF,KAAI,CAAC,IAAK,QAAO;CAIjB,MAAM,aAAc,KAAyE;AAC7F,KAAI,CAAC,cAAc,OAAO,eAAe,SAAU,QAAO;CAC1D,MAAM,QAAS,WAAuC;AACtD,KAAI,CAAC,SAAS,OAAO,UAAU,SAAU,QAAO;AAEhD,QADiB,MAAgC,YAC9B;;AAGrB,SAAgB,gCAAgC,UAAyC;AACvF,KAAI,CAAC,SAAS,IAAI,MAAM,CACtB,OAAM,IAAI,MAAM,2CAA2C;CAE7D,MAAM,KAAK,YAAY,SAAS,GAAG;AACnC,KAAI,oBAAoB,IAAI,GAAG,CAC7B,OAAM,IAAI,MAAM,6CAA6C,SAAS,KAAK;AAG7E,MAAK,MAAM,CAAC,OAAO,WAAW,CAAC,GAAG,WAAW,SAAS,CAAC,CACrD,KAAI,WAAW,GAAI,YAAW,OAAO,MAAM;AAE7C,UAAS,IAAI,IAAI,SAAS;AAC1B,MAAK,MAAM,YAAY,SAAS,WAAW,EAAE,EAAE;AAC7C,MAAI,OAAO,aAAa,SAAU;EAClC,MAAM,QAAQ,YAAY,SAAS;AACnC,MAAI,CAAC,SAAS,UAAU,GAAI;AAC5B,MAAI,oBAAoB,IAAI,MAAM,CAAE;AACpC,MAAI,SAAS,IAAI,MAAM,CAAE;AACzB,aAAW,IAAI,OAAO,GAAG;;;;;;;;AAS7B,SAAgB,2BACd,YACA,KACqC;AACrC,KAAI,OAAO,eAAe,SAAU,QAAO,KAAA;CAC3C,MAAM,KAAK,YAAY,WAAW;AAClC,KAAI,CAAC,GAAI,QAAO,KAAA;CAChB,MAAM,SAAS,SAAS,IAAI,GAAG;AAC/B,KAAI,OACF,QAAO,oBAAoB,KAAK,OAAO,GAAG,GAAG,KAAA,IAAY;CAE3D,MAAM,cAAc,WAAW,IAAI,GAAG;AACtC,KAAI,CAAC,YAAa,QAAO,KAAA;CACzB,MAAM,UAAU,SAAS,IAAI,YAAY;AACzC,KAAI,CAAC,QAAS,QAAO,KAAA;AACrB,QAAO,oBAAoB,KAAK,QAAQ,GAAG,GAAG,KAAA,IAAY;;AAG5D,SAAgB,6BAA6B,KAAyC;CACpF,MAAM,MAAiC,EAAE;AACzC,MAAK,MAAM,YAAY,SAAS,QAAQ,EAAE;AACxC,MAAI,oBAAoB,KAAK,SAAS,GAAG,CAAE;AAC3C,MAAI,KAAK,SAAS;;AAEpB,QAAO;;AAaT,SAAgB,oCACd,KACkC;AAClC,QAAO,6BAA6B,IAAI,CAAC,KAAK,cAAc;EAC1D,IAAI,SAAS;EACb,GAAI,SAAS,QAAQ,EAAE,OAAO,SAAS,OAAO,GAAG,EAAE;EACnD,GAAI,SAAS,eAAe,EAAE,cAAc,SAAS,cAAc,GAAG,EAAE;EACxE,QAAQ,SAAS,WAAW,SAAS,eAAe,CAAC,SAAS,aAAa,GAAG,EAAE;EAChF,GAAI,SAAS,SAAS,SAAS,EAAE,SAAS,CAAC,GAAG,SAAS,QAAQ,EAAE,GAAG,EAAE;EACtE,GAAI,SAAS,eAAe,EAAE,cAAc,SAAS,cAAc,GAAG,EAAE;EACxE,GAAI,SAAS,KAAK,EAAE,IAAI,SAAS,IAAI,GAAG,EAAE;EAC3C,EAAE;;AAGL,SAAgB,uCAA6C;AAC3D,UAAS,OAAO;AAChB,YAAW,OAAO"}

package/dist/src/agent/image/generation/runtime.d.ts

@@ -1,6 +1,6 @@
 import type { Config } from '../../../config/schema.js';
 import { type ImageGenerationProviderSummary } from './provider-registry.js';
-import type { ImageGenerationProviderCapabilities, ImageGenerationCapabilitiesLegacy } from './types.js';
+import type { ImageGenerationProviderCapabilities } from './types.js';
 import './bundled.js';
 export type { GenerateImageParams, GenerateImageRuntimeResult, ImageGenerationRuntimeDeps, } from './runtime-types.js';
 import type { GenerateImageParams, GenerateImageRuntimeResult, ImageGenerationRuntimeDeps } from './runtime-types.js';
@@ -10,5 +10,5 @@ import type { GenerateImageParams, GenerateImageRuntimeResult, ImageGenerationRu
  */
 export declare function generateImage(params: GenerateImageParams, deps?: ImageGenerationRuntimeDeps): Promise<GenerateImageRuntimeResult>;
 export declare function listImageGenerationProvidersSummary(cfg?: Config): ImageGenerationProviderSummary[];
-export type { ImageGenerationCapabilitiesLegacy, ImageGenerationProviderCapabilities, };
+export type { ImageGenerationProviderCapabilities };
 export { getImageGenerationProvider, listImageGenerationProviders, } from './provider-registry.js';

package/dist/src/agent/image/generation/runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.js","names":["listProvidersSummaryFromRegistry"],"sources":["../../../../../src/agent/image/generation/runtime.ts"],"sourcesContent":["import type { Config } from '../../../config/schema.js';\nimport { PROVIDER_ENV_MAP } from '../../../providers/env-keys.js';\nimport { createLogger } from '../../../utils/logger.js';\nimport {\n  buildMediaGenerationNormalizationMetadata,\n  buildNoCapabilityModelConfiguredMessage,\n  recordCapabilityCandidateFailure,\n  resolveCapabilityModelCandidates,\n  throwCapabilityGenerationFailure,\n  type CapabilityProviderCandidate,\n} from '../../media-generation/index.js';\nimport { describeFailoverError, isFailoverError, type FallbackAttempt } from '../../failover-error.js';\nimport { parseImageGenerationModelRef } from './model-ref.js';\nimport { resolveImageGenerationOverrides } from './normalization.js';\nimport {\n  getImageGenerationProvider,\n  listImageGenerationProviders,\n  listImageGenerationProvidersSummary as listProvidersSummaryFromRegistry,\n  type ImageGenerationProvider,\n  type ImageGenerationProviderSummary,\n} from './provider-registry.js';\nimport type {\n  ImageGenerationProviderCapabilities,\n  ImageGenerationCapabilitiesLegacy,\n  ImageGenerationRequest,\n  ImageGenerationSourceImage,\n} from './types.js';\n\n// Side-effect: registers every bundled image-generation provider listed in\n// src/generated/bundled-image-generation-providers.ts (regenerated via\n// `pnpm run generate:bundled-image-providers`). Vendor implementations live\n// under extensions/<vendor>/src/image-generation-provider.ts.\nimport './bundled.js';\n\nexport type {\n  GenerateImageParams,\n  GenerateImageRuntimeResult,\n  ImageGenerationRuntimeDeps,\n} from './runtime-types.js';\n\nimport type {\n  GenerateImageParams,\n  GenerateImageRuntimeResult,\n  ImageGenerationRuntimeDeps,\n} from './runtime-types.js';\n\nconst log = createLogger('ImageGen');\n\n/**\n * Generate one or more images, walking the candidate model list with\n * structured failover. See {@link GenerateImageParams} / {@link GenerateImageRuntimeResult}.\n */\nexport async function generateImage(\n  params: GenerateImageParams,\n  deps: ImageGenerationRuntimeDeps = {},\n): Promise<GenerateImageRuntimeResult> {\n  const listProviders = (cfg?: Config) =>\n    (deps.listProviders ?? listImageGenerationProviders)(cfg);\n  const getProvider = (id: string, cfg?: Config) =>\n    (deps.getProvider ?? getImageGenerationProvider)(id, cfg);\n\n  const candidates = resolveCapabilityModelCandidates({\n    cfg: params.cfg,\n    modelConfig: params.cfg?.agents?.defaults?.imageGenerationModel,\n    modelOverride: params.modelOverride,\n    parseModelRef: parseImageGenerationModelRef,\n    agentDir: params.agentDir,\n    listProviders: (cfg) => listProviders(cfg).map(toCapabilityCandidate),\n    autoProviderFallback: params.autoProviderFallback,\n  });\n\n  if (candidates.length === 0) {\n    throw new Error(buildNoImageGenerationModelConfiguredMessage(params.cfg, deps));\n  }\n\n  const attempts: FallbackAttempt[] = [];\n  let lastError: unknown;\n\n  for (const candidate of candidates) {\n    const startedAt = Date.now();\n    const provider = getProvider(candidate.provider, params.cfg);\n    if (!provider) {\n      const errorMessage = `Image generation provider not registered: ${candidate.provider}`;\n      attempts.push({\n        provider: candidate.provider,\n        model: candidate.model,\n        error: errorMessage,\n        reason: 'config',\n      });\n      lastError = new Error(errorMessage);\n      log.warn(\n        { provider: candidate.provider, model: candidate.model, phase: 'candidate_skipped' },\n        `image-generation candidate skipped: ${errorMessage}`,\n      );\n      continue;\n    }\n\n    try {\n      const sanitized = resolveImageGenerationOverrides({\n        provider,\n        size: params.size,\n        aspectRatio: params.aspectRatio,\n        resolution: params.resolution,\n        quality: params.quality,\n        outputFormat: params.outputFormat,\n        background: params.background,\n        inputImages: params.inputImages,\n      });\n\n      const request = buildProviderRequest({\n        provider,\n        candidate,\n        params,\n        sanitized,\n      });\n\n      log.debug(\n        {\n          provider: candidate.provider,\n          model: candidate.model,\n          phase: 'provider_invoked',\n          normalizationCount: sanitized.normalization\n            ? Object.keys(sanitized.normalization).length\n            : 0,\n          ignoredCount: sanitized.ignoredOverrides.length,\n        },\n        `image-generation provider invoked: ${candidate.provider}/${candidate.model}`,\n      );\n\n      const result = await provider.generateImage(request);\n      if (!result.images?.length) {\n        throw new Error('Image generation provider returned no images.');\n      }\n\n      const normalizationMetadata = buildMediaGenerationNormalizationMetadata({\n        normalization: sanitized.normalization as Record<string, unknown> | undefined,\n      });\n\n      return {\n        images: result.images,\n        provider: candidate.provider,\n        model: result.model ?? candidate.model,\n        attempts,\n        ...(sanitized.normalization ? { normalization: sanitized.normalization } : {}),\n        ignoredOverrides: sanitized.ignoredOverrides,\n        metadata: { ...(result.metadata ?? {}), ...normalizationMetadata },\n      };\n    } catch (err) {\n      lastError = err;\n      const durationMs = Date.now() - startedAt;\n      recordCapabilityCandidateFailure({\n        attempts,\n        provider: candidate.provider,\n        model: candidate.model,\n        error: err,\n        durationMs,\n      });\n      const last = attempts[attempts.length - 1];\n      const description = isFailoverError(err) ? describeFailoverError(err) : undefined;\n      log.warn(\n        {\n          err,\n          provider: candidate.provider,\n          model: candidate.model,\n          status: last?.status,\n          reason: last?.reason,\n          durationMs,\n          phase: 'candidate_failed',\n          attemptCount: attempts.length,\n        },\n        `image-generation candidate failed: ${candidate.provider}/${candidate.model}: ${\n          description ?? last?.error ?? (err instanceof Error ? err.message : String(err))\n        }`,\n      );\n    }\n  }\n\n  return throwCapabilityGenerationFailure({\n    capabilityLabel: 'image generation',\n    attempts,\n    lastError,\n  });\n}\n\nexport function listImageGenerationProvidersSummary(\n  cfg?: Config,\n): ImageGenerationProviderSummary[] {\n  return listProvidersSummaryFromRegistry(cfg);\n}\n\n// ============================================\n// Helpers\n// ============================================\n\nfunction buildProviderRequest(input: {\n  provider: ImageGenerationProvider;\n  candidate: { provider: string; model: string };\n  params: GenerateImageParams;\n  sanitized: ReturnType<typeof resolveImageGenerationOverrides>;\n}): ImageGenerationRequest {\n  const { provider, candidate, params, sanitized } = input;\n  const inputImages = params.inputImages\n    ? cloneInputImages(params.inputImages)\n    : undefined;\n  return {\n    provider: provider.id,\n    model: candidate.model,\n    prompt: params.prompt,\n    ...(params.cfg ? { cfg: params.cfg } : {}),\n    ...(params.agentDir ? { agentDir: params.agentDir } : {}),\n    ...(params.authStore ? { authStore: params.authStore } : {}),\n    ...(typeof params.timeoutMs === 'number' ? { timeoutMs: params.timeoutMs } : {}),\n    ...(params.signal ? { signal: params.signal } : {}),\n    ...(typeof params.count === 'number' ? { count: params.count } : {}),\n    ...(sanitized.size !== undefined ? { size: sanitized.size } : {}),\n    ...(sanitized.aspectRatio !== undefined ? { aspectRatio: sanitized.aspectRatio } : {}),\n    ...(sanitized.resolution !== undefined ? { resolution: sanitized.resolution } : {}),\n    ...(sanitized.quality !== undefined ? { quality: sanitized.quality } : {}),\n    ...(sanitized.outputFormat !== undefined ? { outputFormat: sanitized.outputFormat } : {}),\n    ...(sanitized.background !== undefined ? { background: sanitized.background } : {}),\n    ...(inputImages ? { inputImages } : {}),\n    ...(params.providerOptions ? { providerOptions: params.providerOptions } : {}),\n  };\n}\n\nfunction cloneInputImages(images: ImageGenerationSourceImage[]): ImageGenerationSourceImage[] {\n  return images.map((img) => ({\n    buffer: img.buffer,\n    mimeType: img.mimeType,\n    ...(img.fileName ? { fileName: img.fileName } : {}),\n    ...(img.metadata ? { metadata: img.metadata } : {}),\n  }));\n}\n\nfunction toCapabilityCandidate(provider: ImageGenerationProvider): CapabilityProviderCandidate {\n  return {\n    id: provider.id,\n    ...(provider.aliases ? { aliases: provider.aliases } : {}),\n    defaultModel: provider.defaultModel ?? null,\n    models: provider.models ?? [],\n    isConfigured: provider.isConfigured,\n  };\n}\n\nfunction buildNoImageGenerationModelConfiguredMessage(\n  cfg: Config | undefined,\n  deps: ImageGenerationRuntimeDeps,\n): string {\n  const list = (deps.listProviders ?? listImageGenerationProviders)(cfg);\n  return buildNoCapabilityModelConfiguredMessage({\n    capabilityLabel: 'image-generation',\n    modelConfigKey: 'imageGenerationModel',\n    providers: list.map(toCapabilityCandidate),\n    getProviderEnvVars: deps.getProviderEnvVars ?? ((id) => PROVIDER_ENV_MAP[id]),\n  });\n}\n\n// Touch capability + legacy types so they remain part of the public surface\n// callers can rely on (avoids accidental removal from re-exports).\nexport type {\n  ImageGenerationCapabilitiesLegacy,\n  ImageGenerationProviderCapabilities,\n};\n// Re-export the provider-registry surface that gateway routes / CLI consume\n// through this single barrel module. NOTE: `listImageGenerationProvidersSummary`\n// is implemented locally above (it overlays cfg-aware `configured` flags), so\n// it must not be re-exported from the registry to avoid a name clash.\nexport {\n  getImageGenerationProvider,\n  listImageGenerationProviders,\n} from './provider-registry.js';\n"],"mappings":"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"}
+{"version":3,"file":"runtime.js","names":["listProvidersSummaryFromRegistry"],"sources":["../../../../../src/agent/image/generation/runtime.ts"],"sourcesContent":["import type { Config } from '../../../config/schema.js';\nimport { PROVIDER_ENV_MAP } from '../../../providers/env-keys.js';\nimport { createLogger } from '../../../utils/logger.js';\nimport {\n  buildMediaGenerationNormalizationMetadata,\n  buildNoCapabilityModelConfiguredMessage,\n  recordCapabilityCandidateFailure,\n  resolveCapabilityModelCandidates,\n  throwCapabilityGenerationFailure,\n  type CapabilityProviderCandidate,\n} from '../../media-generation/index.js';\nimport { describeFailoverError, isFailoverError, type FallbackAttempt } from '../../failover-error.js';\nimport { parseImageGenerationModelRef } from './model-ref.js';\nimport { resolveImageGenerationOverrides } from './normalization.js';\nimport {\n  getImageGenerationProvider,\n  listImageGenerationProviders,\n  listImageGenerationProvidersSummary as listProvidersSummaryFromRegistry,\n  type ImageGenerationProvider,\n  type ImageGenerationProviderSummary,\n} from './provider-registry.js';\nimport type {\n  ImageGenerationProviderCapabilities,\n  ImageGenerationRequest,\n  ImageGenerationSourceImage,\n} from './types.js';\n\n// Side-effect: registers every bundled image-generation provider listed in\n// src/generated/bundled-image-generation-providers.ts (regenerated via\n// `pnpm run generate:bundled-image-providers`). Vendor implementations live\n// under extensions/<vendor>/src/image-generation-provider.ts.\nimport './bundled.js';\n\nexport type {\n  GenerateImageParams,\n  GenerateImageRuntimeResult,\n  ImageGenerationRuntimeDeps,\n} from './runtime-types.js';\n\nimport type {\n  GenerateImageParams,\n  GenerateImageRuntimeResult,\n  ImageGenerationRuntimeDeps,\n} from './runtime-types.js';\n\nconst log = createLogger('ImageGen');\n\n/**\n * Generate one or more images, walking the candidate model list with\n * structured failover. See {@link GenerateImageParams} / {@link GenerateImageRuntimeResult}.\n */\nexport async function generateImage(\n  params: GenerateImageParams,\n  deps: ImageGenerationRuntimeDeps = {},\n): Promise<GenerateImageRuntimeResult> {\n  const listProviders = (cfg?: Config) =>\n    (deps.listProviders ?? listImageGenerationProviders)(cfg);\n  const getProvider = (id: string, cfg?: Config) =>\n    (deps.getProvider ?? getImageGenerationProvider)(id, cfg);\n\n  const candidates = resolveCapabilityModelCandidates({\n    cfg: params.cfg,\n    modelConfig: params.cfg?.agents?.defaults?.imageGenerationModel,\n    modelOverride: params.modelOverride,\n    parseModelRef: parseImageGenerationModelRef,\n    agentDir: params.agentDir,\n    listProviders: (cfg) => listProviders(cfg).map(toCapabilityCandidate),\n    autoProviderFallback: params.autoProviderFallback,\n  });\n\n  if (candidates.length === 0) {\n    throw new Error(buildNoImageGenerationModelConfiguredMessage(params.cfg, deps));\n  }\n\n  const attempts: FallbackAttempt[] = [];\n  let lastError: unknown;\n\n  for (const candidate of candidates) {\n    const startedAt = Date.now();\n    const provider = getProvider(candidate.provider, params.cfg);\n    if (!provider) {\n      const errorMessage = `Image generation provider not registered: ${candidate.provider}`;\n      attempts.push({\n        provider: candidate.provider,\n        model: candidate.model,\n        error: errorMessage,\n        reason: 'config',\n      });\n      lastError = new Error(errorMessage);\n      log.warn(\n        { provider: candidate.provider, model: candidate.model, phase: 'candidate_skipped' },\n        `image-generation candidate skipped: ${errorMessage}`,\n      );\n      continue;\n    }\n\n    try {\n      const sanitized = resolveImageGenerationOverrides({\n        provider,\n        size: params.size,\n        aspectRatio: params.aspectRatio,\n        resolution: params.resolution,\n        quality: params.quality,\n        outputFormat: params.outputFormat,\n        background: params.background,\n        inputImages: params.inputImages,\n      });\n\n      const request = buildProviderRequest({\n        provider,\n        candidate,\n        params,\n        sanitized,\n      });\n\n      log.debug(\n        {\n          provider: candidate.provider,\n          model: candidate.model,\n          phase: 'provider_invoked',\n          normalizationCount: sanitized.normalization\n            ? Object.keys(sanitized.normalization).length\n            : 0,\n          ignoredCount: sanitized.ignoredOverrides.length,\n        },\n        `image-generation provider invoked: ${candidate.provider}/${candidate.model}`,\n      );\n\n      const result = await provider.generateImage(request);\n      if (!result.images?.length) {\n        throw new Error('Image generation provider returned no images.');\n      }\n\n      const normalizationMetadata = buildMediaGenerationNormalizationMetadata({\n        normalization: sanitized.normalization as Record<string, unknown> | undefined,\n      });\n\n      return {\n        images: result.images,\n        provider: candidate.provider,\n        model: result.model ?? candidate.model,\n        attempts,\n        ...(sanitized.normalization ? { normalization: sanitized.normalization } : {}),\n        ignoredOverrides: sanitized.ignoredOverrides,\n        metadata: { ...(result.metadata ?? {}), ...normalizationMetadata },\n      };\n    } catch (err) {\n      lastError = err;\n      const durationMs = Date.now() - startedAt;\n      recordCapabilityCandidateFailure({\n        attempts,\n        provider: candidate.provider,\n        model: candidate.model,\n        error: err,\n        durationMs,\n      });\n      const last = attempts[attempts.length - 1];\n      const description = isFailoverError(err) ? describeFailoverError(err) : undefined;\n      log.warn(\n        {\n          err,\n          provider: candidate.provider,\n          model: candidate.model,\n          status: last?.status,\n          reason: last?.reason,\n          durationMs,\n          phase: 'candidate_failed',\n          attemptCount: attempts.length,\n        },\n        `image-generation candidate failed: ${candidate.provider}/${candidate.model}: ${\n          description ?? last?.error ?? (err instanceof Error ? err.message : String(err))\n        }`,\n      );\n    }\n  }\n\n  return throwCapabilityGenerationFailure({\n    capabilityLabel: 'image generation',\n    attempts,\n    lastError,\n  });\n}\n\nexport function listImageGenerationProvidersSummary(\n  cfg?: Config,\n): ImageGenerationProviderSummary[] {\n  return listProvidersSummaryFromRegistry(cfg);\n}\n\n// ============================================\n// Helpers\n// ============================================\n\nfunction buildProviderRequest(input: {\n  provider: ImageGenerationProvider;\n  candidate: { provider: string; model: string };\n  params: GenerateImageParams;\n  sanitized: ReturnType<typeof resolveImageGenerationOverrides>;\n}): ImageGenerationRequest {\n  const { provider, candidate, params, sanitized } = input;\n  const inputImages = params.inputImages\n    ? cloneInputImages(params.inputImages)\n    : undefined;\n  return {\n    provider: provider.id,\n    model: candidate.model,\n    prompt: params.prompt,\n    ...(params.cfg ? { cfg: params.cfg } : {}),\n    ...(params.agentDir ? { agentDir: params.agentDir } : {}),\n    ...(params.authStore ? { authStore: params.authStore } : {}),\n    ...(typeof params.timeoutMs === 'number' ? { timeoutMs: params.timeoutMs } : {}),\n    ...(params.signal ? { signal: params.signal } : {}),\n    ...(typeof params.count === 'number' ? { count: params.count } : {}),\n    ...(sanitized.size !== undefined ? { size: sanitized.size } : {}),\n    ...(sanitized.aspectRatio !== undefined ? { aspectRatio: sanitized.aspectRatio } : {}),\n    ...(sanitized.resolution !== undefined ? { resolution: sanitized.resolution } : {}),\n    ...(sanitized.quality !== undefined ? { quality: sanitized.quality } : {}),\n    ...(sanitized.outputFormat !== undefined ? { outputFormat: sanitized.outputFormat } : {}),\n    ...(sanitized.background !== undefined ? { background: sanitized.background } : {}),\n    ...(inputImages ? { inputImages } : {}),\n    ...(params.providerOptions ? { providerOptions: params.providerOptions } : {}),\n  };\n}\n\nfunction cloneInputImages(images: ImageGenerationSourceImage[]): ImageGenerationSourceImage[] {\n  return images.map((img) => ({\n    buffer: img.buffer,\n    mimeType: img.mimeType,\n    ...(img.fileName ? { fileName: img.fileName } : {}),\n    ...(img.metadata ? { metadata: img.metadata } : {}),\n  }));\n}\n\nfunction toCapabilityCandidate(provider: ImageGenerationProvider): CapabilityProviderCandidate {\n  return {\n    id: provider.id,\n    ...(provider.aliases ? { aliases: provider.aliases } : {}),\n    defaultModel: provider.defaultModel ?? null,\n    models: provider.models ?? [],\n    isConfigured: provider.isConfigured,\n  };\n}\n\nfunction buildNoImageGenerationModelConfiguredMessage(\n  cfg: Config | undefined,\n  deps: ImageGenerationRuntimeDeps,\n): string {\n  const list = (deps.listProviders ?? listImageGenerationProviders)(cfg);\n  return buildNoCapabilityModelConfiguredMessage({\n    capabilityLabel: 'image-generation',\n    modelConfigKey: 'imageGenerationModel',\n    providers: list.map(toCapabilityCandidate),\n    getProviderEnvVars: deps.getProviderEnvVars ?? ((id) => PROVIDER_ENV_MAP[id]),\n  });\n}\n\n// Re-export the canonical capability type for callers consuming this barrel.\nexport type { ImageGenerationProviderCapabilities };\n// Re-export the provider-registry surface that gateway routes / CLI consume\n// through this single barrel module. NOTE: `listImageGenerationProvidersSummary`\n// is implemented locally above (it overlays cfg-aware `configured` flags), so\n// it must not be re-exported from the registry to avoid a name clash.\nexport {\n  getImageGenerationProvider,\n  listImageGenerationProviders,\n} from './provider-registry.js';\n"],"mappings":"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"}

package/dist/src/agent/image/generation/types.d.ts

@@ -1,6 +1,5 @@
 import type { Config } from '../../../config/schema.js';
 import type { AuthProfileStore } from '../../../providers/auth-runtime/index.js';
-import type { FallbackAttempt } from '../../failover-error.js';
 import type { MediaNormalizationEntry } from '../../media-generation/normalization.types.js';
 export type { ImageGenerationProvider, ImageGenerationProviderConfiguredContext, ImageGenerationProviderSummary, } from './provider-registry.js';
 export type { ImageProviderUiBaseUrlPreset, ImageProviderUiMetadata, ImageProviderUiPresetKind, ImageProviderUiRegionOption, } from './image-provider-ui.js';
@@ -104,20 +103,3 @@ export interface ImageGenerationResult {
     model?: string;
     metadata?: Record<string, unknown>;
 }
-/** @deprecated Use {@link FallbackAttempt} from `../failover-error.js`. */
-export type ImageGenFallbackAttempt = FallbackAttempt;
-/**
- * @deprecated Legacy flat capability shape from Step 1. Kept for backward
- * compatibility while older code migrates to {@link ImageGenerationProviderCapabilities}.
- */
-export interface ImageGenerationCapabilitiesLegacy {
-    supportsEdit: boolean;
-    maxInputImages?: number;
-    maxOutputImages?: number;
-    supportedSizes?: string[];
-}
-/**
- * @deprecated Use {@link ImageGenerationProviderCapabilities}. The legacy alias
- * remains so existing code compiles unchanged during Step 2.
- */
-export type ImageGenerationCapabilities = ImageGenerationCapabilitiesLegacy;

package/dist/src/agent/image/image-helpers.js

@@ -30,13 +30,18 @@ function coerceImageModelConfig(cfg) {
 }
 function applyImageGenerationModelConfigDefaults(cfg, imageGenerationModelConfig) {
 	if (!cfg) return;
+	const primary = imageGenerationModelConfig.primary?.trim();
+	if (!primary) return cfg;
 	return {
 		...cfg,
 		agents: {
 			...cfg.agents,
 			defaults: {
 				...cfg.agents?.defaults,
-				imageGenerationModel: imageGenerationModelConfig
+				imageGenerationModel: {
+					primary,
+					...imageGenerationModelConfig.fallbacks?.length ? { fallbacks: imageGenerationModelConfig.fallbacks } : {}
+				}
 			}
 		}
 	};

package/dist/src/agent/image/image-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"image-helpers.js","names":[],"sources":["../../../../src/agent/image/image-helpers.ts"],"sourcesContent":["import type { AgentToolResult } from '@earendil-works/pi-agent-core';\nimport type { AssistantMessage } from '@earendil-works/pi-ai';\nimport type { Config } from '../../config/schema.js';\nimport { extractTextContent } from '../context/workspace.js';\nimport type { ImageAttempt } from './image-model-fallback.js';\nimport { coerceToolModelConfig, type ToolModelConfig } from './tool-model-config.js';\n\nexport type ImageModelConfig = ToolModelConfig;\n\nexport function decodeDataUrl(dataUrl: string): {\n  buffer: Buffer;\n  mimeType: string;\n  kind: 'image';\n} {\n  const trimmed = dataUrl.trim();\n  const match = /^data:([^;,]+);base64,([a-z0-9+/=\\r\\n]+)$/i.exec(trimmed);\n  if (!match) {\n    throw new Error('Invalid data URL (expected base64 data: URL).');\n  }\n  const mimeType = (match[1] ?? '').trim().toLowerCase();\n  if (!mimeType.startsWith('image/')) {\n    throw new Error(`Unsupported data URL type: ${mimeType || 'unknown'}`);\n  }\n  const b64 = (match[2] ?? '').trim();\n  const buffer = Buffer.from(b64, 'base64');\n  if (buffer.length === 0) {\n    throw new Error('Invalid data URL: empty payload.');\n  }\n  return { buffer, mimeType, kind: 'image' };\n}\n\nexport function coerceImageAssistantText(params: {\n  message: AssistantMessage;\n  provider: string;\n  model: string;\n}): string {\n  const stop = params.message.stopReason;\n  const errorMessage = params.message.errorMessage?.trim();\n  if (stop === 'error' || stop === 'aborted') {\n    throw new Error(\n      errorMessage\n        ? `Image model failed (${params.provider}/${params.model}): ${errorMessage}`\n        : `Image model failed (${params.provider}/${params.model})`,\n    );\n  }\n  if (errorMessage) {\n    throw new Error(`Image model failed (${params.provider}/${params.model}): ${errorMessage}`);\n  }\n  const text = extractTextContent(\n    params.message.content as Array<{ type: string; text?: string }>,\n  );\n  if (text.trim()) {\n    return text.trim();\n  }\n  throw new Error(`Image model returned no text (${params.provider}/${params.model}).`);\n}\n\nexport function coerceImageModelConfig(cfg?: Config): ImageModelConfig {\n  return coerceToolModelConfig(cfg?.agents?.defaults?.imageModel);\n}\n\nexport function applyImageGenerationModelConfigDefaults(\n  cfg: Config | undefined,\n  imageGenerationModelConfig: ToolModelConfig,\n): Config | undefined {\n  if (!cfg) {\n    return undefined;\n  }\n  return {\n    ...cfg,\n    agents: {\n      ...cfg.agents,\n      defaults: {\n        ...cfg.agents?.defaults,\n        imageGenerationModel: imageGenerationModelConfig,\n      },\n    },\n  };\n}\n\nexport function resolvePromptAndModelOverride(\n  args: Record<string, unknown>,\n  defaultPrompt: string,\n): {\n  prompt: string;\n  modelOverride?: string;\n} {\n  const prompt =\n    typeof args.prompt === 'string' && args.prompt.trim() ? args.prompt.trim() : defaultPrompt;\n  const modelOverride =\n    typeof args.model === 'string' && args.model.trim() ? args.model.trim() : undefined;\n  return { prompt, modelOverride };\n}\n\nexport function buildImageToolTextResult(\n  result: { text: string; provider: string; model: string; attempts: ImageAttempt[] },\n  extraDetails: Record<string, unknown>,\n): AgentToolResult<Record<string, unknown>> {\n  return {\n    content: [{ type: 'text', text: result.text }],\n    details: {\n      model: `${result.provider}/${result.model}`,\n      ...extraDetails,\n      attempts: result.attempts,\n    },\n  };\n}\n"],"mappings":";;;AASA,SAAgB,cAAc,SAI5B;CACA,MAAM,UAAU,QAAQ,MAAM;CAC9B,MAAM,QAAQ,6CAA6C,KAAK,QAAQ;AACxE,KAAI,CAAC,MACH,OAAM,IAAI,MAAM,gDAAgD;CAElE,MAAM,YAAY,MAAM,MAAM,IAAI,MAAM,CAAC,aAAa;AACtD,KAAI,CAAC,SAAS,WAAW,SAAS,CAChC,OAAM,IAAI,MAAM,8BAA8B,YAAY,YAAY;CAExE,MAAM,OAAO,MAAM,MAAM,IAAI,MAAM;CACnC,MAAM,SAAS,OAAO,KAAK,KAAK,SAAS;AACzC,KAAI,OAAO,WAAW,EACpB,OAAM,IAAI,MAAM,mCAAmC;AAErD,QAAO;EAAE;EAAQ;EAAU,MAAM;EAAS;;AAG5C,SAAgB,yBAAyB,QAI9B;CACT,MAAM,OAAO,OAAO,QAAQ;CAC5B,MAAM,eAAe,OAAO,QAAQ,cAAc,MAAM;AACxD,KAAI,SAAS,WAAW,SAAS,UAC/B,OAAM,IAAI,MACR,eACI,uBAAuB,OAAO,SAAS,GAAG,OAAO,MAAM,KAAK,iBAC5D,uBAAuB,OAAO,SAAS,GAAG,OAAO,MAAM,GAC5D;AAEH,KAAI,aACF,OAAM,IAAI,MAAM,uBAAuB,OAAO,SAAS,GAAG,OAAO,MAAM,KAAK,eAAe;CAE7F,MAAM,OAAO,mBACX,OAAO,QAAQ,QAChB;AACD,KAAI,KAAK,MAAM,CACb,QAAO,KAAK,MAAM;AAEpB,OAAM,IAAI,MAAM,iCAAiC,OAAO,SAAS,GAAG,OAAO,MAAM,IAAI;;AAGvF,SAAgB,uBAAuB,KAAgC;AACrE,QAAO,sBAAsB,KAAK,QAAQ,UAAU,WAAW;;AAGjE,SAAgB,wCACd,KACA,4BACoB;AACpB,KAAI,CAAC,IACH;AAEF,QAAO;EACL,GAAG;EACH,QAAQ;GACN,GAAG,IAAI;GACP,UAAU;IACR,GAAG,IAAI,QAAQ;IACf,sBAAsB;IACvB;GACF;EACF;;AAGH,SAAgB,8BACd,MACA,eAIA;AAKA,QAAO;EAAE,QAHP,OAAO,KAAK,WAAW,YAAY,KAAK,OAAO,MAAM,GAAG,KAAK,OAAO,MAAM,GAAG;EAG9D,eADf,OAAO,KAAK,UAAU,YAAY,KAAK,MAAM,MAAM,GAAG,KAAK,MAAM,MAAM,GAAG,KAAA;EAC5C;;AAGlC,SAAgB,yBACd,QACA,cAC0C;AAC1C,QAAO;EACL,SAAS,CAAC;GAAE,MAAM;GAAQ,MAAM,OAAO;GAAM,CAAC;EAC9C,SAAS;GACP,OAAO,GAAG,OAAO,SAAS,GAAG,OAAO;GACpC,GAAG;GACH,UAAU,OAAO;GAClB;EACF"}
+{"version":3,"file":"image-helpers.js","names":[],"sources":["../../../../src/agent/image/image-helpers.ts"],"sourcesContent":["import type { AgentToolResult } from '@earendil-works/pi-agent-core';\nimport type { AssistantMessage } from '@earendil-works/pi-ai';\nimport type { Config } from '../../config/schema.js';\nimport { extractTextContent } from '../context/workspace.js';\nimport type { ImageAttempt } from './image-model-fallback.js';\nimport { coerceToolModelConfig, type ToolModelConfig } from './tool-model-config.js';\n\nexport type ImageModelConfig = ToolModelConfig;\n\nexport function decodeDataUrl(dataUrl: string): {\n  buffer: Buffer;\n  mimeType: string;\n  kind: 'image';\n} {\n  const trimmed = dataUrl.trim();\n  const match = /^data:([^;,]+);base64,([a-z0-9+/=\\r\\n]+)$/i.exec(trimmed);\n  if (!match) {\n    throw new Error('Invalid data URL (expected base64 data: URL).');\n  }\n  const mimeType = (match[1] ?? '').trim().toLowerCase();\n  if (!mimeType.startsWith('image/')) {\n    throw new Error(`Unsupported data URL type: ${mimeType || 'unknown'}`);\n  }\n  const b64 = (match[2] ?? '').trim();\n  const buffer = Buffer.from(b64, 'base64');\n  if (buffer.length === 0) {\n    throw new Error('Invalid data URL: empty payload.');\n  }\n  return { buffer, mimeType, kind: 'image' };\n}\n\nexport function coerceImageAssistantText(params: {\n  message: AssistantMessage;\n  provider: string;\n  model: string;\n}): string {\n  const stop = params.message.stopReason;\n  const errorMessage = params.message.errorMessage?.trim();\n  if (stop === 'error' || stop === 'aborted') {\n    throw new Error(\n      errorMessage\n        ? `Image model failed (${params.provider}/${params.model}): ${errorMessage}`\n        : `Image model failed (${params.provider}/${params.model})`,\n    );\n  }\n  if (errorMessage) {\n    throw new Error(`Image model failed (${params.provider}/${params.model}): ${errorMessage}`);\n  }\n  const text = extractTextContent(\n    params.message.content as Array<{ type: string; text?: string }>,\n  );\n  if (text.trim()) {\n    return text.trim();\n  }\n  throw new Error(`Image model returned no text (${params.provider}/${params.model}).`);\n}\n\nexport function coerceImageModelConfig(cfg?: Config): ImageModelConfig {\n  return coerceToolModelConfig(cfg?.agents?.defaults?.imageModel);\n}\n\nexport function applyImageGenerationModelConfigDefaults(\n  cfg: Config | undefined,\n  imageGenerationModelConfig: ToolModelConfig,\n): Config | undefined {\n  if (!cfg) {\n    return undefined;\n  }\n  const primary = imageGenerationModelConfig.primary?.trim();\n  if (!primary) {\n    return cfg;\n  }\n  return {\n    ...cfg,\n    agents: {\n      ...cfg.agents,\n      defaults: {\n        ...cfg.agents?.defaults,\n        imageGenerationModel: {\n          primary,\n          ...(imageGenerationModelConfig.fallbacks?.length ? { fallbacks: imageGenerationModelConfig.fallbacks } : {}),\n        },\n      },\n    },\n  };\n}\n\nexport function resolvePromptAndModelOverride(\n  args: Record<string, unknown>,\n  defaultPrompt: string,\n): {\n  prompt: string;\n  modelOverride?: string;\n} {\n  const prompt =\n    typeof args.prompt === 'string' && args.prompt.trim() ? args.prompt.trim() : defaultPrompt;\n  const modelOverride =\n    typeof args.model === 'string' && args.model.trim() ? args.model.trim() : undefined;\n  return { prompt, modelOverride };\n}\n\nexport function buildImageToolTextResult(\n  result: { text: string; provider: string; model: string; attempts: ImageAttempt[] },\n  extraDetails: Record<string, unknown>,\n): AgentToolResult<Record<string, unknown>> {\n  return {\n    content: [{ type: 'text', text: result.text }],\n    details: {\n      model: `${result.provider}/${result.model}`,\n      ...extraDetails,\n      attempts: result.attempts,\n    },\n  };\n}\n"],"mappings":";;;AASA,SAAgB,cAAc,SAI5B;CACA,MAAM,UAAU,QAAQ,MAAM;CAC9B,MAAM,QAAQ,6CAA6C,KAAK,QAAQ;AACxE,KAAI,CAAC,MACH,OAAM,IAAI,MAAM,gDAAgD;CAElE,MAAM,YAAY,MAAM,MAAM,IAAI,MAAM,CAAC,aAAa;AACtD,KAAI,CAAC,SAAS,WAAW,SAAS,CAChC,OAAM,IAAI,MAAM,8BAA8B,YAAY,YAAY;CAExE,MAAM,OAAO,MAAM,MAAM,IAAI,MAAM;CACnC,MAAM,SAAS,OAAO,KAAK,KAAK,SAAS;AACzC,KAAI,OAAO,WAAW,EACpB,OAAM,IAAI,MAAM,mCAAmC;AAErD,QAAO;EAAE;EAAQ;EAAU,MAAM;EAAS;;AAG5C,SAAgB,yBAAyB,QAI9B;CACT,MAAM,OAAO,OAAO,QAAQ;CAC5B,MAAM,eAAe,OAAO,QAAQ,cAAc,MAAM;AACxD,KAAI,SAAS,WAAW,SAAS,UAC/B,OAAM,IAAI,MACR,eACI,uBAAuB,OAAO,SAAS,GAAG,OAAO,MAAM,KAAK,iBAC5D,uBAAuB,OAAO,SAAS,GAAG,OAAO,MAAM,GAC5D;AAEH,KAAI,aACF,OAAM,IAAI,MAAM,uBAAuB,OAAO,SAAS,GAAG,OAAO,MAAM,KAAK,eAAe;CAE7F,MAAM,OAAO,mBACX,OAAO,QAAQ,QAChB;AACD,KAAI,KAAK,MAAM,CACb,QAAO,KAAK,MAAM;AAEpB,OAAM,IAAI,MAAM,iCAAiC,OAAO,SAAS,GAAG,OAAO,MAAM,IAAI;;AAGvF,SAAgB,uBAAuB,KAAgC;AACrE,QAAO,sBAAsB,KAAK,QAAQ,UAAU,WAAW;;AAGjE,SAAgB,wCACd,KACA,4BACoB;AACpB,KAAI,CAAC,IACH;CAEF,MAAM,UAAU,2BAA2B,SAAS,MAAM;AAC1D,KAAI,CAAC,QACH,QAAO;AAET,QAAO;EACL,GAAG;EACH,QAAQ;GACN,GAAG,IAAI;GACP,UAAU;IACR,GAAG,IAAI,QAAQ;IACf,sBAAsB;KACpB;KACA,GAAI,2BAA2B,WAAW,SAAS,EAAE,WAAW,2BAA2B,WAAW,GAAG,EAAE;KAC5G;IACF;GACF;EACF;;AAGH,SAAgB,8BACd,MACA,eAIA;AAKA,QAAO;EAAE,QAHP,OAAO,KAAK,WAAW,YAAY,KAAK,OAAO,MAAM,GAAG,KAAK,OAAO,MAAM,GAAG;EAG9D,eADf,OAAO,KAAK,UAAU,YAAY,KAAK,MAAM,MAAM,GAAG,KAAK,MAAM,MAAM,GAAG,KAAA;EAC5C;;AAGlC,SAAgB,yBACd,QACA,cAC0C;AAC1C,QAAO;EACL,SAAS,CAAC;GAAE,MAAM;GAAQ,MAAM,OAAO;GAAM,CAAC;EAC9C,SAAS;GACP,OAAO,GAAG,OAAO,SAAS,GAAG,OAAO;GACpC,GAAG;GACH,UAAU,OAAO;GAClB;EACF"}

package/dist/src/agent/image/index.d.ts

@@ -13,5 +13,5 @@ export type { ToolModelConfig } from './tool-model-config.js';
 export { resolveImageModelConfigForTool } from './tool-model-config.js';
 export { generateImage, listImageGenerationProvidersSummary, type GenerateImageParams, type GenerateImageRuntimeResult, } from './generation/runtime.js';
 export { registerImageGenerationProvider, getImageGenerationProvider, listImageGenerationProviders, type ImageGenerationProvider, } from './generation/provider-registry.js';
-export type { ImageGenerationSourceImage, ImageGenerationCapabilities, } from './generation/types.js';
+export type { ImageGenerationSourceImage, ImageGenerationProviderCapabilities, } from './generation/types.js';
 export { modelSupportsVision, resolveImageHandlingStrategy, type ImageHandlingStrategy, } from './vision-detection.js';

package/dist/src/agent/inbound/inbound-loop.d.ts

@@ -57,6 +57,11 @@ export interface InboundLoopConfig {
     enqueueMaybeAutoTitleAfterPersist: (sessionKey: string) => void;
     /** Effective merged config snapshot. */
     getConfig: () => Config | undefined;
+    /** Archive transcript + new session id (freshness / reset trigger rollover). */
+    resetSession: (sessionKey: string) => Promise<{
+        sessionId: string;
+        previousSessionId: string;
+    } | null>;
     /** Connect a channel stream handle for partial assistant text rendering. */
     setStreamHandle: (handle: StreamHandle) => void;
 }

package/dist/src/agent/inbound/inbound-loop.js

@@ -1,5 +1,7 @@
 import { runWithLogContext, updateAsyncLogContext } from "../../utils/logger/context.js";
 import { init_logger } from "../../utils/logger.js";
+import { shouldSkipResetOverlapCommand } from "../../session/reset-triggers.js";
+import { initSessionTurn } from "../../session/init-session-turn.js";
 import { MessageBusShutdownError } from "../../infra/bus/queue.js";
 import "../../infra/bus/index.js";
 import { inboundMessageLogRequestId } from "../service-inbound-utils.js";
@@ -92,22 +94,51 @@ var InboundLoop = class {
 				let typingController = null;
 				let inboundTurnArmed = false;
 				let busProcessFailed;
+				let inboundMsg = msg;
 				try {
 					if (msg.channel === "system") {
 						await this.handleSystemMessage(msg, sessionContext);
 						return;
 					}
 					if (this.channelManagerRef && msg.channel !== "cli") await this.channelManagerRef.dispatchInboundMessageAction(msg);
-					if (isCommand && command) {
-						if (await this.cfg.commandHandler.executeCommand(command, commandArgs || "", {
+					const cfg = this.cfg.getConfig();
+					let effectiveContent = msg.content;
+					let resetTriggeredAtInit = false;
+					if (cfg && typeof msg.content === "string") {
+						const turn = await initSessionTurn({
+							cfg,
 							sessionKey: sessionContext.sessionKey,
-							channel: sessionContext.channel,
-							chatId: sessionContext.chatId,
-							senderId: sessionContext.senderId,
-							isGroup: sessionContext.isGroup,
-							inboundMetadata: msg.metadata
-						})) return;
+							body: msg.content,
+							resetSession: (sk) => this.cfg.resetSession(sk)
+						});
+						resetTriggeredAtInit = turn.resetTriggered;
+						if (turn.bareReset && turn.ackMessage) {
+							await this.cfg.bus.publishOutbound({
+								channel: sessionContext.channel,
+								chat_id: sessionContext.chatId,
+								content: turn.ackMessage,
+								type: "message"
+							});
+							return;
+						}
+						effectiveContent = turn.bodyStripped;
+					}
+					if (isCommand && command) {
+						if (!shouldSkipResetOverlapCommand(command, resetTriggeredAtInit)) {
+							if (await this.cfg.commandHandler.executeCommand(command, commandArgs || "", {
+								sessionKey: sessionContext.sessionKey,
+								channel: sessionContext.channel,
+								chatId: sessionContext.chatId,
+								senderId: sessionContext.senderId,
+								isGroup: sessionContext.isGroup,
+								inboundMetadata: msg.metadata
+							})) return;
+						}
 					}
+					inboundMsg = effectiveContent !== msg.content ? {
+						...msg,
+						content: effectiveContent
+					} : msg;
 					typingController = this.cfg.outboundCoordinator.createTypingControllerForInbound(msg);
 					typingController?.start();
 					if (this.channelManagerRef && msg.channel !== "cli") {
@@ -121,7 +152,7 @@ var InboundLoop = class {
 					this.cfg.sessionState.beginInboundTurn(sessionContext.sessionKey);
 					inboundTurnArmed = true;
 					try {
-						await this.cfg.agentOrchestrator.process(msg, sessionContext);
+						await this.cfg.agentOrchestrator.process(inboundMsg, sessionContext);
 					} catch (procErr) {
 						busProcessFailed = procErr instanceof Error ? procErr.message : String(procErr);
 						throw procErr;
@@ -142,7 +173,7 @@ var InboundLoop = class {
 								sessionKey: sessionContext.sessionKey,
 								channel: sessionContext.channel,
 								chatId: sessionContext.chatId,
-								inboundUserText: msg.content,
+								inboundUserText: inboundMsg.content,
 								assistantPlainText,
 								aborted: false,
 								...busProcessFailed !== void 0 ? { streamError: busProcessFailed } : {},