@undefineds.co/xpod 0.4.14 → 0.4.16

package/dist/api/container/common.js

@@ -17,6 +17,7 @@ const AccountRoleRepository_1 = require("../../identity/drizzle/AccountRoleRepos
 const ServiceTokenRepository_1 = require("../../identity/drizzle/ServiceTokenRepository");
 const LocalSetupServiceTokenRepository_1 = require("../../setup/LocalSetupServiceTokenRepository");
 const SolidTokenAuthenticator_1 = require("../auth/SolidTokenAuthenticator");
+const SolidSessionFactory_1 = require("../auth/SolidSessionFactory");
 const ClientCredentialsAuthenticator_1 = require("../auth/ClientCredentialsAuthenticator");
 const NodeTokenAuthenticator_1 = require("../auth/NodeTokenAuthenticator");
 const ServiceTokenAuthenticator_1 = require("../auth/ServiceTokenAuthenticator");
@@ -27,7 +28,13 @@ const InvocationTokenCodec_1 = require("../ai-gateway/auth/InvocationTokenCodec"
 const GatewayApiKeyAuthenticator_1 = require("../ai-gateway/auth/GatewayApiKeyAuthenticator");
 const GatewayKeyLocatorCodec_1 = require("../ai-gateway/auth/GatewayKeyLocatorCodec");
 const PodGatewayAccessKeyRepository_1 = require("../ai-gateway/auth/PodGatewayAccessKeyRepository");
-const HostedPodDataAccess_1 = require("../ai-gateway/pod/HostedPodDataAccess");
+const OwnerPodAccess_1 = require("../ai-gateway/pod/OwnerPodAccess");
+const HostedPodRoute_1 = require("../ai-gateway/pod/HostedPodRoute");
+const TaskCredentialDatabase_1 = require("../tasks/TaskCredentialDatabase");
+const TaskCredentialStore_1 = require("../tasks/TaskCredentialStore");
+const PodInterfaceKeyRepository_1 = require("../../identity/drizzle/PodInterfaceKeyRepository");
+const PodInterfaceKeyStore_1 = require("../ai-gateway/pod/PodInterfaceKeyStore");
+const PodInterfaceKeyMigration_1 = require("../tasks/PodInterfaceKeyMigration");
 const AiGatewayService_1 = require("../ai-gateway/AiGatewayService");
 const PlaintextCredentialVault_1 = require("../ai-gateway/credentials/PlaintextCredentialVault");
 const AiCredentialSecretDecoder_1 = require("../ai-gateway/credentials/AiCredentialSecretDecoder");
@@ -139,10 +146,54 @@ function registerCommonServices(container) {
                 scopes: ['quota:write', 'usage:read', 'account:manage', 'network:read', 'network:write'],
             });
         }).singleton(),
