@agent-native/core 0.202.0 → 0.202.1-nightly-20261007011022

package/dist/agent/provider-model-selection.js

@@ -10,14 +10,17 @@
  * A chat already pinned to an unchecked model keeps running on it.
  */
 import { AGENT_PROVIDER_CATALOG, } from "../client/agent-provider-catalog.js";
+import { assertCredentialCanReachEndpoint, CredentialEndpointMismatchError, } from "../credentials/index.js";
 import { getOrgRoleForEmail } from "../mcp/actions/service-token-access.js";
 import { canManageOrg } from "../org/permissions.js";
-import { resolveBuilderCredentialsDetailed, resolveSecretDetailed, } from "../server/credential-provider.js";
+import { readAppSecret } from "../secrets/storage.js";
+import { canUseDeployCredentialFallbackForRequest, resolveBuilderCredentialsDetailed, resolveSecretDetailed, readDeployCredentialEnv, } from "../server/credential-provider.js";
 import { getRequestOrgId, getRequestUserEmail, } from "../server/request-context.js";
 import { deleteOrgSetting, deleteUserSetting, getOrgSetting, getUserSetting, putOrgSetting, putUserSetting, } from "../settings/index.js";
-import { OLLAMA_BASE_URL_ENV_VAR } from "./engine/openai-compatible-endpoint.js";
+import { isCustomOpenAiBaseUrl, OLLAMA_BASE_URL_ENV_VAR, OPENAI_BASE_URL_ENV_VAR, } from "./engine/openai-compatible-endpoint.js";
 import { PROVIDER_ENV_META } from "./engine/provider-env-vars.js";
 import { BUILDER_MODEL_CONFIG } from "./model-config.js";
+import { upgradeModelToLatestSupportedVersion } from "./model-version.js";
 export const PROVIDER_MODEL_SELECTION_KEY_PREFIX = "agent-provider-models";
 /** Audit target type for selection changes and refused attempts. */
 export const PROVIDER_MODEL_SELECTION_AUDIT_TARGET_TYPE = "provider-models";
