@jupyterlite/ai 0.14.0 → 0.16.0

package/src/models/settings-model.ts

@@ -1,74 +1,16 @@
 import { VDomModel } from '@jupyterlab/ui-components';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 
-const PLUGIN_ID = '@jupyterlite/ai:settings-model';
-
-export interface IProviderParameters {
-  temperature?: number;
-  maxOutputTokens?: number;
-  maxTurns?: number;
-  supportsFillInMiddle?: boolean;
-  useFilterText?: boolean;
-}
-
-export interface IProviderConfig {
-  id: string;
-  name: string;
-  provider: string;
-  model: string;
-  apiKey?: string;
-  baseURL?: string;
-  headers?: Record<string, string>;
-  parameters?: IProviderParameters;
-  customSettings?: Record<string, any>;
-  [key: string]: any; // Index signature for JupyterLab settings compatibility
-}
+import {
+  IAIConfig,
+  IAISettingsModel,
+  IMCPServerConfig,
+  IProviderConfig
+} from '../tokens';
 
-export interface IMCPServerConfig {
-  id: string;
-  name: string;
-  url: string;
-  enabled: boolean;
-  [key: string]: any; // Index signature for JupyterLab settings compatibility
-}
-
-export interface IAIConfig {
-  // Whether to use the secrets manager
-  useSecretsManager: boolean;
-  // List of configured providers
-  providers: IProviderConfig[];
-  // Active provider IDs for different use cases
-  defaultProvider: string; // Default provider for chat
-  activeCompleterProvider?: string; // Provider for completions (if different)
-  // When true, use the same provider for chat and completions
-  useSameProviderForChatAndCompleter: boolean;
-  // MCP servers configuration
-  mcpServers: IMCPServerConfig[];
-  // Global settings
-  contextAwareness: boolean;
-  codeExecution: boolean;
-  systemPrompt: string;
-  completionSystemPrompt: string;
-  toolsEnabled: boolean;
-  // Chat behavior settings
-  sendWithShiftEnter: boolean;
-  // Token usage display setting
-  showTokenUsage: boolean;
-  // Commands that require approval before execution
-  commandsRequiringApproval: string[];
-  // Commands whose execute_command outputs may auto-render MIME bundles in chat
-  commandsAutoRenderMimeBundles: string[];
-  // MIME types that are trusted when auto-rendering execute_command outputs
-  trustedMimeTypesForAutoRender: string[];
-  // Diff display settings
-  showCellDiff: boolean;
-  showFileDiff: boolean;
-  diffDisplayMode: 'split' | 'unified';
-  // Paths to directories containing agent skills
-  skillsPaths: string[];
-}
+const PLUGIN_ID = '@jupyterlite/ai:settings-model';
 