-        hostedPodDataAccess: (0, awilix_1.asFunction)(({ config }) => {
-            return new HostedPodDataAccess_1.HostedPodDataAccess({
-                cssBaseUrl: resolveHostedPodCssBaseUrl(),
-                gatewayAdminProxyAuthSecret: config.gatewayAdminProxyAuthSecret,
+        legacyPodKeyMigration: (0, awilix_1.asFunction)(({ config, db, taskCredentialStore }) => {
+            const issuer = config.solidBaseUrl ?? config.publicUrl;
+            if (!taskCredentialStore || !issuer) {
+                return undefined;
+            }
+            return async () => await (0, PodInterfaceKeyMigration_1.migratePodInterfaceKeysToTaskCredentials)({
+                keys: new PodInterfaceKeyStore_1.PodInterfaceKeyStore({
+                    repository: new PodInterfaceKeyRepository_1.PodInterfaceKeyRepository(db),
+                    vault: credentialVaultForConfig(config),
+                }),
+                taskCredentials: taskCredentialStore,
+                issuer,
+            });
+        }).singleton(),
+        taskCredentialStore: (0, awilix_1.asFunction)(({ config }) => {
+            // No root key means no encrypted store: a credential that cannot be sealed is not kept.
+            const vault = config.secretCellVaultFactory?.();
+            if (!vault) {
+                return undefined;
+            }
+            const url = (0, TaskCredentialDatabase_1.resolveTaskCredentialDatabaseUrl)({
+                identityDatabaseUrl: config.databaseUrl,
+                configuredUrl: config.taskDatabaseUrl,
+            });
+            return new TaskCredentialStore_1.TaskCredentialStore({ database: (0, TaskCredentialDatabase_1.getTaskCredentialDatabase)(url), vault });
+        }).singleton(),
+        solidSessions: (0, awilix_1.asFunction)(({ config }) => {
+            return new SolidSessionFactory_1.SolidSessionFactory({
+                tokenEndpoint: config.cssTokenEndpoint,
+                publicBaseUrl: config.solidBaseUrl,
+            });
+        }).singleton(),
+        ownerPodAccess: (0, awilix_1.asFunction)(({ config, solidSessions, taskCredentialStore }) => {
+            // Background work uses the owner's task-layer grant; a request uses the credential its
+            // caller brought. Nothing is read from a deployment-held key any more.
+            const issuer = config.solidBaseUrl ?? config.publicUrl;
+            return new OwnerPodAccess_1.OwnerPodAccess({
+                sessions: solidSessions,
+                ...(taskCredentialStore && issuer
+                    ? { taskCredentials: (0, TaskCredentialStore_1.createTaskCredentialSource)({ store: taskCredentialStore, issuer }) }
+                    : {}),
+                route: (0, HostedPodRoute_1.resolveHostedPodRoute)({
+                    canonicalBaseUrl: config.solidBaseUrl,
+                    // API_HOST is the address the runtime bound its services to; XPOD_MAIN_PORT is the
+                    // Gateway's. Both are read here, while the runtime still has its environment applied.
+                    gatewayHost: process.env.API_HOST,
+                    gatewayPort: process.env.XPOD_MAIN_PORT,
+                }),
             });
         }).singleton(),
         invocationTokenCodec: (0, awilix_1.asFunction)(() => {
@@ -156,7 +207,7 @@ function registerCommonServices(container) {
             });
         }).singleton(),
         gatewayAccessKeyRepository: (0, awilix_1.asFunction)((cradle) => {
-            const { config, hostedPodDataAccess } = cradle;
+            const { config, ownerPodAccess } = cradle;
             return new PodGatewayAccessKeyRepository_1.PodGatewayAccessKeyRepository({
                 locatorCodec: new GatewayKeyLocatorCodec_1.AesGatewayKeyLocatorCodec({
                     active: {
@@ -165,7 +216,7 @@ function registerCommonServices(container) {
                     },
                     previous: config.gatewayPreviousLocatorSecrets,
                 }),
-                internalPodAccess: hostedPodDataAccess,
+                podAccess: ownerPodAccess,
                 podBaseUrlResolver: podBaseUrlResolver(cradle),
             });
         }).singleton(),
@@ -180,9 +231,8 @@ function registerCommonServices(container) {
         }).singleton(),
         providerConnectService: (0, awilix_1.asFunction)((cradle) => {
             const { config } = cradle;
-            const internalPodAccess = cradle.hostedPodDataAccess;
             const credentialRepository = new connect_1.PodConnectedCredentialRepository({
-                internalPodAccess,
+                podAccess: cradle.ownerPodAccess,
                 podBaseUrlResolver: podBaseUrlResolver(cradle),
             });
             const vault = credentialVaultForConfig(config);
@@ -253,24 +303,24 @@ function registerCommonServices(container) {
             systemProxy: config.edition === 'local' ? (0, provider_http_transport_1.discoverSystemProviderProxy)() : undefined,
         })).singleton(),
         gatewayCredentialStore: (0, awilix_1.asFunction)((cradle) => {
-            const { hostedPodDataAccess } = cradle;
+            const { ownerPodAccess } = cradle;
             return new connect_1.PodConnectedCredentialRepository({
-                internalPodAccess: hostedPodDataAccess,
+                podAccess: ownerPodAccess,
                 podBaseUrlResolver: podBaseUrlResolver(cradle),
             });
         }).singleton(),
         podModelSelectionRepository: (0, awilix_1.asFunction)((cradle) => {
-            const { hostedPodDataAccess } = cradle;
+            const { ownerPodAccess } = cradle;
             return new PodModelSelectionRepository_1.PodModelSelectionRepository({
-                internalPodAccess: hostedPodDataAccess,
+                podAccess: ownerPodAccess,
                 podBaseUrlResolver: podBaseUrlResolver(cradle),
             });
         }).singleton(),
         providerModelSelectionService: (0, awilix_1.asFunction)((cradle) => {
-            const { config, gatewayProviderRegistry, hostedPodDataAccess, podModelSelectionRepository, providerModelsService, } = cradle;
+            const { config, gatewayProviderRegistry, ownerPodAccess, podModelSelectionRepository, providerModelsService, } = cradle;
             return new ProviderModelSelectionService_1.ProviderModelSelectionService({
                 credentialRepository: new connect_1.PodConnectedCredentialRepository({
-                    internalPodAccess: hostedPodDataAccess,
+                    podAccess: ownerPodAccess,
                     podBaseUrlResolver: podBaseUrlResolver(cradle),
                 }),
                 selectionRepository: podModelSelectionRepository,
@@ -346,14 +396,14 @@ function registerCommonServices(container) {
         }).singleton(),
         providerQuotaService: (0, awilix_1.asFunction)((cradle) => {
             const { config } = cradle;
-            const internalPodAccess = cradle.hostedPodDataAccess;
+            const podAccess = cradle.ownerPodAccess;
             return new quota_1.ProviderQuotaService({
                 repository: new quota_1.PodQuotaSnapshotRepository({
-                    internalPodAccess,
+                    podAccess,
                     podBaseUrlResolver: podBaseUrlResolver(cradle),
                 }),
                 credentialRepository: new connect_1.PodConnectedCredentialRepository({
-                    internalPodAccess,
+                    podAccess,
                     podBaseUrlResolver: podBaseUrlResolver(cradle),
                 }),
                 vault: credentialVaultForConfig(config),
@@ -373,7 +423,7 @@ function registerCommonServices(container) {
         }).singleton(),
         providerModelsService: (0, awilix_1.asFunction)((cradle) => {
             const { config } = cradle;
-            const internalPodAccess = cradle.hostedPodDataAccess;
+            const podAccess = cradle.ownerPodAccess;
             const registry = cradle.gatewayProviderRegistry;
             const safeBaseUrls = (provider) => [
                 ...registry.requireProvider(provider).safeBaseUrls,
@@ -381,7 +431,7 @@ function registerCommonServices(container) {
             ];
             return new models_1.ProviderModelsService({
                 credentialRepository: new connect_1.PodConnectedCredentialRepository({
-                    internalPodAccess,
+                    podAccess,
                     podBaseUrlResolver: podBaseUrlResolver(cradle),
                 }),
                 vault: credentialVaultForConfig(config),
@@ -446,14 +496,14 @@ function registerCommonServices(container) {
         providerCustomModelsService: (0, awilix_1.asFunction)((cradle) => {
             return new models_1.ProviderCustomModelsService({
                 credentialRepository: new connect_1.PodConnectedCredentialRepository({
-                    internalPodAccess: cradle.hostedPodDataAccess,
+                    podAccess: cradle.ownerPodAccess,
                     podBaseUrlResolver: podBaseUrlResolver(cradle),
                 }),
                 embeddingModelPolicy: cradle.embeddingModelPolicy,
                 registry: cradle.gatewayProviderRegistry,
             });
         }).singleton(),
-        authenticator: (0, awilix_1.asFunction)(({ nodeRepo, serviceTokenRepo, invocationTokenCodec, gatewayAccessKeyRepository, config, }) => {
+        authenticator: (0, awilix_1.asFunction)(({ nodeRepo, serviceTokenRepo, invocationTokenCodec, gatewayAccessKeyRepository, solidSessions, config, }) => {
             const solidAuthenticator = new SolidTokenAuthenticator_1.SolidTokenAuthenticator({
                 resolveAccountId: async (webId) => webId,
                 publicBaseUrl: config.solidBaseUrl,
@@ -462,8 +512,7 @@ function registerCommonServices(container) {
                 internalBaseUrl: resolveHostedPodCssBaseUrl(),
             });
             const clientCredAuthenticator = new ClientCredentialsAuthenticator_1.ClientCredentialsAuthenticator({
-                tokenEndpoint: config.cssTokenEndpoint,
-                publicBaseUrl: config.solidBaseUrl,
+                sessions: solidSessions,
             });
             const nodeTokenAuthenticator = new NodeTokenAuthenticator_1.NodeTokenAuthenticator({
                 repository: nodeRepo,
@@ -511,9 +560,9 @@ function registerCommonServices(container) {
             });
         }).singleton(),
         // ChatKit 存储与服务
-        chatKitStore: (0, awilix_1.asFunction)(({ config, serverGroupReconcilerService }) => {
+        chatKitStore: (0, awilix_1.asFunction)(({ config, ownerPodAccess, serverGroupReconcilerService }) => {
             return new chatkit_1.PodChatKitStore({
-                tokenEndpoint: config.cssTokenEndpoint,
+                podAccess: ownerPodAccess,
                 serverGroupReconcilerService,
                 deployment: config.edition,
                 credentialSecretDecoder: (0, AiCredentialSecretDecoder_1.createAiCredentialSecretDecoder)({
@@ -545,9 +594,15 @@ function registerCommonServices(container) {
         runAuthContextRegistry: (0, awilix_1.asFunction)(() => {
             return new RunAuthContextRegistry_1.RunAuthContextRegistry();
         }).singleton(),
-        taskAuthBindingService: (0, awilix_1.asFunction)(({ chatKitStore }) => {
+        taskAuthBindingService: (0, awilix_1.asFunction)(({ chatKitStore, taskCredentialStore, config }) => {
+            const issuer = config.solidBaseUrl ?? config.publicUrl;
             return new tasks_1.TaskAuthBindingService({
                 repository: chatKitStore,
+                // Unattended runs take their credential from the task layer; the Pod-stored credential
+                // stays the fallback until every binding names a grant.
+                ...(taskCredentialStore && issuer
+                    ? { taskCredentials: (0, TaskCredentialStore_1.createTaskCredentialSource)({ store: taskCredentialStore, issuer }) }
+                    : {}),
             });
         }).singleton(),
         rdfEngine: (0, awilix_1.asFunction)(({ config }) => {

package/dist/api/container/index.d.ts

@@ -5,6 +5,7 @@
  */
 import { type AwilixContainer } from 'awilix';
 import type { ApiContainerCradle, ApiContainerConfig } from './types';
+import { DeploymentRootKeyProvider } from '../../security/secret-cell';
 export type { ApiContainerCradle, ApiContainerConfig } from './types';
 /**
  * 创建 API 容器
@@ -14,3 +15,10 @@ export declare function createApiContainer(config: ApiContainerConfig): AwilixCo
  * 从环境变量读取配置
  */
 export declare function loadConfigFromEnv(): ApiContainerConfig;
+/**
+ * The deployment's root key material, shared by every component that seals secrets at rest.
+ *
+ * Configuration is all-or-nothing: a key id without a key (or the reverse) is a deployment mistake
+ * rather than a reason to fall back to plaintext.
+ */
+export declare function loadDeploymentRootKeyProvider(env: NodeJS.ProcessEnv): DeploymentRootKeyProvider | undefined;

package/dist/api/container/index.js

@@ -30,6 +30,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createApiContainer = createApiContainer;
 exports.loadConfigFromEnv = loadConfigFromEnv;
+exports.loadDeploymentRootKeyProvider = loadDeploymentRootKeyProvider;
 const awilix_1 = require("awilix");
 const node_crypto_1 = require("node:crypto");
 const fs = __importStar(require("node:fs"));
@@ -122,8 +123,15 @@ function loadConfigFromEnv() {
     const nodeToken = process.env.XPOD_NODE_TOKEN ?? localSetupState?.nodeToken;
     const serviceToken = process.env.XPOD_SERVICE_TOKEN ?? localSetupState?.serviceToken;
     const solidBaseUrl = normalizeOptionalUrl(process.env.CSS_BASE_URL);
+    // A remembered issuer that only loopback can serve is residue: nothing in this process listens
+    // there, so adopting it would point every login (and token exchange) at a dead port. Explicit
+    // configuration still wins, including an intentional loopback one.
+    const rememberedIssuer = localSetupState?.cloudIdentityUrl;
+    if (rememberedIssuer && (0, oidc_issuer_1.isLoopbackIssuer)(rememberedIssuer)) {
+        console.warn(`[Local] Ignoring the remembered identity issuer ${rememberedIssuer}: nothing serves it on this machine`);
+    }
     const oidcIssuer = (0, oidc_issuer_1.resolveExternalOidcIssuer)(process.env)
-        ?? localSetupState?.cloudIdentityUrl
+        ?? (rememberedIssuer && !(0, oidc_issuer_1.isLoopbackIssuer)(rememberedIssuer) ? rememberedIssuer : undefined)
         ?? (edition === 'cloud'
             ? solidBaseUrl
             : undefined)
@@ -147,6 +155,7 @@ function loadConfigFromEnv() {
         }
         : undefined;
     const secretCellCredentialVaultFactory = loadSecretCellCredentialVaultFactory(process.env);
+    const deploymentRootKeys = loadDeploymentRootKeyProvider(process.env);
     const openAiGatewayBaseUrl = normalizeOptionalBaseUrl(process.env.XPOD_AI_GATEWAY_OPENAI_BASE_URL);
     const aiClientConfiguration = edition === 'local'
         ? loadAiClientConfiguration(process.env)
@@ -174,6 +183,8 @@ function loadConfigFromEnv() {
         aiGatewaySessionAffinitySecret: process.env.XPOD_AI_GATEWAY_SESSION_AFFINITY_SECRET,
         gatewayAdminProxyAuthSecret: process.env.XPOD_GATEWAY_ADMIN_PROXY_AUTH_SECRET,
         secretCellCredentialVaultFactory,
+        secretCellVaultFactory: deploymentRootKeys ? () => new secret_cell_1.SecretCellVault({ rootKeys: deploymentRootKeys }) : undefined,
+        taskDatabaseUrl: process.env.CSS_TASK_DB_URL,
         aiGatewayConnectSigningSecret: process.env.XPOD_AI_GATEWAY_CONNECT_SIGNING_SECRET,
         aiGatewayKimiOAuthIntegrationId: process.env.XPOD_AI_GATEWAY_KIMI_OAUTH_INTEGRATION_ID,
         aiGatewayKimiOAuthClientId: process.env.XPOD_AI_GATEWAY_KIMI_OAUTH_CLIENT_ID,
@@ -255,6 +266,16 @@ function nonEmptyEnv(value) {
     return trimmed || undefined;
 }
 function loadSecretCellCredentialVaultFactory(env) {
+    const rootKeys = loadDeploymentRootKeyProvider(env);
+    return rootKeys ? () => new SecretCellCredentialVault_1.SecretCellCredentialVault({ vault: new secret_cell_1.SecretCellVault({ rootKeys }) }) : undefined;
+}
+/**
+ * The deployment's root key material, shared by every component that seals secrets at rest.
+ *
+ * Configuration is all-or-nothing: a key id without a key (or the reverse) is a deployment mistake
+ * rather than a reason to fall back to plaintext.
+ */
+function loadDeploymentRootKeyProvider(env) {
     const activeKeyId = env.XPOD_SECRET_CELL_KEY_ID?.trim();
     const activeKey = env.XPOD_SECRET_CELL_KEY;
     const previousKeysJson = env.XPOD_SECRET_CELL_PREVIOUS_KEYS;
@@ -289,11 +310,7 @@ function loadSecretCellCredentialVaultFactory(env) {
             keys[keyId] = (0, secret_cell_1.parseDeploymentRootKeyConfig)(value);
         }
     }
-    return () => new SecretCellCredentialVault_1.SecretCellCredentialVault({
-        vault: new secret_cell_1.SecretCellVault({
-            rootKeys: new secret_cell_1.DeploymentRootKeyProvider({ activeKeyId, keys }),
-        }),
-    });
+    return new secret_cell_1.DeploymentRootKeyProvider({ activeKeyId, keys });
 }
 function assertSecretCellKeyId(value, variable) {
     if (!/^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/.test(value)) {

package/dist/api/container/local.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerLocalServices = registerLocalServices;
 const awilix_1 = require("awilix");
 const SubdomainClient_1 = require("../../subdomain/SubdomainClient");
+const AutoTunnelProvider_1 = require("../../tunnel/AutoTunnelProvider");
 const LocalTunnelProvider_1 = require("../../tunnel/LocalTunnelProvider");
 const NgrokTunnelProvider_1 = require("../../tunnel/NgrokTunnelProvider");
 const SakuraFrpTunnelProvider_1 = require("../../tunnel/SakuraFrpTunnelProvider");
@@ -49,40 +50,72 @@ function registerLocalServices(container) {
     const activeCredential = activeTunnel.profile?.credentialEnvKey
         ? readCredential(process.env[activeTunnel.profile.credentialEnvKey])
         : undefined;
-    if (activeTunnelProvider === 'ngrok') {
-        container.register({
-            localTunnelProvider: (0, awilix_1.asFunction)(() => {
-                return new NgrokTunnelProvider_1.NgrokTunnelProvider({
-                    authtoken: activeCredential ?? ngrokAuthToken,
-                    url: activeTunnel.profile?.publicUrl ?? ngrokUrl,
-                    ngrokPath,
-                });
-            }).singleton(),
-        });
-        console.log('[Local] Tunnel provider registered (ngrok configured)');
-    }
-    else if (activeTunnelProvider === 'cloudflare') {
+    // Every provider the operator has credentials for is a candidate; which one
+    // can reach its control plane is a property of the network, so an implicit
+    // selection is settled by readiness instead of by list order. An explicitly
+    // pinned profile or provider still starts exactly that one - including when it
+    // has no credential, because then its own failure is the answer the operator
+    // needs rather than a silently absent provider.
+    const profileFor = (provider) => (config.tunnelProfiles ?? []).find((entry) => entry.provider === provider);
+    const profileCredential = (provider) => {
+        const key = profileFor(provider)?.credentialEnvKey;
+        return key ? readCredential(process.env[key]) : undefined;
+    };
+    const credentialFor = (provider) => (activeTunnelProvider === provider ? activeCredential : undefined) ?? profileCredential(provider);
+    const candidates = [
+        {
+            id: 'ngrok',
+            provider: 'ngrok',
+            configured: Boolean(credentialFor('ngrok') ?? ngrokAuthToken ?? ngrokUrl),
+            create: () => new NgrokTunnelProvider_1.NgrokTunnelProvider({
+                authtoken: credentialFor('ngrok') ?? ngrokAuthToken,
+                url: profileFor('ngrok')?.publicUrl ?? ngrokUrl,
+                ngrokPath,
+            }),
+        },
+        {
+            id: 'cloudflare',
+            provider: 'cloudflare',
+            configured: Boolean(credentialFor('cloudflare') ?? cloudflareTunnelToken),
+            create: () => new LocalTunnelProvider_1.LocalTunnelProvider({
+                tunnelToken: (credentialFor('cloudflare') ?? cloudflareTunnelToken),
+                publicUrl: profileFor('cloudflare')?.publicUrl,
+            }),
+        },
+        {
+            id: 'sakura_frp',
+            provider: 'sakura_frp',
+            configured: Boolean(credentialFor('sakura_frp') ?? sakuraTunnelToken),
+            create: () => new SakuraFrpTunnelProvider_1.SakuraFrpTunnelProvider({
+                token: (credentialFor('sakura_frp') ?? sakuraTunnelToken),
+                publicUrl: profileFor('sakura_frp')?.publicUrl,
+                frpcPath,
+            }),
+        },
+    ];
+    const pinnedProvider = config.tunnelActiveProfileId || config.tunnelProvider || process.env.XPOD_TUNNEL_PROVIDER
+        ? activeTunnelProvider
+        : undefined;
+    const selected = pinnedProvider
+        ? candidates.filter((candidate) => candidate.provider === pinnedProvider)
+        : candidates.filter((candidate) => candidate.configured);
+    if (selected.length === 1) {
+        const [only] = selected;
         container.register({
-            localTunnelProvider: (0, awilix_1.asFunction)(() => {
-                return new LocalTunnelProvider_1.LocalTunnelProvider({
-                    tunnelToken: (activeCredential ?? cloudflareTunnelToken),
-                    publicUrl: activeTunnel.profile?.publicUrl,
-                });
-            }).singleton(),
+            localTunnelProvider: (0, awilix_1.asFunction)(only.create).singleton(),
         });
-        console.log('[Local] Tunnel provider registered (CLOUDFLARE_TUNNEL_TOKEN configured)');
+        console.log(`[Local] Tunnel provider registered (${only.id} configured)`);
     }
-    else if (activeTunnelProvider === 'sakura_frp') {
+    else if (selected.length > 1) {
         container.register({
-            localTunnelProvider: (0, awilix_1.asFunction)(() => {
-                return new SakuraFrpTunnelProvider_1.SakuraFrpTunnelProvider({
-                    token: (activeCredential ?? sakuraTunnelToken),
-                    publicUrl: activeTunnel.profile?.publicUrl,
-                    frpcPath,
-                });
-            }).singleton(),
+            localTunnelProvider: (0, awilix_1.asFunction)(() => new AutoTunnelProvider_1.AutoTunnelProvider({
+                candidates: selected.map((candidate) => ({
+                    id: candidate.id,
+                    provider: candidate.create(),
+                })),
+            })).singleton(),
         });
-        console.log('[Local] Tunnel provider registered (SAKURA_TUNNEL_TOKEN configured)');
+        console.log(`[Local] Tunnel providers registered (auto: ${selected.map((candidate) => candidate.id).join(', ')})`);
     }
     // 2. 自适应 DNS 管理 (Self-Hosted DNS)
     // 如果配置了 Cloudflare API Token 和 Base Domain，启用本地 DNS 管理

package/dist/api/container/routes.js

@@ -34,6 +34,7 @@ exports.resolveLocalStorageProviderBaseUrl = resolveLocalStorageProviderBaseUrl;
 const EdgeNodeSignalHandler_1 = require("../handlers/EdgeNodeSignalHandler");
 const ReachabilityHandler_1 = require("../handlers/ReachabilityHandler");
 const NodeAccessResolver_1 = require("../../edge/reachability/NodeAccessResolver");
+const RouteSetBuilder_1 = require("../../edge/reachability/RouteSetBuilder");
 const NodeHandler_1 = require("../handlers/NodeHandler");
 const ChatHandler_1 = require("../handlers/ChatHandler");
 const SubdomainHandler_1 = require("../handlers/SubdomainHandler");
@@ -64,6 +65,7 @@ const QuotaHandler_1 = require("../handlers/QuotaHandler");
 const UsageHandler_1 = require("../handlers/UsageHandler");
 const RdfStatsHandler_1 = require("../handlers/RdfStatsHandler");
 const AiGatewayManagementHandler_1 = require("../handlers/AiGatewayManagementHandler");
+const TaskCredentialHandler_1 = require("../handlers/TaskCredentialHandler");
 const AiClientConfigurationHandler_1 = require("../handlers/AiClientConfigurationHandler");
 const DeviceNotificationRuntime_1 = require("../handlers/DeviceNotificationRuntime");
 const AiClientConfigurationService_1 = require("../service/AiClientConfigurationService");
@@ -112,8 +114,9 @@ function registerHealthRoutes(server) {
     (0, DashboardHandler_1.registerDashboardRoutes)(server, { staticDir });
     const settingsStaticDir = path.resolve(runtime_1.PACKAGE_ROOT, 'static/settings');
     (0, SettingsHandler_1.registerSettingsRoutes)(server, { staticDir: settingsStaticDir });
-    const authCallbackStaticDir = path.resolve(runtime_1.PACKAGE_ROOT, 'static/auth-callback');
-    (0, AuthCallbackHandler_1.registerAuthCallbackRoutes)(server, { staticDir: authCallbackStaticDir });
+    // The callback entry is part of the settings build (one browser engine, one asset set), so its
+    // HTML and theme bootstrap are served from the settings directory.
+    (0, AuthCallbackHandler_1.registerAuthCallbackRoutes)(server, { staticDir: settingsStaticDir });
 }
 /**
  * 共享路由 (cloud 和 local 都有)
@@ -131,7 +134,7 @@ function registerSharedRoutes(container, server) {
     const rdfStorageStatsService = container.resolve('rdfStorageStatsService');
     const rdfEngine = container.resolve('rdfEngine', { allowUnregistered: true });
     const rdfSearchIndexingService = container.resolve('rdfSearchIndexingService', { allowUnregistered: true });
-    const hostedPodDataAccess = container.resolve('hostedPodDataAccess');
+    const ownerPodAccess = container.resolve('ownerPodAccess');
     const aiConnectionInvocationKeyIssuer = container.resolve('aiConnectionInvocationKeyIssuer');
     const gatewayAccessKeyRepository = container.resolve('gatewayAccessKeyRepository', { allowUnregistered: true });
     const providerConnectService = container.resolve('providerConnectService');
@@ -195,6 +198,7 @@ function registerSharedRoutes(container, server) {
         providerModelSelectionService,
         customModelsService: providerCustomModelsService,
         gatewayAccessKeyRepository,
+        invalidateClientCredential: (clientId) => container.resolve('solidSessions').invalidateClientCredential(clientId),
         validateClientCredential: (apiKey) => container.resolve('authenticator').authenticate({
             headers: { authorization: `Bearer ${apiKey}` },
             method: 'POST',
@@ -206,6 +210,15 @@ function registerSharedRoutes(container, server) {
     (0, AiClientConfigurationHandler_1.registerAiClientConfigurationRoutes)(server, {
         service: aiClientConfigurationService,
     });
+    (0, TaskCredentialHandler_1.registerTaskCredentialRoutes)(server, {
+        taskCredentials: container.resolve('taskCredentialStore', { allowUnregistered: true }),
+        clientCredentialIssuer: config.solidBaseUrl ?? config.publicUrl,
+        validateClientCredential: (apiKey) => container.resolve('authenticator').authenticate({
+            headers: { authorization: `Bearer ${apiKey}` },
+            method: 'POST',
+            url: '/api/ai/task-credentials',
+        }),
+    });
     const notificationOrigin = config.publicUrl ?? config.solidBaseUrl ?? process.env.CSS_BASE_URL ?? `http://${config.host === '0.0.0.0' ? '127.0.0.1' : config.host}:${config.port}`;
     (0, DeviceNotificationRuntime_1.registerDeviceNotificationRuntime)(server, {
         origin: notificationOrigin,
@@ -214,15 +227,20 @@ function registerSharedRoutes(container, server) {
     (0, PodSettingsHandler_1.registerPodSettingsRoutes)(server, {
         podLookupRepository,
         usageRepo: new UsageRepository_1.UsageRepository(container.resolve('db')),
-        aiConnectionStatusReader: new PodSettingsHandler_1.DrizzlePodAiConnectionsStatusReader(hostedPodDataAccess, config.edition),
+        aiConnectionStatusReader: new PodSettingsHandler_1.DrizzlePodAiConnectionsStatusReader(ownerPodAccess, config.edition),
     });
     const aiConfigStore = new AiConfigStore_1.DrizzlePodAiConfigStore({
-        internalPodAccess: hostedPodDataAccess,
+        podAccess: ownerPodAccess,
     });
-    const ftsRebuildAvailable = Boolean(hostedPodDataAccess && rdfEngine?.indexTextSource);
-    const vectorRebuildAvailable = Boolean(hostedPodDataAccess && rdfSearchIndexingService && chatKitStore.createTrustedContext);
+    const ftsRebuildAvailable = Boolean(ownerPodAccess && rdfEngine?.indexTextSource);
+    const vectorRebuildAvailable = Boolean(ownerPodAccess && rdfSearchIndexingService && chatKitStore.createTrustedContext);
     const rebuildFts = async (owner) => {
-        const trustedFetch = await hostedPodDataAccess.getTrustedFetch(owner.webId, undefined, { podBaseUrl: owner.podUrl });
+        // Background work uses the owner's task-layer grant: the rebuild is exactly the kind of run
+        // that happens while nobody is watching.
+        const trustedFetch = await ownerPodAccess.getPodFetch(owner.webId, {
+            podBaseUrl: owner.podUrl,
+            taskCredential: { ownerGrant: true },
+        });
         if (!trustedFetch || !rdfEngine?.indexTextSource)
             throw new Error('fts_rebuild_unavailable');
         const result = await new PodSearchIndexRebuilder_1.PodSearchIndexRebuilder({
@@ -235,7 +253,10 @@ function registerSharedRoutes(container, server) {
             throw new Error('fts_rebuild_incomplete');
     };
     const rebuildVector = async (owner) => {
-        const trustedFetch = await hostedPodDataAccess.getTrustedFetch(owner.webId, undefined, { podBaseUrl: owner.podUrl });
+        const trustedFetch = await ownerPodAccess.getPodFetch(owner.webId, {
+            podBaseUrl: owner.podUrl,
+            taskCredential: { ownerGrant: true },
+        });
         if (!trustedFetch || !rdfSearchIndexingService)
             throw new Error('vector_rebuild_unavailable');
         const context = await chatKitStore.createTrustedContext({ ...owner, fetch: trustedFetch });
@@ -523,6 +544,8 @@ function registerLocalRoutes(container, server) {
     // SP 状态查询 (供 Linx 查询 SP 配置状态)
     try {
         const config = container.resolve('config');
+        const statusTunnelProvider = (container.resolve('localTunnelProvider', { allowUnregistered: true })
+            ?? container.resolve('tunnelProvider', { allowUnregistered: true }));
         (0, ProvisionHandler_1.registerProvisionStatusRoute)(server, {
             cloudUrl: config.cloudApiEndpoint,
             nodeId: config.nodeId,
@@ -538,7 +561,35 @@ function registerLocalRoutes(container, server) {
                 ?? process.env.SAKURA_TOKEN,
             cloudBaseUrl: config.oidcIssuer || config.cloudApiEndpoint,
             provisionCode: process.env.XPOD_PROVISION_CODE ?? config.provisionCode,
+            // A configured tunnel only becomes a public route once its provider
+            // reports a proxy-ready endpoint; clients use this to decide whether a
+            // canonical request can leave the machine at all.
+            readPublicRoute: () => {
+                if (!statusTunnelProvider) {
+                    return { configured: false, available: false };
+                }
+                const status = statusTunnelProvider.getStatus();
+                const endpoint = status.endpoint ?? statusTunnelProvider.getEndpoint();
+                return {
+                    configured: true,
+                    available: Boolean(status.connected),
+                    ...(statusTunnelProvider.name ? { provider: statusTunnelProvider.name } : {}),
+                    ...(endpoint ? { endpoint } : {}),
+                };
+            },
             persistState: (0, ProvisionHandler_1.createLocalSetupProvisionStateWriter)(config.localSetupPath, config.localSetupProviderId),
+            // A client ranks access points by where it stands, so the node reports the
+            // paths it can prove: its canonical public route, plus the tunnel endpoint
+            // whenever a provider confirms one that is not simply the canonical URL.
+            readAccessRoutes: () => {
+                const status = statusTunnelProvider?.getStatus();
+                const publicUrl = process.env.XPOD_PUBLIC_URL ?? config.publicUrl ?? process.env.CSS_BASE_URL;
+                return (0, RouteSetBuilder_1.buildPublicAccessRoutes)({
+                    canonicalUrl: publicUrl,
+                    publicRouteAvailable: Boolean(status?.connected),
+                    tunnelEndpoint: status?.endpoint ?? statusTunnelProvider?.getEndpoint(),
+                });
+            },
         });
         console.log('[Local] Provision status route registered (/provision/status)');
     }

package/dist/api/container/types.d.ts

@@ -6,6 +6,10 @@
 import type { ApiServer } from '../ApiServer';
 import type { AuthMiddleware } from '../middleware/AuthMiddleware';
 import type { Authenticator } from '../auth/Authenticator';
+import type { SolidSessionFactory } from '../auth/SolidSessionFactory';
+import type { SecretCellVault } from '../../security/secret-cell';
+import type { TaskCredentialStore } from '../tasks/TaskCredentialStore';
+import type { PodInterfaceKeyMigrationResult } from '../tasks/PodInterfaceKeyMigration';
 import type { EdgeNodeRepository } from '../../identity/drizzle/EdgeNodeRepository';
 import type { ServiceTokenRepositoryPort } from '../../identity/drizzle/ServiceTokenRepository';
 import type { VercelChatService } from '../service/VercelChatService';
@@ -51,7 +55,7 @@ import type { ProviderRegistry as GatewayProviderRegistry } from '../ai-gateway/
 import type { SessionAffinityStore } from '../ai-gateway/routing/SessionAffinityStore';
 import type { AiConnectionsInvocationKeyIssuer } from '../ai-gateway/auth/AiConnectionsInvocationKeyIssuer';
 import type { InvocationTokenCodec } from '../ai-gateway/auth/InvocationTokenCodec';
-import type { InternalPodAccessTokenProvider } from '../ai-gateway/pod/HostedPodDataAccess';
+import type { OwnerPodAccess } from '../ai-gateway/pod/OwnerPodAccess';
 import type { GatewayAccessKeyRepository } from '../ai-gateway/auth/GatewayApiKeyAuthenticator';
 import type { PodModelSelectionRepository } from '../ai-gateway/models/PodModelSelectionRepository';
 import type { ProviderModelSelectionService } from '../ai-gateway/models/ProviderModelSelectionService';
@@ -78,6 +82,17 @@ export interface ApiContainerConfig {
     databaseUrl: string;
     /** RDF/SPARQL facts database connection URL. */
     sparqlEndpoint?: string;
+    /**
+     * Where the task layer keeps its own credentials. Defaults to a sibling of the identity
+     * database, so the two stores are separate files in local mode.
+     */
+    taskDatabaseUrl?: string;
+    /**
+     * Deployment root key material for secrets that must be encrypted at rest (task credentials).
+     * Absent means the deployment configured no key, and those features report themselves unconfigured
+     * instead of falling back to plaintext.
+     */
+    secretCellVaultFactory?: () => SecretCellVault;
     /** Route SPARQL reads through an installed native SPARQL provider. */
     rdfNativeSparqlEnabled?: boolean;
     /** Redis connection URL, used by embedded infrastructure such as Inngest in cloud mode. */
@@ -204,7 +219,24 @@ export interface ApiContainerCradle {
     authenticator: Authenticator;
     nodeRepo: EdgeNodeRepository;
     serviceTokenRepo: ServiceTokenRepositoryPort;
-    hostedPodDataAccess: InternalPodAccessTokenProvider;
+    /**
+     * Exchanges Solid client credentials for tokens, once per credential.
+     *
+     * Shared by inbound authentication and outbound Pod access so one credential yields one
+     * exchange and keeps the key its token is bound to.
+     */
+    solidSessions: SolidSessionFactory;
+    ownerPodAccess: OwnerPodAccess;
+    /**
+     * The task layer's credential store. Present only when the deployment has root key material:
+     * a credential that cannot be encrypted is not stored at all.
+     */
+    taskCredentialStore?: TaskCredentialStore;
+    /**
+     * Moves rows out of the API-side owner-key table into the task layer. Defined only when the task
+     * layer can store them; safe to call on every boot.
+     */
+    legacyPodKeyMigration?: () => Promise<PodInterfaceKeyMigrationResult>;
     invocationTokenCodec?: InvocationTokenCodec;
     gatewayAccessKeyRepository?: GatewayAccessKeyRepository;
     aiConnectionInvocationKeyIssuer?: AiConnectionsInvocationKeyIssuer;