@@ -72,7 +75,7 @@ function providerCredentialEnvVar(provider) {
  * only routes its own catalog, so ids outside it are refused rather than
  * stored as choices the gateway would silently swap for its default.
  */
-export function normalizeSelectedModels(provider, models) {
+export function normalizeSelectedModels(provider, models, options = {}) {
     if (models.length > MAX_SELECTED_MODELS) {
         throw new ProviderModelSelectionError(`Select at most ${MAX_SELECTED_MODELS} models.`, 400);
     }
@@ -89,7 +92,12 @@ export function normalizeSelectedModels(provider, models) {
         }
         seen.add(id);
     }
-    const normalized = [...seen];
+    const supportedModels = recommendedProviderModels(provider);
+    const normalized = [
+        ...new Set([...seen].map((id) => options.preserveCustomModels
+            ? id
+            : (upgradeModelToLatestSupportedVersion(id, supportedModels) ?? id))),
+    ];
     if (provider === "builder") {
         const catalog = new Set(BUILDER_MODEL_CONFIG.supportedModels);
         const unknown = normalized.filter((id) => !catalog.has(id));
@@ -99,17 +107,107 @@ export function normalizeSelectedModels(provider, models) {
     }
     return normalized;
 }
-function parseRow(provider, scope, stored) {
+async function preserveCustomModelsForScope(provider, scope, ctx) {
+    if (provider !== "openai")
+        return false;
+    const scopeId = scopeIdFor(ctx, scope);
+    const credentialRefs = scope === "user"
+        ? [
+            { scope: "user", scopeId },
+            { scope: "workspace", scopeId: `solo:${scopeId}` },
+        ]
+        : [
+            { scope: "org", scopeId },
+            { scope: "workspace", scopeId },
+        ];
+    const [credentials, endpoints] = await Promise.all([
+        Promise.all(credentialRefs.map((ref) => readAppSecret({ key: PROVIDER_ENV_META.openai.envVar, ...ref }))),
+        Promise.all(credentialRefs.map((ref) => readAppSecret({ key: OPENAI_BASE_URL_ENV_VAR, ...ref }))),
+    ]);
+    for (const [endpointIndex, endpoint] of endpoints.entries()) {
+        if (!isCustomOpenAiBaseUrl(endpoint?.value))
+            continue;
+        for (const [credentialIndex, credential] of credentials.entries()) {
+            if (!credential?.value)
+                continue;
+            try {
+                assertCredentialCanReachEndpoint(credentialRefs[endpointIndex], credentialRefs[credentialIndex], PROVIDER_ENV_META.openai.envVar);
+                return true;
+            }
+            catch (error) {
+                if (!(error instanceof CredentialEndpointMismatchError))
+                    throw error;
+            }
+        }
+    }
+    if (endpoints.some((secret) => secret?.value) ||
+        credentials.some((secret) => secret?.value)) {
+        return false;
+    }
+    if (scope === "user") {
+        if (!canUseDeployCredentialFallbackForRequest(PROVIDER_ENV_META.openai.envVar) ||
+            !canUseDeployCredentialFallbackForRequest(OPENAI_BASE_URL_ENV_VAR)) {
+            return false;
+        }
+        return Boolean(readDeployCredentialEnv(PROVIDER_ENV_META.openai.envVar) &&
+            isCustomOpenAiBaseUrl(readDeployCredentialEnv(OPENAI_BASE_URL_ENV_VAR)));
+    }
+    const [credential, resolvedEndpoint] = await Promise.all([
+        resolveSecretDetailed(PROVIDER_ENV_META.openai.envVar, {
+            skipUserScope: true,
+        }),
+        resolveSecretDetailed(OPENAI_BASE_URL_ENV_VAR, { skipUserScope: true }),
+    ]);
+    if (credential.lookupFailed || resolvedEndpoint.lookupFailed) {
+        throw new Error("Could not read the OpenAI credential configuration.");
+    }
+    if (!credential.value ||
+        !resolvedEndpoint.value ||
+        !isCustomOpenAiBaseUrl(resolvedEndpoint.value) ||
+        !credential.source ||
+        !resolvedEndpoint.source) {
+        return false;
+    }
+    if (credential.source === "env" || resolvedEndpoint.source === "env") {
+        return credential.source === "env" && resolvedEndpoint.source === "env";
+    }
+    if (credential.source === "workspace" &&
+        credential.scopeId?.startsWith("solo:")) {
+        return false;
+    }
+    try {
+        assertCredentialCanReachEndpoint({
+            scope: resolvedEndpoint.source,
+            scopeId: resolvedEndpoint.scopeId,
+        }, { scope: credential.source, scopeId: credential.scopeId }, PROVIDER_ENV_META.openai.envVar);
+        return true;
+    }
+    catch (error) {
+        if (error instanceof CredentialEndpointMismatchError)
+            return false;
+        throw error;
+    }
+}
+function parseRow(provider, scope, stored, preserveCustomModels = false) {
+    const customModelMetadata = provider === "openai" && preserveCustomModels
+        ? { preserveCustomModels: true }
+        : {};
     if (!stored || !Array.isArray(stored.models)) {
-        return { provider, scope, models: null };
+        return { provider, scope, models: null, ...customModelMetadata };
     }
     const models = stored.models.filter((model) => typeof model === "string" && !!model.trim());
+    const currentModels = [
+        ...new Set(models.map((model) => preserveCustomModels
+            ? model
+            : (upgradeModelToLatestSupportedVersion(model, recommendedProviderModels(provider)) ?? model))),
+    ];
     return {
         provider,
         scope,
+        ...customModelMetadata,
         models: provider === "builder"
-            ? models.filter((model) => BUILDER_MODEL_CONFIG.supportedModels.includes(model))
-            : models,
+            ? currentModels.filter((model) => BUILDER_MODEL_CONFIG.supportedModels.includes(model))
+            : currentModels,
         ...(typeof stored.updatedAt === "number" &&
             Number.isFinite(stored.updatedAt)
             ? { updatedAt: stored.updatedAt }
@@ -138,7 +236,8 @@ export async function readProviderModelSelection(ctx, provider, scope) {
     const stored = scope === "org"
         ? await getOrgSetting(scopeId, key)
         : await getUserSetting(scopeId, key);
-    return parseRow(provider, scope, stored);
+    const preserveCustomModels = await preserveCustomModelsForScope(provider, scope, ctx);
+    return parseRow(provider, scope, stored, preserveCustomModels);
 }
 /**
  * Whether the caller may change `scope`'s selection. Personal selections are
@@ -157,7 +256,10 @@ export async function assertMayWriteProviderModelSelection(ctx, scope) {
 }
 export async function writeProviderModelSelection(ctx, provider, scope, models) {
     await assertMayWriteProviderModelSelection(ctx, scope);
-    const normalized = normalizeSelectedModels(provider, models);
+    const preserveCustomModels = await preserveCustomModelsForScope(provider, scope, ctx);
+    const normalized = normalizeSelectedModels(provider, models, {
+        preserveCustomModels,
+    });
     const scopeId = scopeIdFor(ctx, scope);
     const key = providerModelSelectionSettingsKey(provider);
     const value = {
@@ -211,7 +313,11 @@ export async function resolveProviderModelSelectionScope(provider, ctx = current
     if (detail.lookupFailed && !detail.value) {
         throw new Error("Could not read the credential store.");
     }
-    return detail.source === "user" ? "user" : "org";
+    return detail.source === "user" ||
+        (detail.source === "workspace" &&
+            detail.scopeId === `solo:${ctx.userEmail}`)
+        ? "user"
+        : "org";
 }
 /** The selection the current request's picker shows for `provider`. */
 export async function resolveEffectiveProviderModelSelection(provider, ctx = currentContext()) {
@@ -247,13 +353,22 @@ export async function resolveProviderModelSelectionAtScope(provider, scope, ctx)
     }
 }
 function selectionFromRow(row) {
+    const customModelMetadata = row.preserveCustomModels
+        ? { preserveCustomModels: true }
+        : {};
     return row.models === null
-        ? { state: "default", provider: row.provider, scope: row.scope }
+        ? {
+            state: "default",
+            provider: row.provider,
+            scope: row.scope,
+            ...customModelMetadata,
+        }
         : {
             state: "selected",
             provider: row.provider,
             scope: row.scope,
             models: row.models,
+            ...customModelMetadata,
         };
 }
 /**
@@ -280,7 +395,10 @@ export async function resolveUncheckedDefaultModelReplacement(engine) {
     }
     if (selection.state !== "selected")
         return undefined;
-    if (selection.models.includes(engine.defaultModel))
+    const currentDefault = selection.preserveCustomModels
+        ? engine.defaultModel
+        : (upgradeModelToLatestSupportedVersion(engine.defaultModel, recommendedProviderModels(provider)) ?? engine.defaultModel);
+    if (selection.models.includes(currentDefault))
         return undefined;
     return selection.models[0];
 }

package/dist/automation/index.d.ts

@@ -139,8 +139,8 @@ export declare function createAutomationCallbackHandler(runtime: AutomationRunti
     duplicate?: undefined;
     eventId?: undefined;
 } | {
-    error?: undefined;
     accepted: boolean;
     duplicate: boolean;
     eventId: string;
+    error?: undefined;
 }>;

package/dist/cli/create.d.ts

@@ -102,7 +102,7 @@ export declare function detectWorkspace(startDir: string): {
 } | null;
 export { parseWorkspaceScope };
 /** @internal — exported for E2E tests */
-export { mergeWorkspaceYamlSections as _mergeWorkspaceYamlSections, scaffoldWorkspaceRoot as _scaffoldWorkspaceRoot, mergeWorkspaceYamlListItems as _mergeWorkspaceYamlListItems, scaffoldOneAppIntoWorkspace as _scaffoldOneAppIntoWorkspace, CreateWizardCancelledError as _CreateWizardCancelledError, ensureGuardedScaffold as _ensureGuardedScaffold, scaffoldAppTemplate as _scaffoldAppTemplate, scaffoldRequiredPackages as _scaffoldRequiredPackages, postProcessStandalone as _postProcessStandalone, loadCatalog as _loadCatalog, fixPackageJsonName as _fixPackageJsonName, renameGitignore as _renameGitignore, discoverEnclosingRepo as _discoverEnclosingRepo, rewriteNetlifyToml as _rewriteNetlifyToml, getCoreDependencyVersion as _getCoreDependencyVersion, getDispatchDependencyVersion as _getDispatchDependencyVersion, getToolkitDependencyVersion as _getToolkitDependencyVersion, getAgentKitDependencyVersion as _getAgentKitDependencyVersion, prepareLocalWorkspaceOverrides as _prepareLocalWorkspaceOverrides, ensureLocalPackageBuildOutputs as _ensureLocalPackageBuildOutputs, getCorePackageVersion as _getCorePackageVersion, getGitHubTemplateRef as _getGitHubTemplateRef, getGitHubTemplateRefCandidates as _getGitHubTemplateRefCandidates, githubTarballUrl as _githubTarballUrl, findLocalTemplateFrom as _findLocalTemplateFrom, workspaceAppNameForTemplateSelection as _workspaceAppNameForTemplateSelection, startShapePromptOptions as _startShapePromptOptions, standaloneTemplatePromptOptions as _standaloneTemplatePromptOptions, parseCommunityTemplateSelection as _parseCommunityTemplateSelection, communityTemplateTrustMessage as _communityTemplateTrustMessage, communityTemplateTarballUrl as _communityTemplateTarballUrl, assertCommunityTemplateRoot as _assertCommunityTemplateRoot, assertSafeCommunityArchiveListing as _assertSafeCommunityArchiveListing, validateCommunityArchive as _validateCommunityArchive, resolveCommunityTemplateSource as _resolveCommunityTemplateSource, discoverCommunityWorkspaceApps as _discoverCommunityWorkspaceApps, normalizeCommunityWorkspaceAppDependencies as _normalizeCommunityWorkspaceAppDependencies, shouldSkipScaffoldEntry as _shouldSkipScaffoldEntry, removeWorkspaceOnlyTemplateWiring as _removeWorkspaceOnlyTemplateWiring, tarExtractArgs as _tarExtractArgs, extractTarball as _extractTarball, materializeArchiveSymlinks as _materializeArchiveSymlinks, downloadGitHubSubdir as _downloadGitHubSubdir, findLocalTemplate as _findLocalTemplate, templateSourceName as _templateSourceName, normalizeTemplateName as _normalizeTemplateName, appTitleForScaffold as _appTitleForScaffold, replacePlaceholders as _replacePlaceholders, rewriteTrackingAppId as _rewriteTrackingAppId, rewriteAgentChatAppId as _rewriteAgentChatAppId, applyScaffoldIdentity as _applyScaffoldIdentity, ensureScaffoldEmailBrandingConfig as _ensureScaffoldEmailBrandingConfig, fixWebManifestName as _fixWebManifestName, copyDir as _copyDir, localTemplateSourceKind as _localTemplateSourceKind, REPO as _REPO, TEMPLATES_DIR as _TEMPLATES_DIR, };
+export { mergeWorkspaceYamlSections as _mergeWorkspaceYamlSections, scaffoldWorkspaceRoot as _scaffoldWorkspaceRoot, mergeWorkspaceYamlListItems as _mergeWorkspaceYamlListItems, scaffoldOneAppIntoWorkspace as _scaffoldOneAppIntoWorkspace, CreateWizardCancelledError as _CreateWizardCancelledError, ensureGuardedScaffold as _ensureGuardedScaffold, scaffoldAppTemplate as _scaffoldAppTemplate, scaffoldRequiredPackages as _scaffoldRequiredPackages, postProcessStandalone as _postProcessStandalone, loadCatalog as _loadCatalog, fixPackageJsonName as _fixPackageJsonName, renameGitignore as _renameGitignore, discoverEnclosingRepo as _discoverEnclosingRepo, rewriteNetlifyToml as _rewriteNetlifyToml, getCoreDependencyVersion as _getCoreDependencyVersion, getDispatchDependencyVersion as _getDispatchDependencyVersion, getOtelDependencyVersion as _getOtelDependencyVersion, getToolkitDependencyVersion as _getToolkitDependencyVersion, getAgentKitDependencyVersion as _getAgentKitDependencyVersion, prepareLocalWorkspaceOverrides as _prepareLocalWorkspaceOverrides, ensureLocalPackageBuildOutputs as _ensureLocalPackageBuildOutputs, getCorePackageVersion as _getCorePackageVersion, getGitHubTemplateRef as _getGitHubTemplateRef, getGitHubTemplateRefCandidates as _getGitHubTemplateRefCandidates, githubTarballUrl as _githubTarballUrl, findLocalTemplateFrom as _findLocalTemplateFrom, workspaceAppNameForTemplateSelection as _workspaceAppNameForTemplateSelection, startShapePromptOptions as _startShapePromptOptions, standaloneTemplatePromptOptions as _standaloneTemplatePromptOptions, parseCommunityTemplateSelection as _parseCommunityTemplateSelection, communityTemplateTrustMessage as _communityTemplateTrustMessage, communityTemplateTarballUrl as _communityTemplateTarballUrl, assertCommunityTemplateRoot as _assertCommunityTemplateRoot, assertSafeCommunityArchiveListing as _assertSafeCommunityArchiveListing, validateCommunityArchive as _validateCommunityArchive, resolveCommunityTemplateSource as _resolveCommunityTemplateSource, discoverCommunityWorkspaceApps as _discoverCommunityWorkspaceApps, normalizeCommunityWorkspaceAppDependencies as _normalizeCommunityWorkspaceAppDependencies, shouldSkipScaffoldEntry as _shouldSkipScaffoldEntry, removeWorkspaceOnlyTemplateWiring as _removeWorkspaceOnlyTemplateWiring, tarExtractArgs as _tarExtractArgs, extractTarball as _extractTarball, materializeArchiveSymlinks as _materializeArchiveSymlinks, downloadGitHubSubdir as _downloadGitHubSubdir, findLocalTemplate as _findLocalTemplate, templateSourceName as _templateSourceName, normalizeTemplateName as _normalizeTemplateName, appTitleForScaffold as _appTitleForScaffold, replacePlaceholders as _replacePlaceholders, rewriteTrackingAppId as _rewriteTrackingAppId, rewriteAgentChatAppId as _rewriteAgentChatAppId, applyScaffoldIdentity as _applyScaffoldIdentity, ensureScaffoldEmailBrandingConfig as _ensureScaffoldEmailBrandingConfig, fixWebManifestName as _fixWebManifestName, copyDir as _copyDir, localTemplateSourceKind as _localTemplateSourceKind, REPO as _REPO, TEMPLATES_DIR as _TEMPLATES_DIR, };
 declare function tarExtractArgs(tarPath: string, destDir: string, options?: {
     skipAgentSymlinks?: boolean;
     untrustedCommunityArchive?: boolean;
@@ -157,6 +157,7 @@ declare function ensureScaffoldEmailBrandingConfig(appDir: string, appName: stri
 declare function fixWebManifestName(appDir: string, name: string, templateName?: string, sourceIdentity?: ScaffoldSourceIdentity): void;
 declare function getCoreDependencyVersion(): string;
 declare function getDispatchDependencyVersion(): string;
+declare function getOtelDependencyVersion(): string;
 declare function getToolkitDependencyVersion(): string;
 declare function getAgentKitDependencyVersion(): string;
 interface PreparedWorkspaceOverrides {

package/dist/cli/create.js

@@ -92,9 +92,7 @@ const FIRST_PARTY_TARBALL_SYMLINK_EXCLUDES = [
 // the files that import them. A scaffold cannot install these (a standalone app
 // resolves them from npm, a new workspace has no such package), so it drops the
 // dependency and those files. Publishing a package removes its entry here.
-const WORKSPACE_ONLY_TEMPLATE_WIRING = {
-    "@agent-native/otel": ["server/plugins/otel.ts"],
-};
+const WORKSPACE_ONLY_TEMPLATE_WIRING = {};
 const TAR_LISTING_MAX_BUFFER = 100 * 1024 * 1024;
 const localPackageTarballs = new Map();
 const IN_PLACE_ALLOWLIST = new Set([
@@ -557,6 +555,7 @@ async function createWorkspaceInteractive(name, opts, clack) {
                 dispatchDependencyVersion: getDispatchDependencyVersion(),
                 toolkitDependencyVersion: getToolkitDependencyVersion(),
                 agentKitDependencyVersion: getAgentKitDependencyVersion(),
+                otelDependencyVersion: getOtelDependencyVersion(),
             });
             fixPackageJsonName(appDir, appName, templateName, {
                 ...resolution,
@@ -800,6 +799,7 @@ async function scaffoldOneAppIntoWorkspace(workspace, appName, templateName, cla
             dispatchDependencyVersion: getDispatchDependencyVersion(),
             toolkitDependencyVersion: getToolkitDependencyVersion(),
             agentKitDependencyVersion: getAgentKitDependencyVersion(),
+            otelDependencyVersion: getOtelDependencyVersion(),
         });
         fixPackageJsonName(appDir, appName, templateName, {
             ...resolution,
@@ -1655,6 +1655,9 @@ function postProcessStandalone(name, targetDir, templateName, resolution) {
                     else if (key === "@agent-native/agentkit") {
                         deps[key] = getAgentKitDependencyVersion();
                     }
+                    else if (key === "@agent-native/otel") {
+                        deps[key] = getOtelDependencyVersion();
+                    }
                     else if (typeof val === "string" && val.startsWith("workspace:")) {
                         deps[key] = "latest";
                     }
@@ -1895,7 +1898,7 @@ export function detectWorkspace(startDir) {
 }
 export { parseWorkspaceScope };
 /** @internal — exported for E2E tests */
-export { mergeWorkspaceYamlSections as _mergeWorkspaceYamlSections, scaffoldWorkspaceRoot as _scaffoldWorkspaceRoot, mergeWorkspaceYamlListItems as _mergeWorkspaceYamlListItems, scaffoldOneAppIntoWorkspace as _scaffoldOneAppIntoWorkspace, CreateWizardCancelledError as _CreateWizardCancelledError, ensureGuardedScaffold as _ensureGuardedScaffold, scaffoldAppTemplate as _scaffoldAppTemplate, scaffoldRequiredPackages as _scaffoldRequiredPackages, postProcessStandalone as _postProcessStandalone, loadCatalog as _loadCatalog, fixPackageJsonName as _fixPackageJsonName, renameGitignore as _renameGitignore, discoverEnclosingRepo as _discoverEnclosingRepo, rewriteNetlifyToml as _rewriteNetlifyToml, getCoreDependencyVersion as _getCoreDependencyVersion, getDispatchDependencyVersion as _getDispatchDependencyVersion, getToolkitDependencyVersion as _getToolkitDependencyVersion, getAgentKitDependencyVersion as _getAgentKitDependencyVersion, prepareLocalWorkspaceOverrides as _prepareLocalWorkspaceOverrides, ensureLocalPackageBuildOutputs as _ensureLocalPackageBuildOutputs, getCorePackageVersion as _getCorePackageVersion, getGitHubTemplateRef as _getGitHubTemplateRef, getGitHubTemplateRefCandidates as _getGitHubTemplateRefCandidates, githubTarballUrl as _githubTarballUrl, findLocalTemplateFrom as _findLocalTemplateFrom, workspaceAppNameForTemplateSelection as _workspaceAppNameForTemplateSelection, startShapePromptOptions as _startShapePromptOptions, standaloneTemplatePromptOptions as _standaloneTemplatePromptOptions, parseCommunityTemplateSelection as _parseCommunityTemplateSelection, communityTemplateTrustMessage as _communityTemplateTrustMessage, communityTemplateTarballUrl as _communityTemplateTarballUrl, assertCommunityTemplateRoot as _assertCommunityTemplateRoot, assertSafeCommunityArchiveListing as _assertSafeCommunityArchiveListing, validateCommunityArchive as _validateCommunityArchive, resolveCommunityTemplateSource as _resolveCommunityTemplateSource, discoverCommunityWorkspaceApps as _discoverCommunityWorkspaceApps, normalizeCommunityWorkspaceAppDependencies as _normalizeCommunityWorkspaceAppDependencies, shouldSkipScaffoldEntry as _shouldSkipScaffoldEntry, removeWorkspaceOnlyTemplateWiring as _removeWorkspaceOnlyTemplateWiring, tarExtractArgs as _tarExtractArgs, extractTarball as _extractTarball, materializeArchiveSymlinks as _materializeArchiveSymlinks, downloadGitHubSubdir as _downloadGitHubSubdir, findLocalTemplate as _findLocalTemplate, templateSourceName as _templateSourceName, normalizeTemplateName as _normalizeTemplateName, appTitleForScaffold as _appTitleForScaffold, replacePlaceholders as _replacePlaceholders, rewriteTrackingAppId as _rewriteTrackingAppId, rewriteAgentChatAppId as _rewriteAgentChatAppId, applyScaffoldIdentity as _applyScaffoldIdentity, ensureScaffoldEmailBrandingConfig as _ensureScaffoldEmailBrandingConfig, fixWebManifestName as _fixWebManifestName, copyDir as _copyDir, localTemplateSourceKind as _localTemplateSourceKind, REPO as _REPO, TEMPLATES_DIR as _TEMPLATES_DIR, };
+export { mergeWorkspaceYamlSections as _mergeWorkspaceYamlSections, scaffoldWorkspaceRoot as _scaffoldWorkspaceRoot, mergeWorkspaceYamlListItems as _mergeWorkspaceYamlListItems, scaffoldOneAppIntoWorkspace as _scaffoldOneAppIntoWorkspace, CreateWizardCancelledError as _CreateWizardCancelledError, ensureGuardedScaffold as _ensureGuardedScaffold, scaffoldAppTemplate as _scaffoldAppTemplate, scaffoldRequiredPackages as _scaffoldRequiredPackages, postProcessStandalone as _postProcessStandalone, loadCatalog as _loadCatalog, fixPackageJsonName as _fixPackageJsonName, renameGitignore as _renameGitignore, discoverEnclosingRepo as _discoverEnclosingRepo, rewriteNetlifyToml as _rewriteNetlifyToml, getCoreDependencyVersion as _getCoreDependencyVersion, getDispatchDependencyVersion as _getDispatchDependencyVersion, getOtelDependencyVersion as _getOtelDependencyVersion, getToolkitDependencyVersion as _getToolkitDependencyVersion, getAgentKitDependencyVersion as _getAgentKitDependencyVersion, prepareLocalWorkspaceOverrides as _prepareLocalWorkspaceOverrides, ensureLocalPackageBuildOutputs as _ensureLocalPackageBuildOutputs, getCorePackageVersion as _getCorePackageVersion, getGitHubTemplateRef as _getGitHubTemplateRef, getGitHubTemplateRefCandidates as _getGitHubTemplateRefCandidates, githubTarballUrl as _githubTarballUrl, findLocalTemplateFrom as _findLocalTemplateFrom, workspaceAppNameForTemplateSelection as _workspaceAppNameForTemplateSelection, startShapePromptOptions as _startShapePromptOptions, standaloneTemplatePromptOptions as _standaloneTemplatePromptOptions, parseCommunityTemplateSelection as _parseCommunityTemplateSelection, communityTemplateTrustMessage as _communityTemplateTrustMessage, communityTemplateTarballUrl as _communityTemplateTarballUrl, assertCommunityTemplateRoot as _assertCommunityTemplateRoot, assertSafeCommunityArchiveListing as _assertSafeCommunityArchiveListing, validateCommunityArchive as _validateCommunityArchive, resolveCommunityTemplateSource as _resolveCommunityTemplateSource, discoverCommunityWorkspaceApps as _discoverCommunityWorkspaceApps, normalizeCommunityWorkspaceAppDependencies as _normalizeCommunityWorkspaceAppDependencies, shouldSkipScaffoldEntry as _shouldSkipScaffoldEntry, removeWorkspaceOnlyTemplateWiring as _removeWorkspaceOnlyTemplateWiring, tarExtractArgs as _tarExtractArgs, extractTarball as _extractTarball, materializeArchiveSymlinks as _materializeArchiveSymlinks, downloadGitHubSubdir as _downloadGitHubSubdir, findLocalTemplate as _findLocalTemplate, templateSourceName as _templateSourceName, normalizeTemplateName as _normalizeTemplateName, appTitleForScaffold as _appTitleForScaffold, replacePlaceholders as _replacePlaceholders, rewriteTrackingAppId as _rewriteTrackingAppId, rewriteAgentChatAppId as _rewriteAgentChatAppId, applyScaffoldIdentity as _applyScaffoldIdentity, ensureScaffoldEmailBrandingConfig as _ensureScaffoldEmailBrandingConfig, fixWebManifestName as _fixWebManifestName, copyDir as _copyDir, localTemplateSourceKind as _localTemplateSourceKind, REPO as _REPO, TEMPLATES_DIR as _TEMPLATES_DIR, };
 function validateRepoName(repo) {
     const parts = repo.split("/");
     if (!/^[a-zA-Z0-9_.-]+\/[a-zA-Z0-9_.-]+$/.test(repo) ||
@@ -2994,6 +2997,16 @@ function getDispatchDependencyVersion() {
     }
     return "latest";
 }
+// OTel is versioned independently of Core (it peer-depends on Core's public
+// observability provider API), so a scaffold takes its current npm release.
+function getOtelDependencyVersion() {
+    if (process.env.AGENT_NATIVE_CREATE_USE_LOCAL_CORE === "1") {
+        const localOtel = findLocalPackage("otel");
+        if (localOtel)
+            return localPackageTarball(localOtel);
+    }
+    return "latest";
+}
 function getToolkitDependencyVersion() {
     if (process.env.AGENT_NATIVE_CREATE_USE_LOCAL_CORE === "1") {
         const localToolkit = findLocalPackage("toolkit");

package/dist/cli/template-sync.js

@@ -2,7 +2,7 @@ import { spawnSync } from "node:child_process";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { detectWorkspace, _REPO, _TEMPLATES_DIR, _appTitleForScaffold, _copyDir, _downloadGitHubSubdir, _findLocalTemplate, _fixPackageJsonName, _fixWebManifestName, _getCoreDependencyVersion, _getCorePackageVersion, _getDispatchDependencyVersion, _getGitHubTemplateRefCandidates, _getToolkitDependencyVersion, _localTemplateSourceKind, _normalizeTemplateName, _postProcessStandalone, _removeWorkspaceOnlyTemplateWiring, _renameGitignore, _replacePlaceholders, _rewriteNetlifyToml, _rewriteTrackingAppId, _shouldSkipScaffoldEntry, _templateSourceName, } from "./create.js";
+import { detectWorkspace, _REPO, _TEMPLATES_DIR, _appTitleForScaffold, _copyDir, _downloadGitHubSubdir, _findLocalTemplate, _fixPackageJsonName, _fixWebManifestName, _getCoreDependencyVersion, _getCorePackageVersion, _getDispatchDependencyVersion, _getGitHubTemplateRefCandidates, _getOtelDependencyVersion, _getToolkitDependencyVersion, _localTemplateSourceKind, _normalizeTemplateName, _postProcessStandalone, _removeWorkspaceOnlyTemplateWiring, _renameGitignore, _replacePlaceholders, _rewriteNetlifyToml, _rewriteTrackingAppId, _shouldSkipScaffoldEntry, _templateSourceName, } from "./create.js";
 import { appDirtyPaths, baselineDescription, baselineExists, clearBaseline, materializeBaseline, promoteBaseline, resolveBaselineStore, writeBaseline, } from "./template-baseline.js";
 import { workspacifyApp } from "./workspacify.js";
 const defaultIO = {
@@ -56,6 +56,7 @@ export async function materializeTemplate(opts) {
             coreDependencyVersion: _getCoreDependencyVersion(),
             dispatchDependencyVersion: _getDispatchDependencyVersion(),
             toolkitDependencyVersion: _getToolkitDependencyVersion(),
+            otelDependencyVersion: _getOtelDependencyVersion(),
         });
         _fixPackageJsonName(dest, opts.appName, opts.template, {
             ...provenance,

package/dist/cli/workspacify.d.ts

@@ -8,6 +8,7 @@ export interface WorkspacifyOptions {
     dispatchDependencyVersion?: string;
     toolkitDependencyVersion?: string;
     agentKitDependencyVersion?: string;
+    otelDependencyVersion?: string;
 }
 export declare function ensureNodePtyBuildDependency(workspaceRoot: string): void;
 export declare function workspacifyApp(opts: WorkspacifyOptions): void;

package/dist/cli/workspacify.js

@@ -55,6 +55,7 @@ export function workspacifyApp(opts) {
     const dispatchDependencyVersion = pinnedByWorkspace("@agent-native/dispatch", opts.dispatchDependencyVersion);
     const toolkitDependencyVersion = pinnedByWorkspace("@agent-native/toolkit", opts.toolkitDependencyVersion);
     const agentKitDependencyVersion = pinnedByWorkspace("@agent-native/agentkit", opts.agentKitDependencyVersion);
+    const otelDependencyVersion = pinnedByWorkspace("@agent-native/otel", opts.otelDependencyVersion);
     const pkgPath = path.join(appDir, "package.json");
     let hasNodePty = false;
     if (fs.existsSync(pkgPath)) {
@@ -82,6 +83,9 @@ export function workspacifyApp(opts) {
                         if (key === "@agent-native/agentkit") {
                             deps[key] = agentKitDependencyVersion;
                         }
+                        if (key === "@agent-native/otel") {
+                            deps[key] = otelDependencyVersion;
+                        }
                     }
                 }
             }

package/dist/client/app-config.d.ts

@@ -1,2 +1,3 @@
 import type { AgentNativeConfig } from "../config.js";
 export declare function injectedAgentNativeConfig(): AgentNativeConfig;
+export declare function injectedAgentNativeAppId(): string | null;

package/dist/client/app-config.js

@@ -3,3 +3,22 @@ export function injectedAgentNativeConfig() {
         ? {}
         : __AGENT_NATIVE_APP_CONFIG__;
 }
+export function injectedAgentNativeAppId() {
+    const browserConfig = typeof window !== "undefined"
+        ? window.__AGENT_NATIVE_CONFIG__
+        : undefined;
+    const workspaceAppId = typeof __AGENT_NATIVE_WORKSPACE_APP_ID__ === "string" &&
+        __AGENT_NATIVE_WORKSPACE_APP_ID__.trim()
+        ? __AGENT_NATIVE_WORKSPACE_APP_ID__
+        : browserConfig?.workspaceAppId;
+    const appId = browserConfig?.appId;
+    const compiledAppId = typeof __AGENT_NATIVE_APP_ID__ === "string"
+        ? __AGENT_NATIVE_APP_ID__
+        : undefined;
+    for (const value of [workspaceAppId, appId, compiledAppId]) {
+        if (typeof value === "string" && value.trim()) {
+            return value.trim().toLowerCase();
+        }
+    }
+    return null;
+}