-export class AISettingsModel extends VDomModel {
+export class AISettingsModel extends VDomModel implements IAISettingsModel {
   private _config: IAIConfig = {
     useSecretsManager: true,
     providers: [],
@@ -81,10 +23,12 @@ export class AISettingsModel extends VDomModel {
     toolsEnabled: true,
     sendWithShiftEnter: false,
     showTokenUsage: false,
+    showContextUsage: false,
     showCellDiff: true,
     showFileDiff: true,
     diffDisplayMode: 'split',
     skillsPaths: ['.agents/skills', '_agents/skills'],
+    chatBackupDirectory: '',
     commandsRequiringApproval: [
       'notebook:restart-run-all',
       'notebook:run-cell',
@@ -166,6 +110,15 @@ When asked to run code or perform computations, choose the most appropriate appr
 
 This means if the user asks you to "calculate the factorial of 100" or "check what library version is installed", run that directly with the jupyterlab-ai-commands kernel execution command rather than creating a new notebook file.
 
+## Notebook State and Cell Identity
+When working with an existing notebook, use the notebook's current structure and kernel state as the source of truth.
+- Before changing notebook content or structure, inspect the notebook and any target cells with the relevant notebook commands you have discovered.
+- If the user may have edited the notebook, or if a previous command could have changed it, refresh your view before continuing rather than relying on earlier results.
+- Treat variables from previously executed cells as part of the active kernel state. When the user asks you to work with existing data or variables, use them by name instead of recreating them unless the user asks you to redefine them or the kernel state is unavailable.
+- Be explicit about the kind of cell reference you are using. A visible execution count (for example In [6]), a notebook position, and an internal cell ID or UUID are different identifiers and may not match.
+- When the user identifies a cell by execution count, relative position, or content, verify the target cell from the current notebook contents before editing it or inserting cells relative to it.
+- For relative insertions, anchor the change to the confirmed target cell rather than to empty placeholder or trailing cells unless the user explicitly refers to those cells.
+
 ## Your Approach
 - **Context-aware**: You understand the user is working in a data science/research environment
 - **Practical**: You focus on actionable solutions that work in the user's current setup
@@ -209,7 +162,7 @@ Guidelines:
 
 ## Multi-Step Task Handling
 When users request complex tasks, you use the command system to accomplish them:
-- For file and notebook operations, use discover_commands with query 'jupyterlab-ai-commands' to find the curated set of AI commands (~17 commands)
+- For file and notebook operations, use discover_commands with query 'jupyterlab-ai-commands' to find the curated set of AI commands (~22 commands)
 - For other JupyterLab operations (terminal, launcher, UI), use specific keywords like 'terminal', 'launcher', etc.
 - IMPORTANT: Always use 'jupyterlab-ai-commands' as the query for file/notebook tasks - this returns a focused set instead of 100+ generic commands
 - For example, to create a notebook with cells:
@@ -251,16 +204,16 @@ Rules:
   constructor(options: AISettingsModel.IOptions) {
     super();
     this._settingRegistry = options.settingRegistry;
-    this.initializeSettings();
+    this._initializeSettings();
   }
 
-  private async initializeSettings(): Promise<void> {
+  private async _initializeSettings(): Promise<void> {
     try {
       this._settings = await this._settingRegistry.load(PLUGIN_ID);
-      this.loadFromSettings();
+      this._loadFromSettings();
 
       // Listen for settings changes
-      this._settings.changed.connect(this.onSettingsChanged, this);
+      this._settings.changed.connect(this._onSettingsChanged, this);
 
       this.stateChanged.emit(void 0);
     } catch (error) {
@@ -269,12 +222,12 @@ Rules:
     }
   }
 
-  private onSettingsChanged(): void {
-    this.loadFromSettings();
+  private _onSettingsChanged(): void {
+    this._loadFromSettings();
     this.stateChanged.emit(void 0);
   }
 
-  private loadFromSettings(): void {
+  private _loadFromSettings(): void {
     if (!this._settings) {
       return;
     }
@@ -334,12 +287,12 @@ Rules:
     // If this is the first provider, make it active
     if (this._config.providers.length === 1) {
       // Save both providers and defaultProvider
-      await this.saveSetting('providers', this._config.providers);
+      await this._saveSetting('providers', this._config.providers);
       this._config.defaultProvider = id;
-      await this.saveSetting('defaultProvider', this._config.defaultProvider);
+      await this._saveSetting('defaultProvider', this._config.defaultProvider);
     } else {
       // Only save providers
-      await this.saveSetting('providers', this._config.providers);
+      await this._saveSetting('providers', this._config.providers);
     }
 
     return id;
@@ -352,18 +305,18 @@ Rules:
     }
 
     this._config.providers.splice(index, 1);
-    await this.saveSetting('providers', this._config.providers);
+    await this._saveSetting('providers', this._config.providers);
 
     // If this was the active provider, select a new one
     if (this._config.defaultProvider === id) {
       this._config.defaultProvider =
         this._config.providers.length > 0 ? this._config.providers[0].id : '';
-      await this.saveSetting('defaultProvider', this._config.defaultProvider);
+      await this._saveSetting('defaultProvider', this._config.defaultProvider);
     }
 
     if (this._config.activeCompleterProvider === id) {
       this._config.activeCompleterProvider = undefined;
-      await this.saveSetting(
+      await this._saveSetting(
         'activeCompleterProvider',
         this._config.activeCompleterProvider
       );
@@ -385,19 +338,19 @@ Rules:
         delete provider[key];
       }
     });
-    await this.saveSetting('providers', this._config.providers);
+    await this._saveSetting('providers', this._config.providers);
   }
 
   async setActiveProvider(id: string): Promise<void> {
     if (this.getProvider(id)) {
       this._config.defaultProvider = id;
-      await this.saveSetting('defaultProvider', this._config.defaultProvider);
+      await this._saveSetting('defaultProvider', this._config.defaultProvider);
     }
   }
 
   async setActiveCompleterProvider(id: string | undefined): Promise<void> {
     this._config.activeCompleterProvider = id;
-    await this.saveSetting(
+    await this._saveSetting(
       'activeCompleterProvider',
       this._config.activeCompleterProvider
     );
@@ -423,7 +376,7 @@ Rules:
     };
 
     this._config.mcpServers.push(newServer);
-    await this.saveSetting('mcpServers', this._config.mcpServers);
+    await this._saveSetting('mcpServers', this._config.mcpServers);
     return id;
   }
 
@@ -434,7 +387,7 @@ Rules:
     }
 
     this._config.mcpServers.splice(index, 1);
-    await this.saveSetting('mcpServers', this._config.mcpServers);
+    await this._saveSetting('mcpServers', this._config.mcpServers);
   }
 
   async updateMCPServer(
@@ -447,7 +400,7 @@ Rules:
     }
 
     Object.assign(server, updates);
-    await this.saveSetting('mcpServers', this._config.mcpServers);
+    await this._saveSetting('mcpServers', this._config.mcpServers);
   }
 
   async updateConfig(updates: Partial<IAIConfig>): Promise<void> {
@@ -460,7 +413,7 @@ Rules:
         this._config[key as keyof IAIConfig] !== value
       ) {
         (this._config as any)[key] = value;
-        promises.push(this.saveSetting(key as keyof IAIConfig, value));
+        promises.push(this._saveSetting(key as keyof IAIConfig, value));
       }
     }
 
@@ -468,6 +421,11 @@ Rules:
     await Promise.all(promises);
   }
 
+  /**
+   * Get the API key saved in the settings file for a given provider.
+   *
+   * @param id - the id of the provider.
+   */
   getApiKey(id: string): string {
     // First check the active completer provider
     const activeCompleterProvider = this.getCompleterProvider();
@@ -484,7 +442,7 @@ Rules:
     return '';
   }
 
-  private async saveSetting(key: keyof IAIConfig, value: any): Promise<void> {
+  private async _saveSetting(key: keyof IAIConfig, value: any): Promise<void> {
     try {
       if (this._settings) {
         // Only save the specific setting that changed

package/src/providers/built-in-providers.ts

@@ -4,6 +4,7 @@ import { createMistral } from '@ai-sdk/mistral';
 import { createOpenAI } from '@ai-sdk/openai';
 import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
 
+import { BUILT_IN_PROVIDER_MODEL_INFO } from './generated-context-windows';
 import type { IProviderInfo } from '../tokens';
 import type { IModelOptions } from './models';
 
@@ -28,9 +29,9 @@ export const anthropicProvider: IProviderInfo = {
     'claude-opus-4-0',
     'claude-opus-4-20250514',
     'claude-sonnet-4-0',
-    'claude-sonnet-4-20250514',
-    'claude-3-haiku-20240307'
+    'claude-sonnet-4-20250514'
   ],
+  modelInfo: BUILT_IN_PROVIDER_MODEL_INFO.anthropic,
   supportsBaseURL: true,
   supportsHeaders: true,
   providerToolCapabilities: {
@@ -65,30 +66,20 @@ export const googleProvider: IProviderInfo = {
     'gemini-3.1-pro-preview',
     'gemini-3.1-pro-preview-customtools',
     'gemini-3.1-flash-image-preview',
-    'gemini-3-pro-preview',
+    'gemini-3.1-flash-lite-preview',
     'gemini-3-pro-image-preview',
     'gemini-3-flash-preview',
     'gemini-2.5-pro',
     'gemini-2.5-flash',
     'gemini-2.5-flash-image',
     'gemini-2.5-flash-lite',
-    'gemini-2.5-flash-lite-preview-09-2025',
     'gemini-2.5-computer-use-preview-10-2025',
-    'gemini-2.0-flash',
-    'gemini-2.0-flash-001',
-    'gemini-2.0-flash-lite',
-    'gemini-2.0-flash-lite-001',
+    'deep-research-pro-preview-12-2025',
     'gemini-pro-latest',
     'gemini-flash-latest',
-    'gemini-flash-lite-latest',
-    'deep-research-pro-preview-12-2025',
-    'gemma-3-27b-it',
-    'gemma-3-12b-it',
-    'gemma-3-4b-it',
-    'gemma-3-1b-it',
-    'gemma-3n-e4b-it',
-    'gemma-3n-e2b-it'
+    'gemini-flash-lite-latest'
   ],
+  modelInfo: BUILT_IN_PROVIDER_MODEL_INFO.google,
   supportsBaseURL: true,
   factory: (options: IModelOptions) => {
     if (!options.apiKey) {
@@ -111,24 +102,21 @@ export const mistralProvider: IProviderInfo = {
   name: 'Mistral AI',
   apiKeyRequirement: 'required',
   defaultModels: [
-    'ministral-3b-latest',
-    'ministral-8b-latest',
     'mistral-large-latest',
     'mistral-medium-latest',
     'mistral-medium-2508',
-    'mistral-medium-2505',
     'mistral-small-latest',
-    'codestral-latest',
+    'mistral-small-2506',
+    'ministral-3b-latest',
+    'ministral-8b-latest',
+    'ministral-14b-latest',
+    'magistral-small-latest',
+    'magistral-medium-latest',
     'pixtral-large-latest',
-    'magistral-small-2507',
-    'magistral-medium-2507',
-    'magistral-small-2506',
-    'magistral-medium-2506',
-    'pixtral-12b-2409',
-    'open-mistral-7b',
-    'open-mixtral-8x7b',
-    'open-mixtral-8x22b'
+    'codestral-latest',
+    'devstral-latest'
   ],
+  modelInfo: BUILT_IN_PROVIDER_MODEL_INFO.mistral,
   supportsBaseURL: true,
   factory: (options: IModelOptions) => {
     if (!options.apiKey) {
@@ -151,6 +139,9 @@ export const openaiProvider: IProviderInfo = {
   name: 'OpenAI',
   apiKeyRequirement: 'required',
   defaultModels: [
+    'gpt-5.4',
+    'gpt-5.4-mini',
+    'gpt-5.4-nano',
     'gpt-5.2',
     'gpt-5.2-2025-12-11',
     'gpt-5.2-chat-latest',
@@ -169,6 +160,7 @@ export const openaiProvider: IProviderInfo = {
     'gpt-5-nano-2025-08-07',
     'o4-mini',
     'o4-mini-2025-04-16',
+    'o3-pro',
     'o3',
     'o3-2025-04-16',
     'o3-mini',
@@ -185,22 +177,16 @@ export const openaiProvider: IProviderInfo = {
     'gpt-4o-2024-05-13',
     'gpt-4o-2024-08-06',
     'gpt-4o-2024-11-20',
-    'gpt-4o-audio-preview',
-    'gpt-4o-audio-preview-2024-12-17',
-    'gpt-4o-audio-preview-2025-06-03',
     'gpt-4o-mini',
     'gpt-4o-mini-2024-07-18',
-    'gpt-4o-mini-audio-preview',
-    'gpt-4o-mini-audio-preview-2024-12-17',
     'gpt-4o-search-preview',
     'gpt-4o-search-preview-2025-03-11',
     'gpt-4o-mini-search-preview',
     'gpt-4o-mini-search-preview-2025-03-11',
     'gpt-3.5-turbo',
-    'gpt-3.5-turbo-0125',
-    'gpt-3.5-turbo-1106',
-    'gpt-3.5-turbo-16k'
+    'gpt-3.5-turbo-0125'
   ],
+  modelInfo: BUILT_IN_PROVIDER_MODEL_INFO.openai,
   supportsBaseURL: true,
   supportsHeaders: true,
   providerToolCapabilities: {

package/src/providers/generated-context-windows.ts

@@ -0,0 +1,102 @@
+/**
+ * This file is generated by `jlpm sync:model-context-windows`.
+ * Source: https://models.dev/api.json
+ * Backed by: https://github.com/anomalyco/models.dev
+ * Generated: 2026-04-08T16:23:34.080Z
+ */
+
+import type { IProviderModelInfo } from '../tokens';
+
+export const BUILT_IN_PROVIDER_MODEL_INFO: Record<
+  string,
+  Record<string, IProviderModelInfo>
+> = {
+  anthropic: {
+    'claude-opus-4-6': { contextWindow: 1000000 },
+    'claude-sonnet-4-6': { contextWindow: 1000000 },
+    'claude-opus-4-5': { contextWindow: 200000 },
+    'claude-opus-4-5-20251101': { contextWindow: 200000 },
+    'claude-sonnet-4-5': { contextWindow: 200000 },
+    'claude-sonnet-4-5-20250929': { contextWindow: 200000 },
+    'claude-haiku-4-5': { contextWindow: 200000 },
+    'claude-haiku-4-5-20251001': { contextWindow: 200000 },
+    'claude-opus-4-1': { contextWindow: 200000 },
+    'claude-opus-4-1-20250805': { contextWindow: 200000 },
+    'claude-opus-4-0': { contextWindow: 200000 },
+    'claude-opus-4-20250514': { contextWindow: 200000 },
+    'claude-sonnet-4-0': { contextWindow: 200000 },
+    'claude-sonnet-4-20250514': { contextWindow: 200000 }
+  },
+  google: {
+    'gemini-3.1-pro-preview': { contextWindow: 1048576 },
+    'gemini-3.1-pro-preview-customtools': { contextWindow: 1048576 },
+    'gemini-3.1-flash-image-preview': { contextWindow: 131072 },
+    'gemini-3.1-flash-lite-preview': { contextWindow: 1048576 },
+    'gemini-3-flash-preview': { contextWindow: 1048576 },
+    'gemini-2.5-pro': { contextWindow: 1048576 },
+    'gemini-2.5-flash': { contextWindow: 1048576 },
+    'gemini-2.5-flash-image': { contextWindow: 32768 },
+    'gemini-2.5-flash-lite': { contextWindow: 1048576 },
+    'gemini-flash-latest': { contextWindow: 1048576 },
+    'gemini-flash-lite-latest': { contextWindow: 1048576 }
+  },
+  mistral: {
+    'mistral-large-latest': { contextWindow: 262144 },
+    'mistral-medium-latest': { contextWindow: 128000 },
+    'mistral-medium-2508': { contextWindow: 262144 },
+    'mistral-small-latest': { contextWindow: 256000 },
+    'mistral-small-2506': { contextWindow: 128000 },
+    'ministral-3b-latest': { contextWindow: 128000 },
+    'ministral-8b-latest': { contextWindow: 128000 },
+    'magistral-small-latest': { contextWindow: 128000 },
+    'magistral-medium-latest': { contextWindow: 128000 },
+    'pixtral-large-latest': { contextWindow: 128000 },
+    'codestral-latest': { contextWindow: 256000 },
+    'devstral-latest': { contextWindow: 262144 },
+    'devstral-2512': { contextWindow: 262144 }
+  },
+  openai: {
+    'gpt-5.4': { contextWindow: 1050000 },
+    'gpt-5.4-mini': { contextWindow: 400000 },
+    'gpt-5.4-nano': { contextWindow: 400000 },
+    'gpt-5.2': { contextWindow: 400000 },
+    'gpt-5.2-2025-12-11': { contextWindow: 400000 },
+    'gpt-5.2-chat-latest': { contextWindow: 128000 },
+    'gpt-5.2-pro': { contextWindow: 400000 },
+    'gpt-5.2-pro-2025-12-11': { contextWindow: 400000 },
+    'gpt-5.2-codex': { contextWindow: 400000 },
+    'gpt-5.1': { contextWindow: 400000 },
+    'gpt-5.1-2025-11-13': { contextWindow: 400000 },
+    'gpt-5.1-chat-latest': { contextWindow: 128000 },
+    'gpt-5': { contextWindow: 400000 },
+    'gpt-5-2025-08-07': { contextWindow: 400000 },
+    'gpt-5-chat-latest': { contextWindow: 400000 },
+    'gpt-5-mini': { contextWindow: 400000 },
+    'gpt-5-mini-2025-08-07': { contextWindow: 400000 },
+    'gpt-5-nano': { contextWindow: 400000 },
+    'gpt-5-nano-2025-08-07': { contextWindow: 400000 },
+    'o4-mini': { contextWindow: 200000 },
+    'o4-mini-2025-04-16': { contextWindow: 200000 },
+    'o3-pro': { contextWindow: 200000 },
+    o3: { contextWindow: 200000 },
+    'o3-2025-04-16': { contextWindow: 200000 },
+    'o3-mini': { contextWindow: 200000 },
+    'o3-mini-2025-01-31': { contextWindow: 200000 },
+    o1: { contextWindow: 200000 },
+    'o1-2024-12-17': { contextWindow: 200000 },
+    'gpt-4.1': { contextWindow: 1047576 },
+    'gpt-4.1-2025-04-14': { contextWindow: 1047576 },
+    'gpt-4.1-mini': { contextWindow: 1047576 },
+    'gpt-4.1-mini-2025-04-14': { contextWindow: 1047576 },
+    'gpt-4.1-nano': { contextWindow: 1047576 },
+    'gpt-4.1-nano-2025-04-14': { contextWindow: 1047576 },
+    'gpt-4o': { contextWindow: 128000 },
+    'gpt-4o-2024-05-13': { contextWindow: 128000 },
+    'gpt-4o-2024-08-06': { contextWindow: 128000 },
+    'gpt-4o-2024-11-20': { contextWindow: 128000 },
+    'gpt-4o-mini': { contextWindow: 128000 },
+    'gpt-4o-mini-2024-07-18': { contextWindow: 128000 },
+    'gpt-3.5-turbo': { contextWindow: 16385 },
+    'gpt-3.5-turbo-0125': { contextWindow: 16385 }
+  }
+};

package/src/providers/model-info.ts

@@ -0,0 +1,88 @@
+import type {
+  IProviderConfig,
+  IProviderInfo,
+  IProviderModelInfo,
+  IProviderRegistry
+} from '../tokens';
+
+const DATE_SUFFIX = /^(.*)-\d{4}-\d{2}-\d{2}$/;
+const SHORT_VERSION_SUFFIX = /^(.*)-\d{4}$/;
+
+// Treat rolling aliases and dated releases as the same model family so they
+// can share provider metadata such as context windows.
+function normalizeModelId(modelId: string): string {
+  if (modelId.endsWith('-latest')) {
+    return modelId.slice(0, -7);
+  }
+
+  const dateSuffixMatch = modelId.match(DATE_SUFFIX);
+  if (dateSuffixMatch) {
+    return dateSuffixMatch[1];
+  }
+
+  const shortVersionSuffixMatch = modelId.match(SHORT_VERSION_SUFFIX);
+  if (shortVersionSuffixMatch) {
+    return shortVersionSuffixMatch[1];
+  }
+
+  return modelId;
+}
+
+function getCandidateModelIds(modelId: string): string[] {
+  const candidates = [modelId];
+  const normalizedModelId = normalizeModelId(modelId);
+
+  candidates.push(normalizedModelId);
+
+  if (normalizedModelId !== modelId) {
+    candidates.push(`${normalizedModelId}-latest`);
+  }
+
+  return [...new Set(candidates)];
+}
+
+export function getProviderModelInfo(
+  providerInfo: IProviderInfo | null | undefined,
+  model: string | undefined
+): IProviderModelInfo | undefined {
+  if (!providerInfo || !model) {
+    return undefined;
+  }
+
+  const modelInfo = providerInfo.modelInfo;
+  if (!modelInfo) {
+    return undefined;
+  }
+
+  for (const candidateId of getCandidateModelIds(model)) {
+    if (modelInfo[candidateId]) {
+      return modelInfo[candidateId];
+    }
+  }
+
+  const normalizedModelId = normalizeModelId(model);
+  // As a last resort, match any known model entry that normalizes to the same
+  // base ID, even if the exact alias/version string differs.
+  return Object.entries(modelInfo).find(([candidateId]) => {
+    return normalizeModelId(candidateId) === normalizedModelId;
+  })?.[1];
+}
+
+export function getEffectiveContextWindow(
+  providerConfig: IProviderConfig | undefined,
+  providerRegistry?: IProviderRegistry
+): number | undefined {
+  if (!providerConfig) {
+    return undefined;
+  }
+
+  if (providerConfig.parameters?.contextWindow !== undefined) {
+    return providerConfig.parameters.contextWindow;
+  }
+
+  const providerInfo = providerRegistry?.getProviderInfo(
+    providerConfig.provider
+  );
+  return getProviderModelInfo(providerInfo, providerConfig.model)
+    ?.contextWindow;
+}