@qduc/term2 0.11.1 → 0.12.0

package/dist/providers/openai.provider.js

@@ -1,46 +1,40 @@
-import { Runner, getCurrentTrace, withTrace } from '@openai/agents';
-import { OpenAIResponsesModel, OpenAIResponsesWSModel } from '@openai/agents-openai';
 import OpenAI from 'openai';
+import { OpenAIResponsesModelWithPromptCacheKey, OpenAIResponsesWSModelWithPromptCacheKey, } from './openai-responses-model.js';
 import { registerProvider } from './registry.js';
 import { createProviderFetch } from './fetch/composer.js';
-import { RetryingModel } from './retrying-model.js';
 import { NULL_SESSION_CONTEXT_SERVICE } from '../services/session/session-context-service.js';
-function forwardPromptCacheKey(request, requestData) {
-    const promptCacheKey = request?.modelSettings?.prompt_cache_key;
-    if (typeof promptCacheKey === 'string' && promptCacheKey.length > 0) {
-        return {
-            ...requestData,
-            prompt_cache_key: promptCacheKey,
-        };
-    }
-    return requestData;
-}
-export class OpenAIResponsesModelWithPromptCacheKey extends OpenAIResponsesModel {
-    _buildResponsesCreateRequest(request, stream) {
-        const built = OpenAIResponsesModel.prototype._buildResponsesCreateRequest.call(this, request, stream);
-        return {
-            ...built,
-            requestData: forwardPromptCacheKey(request, built.requestData),
-        };
-    }
-}
-export class OpenAIResponsesWSModelWithPromptCacheKey extends OpenAIResponsesWSModel {
-    _buildResponsesCreateRequest(request, stream) {
-        const built = super._buildResponsesCreateRequest(request, stream);
-        return {
-            ...built,
-            requestData: forwardPromptCacheKey(request, built.requestData),
-        };
-    }
-    async getResponse(request) {
-        const currentTrace = getCurrentTrace();
-        if (currentTrace) {
-            return super.getResponse(request);
-        }
-        return withTrace('openai-responses-ws-model-trace', () => super.getResponse(request));
-    }
-}
+export { OpenAIResponsesModelWithPromptCacheKey, OpenAIResponsesWSModelWithPromptCacheKey, } from './openai-responses-model.js';
 const OPENAI_MODELS_URL = 'https://api.openai.com/v1/models';
