@agents-ensemble/core 0.6.5 → 0.8.0

package/dist/conductor/conductor-pi-auth.js

@@ -0,0 +1,524 @@
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { AuthStorage, ModelRegistry, } from '@earendil-works/pi-coding-agent';
+import { findEnvKeys, getEnvApiKey, } from '@earendil-works/pi-ai/compat';
+import { loadPiResources, resolvePiResourceRoots, } from './pi-resource-loader.js';
+/** Create the Pi credential store and model registry for the user root. */
+export function createPiConductorAuthContext(options) {
+    const roots = resolvePiResourceRoots(options);
+    const authPath = join(roots.agentDir, 'auth.json');
+    const modelsPath = join(roots.agentDir, 'models.json');
+    const authStorage = AuthStorage.create(authPath);
+    return {
+        agentDir: roots.agentDir,
+        authPath,
+        modelsPath,
+        authStorage,
+        modelRegistry: ModelRegistry.create(authStorage, modelsPath),
+    };
+}
+/** Resolve the provider used by `ensemble auth` from an explicit/default model. */
+export async function resolvePiConductorProvider(options) {
+    const resources = await loadPiResources(options);
+    const context = createPiConductorAuthContext(options);
+    return resolvePiConductorProviderFromResources(options, resources, context);
+}
+/** Login to a Pi provider. API-key login persists only in the user auth file. */
+export async function loginPiConductor(options) {
+    const resources = await loadPiResources(options);
+    const context = createPiConductorAuthContext(options);
+    const provider = resolveConductorProviderOrThrow(options, resources, context);
+    const oauthProvider = context.authStorage
+        .getOAuthProviders()
+        .some((candidate) => candidate.id === provider);
+    if (oauthProvider) {
+        if (!options.oauthCallbacks) {
+            throw new Error(`Pi provider "${provider}" uses OAuth. Run this command from a TTY so the OAuth login flow can interact with you.`);
+        }
+        await context.authStorage.login(provider, options.oauthCallbacks);
+        return {
+            backend: 'pi',
+            provider,
+            method: 'oauth',
+            authPath: context.authPath,
+        };
+    }
+    const apiKey = options.apiKey?.trim();
+    if (!apiKey) {
+        throw new Error(`Pi provider "${provider}" requires an API key. Pass a secret API-key prompt value or set ${formatPiProviderEnvHint(provider)}.`);
+    }
+    context.authStorage.set(provider, { type: 'api_key', key: apiKey });
+    return {
+        backend: 'pi',
+        provider,
+        method: 'api_key',
+        authPath: context.authPath,
+    };
+}
+/** Whether the selected Pi provider exposes Pi's native OAuth login flow. */
+export async function isPiConductorOAuthProvider(options) {
+    const resources = await loadPiResources(options);
+    const context = createPiConductorAuthContext(options);
+    const provider = resolveConductorProviderOrThrow(options, resources, context);
+    return context.authStorage
+        .getOAuthProviders()
+        .some((candidate) => candidate.id === provider);
+}
+/** Remove a Pi provider's user-layer credential. */
+export async function logoutPiConductor(options) {
+    const resources = await loadPiResources(options);
+    const context = createPiConductorAuthContext(options);
+    const provider = resolveConductorProviderOrThrow(options, resources, context);
+    context.authStorage.logout(provider);
+    return {
+        backend: 'pi',
+        provider,
+        authPath: context.authPath,
+    };
+}
+/** Return non-secret Pi auth metadata for the selected/default provider. */
+export async function getPiConductorAuthStatus(options) {
+    const resources = await loadPiResources(options);
+    const context = createPiConductorAuthContext(options);
+    const providers = resolveStatusProviders(options, resources, context);
+    return {
+        backend: 'pi',
+        authPath: context.authPath,
+        providers: providers.map((provider) => getPiProviderAuthStatus(provider, context, resources, options.env ?? process.env)),
+    };
+}
+/** List only Pi models whose provider has usable configured auth. */
+export async function listPiConductorModels(options = { cwd: process.cwd() }) {
+    const resources = await loadPiResources(options);
+    const context = createPiConductorAuthContext(options);
+    const requestedProvider = normalizeProvider(options.provider) ?? providerFromModelId(options.modelId);
+    const entries = new Map();
+    // ModelRegistry's fast `getAvailable()` only sees its user AuthStorage. The
+    // conductor also honors project auth.json, so filter the complete registry
+    // through the merged project-over-user auth view before listing models.
+    for (const model of context.modelRegistry.getAll()) {
+        if (requestedProvider && model.provider !== requestedProvider)
+            continue;
+        if (!hasPiProviderAuth(model.provider, context, resources, options.env ?? process.env)) {
+            continue;
+        }
+        addPiModelEntry(entries, model);
+    }
+    // ModelRegistry reads the user models.json. Project models remain governed by
+    // the existing resource loader, so add those merged definitions explicitly.
+    for (const [provider, config] of Object.entries(resources.models.providers)) {
+        if (requestedProvider && provider !== requestedProvider)
+            continue;
+        if (!hasPiProviderAuth(provider, context, resources, options.env ?? process.env)) {
+            continue;
+        }
+        for (const model of config.models ?? []) {
+            addPiCustomModelEntry(entries, provider, model);
+        }
+    }
+    const result = [...entries.values()].sort((left, right) => left.id.localeCompare(right.id));
+    if (result.length === 0) {
+        const providerHint = requestedProvider ? ` for provider "${requestedProvider}"` : '';
+        throw new Error(`No authenticated Pi models are available${providerHint}. ` +
+            `Run ensemble auth login --provider <provider>, set provider credentials in ${context.agentDir}, ` +
+            'or configure a provider environment variable.');
+    }
+    return result;
+}
+/** Resolve a key while retaining project-over-user auth precedence. */
+export async function resolvePiConductorApiKey(options) {
+    const env = options.env ?? process.env;
+    if (options.explicitApiKey !== undefined)
+        return options.explicitApiKey;
+    // A project auth file intentionally remains above the user auth layer. When
+    // both roots point at the same file, AuthStorage is the canonical reader so
+    // OAuth refresh is not bypassed by the resource-layer compatibility parser.
+    if (options.resources.roots.agentDir !== options.resources.roots.projectDir) {
+        const projectEntry = options.resources.authLayers.at(-1)?.[options.provider];
+        if (isPiOAuthAuthEntry(projectEntry)) {
+            throw new Error(formatProjectOAuthAuthError(options.provider));
+        }
+        const projectKey = resolvePiAuthEntry(projectEntry, env);
+        if (projectKey !== undefined)
+            return projectKey;
+    }
+    const userStatus = options.authStorage.getAuthStatus(options.provider);
+    if (userStatus.source === 'stored' || userStatus.source === 'runtime') {
+        // AuthStorage owns OAuth refresh and locking. Keep this call dynamic per
+        // request rather than capturing its result during agent construction.
+        return options.authStorage.getApiKey(options.provider);
+    }
+    const settingsKey = resolvePiSettingsApiKey(options.resources.settings, options.provider, env);
+    if (settingsKey !== undefined)
+        return settingsKey;
+    const modelsKey = resolvePiModelsApiKey(options.resources.models.providers[options.provider], env);
+    if (modelsKey !== undefined)
+        return modelsKey;
+    return getEnvApiKey(options.provider, toProviderEnv(env));
+}
+/** Return whether a provider has configured auth without exposing its value. */
+export function hasPiProviderAuth(provider, context, resources, env = process.env) {
+    const status = getPiProviderAuthStatus(provider, context, resources, env);
+    return status.configured;
+}
+/** Synchronous readiness check used by CLI/e2e guards before async loading. */
+export function hasPiConductorAuth(options) {
+    const context = createPiConductorAuthContext(options);
+    const env = options.env ?? process.env;
+    const roots = resolvePiResourceRoots(options);
+    const projectAuth = readPiJsonSync(join(roots.projectDir, 'auth.json'));
+    const settings = readPiSettingsSync(roots);
+    const models = readPiModelsSync(roots);
+    const selection = resolvePiConductorSelectionSync(options, settings, models, context);
+    if (selection.provider) {
+        return hasPiProviderAuthSync({
+            provider: selection.provider,
+            context,
+            roots,
+            projectAuth,
+            settings,
+            models,
+            env,
+        });
+    }
+    // A configured model that cannot be mapped to one provider is not a
+    // usable conductor selection, even if another provider happens to have
+    // credentials.
+    if (selection.modelId)
+        return false;
+    return hasAnyPiConductorAuthSync({
+        context,
+        roots,
+        projectAuth,
+        settings,
+        models,
+        env,
+    });
+}
+/**
+ * Mirror PiConductorAgent's synchronous provider/model selection for guards.
+ * The async agent receives the same merged settings and model layers.
+ */
+function resolvePiConductorSelectionSync(options, settings, models, context) {
+    const requestedModel = normalizeModelId(options.modelId);
+    const configuredModel = normalizeModelId(firstString(settings.defaultModel, settings.model, settings.modelId));
+    const selectedModel = requestedModel ?? configuredModel;
+    let provider = normalizeProvider(options.provider);
+    let modelId = selectedModel;
+    if (selectedModel?.includes('/')) {
+        const separator = selectedModel.indexOf('/');
+        if (!provider) {
+            provider = normalizeProvider(selectedModel.slice(0, separator));
+        }
+        modelId = normalizeModelId(selectedModel.slice(separator + 1));
+    }
+    if (!provider)
+        provider = normalizeProvider(settings.defaultProvider);
+    if (!provider && modelId) {
+        const matches = new Set();
+        for (const model of context.modelRegistry.getAll()) {
+            if (model.id === modelId)
+                matches.add(model.provider);
+        }
+        for (const [candidate, config] of Object.entries(models.providers)) {
+            if (config.models?.some((model) => model.id === modelId)) {
+                matches.add(candidate);
+            }
+        }
+        if (matches.size === 1)
+            provider = [...matches][0];
+    }
+    return {
+        ...(provider ? { provider } : {}),
+        ...(modelId ? { modelId } : {}),
+    };
+}
+function hasPiProviderAuthSync(options) {
+    const projectEntry = options.projectAuth?.[options.provider];
+    if (options.roots.agentDir !== options.roots.projectDir &&
+        isPiOAuthAuthEntry(projectEntry)) {
+        return false;
+    }
+    if (resolvePiAuthEntry(projectEntry, options.env) !== undefined)
+        return true;
+    if (options.context.authStorage.has(options.provider))
+        return true;
+    // Keep readiness aligned with ModelRegistry, including command-backed or
+    // otherwise registry-native user models, while the explicit checks below
+    // honor the injected test/runtime environment.
+    if (options.context.modelRegistry
+        .getAvailable()
+        .some((model) => model.provider === options.provider)) {
+        return true;
+    }
+    if (resolvePiSettingsApiKey(options.settings, options.provider, options.env) !== undefined) {
+        return true;
+    }
+    if (resolvePiModelsApiKey(options.models.providers[options.provider], options.env) !== undefined) {
+        return true;
+    }
+    return getEnvApiKey(options.provider, toProviderEnv(options.env)) !== undefined;
+}
+function hasAnyPiConductorAuthSync(options) {
+    if (options.context.modelRegistry.getAvailable().length > 0)
+        return true;
+    const providers = new Set([
+        ...options.context.authStorage.list(),
+        ...options.context.modelRegistry.getAll().map((model) => model.provider),
+        ...Object.keys(options.models.providers),
+        ...Object.keys(options.projectAuth ?? {}),
+        ...options.context.authStorage.getOAuthProviders().map((provider) => provider.id),
+    ]);
+    for (const provider of providers) {
+        if (hasPiProviderAuthSync({ ...options, provider }))
+            return true;
+    }
+    if (typeof options.settings.apiKey === 'string' ||
+        (isRecord(options.settings.apiKeys) &&
+            Object.values(options.settings.apiKeys).some((entry) => typeof entry === 'string'))) {
+        return true;
+    }
+    return false;
+}
+function readPiSettingsSync(roots) {
+    return mergePiRecords(readPiJsonSync(join(roots.agentDir, 'settings.json')) ?? {}, readPiJsonSync(join(roots.projectDir, 'settings.json')) ?? {});
+}
+function readPiModelsSync(roots) {
+    const merged = mergePiRecords(readPiJsonSync(join(roots.agentDir, 'models.json')) ?? {}, readPiJsonSync(join(roots.projectDir, 'models.json')) ?? {});
+    return {
+        providers: isRecord(merged.providers)
+            ? merged.providers
+            : {},
+    };
+}
+function resolveConductorProviderOrThrow(options, resources, context) {
+    const provider = resolvePiConductorProviderFromResources(options, resources, context);
+    if (provider)
+        return provider;
+    throw new Error(`Pi provider is not configured. Set defaultProvider in ${join(context.agentDir, 'settings.json')} or pass --provider <id>.`);
+}
+function resolvePiConductorProviderFromResources(options, resources, context) {
+    const explicit = normalizeProvider(options.provider);
+    if (explicit)
+        return explicit;
+    const requestedModel = normalizeModelId(options.modelId);
+    const configuredModel = normalizeModelId(firstString(resources.settings.defaultModel, resources.settings.model, resources.settings.modelId));
+    const selectedModel = requestedModel ?? configuredModel;
+    if (selectedModel?.includes('/')) {
+        return selectedModel.slice(0, selectedModel.indexOf('/'));
+    }
+    const configuredProvider = normalizeProvider(resources.settings.defaultProvider);
+    if (configuredProvider)
+        return configuredProvider;
+    if (selectedModel) {
+        const matches = new Set();
+        for (const model of context.modelRegistry.getAll()) {
+            if (model.id === selectedModel)
+                matches.add(model.provider);
+        }
+        for (const [provider, config] of Object.entries(resources.models.providers)) {
+            if (config.models?.some((model) => model.id === selectedModel)) {
+                matches.add(provider);
+            }
+        }
+        if (matches.size === 1)
+            return [...matches][0];
+    }
+    return '';
+}
+function resolveStatusProviders(options, resources, context) {
+    const explicit = normalizeProvider(options.provider);
+    if (explicit)
+        return [explicit];
+    const configured = resolvePiConductorProviderFromResources(options, resources, context);
+    if (configured)
+        return [configured];
+    const providers = new Set([
+        ...context.authStorage.list(),
+        ...context.modelRegistry.getAll().map((model) => model.provider),
+        ...Object.keys(resources.models.providers),
+        ...context.authStorage.getOAuthProviders().map((provider) => provider.id),
+    ]);
+    return [...providers].sort();
+}
+function getPiProviderAuthStatus(provider, context, resources, env) {
+    if (resources.roots.agentDir !== resources.roots.projectDir) {
+        const projectEntry = resources.authLayers.at(-1)?.[provider];
+        if (isPiOAuthAuthEntry(projectEntry)) {
+            return {
+                provider,
+                configured: false,
+                source: 'project_oauth_unsupported',
+            };
+        }
+        const projectKey = resolvePiAuthEntry(projectEntry, env);
+        if (projectKey !== undefined) {
+            return { provider, configured: true, source: 'project_stored' };
+        }
+    }
+    const registryStatus = context.modelRegistry.getProviderAuthStatus(provider);
+    if (registryStatus.configured || registryStatus.source === 'stored') {
+        return normalizePiAuthStatus(provider, registryStatus, true);
+    }
+    const settingsKey = resolvePiSettingsApiKey(resources.settings, provider, env);
+    if (settingsKey !== undefined) {
+        return { provider, configured: true, source: 'settings_json' };
+    }
+    const modelsKey = resolvePiModelsApiKey(resources.models.providers[provider], env);
+    if (modelsKey !== undefined) {
+        return { provider, configured: true, source: 'models_json_key' };
+    }
+    const envKey = getEnvApiKey(provider, toProviderEnv(env));
+    if (envKey !== undefined) {
+        return {
+            provider,
+            configured: true,
+            source: 'environment',
+            label: formatPiProviderEnvHint(provider),
+        };
+    }
+    return normalizePiAuthStatus(provider, registryStatus, false);
+}
+function normalizePiAuthStatus(provider, status, configured) {
+    return {
+        provider,
+        configured,
+        ...(status.source ? { source: status.source } : {}),
+        ...(status.label ? { label: status.label } : {}),
+    };
+}
+function addPiModelEntry(entries, model) {
+    const id = `${model.provider}/${model.id}`;
+    entries.set(id, {
+        id,
+        displayName: model.name || model.id,
+        provider: model.provider,
+    });
+}
+function addPiCustomModelEntry(entries, provider, model) {
+    const id = `${provider}/${model.id}`;
+    entries.set(id, {
+        id,
+        displayName: model.name ?? model.id,
+        provider,
+    });
+}
+function resolvePiAuthEntry(entry, env) {
+    if (typeof entry === 'string')
+        return expandEnvReference(entry, env);
+    if (!isRecord(entry))
+        return undefined;
+    if (isPiOAuthAuthEntry(entry))
+        return undefined;
+    for (const key of ['key', 'apiKey', 'token', 'accessToken', 'access']) {
+        const value = entry[key];
+        if (typeof value === 'string')
+            return expandEnvReference(value, env);
+    }
+    return undefined;
+}
+function isPiOAuthAuthEntry(entry) {
+    return isRecord(entry) && entry.type === 'oauth';
+}
+function formatProjectOAuthAuthError(provider) {
+    return (`Project Pi OAuth credentials for provider "${provider}" are not supported in ` +
+        'project .ensemble/pi/auth.json because that layer cannot refresh them safely. ' +
+        `Run ensemble auth login --provider ${provider} to store the credential in the user AuthStorage.`);
+}
+function resolvePiSettingsApiKey(settings, provider, env) {
+    if (typeof settings.apiKey === 'string') {
+        return expandEnvReference(settings.apiKey, env);
+    }
+    if (!isRecord(settings.apiKeys))
+        return undefined;
+    const value = settings.apiKeys[provider];
+    return typeof value === 'string' ? expandEnvReference(value, env) : undefined;
+}
+function resolvePiModelsApiKey(providerConfig, env) {
+    return providerConfig?.apiKey
+        ? expandEnvReference(providerConfig.apiKey, env)
+        : undefined;
+}
+function expandEnvReference(value, env) {
+    if (value.startsWith('!'))
+        return undefined;
+    const variable = /^\$\{([^}]+)\}$/.exec(value) ?? /^\$([A-Za-z_][A-Za-z0-9_]*)$/.exec(value);
+    return variable ? env[variable[1]] : value;
+}
+function toProviderEnv(env) {
+    return Object.fromEntries(Object.entries(env).filter((entry) => typeof entry[1] === 'string'));
+}
+function normalizeProvider(value) {
+    if (typeof value !== 'string')
+        return undefined;
+    const normalized = value.trim();
+    return normalized && normalized !== 'default' && normalized !== 'auto'
+        ? normalized
+        : undefined;
+}
+function normalizeModelId(value) {
+    if (typeof value !== 'string')
+        return undefined;
+    const normalized = value.trim();
+    return normalized && normalized !== 'default' && normalized !== 'auto'
+        ? normalized
+        : undefined;
+}
+function providerFromModelId(value) {
+    const modelId = normalizeModelId(value);
+    if (!modelId?.includes('/'))
+        return undefined;
+    return normalizeProvider(modelId.slice(0, modelId.indexOf('/')));
+}
+function firstString(...values) {
+    for (const value of values) {
+        if (typeof value !== 'string')
+            continue;
+        const normalized = value.trim();
+        if (normalized && normalized !== 'default' && normalized !== 'auto')
+            return normalized;
+    }
+    return undefined;
+}
+/** Return the concrete environment variables recognised by Pi for a provider. */
+export function formatPiProviderEnvHint(provider) {
+    // `findEnvKeys` normally reports only variables that are currently set. A
+    // truthy probe lets the SDK expose its existing provider mapping even for a
+    // missing credential, which is the case where this recovery hint is used.
+    const envKeys = findEnvKeys(provider, PI_ENV_HINT_PROBE);
+    if (envKeys)
+        return envKeys.join(' / ');
+    if (provider === 'google-vertex') {
+        return 'GOOGLE_APPLICATION_CREDENTIALS / GOOGLE_CLOUD_PROJECT / GOOGLE_CLOUD_LOCATION';
+    }
+    if (provider === 'amazon-bedrock') {
+        return ('AWS_PROFILE / AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY / ' +
+            'AWS_BEARER_TOKEN_BEDROCK');
+    }
+    return `${provider.toUpperCase().replace(/[^A-Z0-9]+/g, '_')}_API_KEY`;
+}
+const PI_ENV_HINT_PROBE = new Proxy({}, { get: (_target, property) => (typeof property === 'string' ? 'configured' : undefined) });
+function isRecord(value) {
+    return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+}
+function readPiJsonSync(path) {
+    try {
+        const value = JSON.parse(readFileSync(path, 'utf8'));
+        return isRecord(value) ? value : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function mergePiRecords(base, override) {
+    const merged = { ...base };
+    for (const [key, value] of Object.entries(override)) {
+        const previous = merged[key];
+        merged[key] =
+            isRecord(previous) && isRecord(value)
+                ? mergePiRecords(previous, value)
+                : value;
+    }
+    return merged;
+}
+//# sourceMappingURL=conductor-pi-auth.js.map

package/dist/conductor/conductor-pi-auth.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conductor-pi-auth.js","sourceRoot":"","sources":["../../src/conductor/conductor-pi-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,WAAW,EACX,aAAa,GAEd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,WAAW,EACX,YAAY,GAGb,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,eAAe,EACf,sBAAsB,GAOvB,MAAM,yBAAyB,CAAC;AAiDjC,2EAA2E;AAC3E,MAAM,UAAU,4BAA4B,CAC1C,OAAgC;IAEhC,MAAM,KAAK,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IACvD,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACjD,OAAO;QACL,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ;QACR,UAAU;QACV,WAAW;QACX,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,WAAW,EAAE,UAAU,CAAC;KAC7D,CAAC;AACJ,CAAC;AAED,mFAAmF;AACnF,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,OAA+B;IAE/B,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;IACtD,OAAO,uCAAuC,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;AAC9E,CAAC;AAED,iFAAiF;AACjF,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAGC;IAED,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,+BAA+B,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAC9E,MAAM,aAAa,GAAG,OAAO,CAAC,WAAW;SACtC,iBAAiB,EAAE;SACnB,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;IAElD,IAAI,aAAa,EAAE,CAAC;QAClB,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CACb,gBAAgB,QAAQ,0FAA0F,CACnH,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;QAClE,OAAO;YACL,OAAO,EAAE,IAAI;YACb,QAAQ;YACR,MAAM,EAAE,OAAO;YACf,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;IACtC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CACb,gBAAgB,QAAQ,oEAAoE,uBAAuB,CAAC,QAAQ,CAAC,GAAG,CACjI,CAAC;IACJ,CAAC;IACD,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;IACpE,OAAO;QACL,OAAO,EAAE,IAAI;QACb,QAAQ;QACR,MAAM,EAAE,SAAS;QACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAC;AACJ,CAAC;AAED,6EAA6E;AAC7E,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,OAA+B;IAE/B,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,+BAA+B,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAC9E,OAAO,OAAO,CAAC,WAAW;SACvB,iBAAiB,EAAE;SACnB,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;AACpD,CAAC;AAED,oDAAoD;AACpD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,OAA+B;IAE/B,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,+BAA+B,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAC9E,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACrC,OAAO;QACL,OAAO,EAAE,IAAI;QACb,QAAQ;QACR,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAC;AACJ,CAAC;AAED,4EAA4E;AAC5E,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,OAA+B;IAE/B,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,sBAAsB,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACtE,OAAO;QACL,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CACpC,uBAAuB,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,CAClF;KACF,CAAC;AACJ,CAAC;AAED,qEAAqE;AACrE,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,UAAkC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE;IAExD,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,iBAAiB,GACrB,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,mBAAmB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9E,MAAM,OAAO,GAAG,IAAI,GAAG,EAAqC,CAAC;IAE7D,4EAA4E;IAC5E,2EAA2E;IAC3E,wEAAwE;IACxE,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC;QACnD,IAAI,iBAAiB,IAAI,KAAK,CAAC,QAAQ,KAAK,iBAAiB;YAAE,SAAS;QACxE,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACvF,SAAS;QACX,CAAC;QACD,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAClC,CAAC;IAED,8EAA8E;IAC9E,4EAA4E;IAC5E,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5E,IAAI,iBAAiB,IAAI,QAAQ,KAAK,iBAAiB;YAAE,SAAS;QAClE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACjF,SAAS;QACX,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;YACxC,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACxD,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,CAChC,CAAC;IACF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,YAAY,GAAG,iBAAiB,CAAC,CAAC,CAAC,kBAAkB,iBAAiB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACrF,MAAM,IAAI,KAAK,CACb,2CAA2C,YAAY,IAAI;YACzD,8EAA8E,OAAO,CAAC,QAAQ,IAAI;YAClG,+CAA+C,CAClD,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,uEAAuE;AACvE,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,OAM9C;IACC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACvC,IAAI,OAAO,CAAC,cAAc,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC,cAAc,CAAC;IAExE,4EAA4E;IAC5E,4EAA4E;IAC5E,4EAA4E;IAC5E,IAAI,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,KAAK,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QAC5E,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC7E,IAAI,kBAAkB,CAAC,YAAY,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,UAAU,GAAG,kBAAkB,CACnC,YAAY,EACZ,GAAG,CACJ,CAAC;QACF,IAAI,UAAU,KAAK,SAAS;YAAE,OAAO,UAAU,CAAC;IAClD,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvE,IAAI,UAAU,CAAC,MAAM,KAAK,QAAQ,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACtE,yEAAyE;QACzE,sEAAsE;QACtE,OAAO,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,WAAW,GAAG,uBAAuB,CACzC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAC1B,OAAO,CAAC,QAAQ,EAChB,GAAG,CACJ,CAAC;IACF,IAAI,WAAW,KAAK,SAAS;QAAE,OAAO,WAAW,CAAC;IAElD,MAAM,SAAS,GAAG,qBAAqB,CACrC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EACpD,GAAG,CACJ,CAAC;IACF,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAE9C,OAAO,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED,gFAAgF;AAChF,MAAM,UAAU,iBAAiB,CAC/B,QAAgB,EAChB,OAA+B,EAC/B,SAA4E,EAC5E,MAAyB,OAAO,CAAC,GAAG;IAEpC,MAAM,MAAM,GAAG,uBAAuB,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;IAC1E,OAAO,MAAM,CAAC,UAAU,CAAC;AAC3B,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,kBAAkB,CAAC,OAA+B;IAChE,MAAM,OAAO,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACvC,MAAM,KAAK,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,+BAA+B,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAEtF,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;QACvB,OAAO,qBAAqB,CAAC;YAC3B,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,OAAO;YACP,KAAK;YACL,WAAW;YACX,QAAQ;YACR,MAAM;YACN,GAAG;SACJ,CAAC,CAAC;IACL,CAAC;IAED,oEAAoE;IACpE,uEAAuE;IACvE,eAAe;IACf,IAAI,SAAS,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAEpC,OAAO,yBAAyB,CAAC;QAC/B,OAAO;QACP,KAAK;QACL,WAAW;QACX,QAAQ;QACR,MAAM;QACN,GAAG;KACJ,CAAC,CAAC;AACL,CAAC;AAgBD;;;GAGG;AACH,SAAS,+BAA+B,CACtC,OAA+B,EAC/B,QAAwB,EACxB,MAAoB,EACpB,OAA+B;IAE/B,MAAM,cAAc,GAAG,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG,gBAAgB,CACtC,WAAW,CAAC,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,CACrE,CAAC;IACF,MAAM,aAAa,GAAG,cAAc,IAAI,eAAe,CAAC;IACxD,IAAI,QAAQ,GAAG,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnD,IAAI,OAAO,GAAG,aAAa,CAAC;IAE5B,IAAI,aAAa,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACjC,MAAM,SAAS,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,QAAQ,GAAG,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,GAAG,gBAAgB,CAAC,aAAa,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,CAAC,QAAQ;QAAE,QAAQ,GAAG,iBAAiB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAEtE,IAAI,CAAC,QAAQ,IAAI,OAAO,EAAE,CAAC;QACzB,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC;YACnD,IAAI,KAAK,CAAC,EAAE,KAAK,OAAO;gBAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACxD,CAAC;QACD,KAAK,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YACnE,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC;gBACzD,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC;YAAE,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,OAAO;QACL,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAChC,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAC5B,OAA0D;IAE1D,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7D,IACE,OAAO,CAAC,KAAK,CAAC,QAAQ,KAAK,OAAO,CAAC,KAAK,CAAC,UAAU;QACnD,kBAAkB,CAAC,YAAY,CAAC,EAChC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,kBAAkB,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IAC7E,IAAI,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAEnE,yEAAyE;IACzE,yEAAyE;IACzE,+CAA+C;IAC/C,IACE,OAAO,CAAC,OAAO,CAAC,aAAa;SAC1B,YAAY,EAAE;SACd,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,KAAK,OAAO,CAAC,QAAQ,CAAC,EACvD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IACE,uBAAuB,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,SAAS,EACtF,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IACE,qBAAqB,CACnB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAC1C,OAAO,CAAC,GAAG,CACZ,KAAK,SAAS,EACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,SAAS,CAAC;AAClF,CAAC;AAED,SAAS,yBAAyB,CAAC,OAAmC;IACpE,IAAI,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAEzE,MAAM,SAAS,GAAG,IAAI,GAAG,CAAS;QAChC,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE;QACrC,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC;QACxE,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;QACxC,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;QACzC,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;KAClF,CAAC,CAAC;IACH,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,IAAI,qBAAqB,CAAC,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,CAAC;YAAE,OAAO,IAAI,CAAC;IACnE,CAAC;IAED,IACE,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,QAAQ;QAC3C,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;YACjC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,EACrF,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,kBAAkB,CACzB,KAAgD;IAEhD,OAAO,cAAc,CACnB,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,IAAI,EAAE,EAC3D,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,IAAI,EAAE,CAC5C,CAAC;AACtB,CAAC;AAED,SAAS,gBAAgB,CACvB,KAAgD;IAEhD,MAAM,MAAM,GAAG,cAAc,CAC3B,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,IAAI,EAAE,EACzD,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,IAAI,EAAE,CAC5D,CAAC;IACF,OAAO;QACL,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;YACnC,CAAC,CAAE,MAAM,CAAC,SAA8C;YACxD,CAAC,CAAC,EAAE;KACP,CAAC;AACJ,CAAC;AAED,SAAS,+BAA+B,CACtC,OAA+B,EAC/B,SAAsB,EACtB,OAA+B;IAE/B,MAAM,QAAQ,GAAG,uCAAuC,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACtF,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,MAAM,IAAI,KAAK,CACb,yDAAyD,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC,2BAA2B,CAC5H,CAAC;AACJ,CAAC;AAED,SAAS,uCAAuC,CAC9C,OAA+B,EAC/B,SAAsB,EACtB,OAA+B;IAE/B,MAAM,QAAQ,GAAG,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACrD,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAE9B,MAAM,cAAc,GAAG,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG,gBAAgB,CACtC,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CACnG,CAAC;IACF,MAAM,aAAa,GAAG,cAAc,IAAI,eAAe,CAAC;IACxD,IAAI,aAAa,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACjC,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACjF,IAAI,kBAAkB;QAAE,OAAO,kBAAkB,CAAC;IAElD,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC;YACnD,IAAI,KAAK,CAAC,EAAE,KAAK,aAAa;gBAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC9D,CAAC;QACD,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5E,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,aAAa,CAAC,EAAE,CAAC;gBAC/D,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxB,CAAC;QACH,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAE,CAAC;IAClD,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,sBAAsB,CAC7B,OAA+B,EAC/B,SAAsB,EACtB,OAA+B;IAE/B,MAAM,QAAQ,GAAG,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACrD,IAAI,QAAQ;QAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEhC,MAAM,UAAU,GAAG,uCAAuC,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACxF,IAAI,UAAU;QAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAEpC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAS;QAChC,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE;QAC7B,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC;QAChE,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC;QAC1C,GAAG,OAAO,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;KAC1E,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,SAAS,CAAC,CAAC,IAAI,EAAE,CAAC;AAC/B,CAAC;AAED,SAAS,uBAAuB,CAC9B,QAAgB,EAChB,OAA+B,EAC/B,SAA4E,EAC5E,GAAsB;IAEtB,IAAI,SAAS,CAAC,KAAK,CAAC,QAAQ,KAAK,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QAC5D,MAAM,YAAY,GAAG,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAC7D,IAAI,kBAAkB,CAAC,YAAY,CAAC,EAAE,CAAC;YACrC,OAAO;gBACL,QAAQ;gBACR,UAAU,EAAE,KAAK;gBACjB,MAAM,EAAE,2BAA2B;aACpC,CAAC;QACJ,CAAC;QACD,MAAM,UAAU,GAAG,kBAAkB,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QACzD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;QAClE,CAAC;IACH,CAAC;IAED,MAAM,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IAC7E,IAAI,cAAc,CAAC,UAAU,IAAI,cAAc,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACpE,OAAO,qBAAqB,CAAC,QAAQ,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,WAAW,GAAG,uBAAuB,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC/E,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC;IACjE,CAAC;IAED,MAAM,SAAS,GAAG,qBAAqB,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC;IACnF,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC;IACnE,CAAC;IAED,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1D,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO;YACL,QAAQ;YACR,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,aAAa;YACrB,KAAK,EAAE,uBAAuB,CAAC,QAAQ,CAAC;SACzC,CAAC;IACJ,CAAC;IACD,OAAO,qBAAqB,CAAC,QAAQ,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,qBAAqB,CAC5B,QAAgB,EAChB,MAAkB,EAClB,UAAmB;IAEnB,OAAO;QACL,QAAQ;QACR,UAAU;QACV,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjD,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CACtB,OAA+C,EAC/C,KAAiB;IAEjB,MAAM,EAAE,GAAG,GAAG,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,EAAE,EAAE,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE;QACd,EAAE;QACF,WAAW,EAAE,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE;QACnC,QAAQ,EAAE,KAAK,CAAC,QAAQ;KACzB,CAAC,CAAC;AACL,CAAC;AAED,SAAS,qBAAqB,CAC5B,OAA+C,EAC/C,QAAgB,EAChB,KAAwB;IAExB,MAAM,EAAE,GAAG,GAAG,QAAQ,IAAI,KAAK,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE;QACd,EAAE;QACF,WAAW,EAAE,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE;QACnC,QAAQ;KACT,CAAC,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CACzB,KAAc,EACd,GAAsB;IAEtB,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,kBAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACrE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACvC,IAAI,kBAAkB,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAChD,KAAK,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,CAAC;QACtE,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACzB,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,kBAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAc;IACxC,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC;AACnD,CAAC;AAED,SAAS,2BAA2B,CAAC,QAAgB;IACnD,OAAO,CACL,8CAA8C,QAAQ,yBAAyB;QAC/E,gFAAgF;QAChF,sCAAsC,QAAQ,mDAAmD,CAClG,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAC9B,QAAwB,EACxB,QAAgB,EAChB,GAAsB;IAEtB,IAAI,OAAO,QAAQ,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,kBAAkB,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAClD,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;QAAE,OAAO,SAAS,CAAC;IAClD,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACzC,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAChF,CAAC;AAED,SAAS,qBAAqB,CAC5B,cAA4C,EAC5C,GAAsB;IAEtB,OAAO,cAAc,EAAE,MAAM;QAC3B,CAAC,CAAC,kBAAkB,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC;QAChD,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAa,EAAE,GAAsB;IAC/D,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5C,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,8BAA8B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7F,OAAO,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC7C,CAAC;AAED,SAAS,aAAa,CAAC,GAAsB;IAC3C,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CACxB,CAAC,KAAK,EAA6B,EAAE,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,QAAQ,CACnE,CACF,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAc;IACvC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChD,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAChC,OAAO,UAAU,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,MAAM;QACpE,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACtC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChD,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAChC,OAAO,UAAU,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,MAAM;QACpE,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAc;IACzC,MAAM,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACxC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAC9C,OAAO,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACnE,CAAC;AAED,SAAS,WAAW,CAAC,GAAG,MAAiB;IACvC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,SAAS;QACxC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QAChC,IAAI,UAAU,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,MAAM;YAAE,OAAO,UAAU,CAAC;IACzF,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,iFAAiF;AACjF,MAAM,UAAU,uBAAuB,CAAC,QAAgB;IACtD,0EAA0E;IAC1E,4EAA4E;IAC5E,0EAA0E;IAC1E,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IACzD,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAExC,IAAI,QAAQ,KAAK,eAAe,EAAE,CAAC;QACjC,OAAO,+EAA+E,CAAC;IACzF,CAAC;IACD,IAAI,QAAQ,KAAK,gBAAgB,EAAE,CAAC;QAClC,OAAO,CACL,4DAA4D;YAC5D,0BAA0B,CAC3B,CAAC;IACJ,CAAC;IAED,OAAO,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,UAAU,CAAC;AACzE,CAAC;AAED,MAAM,iBAAiB,GAAG,IAAI,KAAK,CACjC,EAAE,EACF,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAC1F,CAAC;AAEF,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAClC,IAAI,CAAC;QACH,MAAM,KAAK,GAAY,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAC9D,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CACrB,IAAyB,EACzB,QAA6B;IAE7B,MAAM,MAAM,GAAwB,EAAE,GAAG,IAAI,EAAE,CAAC;IAChD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC;YACT,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC;gBACnC,CAAC,CAAC,cAAc,CAAC,QAAQ,EAAE,KAAK,CAAC;gBACjC,CAAC,CAAC,KAAK,CAAC;IACd,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/conductor/conductor-send-reconnect.d.ts

@@ -1,4 +1,4 @@
-import { ConductorAgent, type ConductorAgentOptions, type ConductorSendCallbacks, type ConductorSendResult } from './conductor-agent.js';
+import { type ConductorAgent, type ConductorAgentCreateOptions, type ConductorAgentFactory, type ConductorSendCallbacks, type ConductorSendResult } from './conductor-agent.js';
 /** セッション中に `ConductorAgent` インスタンスを差し替え可能にする holder。 */
 export interface ConductorAgentHandle {
     conductor: ConductorAgent;
@@ -14,12 +14,16 @@ export interface ConductorReconnectCallbacks {
     }) => void;
     onReconnectComplete?: (input: ConductorReconnectCompleteInfo) => void;
 }
-/** Direct な SDK options と既存の wrapper の両方を受け付ける。 */
-export type ConductorReconnectOptions = (ConductorAgentOptions & ConductorReconnectCallbacks) | ({
-    conductorOptions: ConductorAgentOptions;
+/** Direct な options と `conductorOptions` wrapper の両方を受け付ける。 */
+export type ConductorReconnectOptions = (ConductorAgentCreateOptions & ConductorReconnectCallbacks & {
+    conductorAgentFactory: ConductorAgentFactory;
+}) | ({
+    conductorOptions: ConductorAgentCreateOptions;
+    conductorAgentFactory: ConductorAgentFactory;
 } & ConductorReconnectCallbacks);
 export interface ConductorSendReconnectOptions extends ConductorReconnectCallbacks {
-    conductorOptions: ConductorAgentOptions;
+    conductorOptions: ConductorAgentCreateOptions;
+    conductorAgentFactory: ConductorAgentFactory;
     /** 後方互換用。指定時は auth/transport 両方の attempt に使う。 */
     onReconnectAttempt?: (input: {
         agentId: string;
@@ -33,7 +37,7 @@ export interface ConductorSendReconnectOptions extends ConductorReconnectCallbac
     onAuthReconnectComplete?: (input: ConductorReconnectCompleteInfo) => void;
     onTransportReconnectComplete?: (input: ConductorReconnectCompleteInfo) => void;
 }
-/** close → ConductorAgent.resume(sameId) で in-process の agent を差し替える。 */
+/** close → factory.resume(sameId) で in-process の agent を差し替える。 */
 export declare function reconnectConductorAgent(handle: ConductorAgentHandle, options: ConductorReconnectOptions): Promise<string>;
 /**
  * SDK の RetriableError / transport stall 相当の send 結果かを保守的に判定する。

package/dist/conductor/conductor-send-reconnect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conductor-send-reconnect.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-send-reconnect.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACzB,MAAM,sBAAsB,CAAC;AAG9B,wDAAwD;AACxD,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,cAAc,CAAC;CAC3B;AAED,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,2BAA2B;IAC1C,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC1D,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,IAAI,CAAC;CACvE;AAED,mDAAmD;AACnD,MAAM,MAAM,yBAAyB,GACjC,CAAC,qBAAqB,GAAG,2BAA2B,CAAC,GACrD,CAAC;IAAE,gBAAgB,EAAE,qBAAqB,CAAA;CAAE,GAAG,2BAA2B,CAAC,CAAC;AAEhF,MAAM,WAAW,6BACf,SAAQ,2BAA2B;IACnC,gBAAgB,EAAE,qBAAqB,CAAC;IACxC,iDAAiD;IACjD,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC1D,sBAAsB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC9D,2BAA2B,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACnE,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,IAAI,CAAC;IAC1E,4BAA4B,CAAC,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,IAAI,CAAC;CAChF;AAED,yEAAyE;AACzE,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,MAAM,CAAC,CA+BjB;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAWT;AAED;;;;GAIG;AACH,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,6BAA6B,GAAG,sBAAsB,GAC9D,OAAO,CAAC,mBAAmB,CAAC,CAyB9B"}
+{"version":3,"file":"conductor-send-reconnect.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-send-reconnect.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,2BAA2B,EAChC,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACzB,MAAM,sBAAsB,CAAC;AAG9B,wDAAwD;AACxD,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,cAAc,CAAC;CAC3B;AAED,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,2BAA2B;IAC1C,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC1D,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,IAAI,CAAC;CACvE;AAED,+DAA+D;AAC/D,MAAM,MAAM,yBAAyB,GACjC,CAAC,2BAA2B,GAC1B,2BAA2B,GAAG;IAC5B,qBAAqB,EAAE,qBAAqB,CAAC;CAC9C,CAAC,GACJ,CAAC;IACC,gBAAgB,EAAE,2BAA2B,CAAC;IAC9C,qBAAqB,EAAE,qBAAqB,CAAC;CAC9C,GAAG,2BAA2B,CAAC,CAAC;AAErC,MAAM,WAAW,6BACf,SAAQ,2BAA2B;IACnC,gBAAgB,EAAE,2BAA2B,CAAC;IAC9C,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,iDAAiD;IACjD,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC1D,sBAAsB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC9D,2BAA2B,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACnE,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,IAAI,CAAC;IAC1E,4BAA4B,CAAC,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,IAAI,CAAC;CAChF;AAED,kEAAkE;AAClE,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,MAAM,CAAC,CAqCjB;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAWT;AAED;;;;GAIG;AACH,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,6BAA6B,GAAG,sBAAsB,GAC9D,OAAO,CAAC,mBAAmB,CAAC,CA0B9B"}

package/dist/conductor/conductor-send-reconnect.js

@@ -1,22 +1,23 @@
-import { ConductorAgent, } from './conductor-agent.js';
 import { isConductorSendAuthError } from './conductor-auth.js';
-/** close → ConductorAgent.resume(sameId) で in-process の agent を差し替える。 */
+/** close → factory.resume(sameId) で in-process の agent を差し替える。 */
 export async function reconnectConductorAgent(handle, options) {
     const agentId = handle.conductor.agentId;
     options.onReconnectAttempt?.({ agentId });
     let conductorOptions;
+    const conductorAgentFactory = options.conductorAgentFactory;
     if ('conductorOptions' in options) {
         conductorOptions = options.conductorOptions;
     }
     else {
-        const { onReconnectAttempt, onReconnectComplete, ...sdkOptions } = options;
+        const { onReconnectAttempt, onReconnectComplete, conductorAgentFactory: _conductorAgentFactory, ...sdkOptions } = options;
         void onReconnectAttempt;
         void onReconnectComplete;
+        void _conductorAgentFactory;
         conductorOptions = sdkOptions;
     }
     try {
         await handle.conductor.close();
-        handle.conductor = await ConductorAgent.resume(agentId, conductorOptions);
+        handle.conductor = await conductorAgentFactory.resume(agentId, conductorOptions);
         options.onReconnectComplete?.({ agentId, success: true });
         return agentId;
     }
@@ -61,6 +62,7 @@ export async function sendConductorWithReconnect(handle, message, options) {
     }
     try {
         await reconnectConductorAgent(handle, {
+            conductorAgentFactory: options.conductorAgentFactory,
             conductorOptions: options.conductorOptions,
             onReconnectAttempt: resolveReconnectAttempt(options, reconnectReason),
             onReconnectComplete: resolveReconnectComplete(options, reconnectReason),

package/dist/conductor/conductor-send-reconnect.js.map

@@ -1 +1 @@
-{"version":3,"file":"conductor-send-reconnect.js","sourceRoot":"","sources":["../../src/conductor/conductor-send-reconnect.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conductor-send-reconnect.js","sourceRoot":"","sources":["../../src/conductor/conductor-send-reconnect.ts"],"names":[],"mappings":"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"}