+const OPENAI_CAPABILITIES = {
+    supportsConversationChaining: true,
+    supportsContextCompaction: true,
+    supportsPromptCacheKey: true,
+    usesStrictToolSchema: true,
+    nativePatchModelPrefixes: ['gpt-5.1'],
+};
+/**
+ * Observe retries at the SDK transport boundary. OpenAI's fetch hook sees the
+ * response before the SDK decides whether to retry, so response status alone
+ * cannot distinguish a retryable final response from one followed by another
+ * attempt. The SDK does expose its attempt number in this request header;
+ * callback at the start of attempt N>0, where the next retry is actually
+ * being dispatched. This also covers transport failures and emits nothing for
+ * exhausted attempt N=0.
+ */
+export function createRetryAwareFetch(baseFetch, onRetry, retryAttempts) {
+    if (!onRetry || retryAttempts <= 0)
+        return baseFetch;
+    return (async (url, init) => {
+        const headers = init?.headers;
+        const rawRetryCount = typeof headers?.get === 'function'
+            ? headers.get('x-stainless-retry-count')
+            : headers?.['x-stainless-retry-count'] ?? headers?.['X-Stainless-Retry-Count'];
+        const retryCount = Number(rawRetryCount);
+        if (Number.isInteger(retryCount) && retryCount > 0)
+            onRetry();
+        return baseFetch(url, init);
+    });
+}
 async function fetchOpenAIModels(deps, fetchImpl = fetch) {
     const headers = {
         'Content-Type': 'application/json',
@@ -49,7 +43,7 @@ async function fetchOpenAIModels(deps, fetchImpl = fetch) {
     if (apiKey) {
         headers.Authorization = `Bearer ${apiKey}`;
     }
-    const response = await fetchImpl(OPENAI_MODELS_URL, { headers });
+    const response = await fetchImpl(OPENAI_MODELS_URL, { headers, ...(deps.signal ? { signal: deps.signal } : {}) });
     if (!response.ok) {
         throw new Error(`OpenAI models request failed (${response.status})`);
     }
@@ -66,73 +60,31 @@ async function fetchOpenAIModels(deps, fetchImpl = fetch) {
         .filter(Boolean)
         .reverse();
 }
-class OpenAIProvider {
-    openAIClient;
-    loggingService;
-    transport;
-    retryAttempts;
-    onRetry;
-    models = new Map();
-    constructor(openAIClient, loggingService, transport, retryAttempts, onRetry) {
-        this.openAIClient = openAIClient;
-        this.loggingService = loggingService;
-        this.transport = transport;
-        this.retryAttempts = retryAttempts;
-        this.onRetry = onRetry;
-    }
-    getModel(modelName) {
-        const model = modelName || 'gpt-4o';
-        const cached = this.models.get(model);
-        if (cached) {
-            return cached;
-        }
-        const selectedModel = this.transport === 'http'
-            ? new OpenAIResponsesModelWithPromptCacheKey(this.openAIClient, model)
-            : new OpenAIResponsesWSModelWithPromptCacheKey(this.openAIClient, model);
-        const retryingModel = new RetryingModel(selectedModel, {
-            retryAttempts: this.retryAttempts,
-            loggingService: this.loggingService,
-            onRetry: this.onRetry,
-        });
-        this.models.set(model, retryingModel);
-        return retryingModel;
-    }
-    async close() {
-        for (const model of this.models.values()) {
-            await model.close();
-        }
-        this.models.clear();
-    }
-}
 // Register OpenAI provider
 registerProvider({
     id: 'openai',
     label: 'OpenAI',
-    createRunner: ({ settingsService, loggingService, sessionContextService, onRetry }) => {
+    createStreamedModel: (model, { settingsService, loggingService, sessionContextService, onRetry, retryAttempts, requestCapture, contextCompactionSessionState, }) => {
         const defaultModel = settingsService.get('agent.model') || 'gpt-4o';
         const apiKey = settingsService.get('agent.openai.apiKey') || process.env.OPENAI_API_KEY;
+        const configuredRetries = retryAttempts ?? settingsService.get('agent.retryAttempts') ?? 2;
         const openAIClient = new OpenAI({
             apiKey: apiKey || 'placeholder',
-            maxRetries: settingsService.get('agent.retryAttempts') ?? 2,
-            fetch: createProviderFetch({
+            maxRetries: configuredRetries,
+            fetch: createRetryAwareFetch(createProviderFetch({
                 providerId: 'openai',
                 defaultModel,
                 deps: { loggingService, sessionContextService: sessionContextService ?? NULL_SESSION_CONTEXT_SERVICE },
-            }),
-        });
-        return new Runner({
-            modelProvider: new OpenAIProvider(openAIClient, loggingService, settingsService.get('agent.transport') ?? 'websocket', settingsService.get('agent.retryAttempts') ?? 2, onRetry),
+            }), onRetry, configuredRetries),
         });
+        const selectedModel = settingsService.get('agent.transport') === 'http'
+            ? new OpenAIResponsesModelWithPromptCacheKey(openAIClient, model || defaultModel, requestCapture, OPENAI_CAPABILITIES.supportsContextCompaction, contextCompactionSessionState)
+            : new OpenAIResponsesWSModelWithPromptCacheKey(openAIClient, model || defaultModel, requestCapture, OPENAI_CAPABILITIES.supportsContextCompaction, contextCompactionSessionState);
+        return selectedModel;
     },
     fetchModels: fetchOpenAIModels,
     clearConversations: undefined, // No conversation state to clear
     sensitiveSettingKeys: [],
-    capabilities: {
-        supportsConversationChaining: true,
-        supportsTracingControl: true,
-        supportsPromptCacheKey: true,
-        usesStrictToolSchema: true,
-        nativePatchModelPrefixes: ['gpt-5.1'],
-    },
+    capabilities: OPENAI_CAPABILITIES,
 });
 //# sourceMappingURL=openai.provider.js.map

package/dist/providers/openai.provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"openai.provider.js","sourceRoot":"","sources":["../../source/providers/openai.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAwB,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC1F,OAAO,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,4BAA4B,EAAE,MAAM,gDAAgD,CAAC;AAE9F,SAAS,qBAAqB,CAAC,OAAY,EAAE,WAAoC;IAC/E,MAAM,cAAc,GAAG,OAAO,EAAE,aAAa,EAAE,gBAAgB,CAAC;IAChE,IAAI,OAAO,cAAc,KAAK,QAAQ,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpE,OAAO;YACL,GAAG,WAAW;YACd,gBAAgB,EAAE,cAAc;SACjC,CAAC;IACJ,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,MAAM,OAAO,sCAAuC,SAAQ,oBAAoB;IAC9E,4BAA4B,CAAC,OAAY,EAAE,MAAe;QACxD,MAAM,KAAK,GAAI,oBAAoB,CAAC,SAAiB,CAAC,4BAA4B,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAC/G,OAAO;YACL,GAAG,KAAK;YACR,WAAW,EAAE,qBAAqB,CAAC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC;SAC/D,CAAC;IACJ,CAAC;CACF;AAED,MAAM,OAAO,wCAAyC,SAAQ,sBAAsB;IAClF,4BAA4B,CAAC,OAAY,EAAE,MAAe;QACxD,MAAM,KAAK,GAAG,KAAK,CAAC,4BAA4B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAClE,OAAO;YACL,GAAG,KAAK;YACR,WAAW,EAAE,qBAAqB,CAAC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC;SAC/D,CAAC;IACJ,CAAC;IAEQ,KAAK,CAAC,WAAW,CAAC,OAAY;QACrC,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;QACvC,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,SAAS,CAAC,iCAAiC,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;IACxF,CAAC;CACF;AAED,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AAE7D,KAAK,UAAU,iBAAiB,CAC9B,IAAkB,EAClB,SAAS,GAAkB,KAAY;IAEvC,MAAM,OAAO,GAA2B;QACtC,cAAc,EAAE,kBAAkB;KACnC,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,qBAAqB,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;IAC7F,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,CAAC,aAAa,GAAG,UAAU,MAAM,EAAE,CAAC;IAC7C,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IACjE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,iCAAiC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACnC,MAAM,GAAG,GAAG,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;IAE7B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IAEnC,OAAO,GAAG;SACP,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;QACjB,MAAM,EAAE,GAAG,IAAI,EAAE,EAAE,IAAI,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,YAAY,IAAI,IAAI,EAAE,WAAW,CAAC;QACnE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAClC,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAC;SACf,OAAO,EAA0C,CAAC;AACvD,CAAC;AAED,MAAM,cAAc;IAIC,YAAY;IACZ,cAAc;IACd,SAAS;IACT,aAAa;IACb,OAAO;IAPT,MAAM,GAAG,IAAI,GAAG,EAAyB,CAAC;IAE3D,YACmB,YAAoB,EACpB,cAAmB,EACnB,SAA+B,EAC/B,aAAqB,EACrB,OAAoB;4BAJpB,YAAY;8BACZ,cAAc;yBACd,SAAS;6BACT,aAAa;uBACb,OAAO;IACvB,CAAC;IAEJ,QAAQ,CAAC,SAAkB;QACzB,MAAM,KAAK,GAAG,SAAS,IAAI,QAAQ,CAAC;QACpC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,aAAa,GACjB,IAAI,CAAC,SAAS,KAAK,MAAM;YACvB,CAAC,CAAC,IAAI,sCAAsC,CAAC,IAAI,CAAC,YAAmB,EAAE,KAAK,CAAC;YAC7E,CAAC,CAAC,IAAI,wCAAwC,CAAC,IAAI,CAAC,YAAmB,EAAE,KAAK,CAAC,CAAC;QACpF,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,aAAa,EAAE;YACrD,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QACtC,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,KAAK;QACT,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YACzC,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;CACF;AAED,2BAA2B;AAC3B,gBAAgB,CAAC;IACf,EAAE,EAAE,QAAQ;IACZ,KAAK,EAAE,QAAQ;IACf,YAAY,EAAE,CAAC,EAAE,eAAe,EAAE,cAAc,EAAE,qBAAqB,EAAE,OAAO,EAAE,EAAE,EAAE;QACpF,MAAM,YAAY,GAAG,eAAe,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,QAAQ,CAAC;QACpE,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,qBAAqB,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;QACxF,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC;YAC9B,MAAM,EAAE,MAAM,IAAI,aAAa;YAC/B,UAAU,EAAE,eAAe,CAAC,GAAG,CAAC,qBAAqB,CAAC,IAAI,CAAC;YAC3D,KAAK,EAAE,mBAAmB,CAAC;gBACzB,UAAU,EAAE,QAAQ;gBACpB,YAAY;gBACZ,IAAI,EAAE,EAAE,cAAc,EAAE,qBAAqB,EAAE,qBAAqB,IAAI,4BAA4B,EAAE;aACvG,CAAQ;SACV,CAAC,CAAC;QAEH,OAAO,IAAI,MAAM,CAAC;YAChB,aAAa,EAAE,IAAI,cAAc,CAC/B,YAAY,EACZ,cAAc,EACd,eAAe,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,WAAW,EACrD,eAAe,CAAC,GAAG,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAC/C,OAAO,CACR;SACF,CAAC,CAAC;IACL,CAAC;IACD,WAAW,EAAE,iBAAiB;IAC9B,kBAAkB,EAAE,SAAS,EAAE,iCAAiC;IAChE,oBAAoB,EAAE,EAAE;IACxB,YAAY,EAAE;QACZ,4BAA4B,EAAE,IAAI;QAClC,sBAAsB,EAAE,IAAI;QAC5B,sBAAsB,EAAE,IAAI;QAC5B,oBAAoB,EAAE,IAAI;QAC1B,wBAAwB,EAAE,CAAC,SAAS,CAAC;KACtC;CACF,CAAC,CAAC"}
+{"version":3,"file":"openai.provider.js","sourceRoot":"","sources":["../../source/providers/openai.provider.ts"],"names":[],"mappings":"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"}

package/dist/providers/opencode-routing.d.ts

@@ -1,4 +1,4 @@
-export type OpencodeModelTransport = 'anthropic-messages' | 'openai-chat-completions';
+export type OpencodeModelTransport = 'anthropic-messages' | 'openai-chat-completions' | 'openai-responses';
 export declare function selectOpencodeModelTransport(modelId: string): OpencodeModelTransport;
 export declare function shouldApplyOpencodeAnthropicPromptCaching(modelId: string): boolean;
 //# sourceMappingURL=opencode-routing.d.ts.map

package/dist/providers/opencode-routing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opencode-routing.d.ts","sourceRoot":"","sources":["../../source/providers/opencode-routing.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,GAAG,yBAAyB,CAAC;AAItF,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,sBAAsB,CAKpF;AAED,wBAAgB,yCAAyC,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAOlF"}
+{"version":3,"file":"opencode-routing.d.ts","sourceRoot":"","sources":["../../source/providers/opencode-routing.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,GAAG,yBAAyB,GAAG,kBAAkB,CAAC;AAI3G,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,sBAAsB,CAMpF;AAED,wBAAgB,yCAAyC,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAOlF"}

package/dist/providers/opencode-routing.js

@@ -1,12 +1,14 @@
 const ANTHROPIC_FORMAT_MODEL_FRAGMENTS = ['minimax', 'qwen'];
 export function selectOpencodeModelTransport(modelId) {
-    const normalizedModelId = modelId.toLowerCase();
+    const normalizedModelId = modelId.trim().toLowerCase();
+    if (normalizedModelId.includes('gpt') || normalizedModelId.includes('grok'))
+        return 'openai-responses';
     return ANTHROPIC_FORMAT_MODEL_FRAGMENTS.some((fragment) => normalizedModelId.includes(fragment))
         ? 'anthropic-messages'
         : 'openai-chat-completions';
 }
 export function shouldApplyOpencodeAnthropicPromptCaching(modelId) {
-    const normalizedModelId = modelId.toLowerCase();
+    const normalizedModelId = modelId.trim().toLowerCase();
     return (normalizedModelId.includes('anthropic') ||
         normalizedModelId.includes('claude') ||
         normalizedModelId.includes('qwen'));

package/dist/providers/opencode-routing.js.map

@@ -1 +1 @@
-{"version":3,"file":"opencode-routing.js","sourceRoot":"","sources":["../../source/providers/opencode-routing.ts"],"names":[],"mappings":"AAEA,MAAM,gCAAgC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;AAE7D,MAAM,UAAU,4BAA4B,CAAC,OAAe;IAC1D,MAAM,iBAAiB,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAChD,OAAO,gCAAgC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC9F,CAAC,CAAC,oBAAoB;QACtB,CAAC,CAAC,yBAAyB,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,yCAAyC,CAAC,OAAe;IACvE,MAAM,iBAAiB,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAChD,OAAO,CACL,iBAAiB,CAAC,QAAQ,CAAC,WAAW,CAAC;QACvC,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACpC,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,CACnC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"opencode-routing.js","sourceRoot":"","sources":["../../source/providers/opencode-routing.ts"],"names":[],"mappings":"AAEA,MAAM,gCAAgC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;AAE7D,MAAM,UAAU,4BAA4B,CAAC,OAAe;IAC1D,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACvD,IAAI,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,kBAAkB,CAAC;IACvG,OAAO,gCAAgC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC9F,CAAC,CAAC,oBAAoB;QACtB,CAAC,CAAC,yBAAyB,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,yCAAyC,CAAC,OAAe;IACvE,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACvD,OAAO,CACL,iBAAiB,CAAC,QAAQ,CAAC,WAAW,CAAC;QACvC,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACpC,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,CACnC,CAAC;AACJ,CAAC"}

package/dist/providers/opencode-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opencode-session.d.ts","sourceRoot":"","sources":["../../source/providers/opencode-session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAEhF,OAAO,EAAsB,KAAK,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAI3F;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,MAAM,CAkC7E;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IAChD,qBAAqB,CAAC,EAAE,sBAAsB,CAAC;IAC/C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,yBAAyB,CAAC,EAAE,MAAM,CAAC;CACpC,GAAG,MAAM,GAAG,SAAS,CAWrB;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,CAO3F;AAED,MAAM,MAAM,uBAAuB,GAAG,CAAC,IAAI,EAAE,WAAW,KAAK,WAAW,GAAG,IAAI,CAAC;AAEhF,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,wBAAwB,EAClC,OAAO,CAAC,EAAE;IACR,qBAAqB,CAAC,EAAE,sBAAsB,CAAC;IAC/C,yBAAyB,CAAC,EAAE,MAAM,CAAC;CACpC,GACA,uBAAuB,GAAG,IAAI,CAchC"}
+{"version":3,"file":"opencode-session.d.ts","sourceRoot":"","sources":["../../source/providers/opencode-session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAyB,MAAM,mCAAmC,CAAC;AAEvG,OAAO,EAAsB,KAAK,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAI3F;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,MAAM,CAkC7E;AAkBD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IAChD,qBAAqB,CAAC,EAAE,sBAAsB,CAAC;IAC/C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,yBAAyB,CAAC,EAAE,MAAM,CAAC;CACpC,GAAG,MAAM,GAAG,SAAS,CAoBrB;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,CAO3F;AAED,MAAM,MAAM,uBAAuB,GAAG,CAAC,IAAI,EAAE,WAAW,KAAK,WAAW,GAAG,IAAI,CAAC;AAEhF,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,wBAAwB,EAClC,OAAO,CAAC,EAAE;IACR,qBAAqB,CAAC,EAAE,sBAAsB,CAAC;IAC/C,yBAAyB,CAAC,EAAE,MAAM,CAAC;CACpC,GACA,uBAAuB,GAAG,IAAI,CAchC"}

package/dist/providers/opencode-session.js

@@ -40,13 +40,38 @@ export function generateOpencodeSessionId(effectiveSessionId) {
     }
     return `ses_${timestamp}${random}`;
 }
+/**
+ * Requests made on behalf of a nested run — a subagent, or the shell
+ * auto-approval evaluator — must not land in the parent conversation's OpenCode
+ * session, because the server keys state off `x-opencode-session`. Such a run
+ * is identified by its own `providerHistoryKey`, or by the `evaluator` marker.
+ *
+ * Returns the key to derive a session ID from, or `undefined` when the context
+ * is the conversation itself.
+ */
+function nestedScopeKey(context) {
+    if (!context)
+        return undefined;
+    if (context.providerHistoryKey)
+        return context.providerHistoryKey;
+    if (context.evaluator)
+        return `${context.sessionId}:evaluator`;
+    return undefined;
+}
 export function resolveOpencodeSessionId(options) {
+    const context = options.sessionContextService?.getContext();
+    // Checked ahead of the override: the override is conversation-scoped by
+    // construction, so honouring it here would put nested runs back in the
+    // parent's session.
+    const nestedKey = nestedScopeKey(context);
+    if (nestedKey) {
+        return generateOpencodeSessionId(nestedKey);
+    }
     if (options.fallbackSessionIdOverride) {
         return options.fallbackSessionIdOverride;
     }
-    const trafficSessionId = options.sessionContextService?.getContext()?.sessionId;
-    if (trafficSessionId) {
-        return generateOpencodeSessionId(trafficSessionId);
+    if (context?.sessionId) {
+        return generateOpencodeSessionId(context.sessionId);
     }
     return options.fallbackSessionId;
 }

package/dist/providers/opencode-session.js.map

@@ -1 +1 @@
-{"version":3,"file":"opencode-session.js","sourceRoot":"","sources":["../../source/providers/opencode-session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"opencode-session.js","sourceRoot":"","sources":["../../source/providers/opencode-session.ts"],"names":[],"mappings":"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"}

package/dist/providers/openrouter.provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openrouter.provider.d.ts","sourceRoot":"","sources":["../../source/providers/openrouter.provider.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAsB1D,eAAO,MAAM,iCAAiC,EAAE,eAc/C,CAAC"}
+{"version":3,"file":"openrouter.provider.d.ts","sourceRoot":"","sources":["../../source/providers/openrouter.provider.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAoD1D,eAAO,MAAM,iCAAiC,EAAE,eAc/C,CAAC"}

package/dist/providers/openrouter.provider.js

@@ -1,9 +1,36 @@
-import { Runner } from '@openai/agents';
 import { registerProvider } from './registry.js';
 import { AiSdkOpenRouterProvider } from './ai-sdk-openrouter.provider.js';
 import { createProviderFetch } from './fetch/composer.js';
 import { addCacheControlToLastTwoMessages } from './common/openai-compatible-messages.js';
 import { NULL_SESSION_CONTEXT_SERVICE } from '../services/session/session-context-service.js';
+function createOpenRouterModel(deps, model) {
+    const { settingsService, loggingService, sessionContextService } = deps;
+    const apiKey = settingsService.get('agent.openrouter.apiKey') || process.env.OPENROUTER_API_KEY;
+    if (!apiKey)
+        return null;
+    return new AiSdkOpenRouterProvider({
+        defaultModel: model,
+        resolveConfig: () => ({
+            baseURL: settingsService.get('agent.openrouter.baseUrl') || 'https://openrouter.ai/api/v1',
+            apiKey,
+            headers: {
+                'HTTP-Referer': settingsService.get('agent.openrouter.referrer') || 'https://github.com/qduc/term2',
+                'X-Title': settingsService.get('agent.openrouter.title') || 'term2',
+            },
+            appUrl: settingsService.get('agent.openrouter.referrer') || 'https://github.com/qduc/term2',
+            appName: settingsService.get('agent.openrouter.title') || 'term2',
+            fetch: createProviderFetch({
+                providerId: 'openrouter',
+                defaultModel: settingsService.get('agent.model') || model,
+                deps: {
+                    loggingService,
+                    sessionContextService: sessionContextService ?? NULL_SESSION_CONTEXT_SERVICE,
+                },
+                middlewares: [openRouterPreprocessingMiddleware],
+            }),
+        }),
+    });
+}
 function sanitizeOpenRouterReasoningDetails(messages) {
     const requiresSignature = new Set(['google-gemini-v1', 'anthropic-claude-v1']);
     for (const message of messages) {
@@ -67,37 +94,11 @@ async function fetchOpenRouterModels(deps, fetchImpl = fetch) {
 registerProvider({
     id: 'openrouter',
     label: 'OpenRouter',
-    createRunner: ({ settingsService, loggingService, sessionContextService }) => {
-        const apiKey = settingsService.get('agent.openrouter.apiKey') || process.env.OPENROUTER_API_KEY;
-        if (!apiKey) {
-            return null;
-        }
-        const defaultModel = settingsService.get('agent.model') || 'openrouter/auto';
-        return new Runner({
-            tracingDisabled: true,
-            modelProvider: new AiSdkOpenRouterProvider({
-                defaultModel,
-                resolveConfig: () => ({
-                    baseURL: settingsService.get('agent.openrouter.baseUrl') || 'https://openrouter.ai/api/v1',
-                    apiKey,
-                    headers: {
-                        'HTTP-Referer': settingsService.get('agent.openrouter.referrer') || 'https://github.com/qduc/term2',
-                        'X-Title': settingsService.get('agent.openrouter.title') || 'term2',
-                    },
-                    appUrl: settingsService.get('agent.openrouter.referrer') || 'https://github.com/qduc/term2',
-                    appName: settingsService.get('agent.openrouter.title') || 'term2',
-                    fetch: createProviderFetch({
-                        providerId: 'openrouter',
-                        defaultModel: settingsService.get('agent.model') || defaultModel,
-                        deps: {
-                            loggingService,
-                            sessionContextService: sessionContextService ?? NULL_SESSION_CONTEXT_SERVICE,
-                        },
-                        middlewares: [openRouterPreprocessingMiddleware],
-                    }),
-                }),
-            }),
-        });
+    createStreamedModel: (model, deps) => {
+        const provider = createOpenRouterModel(deps, model);
+        if (!provider)
+            throw new Error('OpenRouter API key is not configured');
+        return provider.getStreamedModel(model);
     },
     fetchModels: fetchOpenRouterModels,
     sensitiveSettingKeys: [
@@ -108,7 +109,6 @@ registerProvider({
     ],
     capabilities: {
         supportsConversationChaining: false,
-        supportsTracingControl: false,
     },
 });
 //# sourceMappingURL=openrouter.provider.js.map

package/dist/providers/openrouter.provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"openrouter.provider.js","sourceRoot":"","sources":["../../source/providers/openrouter.provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"openrouter.provider.js","sourceRoot":"","sources":["../../source/providers/openrouter.provider.ts"],"names":[],"mappings":"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"}

package/dist/providers/provider-request-capture.d.ts

@@ -0,0 +1,35 @@
+import type { OpenAIRequestPrefixBinding, OpenAIRequestPrefixBindingOutcome } from './openai-request-prefix-binding.js';
+/**
+ * Optional Stage 0 instrumentation for recording the exact provider request
+ * projection at an established wire seam. It is deliberately observational:
+ * callers own storage and the default is no capture.
+ */
+export type ProviderRequestProjection = {
+    provider: 'openai' | 'codex';
+    transport: 'http' | 'websocket';
+    requestData: Record<string, unknown>;
+};
+export type ProviderRequestCapture = {
+    record(projection: ProviderRequestProjection): void;
+    /**
+     * Optional OpenAI-private lifecycle seam. It intentionally has no continuity
+     * or checkpoint dependency: it can carry observational prefix evidence, but
+     * truthful account identity is not available at this boundary.
+     */
+    observe?(observation: OpenAIRequestLifecycleObservation): void;
+};
+export type OpenAIRequestLifecycleObservation = {
+    token: string;
+    provider: 'openai';
+    transport: 'http' | 'websocket';
+    model: string;
+    endpoint: string;
+    requestData: Record<string, unknown>;
+    phase: 'request-built' | 'terminal' | 'failed' | 'abandoned';
+    responseId?: string;
+    prefixBinding?: OpenAIRequestPrefixBinding;
+    prefixBindingOutcome?: OpenAIRequestPrefixBindingOutcome;
+};
+export declare const captureProviderRequest: (capture: ProviderRequestCapture | undefined, projection: ProviderRequestProjection) => void;
+export declare const observeOpenAIRequestLifecycle: (capture: ProviderRequestCapture | undefined, observation: OpenAIRequestLifecycleObservation) => void;
+//# sourceMappingURL=provider-request-capture.d.ts.map

package/dist/providers/provider-request-capture.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-request-capture.d.ts","sourceRoot":"","sources":["../../source/providers/provider-request-capture.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,iCAAiC,EAAE,MAAM,oCAAoC,CAAC;AAExH;;;;GAIG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,WAAW,CAAC;IAChC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,CAAC,UAAU,EAAE,yBAAyB,GAAG,IAAI,CAAC;IACpD;;;;OAIG;IACH,OAAO,CAAC,CAAC,WAAW,EAAE,iCAAiC,GAAG,IAAI,CAAC;CAChE,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,EAAE,MAAM,GAAG,WAAW,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,KAAK,EAAE,eAAe,GAAG,UAAU,GAAG,QAAQ,GAAG,WAAW,CAAC;IAC7D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,0BAA0B,CAAC;IAC3C,oBAAoB,CAAC,EAAE,iCAAiC,CAAC;CAC1D,CAAC;AAEF,eAAO,MAAM,sBAAsB,YACxB,sBAAsB,GAAG,SAAS,cAC/B,yBAAyB,KACpC,IAWF,CAAC;AAEF,eAAO,MAAM,6BAA6B,YAC/B,sBAAsB,GAAG,SAAS,eAC9B,iCAAiC,KAC7C,IAMF,CAAC"}

package/dist/providers/provider-request-capture.js

@@ -0,0 +1,22 @@
+export const captureProviderRequest = (capture, projection) => {
+    try {
+        capture?.record({
+            ...projection,
+            // Captures must remain stable if the private client mutates its request
+            // object after this observation point.
+            requestData: structuredClone(projection.requestData),
+        });
+    }
+    catch {
+        // Observation must never alter the provider request path.
+    }
+};
+export const observeOpenAIRequestLifecycle = (capture, observation) => {
+    try {
+        capture?.observe?.({ ...observation, requestData: structuredClone(observation.requestData) });
+    }
+    catch {
+        // Observation must never alter the provider request path.
+    }
+};
+//# sourceMappingURL=provider-request-capture.js.map

package/dist/providers/provider-request-capture.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-request-capture.js","sourceRoot":"","sources":["../../source/providers/provider-request-capture.ts"],"names":[],"mappings":"AAoCA,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,OAA2C,EAC3C,UAAqC,EAC/B,EAAE;IACR,IAAI,CAAC;QACH,OAAO,EAAE,MAAM,CAAC;YACd,GAAG,UAAU;YACb,wEAAwE;YACxE,uCAAuC;YACvC,WAAW,EAAE,eAAe,CAAC,UAAU,CAAC,WAAW,CAAC;SACrD,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,0DAA0D;IAC5D,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAC3C,OAA2C,EAC3C,WAA8C,EACxC,EAAE;IACR,IAAI,CAAC;QACH,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAChG,CAAC;IAAC,MAAM,CAAC;QACP,0DAA0D;IAC5D,CAAC;AACH,CAAC,CAAC"}

package/dist/providers/provider-service.d.ts

@@ -1,4 +1,5 @@
-import type { SettingsService } from '../services/settings/settings-service.js';
+import type { ISettingsService } from '../services/service-interfaces.js';
+import { type StoredCustomProviderConfig } from '../services/settings/custom-provider-normalization.js';
 export type ProviderSelectionPhase = 'list' | 'edit_fields' | 'wizard_name' | 'wizard_type' | 'wizard_url' | 'wizard_key' | 'confirm_delete' | 'confirm_discard' | 'reorder';
 export interface CustomProviderDraft {
     name: string;
@@ -14,17 +15,18 @@ export interface ProviderSelectionItem {
 }
 export declare const PROVIDER_TYPES: CustomProviderDraft['type'][];
 export declare const PROVIDER_NAME_REGEX: RegExp;
-export declare const getConfiguredProviderNames: (settingsService: SettingsService) => Set<string>;
-export declare const hasProviderNameConflict: (settingsService: SettingsService, candidate: string, currentName?: string) => boolean;
-export declare const loadProviderItems: (settingsService: SettingsService) => ProviderSelectionItem[];
+export declare const getCustomProviderConfigs: (settingsService: ISettingsService) => StoredCustomProviderConfig[];
+export declare const getConfiguredProviderNames: (settingsService: ISettingsService) => Set<string>;
+export declare const hasProviderNameConflict: (settingsService: ISettingsService, candidate: string, currentName?: string) => boolean;
+export declare const loadProviderItems: (settingsService: ISettingsService) => ProviderSelectionItem[];
 export interface SaveProviderResult {
     success: boolean;
     errorMessage?: string;
     fieldErrors?: Record<string, string>;
 }
-export declare const saveProvider: (settingsService: SettingsService, draft: CustomProviderDraft, editingOriginalName: string | null) => SaveProviderResult;
-export declare const deleteCustomProvider: (settingsService: SettingsService, name: string) => void;
-export declare const validateWizardName: (value: string, settingsService: SettingsService, isEditingField: boolean, editingOriginalName?: string) => {
+export declare const saveProvider: (settingsService: ISettingsService, draft: CustomProviderDraft, editingOriginalName: string | null) => SaveProviderResult;
+export declare const deleteCustomProvider: (settingsService: ISettingsService, name: string) => void;
+export declare const validateWizardName: (value: string, settingsService: ISettingsService, isEditingField: boolean, editingOriginalName?: string) => {
     valid: boolean;
     errorMessage?: string;
 };

package/dist/providers/provider-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider-service.d.ts","sourceRoot":"","sources":["../../source/providers/provider-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAShF,MAAM,MAAM,sBAAsB,GAC9B,MAAM,GACN,aAAa,GACb,aAAa,GACb,aAAa,GACb,YAAY,GACZ,YAAY,GACZ,gBAAgB,GAChB,iBAAiB,GACjB,SAAS,CAAC;AAEd,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,mBAAmB,GAAG,QAAQ,GAAG,WAAW,GAAG,WAAW,GAAG,QAAQ,GAAG,UAAU,CAAC;IACzF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,eAAO,MAAM,cAAc,EAAE,mBAAmB,CAAC,MAAM,CAAC,EAOvD,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAiC,CAAC;AAElE,eAAO,MAAM,0BAA0B,oBAAqB,eAAe,KAAG,GAAG,CAAC,MAAM,CAgBvF,CAAC;AAEF,eAAO,MAAM,uBAAuB,oBACjB,eAAe,aACrB,MAAM,gBACH,MAAM,KACnB,OAaF,CAAC;AAEF,eAAO,MAAM,iBAAiB,oBAAqB,eAAe,KAAG,qBAAqB,EAuCzF,CAAC;AAEF,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtC;AAED,eAAO,MAAM,YAAY,oBACN,eAAe,SACzB,mBAAmB,uBACL,MAAM,GAAG,IAAI,KACjC,kBAkFF,CAAC;AAEF,eAAO,MAAM,oBAAoB,oBAAqB,eAAe,QAAQ,MAAM,KAAG,IAUrF,CAAC;AAEF,eAAO,MAAM,kBAAkB,UACtB,MAAM,mBACI,eAAe,kBAChB,OAAO,wBACD,MAAM,KAC3B;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAkBzC,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAAW,MAAM,QAAQ,MAAM,KAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CActG,CAAC;AAEF,eAAO,MAAM,iBAAiB,OAAQ,MAAM,KAAG,OAG9C,CAAC;AAEF,eAAO,MAAM,gBAAgB,OAAQ,MAAM,KAAG,MAAM,GAAG,SAEtD,CAAC"}
+{"version":3,"file":"provider-service.d.ts","sourceRoot":"","sources":["../../source/providers/provider-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAG1E,OAAO,EAIL,KAAK,0BAA0B,EAChC,MAAM,uDAAuD,CAAC;AAE/D,MAAM,MAAM,sBAAsB,GAC9B,MAAM,GACN,aAAa,GACb,aAAa,GACb,aAAa,GACb,YAAY,GACZ,YAAY,GACZ,gBAAgB,GAChB,iBAAiB,GACjB,SAAS,CAAC;AAEd,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,mBAAmB,GAAG,QAAQ,GAAG,WAAW,GAAG,WAAW,GAAG,QAAQ,GAAG,UAAU,CAAC;IACzF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,eAAO,MAAM,cAAc,EAAE,mBAAmB,CAAC,MAAM,CAAC,EAOvD,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAiC,CAAC;AAElE,eAAO,MAAM,wBAAwB,oBAAqB,gBAAgB,KAAG,0BAA0B,EAGtG,CAAC;AAEF,eAAO,MAAM,0BAA0B,oBAAqB,gBAAgB,KAAG,GAAG,CAAC,MAAM,CAYxF,CAAC;AAEF,eAAO,MAAM,uBAAuB,oBACjB,gBAAgB,aACtB,MAAM,gBACH,MAAM,KACnB,OAaF,CAAC;AAEF,eAAO,MAAM,iBAAiB,oBAAqB,gBAAgB,KAAG,qBAAqB,EAmC1F,CAAC;AAEF,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtC;AAED,eAAO,MAAM,YAAY,oBACN,gBAAgB,SAC1B,mBAAmB,uBACL,MAAM,GAAG,IAAI,KACjC,kBAsFF,CAAC;AAEF,eAAO,MAAM,oBAAoB,oBAAqB,gBAAgB,QAAQ,MAAM,KAAG,IAYtF,CAAC;AAEF,eAAO,MAAM,kBAAkB,UACtB,MAAM,mBACI,gBAAgB,kBACjB,OAAO,wBACD,MAAM,KAC3B;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAkBzC,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAAW,MAAM,QAAQ,MAAM,KAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CActG,CAAC;AAEF,eAAO,MAAM,iBAAiB,OAAQ,MAAM,KAAG,OAG9C,CAAC;AAEF,eAAO,MAAM,gBAAgB,OAAQ,MAAM,KAAG,MAAM,GAAG,SAEtD,CAAC"}