@awiki/dsh-plugin 0.3.4 → 0.3.6

package/lib/types/index.js

@@ -34,7 +34,8 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     done = true;
 };
 import { Context } from '@deepseek-ai/cordis';
-import { createHash, randomUUID, timingSafeEqual } from 'node:crypto';
+import { createHash } from 'node:crypto';
+import { existsSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { isAbsolute, join } from 'node:path';
 import z from '@deepseek-ai/schemastery';
@@ -44,7 +45,7 @@ import { AWIKI_CLEAR_LOCAL_DATA_CONFIRMATION, AWIKI_LOGOUT_CONFIRMATION } from "
 import { AwikiExternalHttpAuthError, createAwikiExternalHttpAuth, externalHttpAuthError, mapProviderError as mapExternalHttpProviderError, } from "./external-http-auth.js";
 import { downloadedAttachment } from "./sdk-adapter.js";
 import { registerAwikiTools } from "./tools.js";
-import { mailInboxRequest, mailMarkReadRequest, mailReadRequest, mailSendRequest, } from "./mail.js";
+import { MAIL_ATTACHMENT_SERVICE_MAX_BYTES, MAIL_ATTACHMENT_SERVICE_MAX_COUNT, MAIL_ATTACHMENT_SERVICE_TOTAL_MAX_BYTES, mailAttachmentDownloadRequest, mailAttachmentContentType, mailAttachmentFileName, mailInboxRequest, mailMarkReadRequest, mailReadRequest, mailSendRequest, } from "./mail.js";
 import { AwikiSettingsSchema, validateAwikiSettings, } from "./settings.js";
 import { AWIKI_SETTINGS_NAMESPACE, DEFAULT_AWIKI_DOMAIN, normalizeAwikiDomain } from "./domain.js";
 import { AWIKI_SETTINGS_RPC_CHANNEL } from "./settings-rpc-contract.js";
@@ -54,7 +55,7 @@ import { AwikiImageAttachmentCache, minimumImageAttachmentCacheMaxBytes } from "
 import { AwikiSentMailStore, isLocalSentMailId } from "./sent-mail-store.js";
 import { AwikiConversationPreferenceStore, normalizeConversationPreferenceMutation, } from "./conversation-preferences.js";
 import { AwikiAgentListener, DshAwikiListenerAgentRuntime, } from "./listener.js";
-import { IdentityRealtimeSupervisor, } from "./realtime-supervisor.js";
+import { resolveAwikiProfileName, resolveAwikiStateRoot, resolveAwikiTenantStateRoot, } from "./profile-state.js";
 export { AWIKI_CLEAR_LOCAL_DATA_CONFIRMATION, AWIKI_LOGOUT_CONFIRMATION } from "./types.js";
 export { AWIKI_EXTERNAL_HTTP_MAX_BODY_BYTES, AwikiExternalHttpAuthError, } from "./external-http-auth.js";
 export { AWIKI_DOMAIN_FIELD, AWIKI_SETTINGS_NAMESPACE, AwikiSettingsSchema, DEFAULT_AWIKI_DOMAIN, normalizeAwikiDomain, validateAwikiSettings, } from "./settings.js";
@@ -75,19 +76,21 @@ export const DEFAULT_SUMMARY_MAX_INPUT_BYTES = 32 * 1024;
 export const MAX_SUMMARY_MESSAGES = 50;
 /** Loader schema for the Host deployment configuration. */
 export const Config = z.object({
-    userServiceUrl: z.string().default(DEFAULT_AWIKI_SERVICE_URL),
+    userServiceUrl: z.string(),
     userServiceDomain: z.string().default(DEFAULT_AWIKI_DOMAIN),
-    messageServiceUrl: z.string().default(DEFAULT_AWIKI_SERVICE_URL),
+    messageServiceUrl: z.string(),
     mailServiceUrl: z.string(),
-    messageServicePublicUrl: z.string().default(DEFAULT_AWIKI_SERVICE_URL),
-    messageServiceDid: z.string().default(DEFAULT_AWIKI_MESSAGE_SERVICE_DID),
+    messageServicePublicUrl: z.string(),
+    messageServiceDid: z.string(),
     allowedAttachmentOrigins: z.array(z.string()).default([]),
     allowInsecureLoopbackForTesting: z.boolean().default(false),
     stateRoot: z.string(),
     attachmentMaxBytes: z.number().default(DEFAULT_ATTACHMENT_MAX_BYTES),
+    mailAttachmentMaxCount: z.number().default(MAIL_ATTACHMENT_SERVICE_MAX_COUNT),
+    mailAttachmentMaxBytes: z.number().default(MAIL_ATTACHMENT_SERVICE_MAX_BYTES),
+    mailAttachmentTotalMaxBytes: z.number().default(MAIL_ATTACHMENT_SERVICE_TOTAL_MAX_BYTES),
     imageAttachmentCacheMaxBytes: z.number().default(DEFAULT_IMAGE_ATTACHMENT_CACHE_MAX_BYTES),
     pollIntervalMs: z.number().default(DEFAULT_POLL_INTERVAL_MS),
-    realtimeEnabled: z.boolean().default(true),
     listenerEnabled: z.boolean().default(false),
     listenerAllowedPeers: z.array(z.string()).default([]),
     listenerWorkspacePath: z.string(),
@@ -105,6 +108,7 @@ const FAILURE_CODES = new Set([
     'forbidden',
     'identity-recovery-required',
     'conflict',
+    'state-in-use',
     'rate-limited',
     'group-membership-required',
     'group-identity-stale',
@@ -118,17 +122,10 @@ const FAILURE_CODES = new Set([
     'network',
     'remote',
 ]);
-const DEVICE_JOIN_APPROVAL_CONFIRMATION = 'APPROVE';
-const DEVICE_REVOKE_CONFIRMATION = 'REVOKE';
-const DEVICE_JOIN_CHALLENGE_TTL_SECONDS = 240;
-const RESUMABLE_JOIN_PHASES = new Set([
-    'pending',
-    'challenge_prepared',
-    'response_prepared',
-    'response_verified',
-    'approval_prepared',
-    'authorized',
-]);
+const LISTENER_RESTART_BASE_DELAY_MS = 1_000;
+const LISTENER_RESTART_MAX_DELAY_MS = 30_000;
+const LISTENER_RESTART_MAX_ATTEMPT = 6;
+const LISTENER_STABLE_RESET_MS = 60_000;
 const FAILURE_MESSAGES = {
     'not-registered': 'No AWiki identity is registered for this deployment.',
     'signed-out': 'This installation is signed out of AWiki.',
@@ -141,6 +138,7 @@ const FAILURE_MESSAGES = {
     'forbidden': 'The AWiki operation is not permitted.',
     'identity-recovery-required': 'The local AWiki identity must be recovered before it can be used again.',
     'conflict': 'The AWiki operation conflicts with current state.',
+    'state-in-use': 'AWiki data is already open in another client.',
     'rate-limited': 'The AWiki service rate-limited the request.',
     'group-membership-required': 'The active AWiki identity is not a member of this group.',
     'group-identity-stale': 'The AWiki group identity binding is still recovering.',
@@ -158,67 +156,6 @@ class ProviderUnavailableError extends Error {
 }
 class SummaryProviderUnavailableError extends Error {
 }
-function candidateJoinPhase(value) {
-    if (value.remoteState === 'rejected')
-        return 'rejected';
-    if (value.remoteState === 'cancelled' || value.localPhase === 'cancelled')
-        return 'cancelled';
-    if (value.remoteState === 'expired' || value.localPhase === 'expired')
-        return 'expired';
-    if (value.localPhase === 'authorized'
-        && value.remoteState === 'consumed'
-        && value.completed
-        && value.identity !== undefined)
-        return 'authorized';
-    if (value.sas !== undefined) {
-        return value.remoteState === 'response_verified' && /^\d{6}$/u.test(value.sas)
-            ? 'sas-ready'
-            : undefined;
-    }
-    if (value.remoteState === 'challenge_sent'
-        || value.remoteState === 'response_verified'
-        || value.remoteState === 'consumed'
-        || value.localPhase !== 'pending')
-        return 'verifying';
-    return value.remoteState === 'pending' ? 'pending' : undefined;
-}
-function adminJoinPhase(value) {
-    if (value.remoteState === 'rejected')
-        return 'rejected';
-    if (value.remoteState === 'cancelled' || value.localPhase === 'cancelled')
-        return 'cancelled';
-    if (value.remoteState === 'expired' || value.localPhase === 'expired')
-        return 'expired';
-    if (value.localPhase === 'authorized' && value.remoteState === 'consumed')
-        return 'authorized';
-    if (value.sas !== undefined) {
-        return value.remoteState === 'response_verified' && /^\d{6}$/u.test(value.sas)
-            ? 'sas-ready'
-            : undefined;
-    }
-    if (value.remoteState === 'challenge_sent'
-        || value.remoteState === 'response_verified'
-        || value.remoteState === 'consumed'
-        || value.localPhase !== 'pending')
-        return 'verifying';
-    return value.remoteState === 'pending' ? 'pending' : undefined;
-}
-function requestJoinPhase(value) {
-    switch (value.state) {
-        case 'pending': return 'pending';
-        case 'challenge_sent':
-        case 'response_verified': return 'verifying';
-        case 'consumed': return 'authorized';
-        case 'cancelled': return 'cancelled';
-        case 'rejected': return 'rejected';
-        case 'expired': return 'expired';
-    }
-}
-function constantTimeSasMatches(expected, actual) {
-    if (!/^\d{6}$/u.test(expected) || !/^\d{6}$/u.test(actual))
-        return false;
-    return timingSafeEqual(Buffer.from(expected, 'ascii'), Buffer.from(actual, 'ascii'));
-}
 /** Validate and preserve one SDK service URL without accepting insecure remote HTTP. */
 function serviceUrl(field, raw, allowInsecureLoopbackForTesting) {
     let url;
@@ -249,30 +186,6 @@ function recoveryReconciliationEndpoint(target, allowInsecureLoopbackForTesting)
     }
     return new URL('/api/identity-recovery', parsed).toString();
 }
-/** Accept only the closed Model Proxy success response; no ledger identifier may cross back. */
-async function acceptsRecoveryReconciliation(response) {
-    if (!response.ok)
-        return false;
-    let value;
-    try {
-        const text = await readBoundedResponseText(response, RECOVERY_RECONCILIATION_RESPONSE_MAX_BYTES);
-        if (text === undefined)
-            return false;
-        value = JSON.parse(text);
-    }
-    catch {
-        return false;
-    }
-    if (typeof value !== 'object' || value === null || Array.isArray(value))
-        return false;
-    const result = value;
-    const keys = Object.keys(result).sort();
-    return keys.length === 2
-        && keys[0] === 'idempotent'
-        && keys[1] === 'restored'
-        && result.restored === true
-        && typeof result.idempotent === 'boolean';
-}
 /** Validate a provider domain without inferring it from an API endpoint. */
 function serviceDomain(raw, field = 'userServiceDomain') {
     return normalizeAwikiDomain(raw, field);
@@ -320,22 +233,45 @@ function listenerAllowedPeers(raw, enabled) {
     return peers;
 }
 /** Resolve and validate every deployment choice before publishing the service. */
-function resolveConfig(config) {
+function resolveConfig(ctx, config) {
     const allowInsecureLoopbackForTesting = config.allowInsecureLoopbackForTesting ?? false;
     const configuredStateRoot = config.stateRoot?.trim();
     const configuredDshHome = process.env.DSH_HOME?.trim();
     const dshHome = configuredDshHome === undefined || configuredDshHome.length === 0
         ? join(homedir(), '.dsh')
         : configuredDshHome;
+    const profileName = configuredStateRoot === undefined || configuredStateRoot.length === 0
+        ? resolveAwikiProfileName(ctx, dshHome)
+        : undefined;
     const stateRoot = configuredStateRoot === undefined || configuredStateRoot.length === 0
-        ? join(dshHome, 'awiki', 'im-core')
+        ? resolveAwikiStateRoot(ctx, dshHome)
         : configuredStateRoot;
+    const legacySharedStateDetected = profileName !== undefined
+        && existsSync(join(dshHome, 'awiki', 'im-core'));
     if (!isAbsolute(stateRoot))
         throw new TypeError('awiki: stateRoot must be an absolute path');
     const attachmentMaxBytes = config.attachmentMaxBytes ?? DEFAULT_ATTACHMENT_MAX_BYTES;
     if (!Number.isSafeInteger(attachmentMaxBytes) || attachmentMaxBytes < 1) {
         throw new TypeError('awiki: attachmentMaxBytes must be a positive safe integer');
     }
+    const mailAttachmentMaxCount = config.mailAttachmentMaxCount ?? MAIL_ATTACHMENT_SERVICE_MAX_COUNT;
+    if (!Number.isSafeInteger(mailAttachmentMaxCount)
+        || mailAttachmentMaxCount < 0
+        || mailAttachmentMaxCount > MAIL_ATTACHMENT_SERVICE_MAX_COUNT) {
+        throw new TypeError('awiki: mailAttachmentMaxCount must be an integer from 0 through 10');
+    }
+    const mailAttachmentMaxBytes = config.mailAttachmentMaxBytes ?? MAIL_ATTACHMENT_SERVICE_MAX_BYTES;
+    if (!Number.isSafeInteger(mailAttachmentMaxBytes)
+        || mailAttachmentMaxBytes < 1
+        || mailAttachmentMaxBytes > MAIL_ATTACHMENT_SERVICE_MAX_BYTES) {
+        throw new TypeError('awiki: mailAttachmentMaxBytes must be a positive safe integer no greater than 10 MiB');
+    }
+    const mailAttachmentTotalMaxBytes = config.mailAttachmentTotalMaxBytes ?? MAIL_ATTACHMENT_SERVICE_TOTAL_MAX_BYTES;
+    if (!Number.isSafeInteger(mailAttachmentTotalMaxBytes)
+        || mailAttachmentTotalMaxBytes < mailAttachmentMaxBytes
+        || mailAttachmentTotalMaxBytes > MAIL_ATTACHMENT_SERVICE_TOTAL_MAX_BYTES) {
+        throw new TypeError('awiki: mailAttachmentTotalMaxBytes must cover one attachment and not exceed 18 MiB');
+    }
     const imageAttachmentCacheMaxBytes = config.imageAttachmentCacheMaxBytes ?? DEFAULT_IMAGE_ATTACHMENT_CACHE_MAX_BYTES;
     if (!Number.isSafeInteger(imageAttachmentCacheMaxBytes)
         || imageAttachmentCacheMaxBytes < minimumImageAttachmentCacheMaxBytes(attachmentMaxBytes)) {
@@ -346,10 +282,6 @@ function resolveConfig(config) {
         throw new TypeError('awiki: pollIntervalMs must be a safe integer from 1000 through 60000');
     }
     const listenerEnabled = config.listenerEnabled ?? false;
-    const realtimeEnabled = config.realtimeEnabled ?? true;
-    if (listenerEnabled && !realtimeEnabled) {
-        throw new TypeError('awiki: listenerEnabled requires realtimeEnabled');
-    }
     const listenerWorkspacePath = config.listenerWorkspacePath?.trim() || join(dshHome, 'workspaces', 'awiki');
     if (!isAbsolute(listenerWorkspacePath)) {
         throw new TypeError('awiki: listenerWorkspacePath must be an absolute path');
@@ -364,6 +296,7 @@ function resolveConfig(config) {
     const mailServiceUrl = serviceUrl('mailServiceUrl', config.mailServiceUrl ?? userServiceUrl, allowInsecureLoopbackForTesting);
     const messageServicePublicUrl = serviceUrl('messageServicePublicUrl', config.messageServicePublicUrl ?? DEFAULT_AWIKI_SERVICE_URL, allowInsecureLoopbackForTesting);
     return {
+        tenantDomain: serviceDomain(config.userServiceDomain ?? DEFAULT_AWIKI_DOMAIN),
         userServiceUrl,
         userServiceDomain: serviceDomain(config.userServiceDomain ?? DEFAULT_AWIKI_DOMAIN),
         messageServiceUrl,
@@ -374,9 +307,12 @@ function resolveConfig(config) {
         allowInsecureLoopbackForTesting,
         stateRoot,
         attachmentMaxBytes,
+        mailAttachmentMaxCount,
+        mailAttachmentMaxBytes,
+        mailAttachmentTotalMaxBytes,
         imageAttachmentCacheMaxBytes,
         pollIntervalMs,
-        realtimeEnabled,
+        ...profileName === undefined ? {} : { profileName, legacySharedStateDetected },
         listenerEnabled,
         listener: {
             allowedPeers,
@@ -384,6 +320,42 @@ function resolveConfig(config) {
             stateRoot,
         },
         summaryMaxInputBytes,
+        deriveUserServiceUrl: config.userServiceUrl === undefined,
+        deriveMessageServiceUrl: config.messageServiceUrl === undefined,
+        deriveMailServiceUrl: config.mailServiceUrl === undefined,
+        deriveMessageServicePublicUrl: config.messageServicePublicUrl === undefined,
+        deriveMessageServiceDid: config.messageServiceDid === undefined,
+        deriveAllowedAttachmentOrigins: config.allowedAttachmentOrigins === undefined
+            || config.allowedAttachmentOrigins.length === 0,
+    };
+}
+/** Resolve every tenant-sensitive endpoint and state path from one selected domain. */
+function activeTenantConfig(config, domain) {
+    const tenantOrigin = `https://${domain}`;
+    const userServiceUrl = config.deriveUserServiceUrl ? tenantOrigin : config.userServiceUrl;
+    const messageServiceUrl = config.deriveMessageServiceUrl ? tenantOrigin : config.messageServiceUrl;
+    const mailServiceUrl = config.deriveMailServiceUrl ? userServiceUrl : config.mailServiceUrl;
+    const messageServicePublicUrl = config.deriveMessageServicePublicUrl
+        ? tenantOrigin
+        : config.messageServicePublicUrl;
+    const messageServiceDid = config.deriveMessageServiceDid
+        ? `did:wba:${domain}`
+        : config.messageServiceDid;
+    const allowedAttachmentOrigins = config.deriveAllowedAttachmentOrigins
+        ? attachmentOrigins(undefined, messageServicePublicUrl, config.allowInsecureLoopbackForTesting)
+        : config.allowedAttachmentOrigins;
+    return {
+        domain,
+        userServiceUrl,
+        userServiceDomain: domain,
+        messageServiceUrl,
+        mailServiceUrl,
+        messageServicePublicUrl,
+        messageServiceDid,
+        allowedAttachmentOrigins,
+        attachmentMaxBytes: config.attachmentMaxBytes,
+        allowInsecureLoopbackForTesting: config.allowInsecureLoopbackForTesting,
+        stateRoot: resolveAwikiTenantStateRoot(config.stateRoot, domain, config.userServiceDomain),
     };
 }
 /** Return a public, fixed-message failure without retaining a thrown value. */
@@ -537,8 +509,6 @@ function normalizeRecoveryPrepareRequest(request) {
     return { ...operation, phone, otp };
 }
 const IDENTITY_ACCESS_RESPONSE_MAX_BYTES = 64 * 1024;
-const SERVER_INFO_RESPONSE_MAX_BYTES = 64 * 1024;
-const RECOVERY_RECONCILIATION_RESPONSE_MAX_BYTES = 4 * 1024;
 /** Read one untrusted discovery response without buffering beyond the fixed Host limit. */
 async function readBoundedResponseText(response, maxBytes) {
     const declaredLength = response.headers.get('content-length');
@@ -767,14 +737,6 @@ let AwikiService = (() => {
     let _inspectIdentityAccess_decorators;
     let _sendRegistrationOtp_decorators;
     let _registerIdentity_decorators;
-    let _beginDeviceJoin_decorators;
-    let _getDeviceJoinStatus_decorators;
-    let _cancelDeviceJoin_decorators;
-    let _refreshDeviceManagement_decorators;
-    let _startDeviceJoinVerification_decorators;
-    let _approveDeviceJoin_decorators;
-    let _rejectDeviceJoin_decorators;
-    let _revokeDevice_decorators;
     let _updateDisplayName_decorators;
     let _getProfile_decorators;
     let _updateProfile_decorators;
@@ -808,6 +770,7 @@ let AwikiService = (() => {
     let _readMail_decorators;
     let _markMailRead_decorators;
     let _sendMail_decorators;
+    let _downloadMailAttachment_decorators;
     let _clearLocalData_decorators;
     return class AwikiService extends _classSuper {
         static {
@@ -820,14 +783,6 @@ let AwikiService = (() => {
             _inspectIdentityAccess_decorators = [Remote];
             _sendRegistrationOtp_decorators = [Remote];
             _registerIdentity_decorators = [Remote];
-            _beginDeviceJoin_decorators = [Remote];
-            _getDeviceJoinStatus_decorators = [Remote];
-            _cancelDeviceJoin_decorators = [Remote];
-            _refreshDeviceManagement_decorators = [Remote];
-            _startDeviceJoinVerification_decorators = [Remote];
-            _approveDeviceJoin_decorators = [Remote];
-            _rejectDeviceJoin_decorators = [Remote];
-            _revokeDevice_decorators = [Remote];
             _updateDisplayName_decorators = [Remote];
             _getProfile_decorators = [Remote];
             _updateProfile_decorators = [Remote];
@@ -861,6 +816,7 @@ let AwikiService = (() => {
             _readMail_decorators = [Remote];
             _markMailRead_decorators = [Remote];
             _sendMail_decorators = [Remote];
+            _downloadMailAttachment_decorators = [Remote];
             _clearLocalData_decorators = [Remote];
             __esDecorate(this, null, _getConfig_decorators, { kind: "method", name: "getConfig", static: false, private: false, access: { has: obj => "getConfig" in obj, get: obj => obj.getConfig }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getIdentity_decorators, { kind: "method", name: "getIdentity", static: false, private: false, access: { has: obj => "getIdentity" in obj, get: obj => obj.getIdentity }, metadata: _metadata }, null, _instanceExtraInitializers);
@@ -870,14 +826,6 @@ let AwikiService = (() => {
             __esDecorate(this, null, _inspectIdentityAccess_decorators, { kind: "method", name: "inspectIdentityAccess", static: false, private: false, access: { has: obj => "inspectIdentityAccess" in obj, get: obj => obj.inspectIdentityAccess }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _sendRegistrationOtp_decorators, { kind: "method", name: "sendRegistrationOtp", static: false, private: false, access: { has: obj => "sendRegistrationOtp" in obj, get: obj => obj.sendRegistrationOtp }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _registerIdentity_decorators, { kind: "method", name: "registerIdentity", static: false, private: false, access: { has: obj => "registerIdentity" in obj, get: obj => obj.registerIdentity }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(this, null, _beginDeviceJoin_decorators, { kind: "method", name: "beginDeviceJoin", static: false, private: false, access: { has: obj => "beginDeviceJoin" in obj, get: obj => obj.beginDeviceJoin }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(this, null, _getDeviceJoinStatus_decorators, { kind: "method", name: "getDeviceJoinStatus", static: false, private: false, access: { has: obj => "getDeviceJoinStatus" in obj, get: obj => obj.getDeviceJoinStatus }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(this, null, _cancelDeviceJoin_decorators, { kind: "method", name: "cancelDeviceJoin", static: false, private: false, access: { has: obj => "cancelDeviceJoin" in obj, get: obj => obj.cancelDeviceJoin }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(this, null, _refreshDeviceManagement_decorators, { kind: "method", name: "refreshDeviceManagement", static: false, private: false, access: { has: obj => "refreshDeviceManagement" in obj, get: obj => obj.refreshDeviceManagement }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(this, null, _startDeviceJoinVerification_decorators, { kind: "method", name: "startDeviceJoinVerification", static: false, private: false, access: { has: obj => "startDeviceJoinVerification" in obj, get: obj => obj.startDeviceJoinVerification }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(this, null, _approveDeviceJoin_decorators, { kind: "method", name: "approveDeviceJoin", static: false, private: false, access: { has: obj => "approveDeviceJoin" in obj, get: obj => obj.approveDeviceJoin }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(this, null, _rejectDeviceJoin_decorators, { kind: "method", name: "rejectDeviceJoin", static: false, private: false, access: { has: obj => "rejectDeviceJoin" in obj, get: obj => obj.rejectDeviceJoin }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(this, null, _revokeDevice_decorators, { kind: "method", name: "revokeDevice", static: false, private: false, access: { has: obj => "revokeDevice" in obj, get: obj => obj.revokeDevice }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _updateDisplayName_decorators, { kind: "method", name: "updateDisplayName", static: false, private: false, access: { has: obj => "updateDisplayName" in obj, get: obj => obj.updateDisplayName }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getProfile_decorators, { kind: "method", name: "getProfile", static: false, private: false, access: { has: obj => "getProfile" in obj, get: obj => obj.getProfile }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _updateProfile_decorators, { kind: "method", name: "updateProfile", static: false, private: false, access: { has: obj => "updateProfile" in obj, get: obj => obj.updateProfile }, metadata: _metadata }, null, _instanceExtraInitializers);
@@ -911,16 +859,15 @@ let AwikiService = (() => {
             __esDecorate(this, null, _readMail_decorators, { kind: "method", name: "readMail", static: false, private: false, access: { has: obj => "readMail" in obj, get: obj => obj.readMail }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _markMailRead_decorators, { kind: "method", name: "markMailRead", static: false, private: false, access: { has: obj => "markMailRead" in obj, get: obj => obj.markMailRead }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _sendMail_decorators, { kind: "method", name: "sendMail", static: false, private: false, access: { has: obj => "sendMail" in obj, get: obj => obj.sendMail }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _downloadMailAttachment_decorators, { kind: "method", name: "downloadMailAttachment", static: false, private: false, access: { has: obj => "downloadMailAttachment" in obj, get: obj => obj.downloadMailAttachment }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _clearLocalData_decorators, { kind: "method", name: "clearLocalData", static: false, private: false, access: { has: obj => "clearLocalData" in obj, get: obj => obj.clearLocalData }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
-        static inject = ['tools'];
+        static inject = ['tools', 'settings'];
         static Config = Config;
         resolved = __runInitializers(this, _instanceExtraInitializers);
-        sessionStore;
-        imageAttachmentCache;
-        sentMailStore;
-        conversationPreferenceStore;
+        tenantConfigCache;
+        tenantStateCache;
         startupUserServiceDomain;
         settingsProvider;
         provider;
@@ -928,12 +875,6 @@ let AwikiService = (() => {
         sessionMutation = Promise.resolve();
         sessionRevision = 0;
         activeIdentityDid;
-        pendingDeviceJoin;
-        activeDeviceJoinSessionId;
-        requestRefs = new Map();
-        requestSessions = new Map();
-        deviceRefs = new Map();
-        deviceIds = new Map();
         activeSummaryRequests = new Set();
         summaryProvider;
         recoveryReconciliationTarget;
@@ -948,29 +889,23 @@ let AwikiService = (() => {
         constructor(ctx, config) {
             super(ctx, 'awiki');
             this.hostContext = ctx;
-            this.resolved = resolveConfig(config);
+            this.resolved = resolveConfig(ctx, config);
             this.externalHttpAuth = createAwikiExternalHttpAuth(() => this.acquireExternalHttpAuthSession());
-            this.sessionStore = new AwikiSessionStore(this.resolved.stateRoot);
-            this.imageAttachmentCache = new AwikiImageAttachmentCache(this.resolved.stateRoot, this.resolved.attachmentMaxBytes, this.resolved.imageAttachmentCacheMaxBytes);
-            this.sentMailStore = new AwikiSentMailStore(this.resolved.stateRoot);
-            this.conversationPreferenceStore = new AwikiConversationPreferenceStore(this.resolved.stateRoot);
             this.startupUserServiceDomain = this.resolved.userServiceDomain;
-            ctx.inject(['settings'], (settingsCtx) => {
-                const provider = settingsCtx.settings;
-                const settingsScope = settingsCtx.settings.register(settingsNamespace(AWIKI_SETTINGS_NAMESPACE), AwikiSettingsSchema, {
-                    base: { domain: this.resolved.userServiceDomain },
-                    applies: 'restart',
-                    validate: validateAwikiSettings,
-                });
-                this.settingsProvider = provider;
-                this.startupUserServiceDomain = settingsScope.get().domain;
-                settingsCtx.effect(() => () => {
-                    if (this.settingsProvider === provider) {
-                        this.settingsProvider = undefined;
-                        this.startupUserServiceDomain = this.resolved.userServiceDomain;
-                    }
-                }, 'awiki: release settings namespace');
+            const provider = ctx.settings;
+            const settingsScope = provider.register(settingsNamespace(AWIKI_SETTINGS_NAMESPACE), AwikiSettingsSchema, {
+                base: { domain: this.resolved.userServiceDomain },
+                applies: 'restart',
+                validate: validateAwikiSettings,
             });
+            this.settingsProvider = provider;
+            this.startupUserServiceDomain = settingsScope.get().domain;
+            ctx.effect(() => () => {
+                if (this.settingsProvider === provider) {
+                    this.settingsProvider = undefined;
+                    this.startupUserServiceDomain = this.resolved.userServiceDomain;
+                }
+            }, 'awiki: release settings namespace');
             ctx.inject(['connection'], (connectionCtx) => {
                 connectionCtx.connection.rpc.handle(AWIKI_SETTINGS_RPC_CHANNEL, createAwikiSettingsRpcHandler(() => this.settingsProvider), { authority: 'loopback' });
             });
@@ -978,14 +913,14 @@ let AwikiService = (() => {
                 this.workspaceContext = workspaceCtx;
                 const provider = this.provider;
                 if (provider !== undefined)
-                    this.ensureAgentConsumer(provider);
+                    void this.startListener(provider);
                 workspaceCtx.effect(() => async () => {
                     if (this.workspaceContext !== workspaceCtx)
                         return;
                     this.workspaceContext = undefined;
                     const current = this.provider;
                     if (current !== undefined)
-                        await this.stopAgentConsumer(current);
+                        await this.stopListener(current);
                 }, 'awiki: release Workspace listener composition');
             });
             registerAwikiTools(ctx, this);
@@ -1008,45 +943,17 @@ let AwikiService = (() => {
         registerClientFactory(factory) {
             if (this.provider !== undefined)
                 throw new Error('awiki: a client provider is already registered');
-            this.pendingDeviceJoin = undefined;
-            this.activeDeviceJoinSessionId = undefined;
-            const client = factory({
-                userServiceUrl: this.resolved.userServiceUrl,
-                userServiceDomain: this.startupUserServiceDomain,
-                messageServiceUrl: this.resolved.messageServiceUrl,
-                mailServiceUrl: this.resolved.mailServiceUrl,
-                messageServicePublicUrl: this.resolved.messageServicePublicUrl,
-                messageServiceDid: this.resolved.messageServiceDid,
-                allowedAttachmentOrigins: this.resolved.allowedAttachmentOrigins,
-                attachmentMaxBytes: this.resolved.attachmentMaxBytes,
-                allowInsecureLoopbackForTesting: this.resolved.allowInsecureLoopbackForTesting,
-                stateRoot: this.resolved.stateRoot,
-            });
+            const client = factory(this.activeTenant());
             const provider = {
                 client,
-                realtimeGeneration: 0,
-                agentConsumerGeneration: 0,
-                localDeviceJoinRequestCountAfterSync: 0,
+                listenerRestartAttempt: 0,
+                listenerGeneration: 0,
+                listenerRecoveryBlocked: false,
             };
             this.provider = provider;
-            this.ensureRealtimeSupervisor(provider);
-            this.ensureAgentConsumer(provider);
+            void this.startListener(provider);
             return () => this.disposeProvider(provider);
         }
-        /** Safe same-process diagnostics for focused E2E. Never exposed through Typert Remote. */
-        getRealtimeDiagnostics() {
-            const provider = this.provider;
-            const realtime = provider?.realtimeSupervisor?.diagnostics() ?? {
-                connected: false,
-                activeSessionCount: 0,
-                startCount: 0,
-                stopCount: 0,
-            };
-            return {
-                ...realtime,
-                localDeviceJoinRequestCountAfterSync: provider?.localDeviceJoinRequestCountAfterSync ?? 0,
-            };
-        }
         /** Register the optional Model Proxy recovery target without exposing an arbitrary callback or token. */
         registerRecoveryReconciliationTarget(target) {
             if (this.recoveryReconciliationTarget !== undefined) {
@@ -1084,43 +991,58 @@ let AwikiService = (() => {
          * Read settings needed by the browser presentation.
          * @returns Browser-safe polling configuration without SDK endpoints or state paths.
          */
-        async getConfig() {
-            let handleRecoveryPhoneEnabled = false;
-            const abort = new AbortController();
-            const timeout = setTimeout(() => { abort.abort(); }, 10_000);
-            try {
-                const response = await fetch(new URL('/user-service/v1/server-info', this.resolved.userServiceUrl), {
-                    method: 'GET',
-                    headers: { accept: 'application/json', 'cache-control': 'no-store' },
-                    cache: 'no-store',
-                    redirect: 'error',
-                    signal: abort.signal,
-                });
-                if (response.ok) {
-                    const text = await readBoundedResponseText(response, SERVER_INFO_RESPONSE_MAX_BYTES);
-                    const value = text === undefined ? undefined : JSON.parse(text);
-                    if (typeof value === 'object' && value !== null && value.schema_version === 1) {
-                        const methods = value.identity?.handle_recovery?.methods;
-                        handleRecoveryPhoneEnabled = Array.isArray(methods) && methods.some((method) => (typeof method === 'object' && method !== null
-                            && method.id === 'phone'
-                            && method.enabled === true
-                            && method.verification?.required === true
-                            && method.verification?.type === 'sms_otp'));
-                    }
-                }
-            }
-            catch { }
-            finally {
-                clearTimeout(timeout);
-            }
-            return {
+        getConfig() {
+            return Promise.resolve({
                 ok: true,
                 value: {
+                    tenantDomain: this.activeTenant().domain,
                     pollIntervalMs: this.resolved.pollIntervalMs,
                     attachmentMaxBytes: this.resolved.attachmentMaxBytes,
-                    handleRecoveryPhoneEnabled,
+                    mailAttachmentMaxCount: this.resolved.mailAttachmentMaxCount,
+                    mailAttachmentMaxBytes: this.resolved.mailAttachmentMaxBytes,
+                    mailAttachmentTotalMaxBytes: this.resolved.mailAttachmentTotalMaxBytes,
+                    ...this.resolved.profileName === undefined ? {} : {
+                        profileName: this.resolved.profileName,
+                        legacySharedStateDetected: this.resolved.legacySharedStateDetected,
+                    },
                 },
-            };
+            });
+        }
+        activeTenant() {
+            const cached = this.tenantConfigCache;
+            if (cached !== undefined)
+                return cached;
+            const value = Object.freeze(activeTenantConfig(this.resolved, this.startupUserServiceDomain));
+            this.tenantConfigCache = value;
+            return value;
+        }
+        activeTenantState() {
+            const cached = this.tenantStateCache;
+            if (cached !== undefined)
+                return cached;
+            const tenant = this.activeTenant();
+            const value = Object.freeze({
+                domain: tenant.domain,
+                stateRoot: tenant.stateRoot,
+                sessionStore: new AwikiSessionStore(tenant.stateRoot),
+                imageAttachmentCache: new AwikiImageAttachmentCache(tenant.stateRoot, this.resolved.attachmentMaxBytes, this.resolved.imageAttachmentCacheMaxBytes),
+                sentMailStore: new AwikiSentMailStore(tenant.stateRoot),
+                conversationPreferenceStore: new AwikiConversationPreferenceStore(tenant.stateRoot),
+            });
+            this.tenantStateCache = value;
+            return value;
+        }
+        get sessionStore() {
+            return this.activeTenantState().sessionStore;
+        }
+        get imageAttachmentCache() {
+            return this.activeTenantState().imageAttachmentCache;
+        }
+        get sentMailStore() {
+            return this.activeTenantState().sentMailStore;
+        }
+        get conversationPreferenceStore() {
+            return this.activeTenantState().conversationPreferenceStore;
         }
         /**
          * Read the deployment's identity status.
@@ -1142,9 +1064,6 @@ let AwikiService = (() => {
             if (!identity.ok)
                 return identity;
             this.activeIdentityDid = identity.value?.did;
-            const provider = this.provider;
-            if (identity.value !== null && provider !== undefined)
-                this.ensureProviderRuntime(provider);
             return identity.value === null
                 ? { ok: true, value: { status: 'unregistered' } }
                 : { ok: true, value: { status: 'active', identity: identity.value } };
@@ -1171,7 +1090,7 @@ let AwikiService = (() => {
                     this.publishSession(session);
                     const provider = this.provider;
                     if (provider !== undefined)
-                        await this.stopProviderRuntime(provider);
+                        await this.stopListener(provider);
                     return { ok: true, value: session };
                 }
                 catch {
@@ -1196,7 +1115,7 @@ let AwikiService = (() => {
                     this.publishSession(session);
                     const provider = this.provider;
                     if (provider !== undefined)
-                        this.ensureProviderRuntime(provider);
+                        void this.startListener(provider);
                     return { ok: true, value: session };
                 }
                 catch {
@@ -1209,7 +1128,7 @@ let AwikiService = (() => {
             const target = identityAccessTarget(request, this.startupUserServiceDomain);
             if (target === undefined)
                 return { ok: false, error: failure('invalid-request') };
-            const endpoint = new URL(`/.well-known/handle/${encodeURIComponent(target.localPart)}`, this.resolved.userServiceUrl);
+            const endpoint = new URL(`/.well-known/handle/${encodeURIComponent(target.localPart)}`, this.activeTenant().userServiceUrl);
             const abort = new AbortController();
             const timeout = setTimeout(() => { abort.abort(); }, 10_000);
             let response;
@@ -1254,14 +1173,8 @@ let AwikiService = (() => {
                 return { ok: false, error: failure('remote') };
             }
         }
-        async sendRegistrationOtp(request) {
-            this.pendingDeviceJoin = undefined;
-            return this.run(async (client) => {
-                if (await this.selectDeviceJoinSession(client) !== null) {
-                    throw Object.assign(new Error('join already exists'), { name: 'AwikiSdkError', code: 'conflict' });
-                }
-                return client.sendRegistrationOtp(request);
-            });
+        sendRegistrationOtp(request) {
+            return this.run(client => client.sendRegistrationOtp(request));
         }
         /**
          * Register and persist the deployment's only AWiki identity.
@@ -1269,177 +1182,10 @@ let AwikiService = (() => {
          * @returns The new public identity or a closed failure.
          */
         async registerIdentity(request) {
-            this.pendingDeviceJoin = undefined;
-            const result = await this.run(async (client) => {
-                if (await this.selectDeviceJoinSession(client) !== null) {
-                    throw Object.assign(new Error('join already exists'), { name: 'AwikiSdkError', code: 'conflict' });
-                }
-                return client.registerIdentity(request);
-            });
-            if (!result.ok)
-                return result;
-            if (result.value.status === 'registered') {
-                await this.activateRegisteredIdentity(result.value.identity);
-                return { ok: true, value: { status: 'registered', identity: result.value.identity } };
-            }
-            this.pendingDeviceJoin = {
-                continuationId: result.value.continuationId,
-                fullHandle: result.value.fullHandle,
-                mode: result.value.mode,
-                requiresUserPresence: result.value.requiresUserPresence,
-            };
-            return {
-                ok: true,
-                value: {
-                    status: 'join-required',
-                    fullHandle: result.value.fullHandle,
-                    mode: result.value.mode,
-                    requiresUserPresence: result.value.requiresUserPresence,
-                },
-            };
-        }
-        /** Consume the exact in-memory continuation; ordinary Join never claims rebind user presence. */
-        async beginDeviceJoin() {
-            const continuation = this.pendingDeviceJoin;
-            if (continuation === undefined)
-                return { ok: false, error: failure('conflict') };
-            if (continuation.mode !== 'ordinary' || continuation.requiresUserPresence) {
-                return { ok: false, error: failure('forbidden') };
-            }
-            this.pendingDeviceJoin = undefined;
-            const result = await this.run(client => client.beginDeviceJoin({
-                continuationId: continuation.continuationId,
-                operationId: `dsh-device-join-${randomUUID()}`,
-                userPresenceConfirmed: false,
-            }));
-            if (!result.ok)
-                return result;
-            this.activeDeviceJoinSessionId = result.value.joinSessionId;
-            return this.applyCandidateJoinProgress(result.value);
-        }
-        /** Restore from Core local_sessions and advance only the exact resumable Join. */
-        async getDeviceJoinStatus() {
-            const result = await this.run(async (client) => {
-                const joinSessionId = await this.selectDeviceJoinSession(client);
-                return joinSessionId === null ? null : client.getDeviceJoinStatus(joinSessionId);
-            });
-            if (!result.ok)
-                return result;
-            if (result.value === null)
-                return { ok: true, value: null };
-            this.activeDeviceJoinSessionId = result.value.joinSessionId;
-            return this.applyCandidateJoinProgress(result.value);
-        }
-        async cancelDeviceJoin() {
-            const result = await this.run(async (client) => {
-                const joinSessionId = await this.selectDeviceJoinSession(client);
-                if (joinSessionId === null)
-                    return null;
-                return client.cancelDeviceJoin(joinSessionId);
-            });
-            if (!result.ok)
-                return result;
-            this.pendingDeviceJoin = undefined;
-            this.activeDeviceJoinSessionId = undefined;
-            return { ok: true, value: { completed: true } };
-        }
-        /** Reliable-sync and project only Host-opaque device/request references. */
-        refreshDeviceManagement() {
-            return this.run(client => this.deviceManagementSnapshot(client));
-        }
-        async startDeviceJoinVerification(request) {
-            const joinSessionId = this.requestSessions.get(request?.requestRef);
-            if (joinSessionId === undefined)
-                return { ok: false, error: failure('invalid-request') };
-            const result = await this.run(async (client) => {
-                await this.requireDeviceManager(client);
-                await client.syncDeviceManagement();
-                let notice = (await client.listLocalDeviceJoinRequests())
-                    .find(value => value.joinSessionId === joinSessionId);
-                if (notice === undefined) {
-                    throw Object.assign(new Error('request not found'), { name: 'AwikiSdkError', code: 'not-found' });
-                }
-                const localProgress = await this.localAdminJoinProgress(client, notice);
-                if (localProgress !== undefined)
-                    return localProgress;
-                if (!notice.canStartVerification) {
-                    throw Object.assign(new Error('request unavailable'), { name: 'AwikiSdkError', code: 'forbidden' });
-                }
-                const operationId = `dsh-device-verify-${createHash('sha256').update(joinSessionId).digest('hex').slice(0, 32)}`;
-                let started;
-                try {
-                    started = await client.startDeviceJoinVerification({
-                        joinSessionId,
-                        operationId,
-                        challengeTtlSeconds: DEVICE_JOIN_CHALLENGE_TTL_SECONDS,
-                    });
-                }
-                catch (error) {
-                    await client.syncDeviceManagement();
-                    notice = (await client.listLocalDeviceJoinRequests())
-                        .find(value => value.joinSessionId === joinSessionId);
-                    const recovered = notice === undefined ? undefined : await this.localAdminJoinProgress(client, notice);
-                    if (recovered !== undefined)
-                        return recovered;
-                    throw error;
-                }
-                await client.syncDeviceManagement();
-                notice = (await client.listLocalDeviceJoinRequests())
-                    .find(value => value.joinSessionId === joinSessionId);
-                if (notice === undefined)
-                    return started;
-                return (await this.localAdminJoinProgress(client, notice)) ?? started;
-            });
-            return result.ok ? this.publicAdminJoinProgress(request.requestRef, result.value) : result;
-        }
-        async approveDeviceJoin(request) {
-            if (request?.confirmation !== DEVICE_JOIN_APPROVAL_CONFIRMATION) {
-                return { ok: false, error: failure('invalid-request') };
-            }
-            const joinSessionId = this.requestSessions.get(request.requestRef);
-            if (joinSessionId === undefined || !/^\d{6}$/u.test(request.enteredSas)) {
-                return { ok: false, error: failure('invalid-request') };
-            }
-            const result = await this.run(async (client) => {
-                await this.requireDeviceManager(client);
-                const progress = await client.getLocalDeviceJoinVerificationProgress(joinSessionId);
-                if (progress.sas === undefined || !constantTimeSasMatches(progress.sas, request.enteredSas)) {
-                    throw Object.assign(new Error('sas mismatch'), { name: 'AwikiSdkError', code: 'forbidden' });
-                }
-                const prompt = await client.prepareDeviceJoinApproval(joinSessionId);
-                return client.confirmDeviceJoinApproval(prompt.approvalHandle);
-            });
-            return result.ok ? this.publicAdminJoinProgress(request.requestRef, result.value) : result;
-        }
-        async rejectDeviceJoin(request) {
-            const joinSessionId = this.requestSessions.get(request?.requestRef);
-            if (joinSessionId === undefined
-                || (request.reason !== 'user_rejected' && request.reason !== 'sas_mismatch')) {
-                return { ok: false, error: failure('invalid-request') };
-            }
-            const result = await this.run(async (client) => {
-                await this.requireDeviceManager(client);
-                return client.rejectDeviceJoin(joinSessionId, request.reason);
-            });
-            return result.ok ? this.publicAdminJoinProgress(request.requestRef, result.value) : result;
-        }
-        async revokeDevice(request) {
-            if (request?.confirmation !== DEVICE_REVOKE_CONFIRMATION) {
-                return { ok: false, error: failure('invalid-request') };
-            }
-            const deviceId = this.deviceIds.get(request.deviceRef);
-            if (deviceId === undefined)
-                return { ok: false, error: failure('invalid-request') };
-            return this.run(async (client) => {
-                await this.requireDeviceManager(client);
-                const devices = await client.getDeviceRegistry();
-                const target = devices.find(device => device.deviceId === deviceId);
-                if (target === undefined || target.isCurrent) {
-                    throw Object.assign(new Error('device unavailable'), { name: 'AwikiSdkError', code: 'forbidden' });
-                }
-                await client.revokeDevice(deviceId);
-                return this.deviceManagementSnapshot(client);
-            });
+            const result = await this.run(client => client.registerIdentity(request));
+            if (result.ok)
+                await this.activateRegisteredIdentity(result.value);
+            return result;
         }
         /**
          * Update the deployment identity's public WNS display name.
@@ -1465,16 +1211,10 @@ let AwikiService = (() => {
         }
         /** Start durable phone recovery for one existing full Handle. */
         sendRecoveryOtp(request) {
-            this.pendingDeviceJoin = undefined;
             const normalized = normalizeRecoveryOtpRequest(request);
             if (normalized === undefined)
                 return Promise.resolve({ ok: false, error: failure('invalid-request') });
-            return this.run(async (client) => {
-                if (await this.selectDeviceJoinSession(client) !== null) {
-                    throw Object.assign(new Error('join already exists'), { name: 'AwikiSdkError', code: 'conflict' });
-                }
-                return client.sendRecoveryOtp(normalized);
-            }, { allowSignedOut: true });
+            return this.run(client => client.sendRecoveryOtp(normalized), { allowSignedOut: true });
         }
         /** Verify a recovery OTP and freeze its exact intent before the remote commit. */
         prepareRecovery(request) {
@@ -1842,7 +1582,7 @@ let AwikiService = (() => {
         }
         /** Return the deployment identity's public mailbox state. */
         getMailAccount() {
-            return this.run(client => client.getMailAccount());
+            return this.run(client => client.getMailAccount(), { bindMailOwner: true });
         }
         /** List one bounded mailbox page on explicit browser/tool demand. */
         async listMailInbox(request) {
@@ -1853,11 +1593,11 @@ let AwikiService = (() => {
             catch {
                 return { ok: false, error: failure('invalid-request') };
             }
-            return this.run(async (client) => {
+            return this.run(async (client, _provider, ownerDid) => {
                 if (normalized.folder !== 'sent')
                     return client.listMailInbox(normalized);
-                return this.sentMailStore.list(await this.ownerDid(client), normalized);
-            });
+                return this.sentMailStore.list(ownerDid, normalized);
+            }, { bindMailOwner: true });
         }
         /** Read one bounded plain-text mail message. */
         async readMail(request) {
@@ -1868,45 +1608,116 @@ let AwikiService = (() => {
             catch {
                 return { ok: false, error: failure('invalid-request') };
             }
-            return this.run(async (client) => {
+            return this.run(async (client, _provider, ownerDid) => {
                 if (!isLocalSentMailId(normalized.messageId))
                     return client.readMail(normalized);
-                const local = await this.sentMailStore.read(await this.ownerDid(client), normalized.messageId);
+                const local = await this.sentMailStore.read(ownerDid, normalized.messageId);
                 if (local === undefined) {
                     throw Object.assign(new Error('sent mail not found'), { name: 'AwikiSdkError', code: 'not-found' });
                 }
                 return local;
-            });
+            }, { bindMailOwner: true });
         }
         /** Mark explicitly selected mail messages read. Browser callers require an explicit click. */
         markMailRead(request) {
-            return this.runValidatedMail(() => mailMarkReadRequest(request), (client, normalized) => client.markMailRead(normalized));
+            return this.runValidatedMail(() => mailMarkReadRequest(request), (client, normalized) => client.markMailRead(normalized), { bindMailOwner: true });
         }
-        /** Send one plain-text mail once. Browser callers require an explicit confirmation. */
+        /** Send one mail once. Browser callers require an explicit confirmation. */
         async sendMail(request) {
             let normalized;
             try {
-                normalized = mailSendRequest(request);
+                normalized = mailSendRequest(request, {
+                    maxCount: this.resolved.mailAttachmentMaxCount,
+                    maxBytes: this.resolved.mailAttachmentMaxBytes,
+                    totalMaxBytes: this.resolved.mailAttachmentTotalMaxBytes,
+                });
             }
             catch {
                 return { ok: false, error: failure('invalid-request') };
             }
-            return this.run(async (client) => {
-                const result = await client.sendMail(normalized);
+            return this.run(async (client, _provider, ownerDid, assertActive) => {
+                const result = await client.sendMail({
+                    to: [...normalized.to],
+                    cc: [...normalized.cc],
+                    subject: normalized.subject,
+                    bodyText: normalized.bodyText,
+                    ...normalized.attachments.length === 0 ? {} : {
+                        attachments: normalized.attachments.map(attachment => ({
+                            fileName: attachment.fileName,
+                            contentType: attachment.contentType,
+                            bytes: attachment.bytes,
+                        })),
+                    },
+                });
+                assertActive();
                 if (!result.accepted)
                     return result;
+                const settled = normalized.attachments.length > 0
+                    && result.messageId === undefined
+                    && result.warnings.length < 100
+                    ? { ...result, warnings: [...result.warnings, 'Sent attachment download is unavailable because the service returned no message id.'] }
+                    : result;
                 try {
-                    const ownerDid = await this.ownerDid(client);
                     const account = await client.getMailAccount().catch(() => undefined);
-                    await this.sentMailStore.append(ownerDid, normalized, result, account);
-                    return result;
+                    assertActive();
+                    await this.sentMailStore.append(ownerDid, normalized, settled, account);
+                    assertActive();
+                    return settled;
                 }
                 catch {
-                    return result.warnings.length >= 100
-                        ? result
-                        : { ...result, warnings: [...result.warnings, 'Sent history could not be saved locally.'] };
+                    assertActive();
+                    return settled.warnings.length >= 100
+                        ? settled
+                        : { ...settled, warnings: [...settled.warnings, 'Sent history could not be saved locally.'] };
                 }
-            });
+            }, { bindMailOwner: true });
+        }
+        /** Download one mail attachment only after an explicit browser action. */
+        async downloadMailAttachment(request) {
+            let normalized;
+            try {
+                normalized = mailAttachmentDownloadRequest(request);
+            }
+            catch {
+                return { ok: false, error: failure('invalid-request') };
+            }
+            return this.run(async (client, _provider, ownerDid, assertActive) => {
+                let serviceMessageId = normalized.localMessageId;
+                if (isLocalSentMailId(serviceMessageId)) {
+                    const resolved = await this.sentMailStore.resolveAttachment(ownerDid, serviceMessageId, normalized.attachmentIndex);
+                    if (resolved === undefined) {
+                        throw Object.assign(new Error('sent mail attachment is unavailable'), {
+                            name: 'AwikiSdkError', code: 'not-found',
+                        });
+                    }
+                    serviceMessageId = resolved;
+                }
+                const value = await client.downloadMailAttachment({
+                    messageId: serviceMessageId,
+                    attachmentIndex: normalized.attachmentIndex,
+                });
+                assertActive();
+                if (!Number.isSafeInteger(value.sizeBytes) || value.sizeBytes < 0)
+                    throw new TypeError('invalid mail attachment size');
+                if (value.sizeBytes > this.resolved.mailAttachmentMaxBytes) {
+                    throw Object.assign(new Error('mail attachment exceeds Host limit'), {
+                        name: 'AwikiSdkError', code: 'attachment-too-large',
+                    });
+                }
+                if (!(value.bytes instanceof Uint8Array) || value.bytes.byteLength !== value.sizeBytes) {
+                    throw new TypeError('invalid mail attachment bytes');
+                }
+                const fileName = mailAttachmentFileName(value.fileName);
+                const contentType = mailAttachmentContentType(value.contentType);
+                const bytes = value.bytes;
+                return {
+                    fileName,
+                    contentType,
+                    sizeBytes: bytes.byteLength,
+                    sha256: createHash('sha256').update(bytes).digest('hex'),
+                    bytesBase64: Buffer.from(bytes).toString('base64'),
+                };
+            }, { bindMailOwner: true });
         }
         /**
          * Permanently remove the exact SDK-owned local state after an explicit browser acknowledgement.
@@ -1921,11 +1732,11 @@ let AwikiService = (() => {
             return this.mutateSession(async () => {
                 const provider = this.provider;
                 if (provider !== undefined)
-                    await this.stopProviderRuntime(provider);
+                    await this.stopListener(provider);
                 const result = await this.run(client => client.clearLocalData(), { allowSignedOut: true });
                 if (!result.ok) {
                     if (provider !== undefined && this.provider === provider)
-                        this.ensureProviderRuntime(provider);
+                        void this.startListener(provider);
                     return result;
                 }
                 try {
@@ -1935,10 +1746,10 @@ let AwikiService = (() => {
                     await this.sessionStore.signIn();
                     this.signedOut = false;
                     this.activeIdentityDid = undefined;
-                    this.pendingDeviceJoin = undefined;
-                    this.activeDeviceJoinSessionId = undefined;
                     this.invalidateSummaries();
                     this.publishSession({ status: 'unregistered' });
+                    if (provider !== undefined && this.provider === provider)
+                        void this.startListener(provider);
                     return result;
                 }
                 catch {
@@ -1946,7 +1757,7 @@ let AwikiService = (() => {
                 }
             });
         }
-        /** Re-enter only after Core confirms that the exact recovered identity is applied locally. */
+        /** Re-enter after Core applies the recovered identity without blocking on optional account restoration. */
         async applyRecoveredSession(progress) {
             if (progress.phase !== 'applied')
                 return true;
@@ -1965,211 +1776,34 @@ let AwikiService = (() => {
                         this.activeIdentityDid = identity.did;
                         this.invalidateSummaries();
                     }
-                    const reconciled = await this.reconcileRecoveredIdentity(provider, progress.operationId);
                     if (this.provider !== provider)
                         return false;
                     if (!alreadyActive) {
                         const session = { status: 'active', identity };
                         this.publishSession(session);
-                        this.ensureProviderRuntime(provider);
+                        await provider.listenerStartup;
+                        await this.startListener(provider);
                     }
-                    return reconciled;
+                    return true;
                 }
                 catch {
                     return false;
                 }
             });
         }
-        /** Rebind Mail first-use ownership and, when installed, the canonical model billing account. */
-        async reconcileRecoveredIdentity(provider, operationId) {
-            const logger = this.ctx.logger('awiki-recovery');
-            let mailboxRestored = false;
-            try {
-                await provider.client.getMailAccount();
-                mailboxRestored = true;
-            }
-            catch {
-                logger.warn('awiki: recovered mailbox reconciliation is pending');
-            }
-            const target = this.recoveryReconciliationTarget;
-            if (target === undefined)
-                return mailboxRestored;
-            try {
-                const authority = await provider.client.issueRecoveryAttestation({ operationId });
-                const response = await this.externalHttpAuth.dispatch(new Request(target.endpoint, {
-                    method: 'POST',
-                    headers: { 'content-type': 'application/json' },
-                    body: JSON.stringify({ attestation: authority.attestation }),
-                }), request => fetch(request));
-                if (!await acceptsRecoveryReconciliation(response)) {
-                    logger.warn('awiki: recovered model account reconciliation is pending');
-                    return false;
-                }
-                return mailboxRestored;
-            }
-            catch {
-                logger.warn('awiki: recovered model account reconciliation is pending');
-                return false;
-            }
-        }
-        /** Select the only resumable new-device session; Core local_sessions is the sole restart SoT. */
-        async selectDeviceJoinSession(client) {
-            const sessions = await client.listLocalDeviceJoinSessions();
-            if (this.activeDeviceJoinSessionId !== undefined) {
-                const tracked = sessions.find(value => (value.side === 'new_device' && value.joinSessionId === this.activeDeviceJoinSessionId));
-                if (tracked !== undefined)
-                    return tracked.joinSessionId;
-                this.activeDeviceJoinSessionId = undefined;
-            }
-            const resumable = sessions.filter(value => (value.side === 'new_device' && RESUMABLE_JOIN_PHASES.has(value.localPhase)));
-            if (resumable.length > 1) {
-                throw Object.assign(new Error('multiple local joins'), { name: 'AwikiSdkError', code: 'conflict' });
-            }
-            const selected = resumable[0];
-            this.activeDeviceJoinSessionId = selected?.joinSessionId;
-            return selected?.joinSessionId ?? null;
-        }
-        async applyCandidateJoinProgress(value) {
-            const phase = candidateJoinPhase(value);
-            if (phase === undefined)
-                return { ok: false, error: failure('remote') };
-            if (phase === 'cancelled' || phase === 'rejected' || phase === 'expired') {
-                this.activeDeviceJoinSessionId = undefined;
-            }
-            if (phase === 'authorized') {
-                if (value.identity === undefined)
-                    return { ok: false, error: failure('remote') };
-                await this.activateRegisteredIdentity(value.identity);
-            }
-            return {
-                ok: true,
-                value: {
-                    phase,
-                    expiresAt: value.expiresAt,
-                    ...(phase === 'sas-ready' && value.sas !== undefined ? { sas: value.sas } : {}),
-                    completed: phase === 'authorized',
-                },
-            };
-        }
-        publicAdminJoinProgress(requestRef, value) {
-            const phase = adminJoinPhase(value);
-            if (phase === undefined)
-                return { ok: false, error: failure('remote') };
-            return {
-                ok: true,
-                value: {
-                    requestRef,
-                    phase,
-                    expiresAt: value.expiresAt,
-                    ...(phase === 'sas-ready' && value.sas !== undefined ? { sas: value.sas } : {}),
-                },
-            };
-        }
-        async localAdminJoinProgress(client, notice) {
-            const local = (await client.listLocalDeviceJoinSessions())
-                .find(session => session.side === 'admin' && session.joinSessionId === notice.joinSessionId);
-            if (local === undefined) {
-                return notice.claimedByCurrentDevice
-                    ? client.getLocalDeviceJoinVerificationProgress(notice.joinSessionId)
-                    : undefined;
-            }
-            if (local.localPhase === 'challenge_prepared') {
-                return {
-                    joinSessionId: notice.joinSessionId,
-                    localPhase: local.localPhase,
-                    remoteState: notice.state,
-                    expiresAt: local.expiresAt,
-                };
-            }
-            return client.getLocalDeviceJoinVerificationProgress(notice.joinSessionId);
-        }
-        async requireDeviceManager(client) {
-            const current = await client.getCurrentDeviceSummary();
-            if (!current.canManage || current.role !== 'admin' || current.readiness !== 'admin_ready') {
-                throw Object.assign(new Error('device manager required'), { name: 'AwikiSdkError', code: 'forbidden' });
-            }
-        }
-        requestRef(joinSessionId) {
-            const existing = this.requestRefs.get(joinSessionId);
-            if (existing !== undefined)
-                return existing;
-            const reference = `join-${randomUUID()}`;
-            this.requestRefs.set(joinSessionId, reference);
-            this.requestSessions.set(reference, joinSessionId);
-            return reference;
-        }
-        deviceRef(deviceId) {
-            const existing = this.deviceRefs.get(deviceId);
-            if (existing !== undefined)
-                return existing;
-            const reference = `device-${randomUUID()}`;
-            this.deviceRefs.set(deviceId, reference);
-            this.deviceIds.set(reference, deviceId);
-            return reference;
-        }
-        async deviceManagementSnapshot(client) {
-            await client.syncDeviceManagement();
-            const current = await client.getCurrentDeviceSummary();
-            if (!current.canManage || current.role !== 'admin' || current.readiness !== 'admin_ready') {
-                this.requestRefs.clear();
-                this.requestSessions.clear();
-                this.deviceRefs.clear();
-                this.deviceIds.clear();
-                return {
-                    canManage: false,
-                    ...current.role === undefined ? {} : { role: current.role },
-                    readiness: current.readiness,
-                    devices: [],
-                    requests: [],
-                };
-            }
-            const requests = await client.listLocalDeviceJoinRequests();
-            await Promise.all(requests
-                .filter(request => request.claimedByCurrentDevice)
-                .map(request => client.getLocalDeviceJoinVerificationProgress(request.joinSessionId).catch(() => undefined)));
-            const devices = await client.getDeviceRegistry();
-            return {
-                canManage: true,
-                role: 'admin',
-                readiness: 'admin_ready',
-                devices: devices.map(device => this.publicDevice(device)),
-                requests: requests.map(request => ({
-                    requestRef: this.requestRef(request.joinSessionId),
-                    candidateKeyFingerprint: request.candidateKeyFingerprint,
-                    issuedAt: request.issuedAt,
-                    expiresAt: request.expiresAt,
-                    state: requestJoinPhase(request),
-                    claimedByCurrentDevice: request.claimedByCurrentDevice,
-                    canStartVerification: request.canStartVerification,
-                })),
-            };
-        }
-        publicDevice(device) {
-            return {
-                deviceRef: this.deviceRef(device.deviceId),
-                status: device.status,
-                role: device.role,
-                managementReady: device.managementReady,
-                isCurrent: device.isCurrent,
-            };
-        }
-        /** Publish one newly registered identity, then start realtime only in the background. */
+        /** Publish one newly registered identity and start its listener through the existing session path. */
         async activateRegisteredIdentity(identity) {
-            this.pendingDeviceJoin = undefined;
-            this.activeDeviceJoinSessionId = undefined;
             this.activeIdentityDid = identity.did;
             this.publishSession({ status: 'active', identity });
             const provider = this.provider;
-            if (provider !== undefined)
-                this.ensureProviderRuntime(provider);
+            if (provider !== undefined) {
+                await provider.listenerStartup;
+                await this.startListener(provider);
+            }
         }
         /** Invalidate cached session work and cancel every model request still owned by the old session. */
         invalidateSummaries() {
             this.sessionRevision += 1;
-            this.requestRefs.clear();
-            this.requestSessions.clear();
-            this.deviceRefs.clear();
-            this.deviceIds.clear();
             for (const controller of this.activeSummaryRequests)
                 controller.abort();
             this.activeSummaryRequests.clear();
@@ -2180,24 +1814,40 @@ let AwikiService = (() => {
         }
         /** Resolve and cache the owner binding required by private Host-side projections. */
         async ownerDid(client) {
-            const identity = this.activeIdentityDid === undefined ? await client.getIdentity() : undefined;
-            const ownerDid = this.activeIdentityDid ?? identity?.did;
+            const identity = await client.getIdentity();
+            const ownerDid = identity?.did;
             if (ownerDid === undefined) {
                 throw Object.assign(new Error('not registered'), { name: 'AwikiSdkError', code: 'not-registered' });
             }
+            if (this.activeIdentityDid !== undefined && this.activeIdentityDid !== ownerDid) {
+                throw new ProviderUnavailableError();
+            }
             this.activeIdentityDid = ownerDid;
             return ownerDid;
         }
         /** Invoke the current client and normalize every rejection to a public result. */
         async run(operation, options = {}) {
             try {
+                const sessionRevision = this.sessionRevision;
                 if (options.allowSignedOut !== true && await this.isSignedOut()) {
                     return { ok: false, error: failure('signed-out') };
                 }
                 const provider = this.provider;
                 if (provider === undefined)
                     throw new ProviderUnavailableError();
-                const value = await operation(provider.client);
+                const ownerDid = options.bindMailOwner === true
+                    ? await this.ownerDid(provider.client)
+                    : undefined;
+                const assertActive = () => {
+                    if (this.provider !== provider
+                        || (options.bindMailOwner === true && (this.sessionRevision !== sessionRevision
+                            || this.signedOut === true
+                            || this.activeIdentityDid !== ownerDid)))
+                        throw new ProviderUnavailableError();
+                };
+                assertActive();
+                const value = await operation(provider.client, provider, ownerDid, assertActive);
+                assertActive();
                 if (options.skipAttachmentByteValidation !== true && containsUnexpectedBinary(value, new Set())) {
                     return { ok: false, error: failure('remote') };
                 }
@@ -2208,7 +1858,7 @@ let AwikiService = (() => {
             }
         }
         /** Validate mail input before entering the provider and preserve fixed public failures. */
-        runValidatedMail(validate, operation) {
+        runValidatedMail(validate, operation, options = {}) {
             let request;
             try {
                 request = validate();
@@ -2216,7 +1866,7 @@ let AwikiService = (() => {
             catch {
                 return Promise.resolve({ ok: false, error: failure('invalid-request') });
             }
-            return this.run(client => operation(client, request));
+            return this.run(client => operation(client, request), options);
         }
         /** Read and cache the private Host-owned session marker. */
         async isSignedOut() {
@@ -2271,194 +1921,161 @@ let AwikiService = (() => {
             this.sessionMutation = pending.then(() => undefined, () => undefined);
             return pending;
         }
-        /** Start identity realtime and the optional Agent consumer without blocking identity success. */
-        ensureProviderRuntime(provider) {
-            const identityDid = this.activeIdentityDid;
-            if (provider.runtimeReplacement !== undefined)
-                return;
-            if (identityDid !== undefined
-                && provider.realtimeIdentityDid !== undefined
-                && provider.realtimeIdentityDid !== identityDid) {
-                this.replaceProviderRuntime(provider, identityDid);
-                return;
-            }
-            this.ensureRealtimeSupervisor(provider);
-            this.ensureAgentConsumer(provider);
-        }
-        replaceProviderRuntime(provider, identityDid) {
-            if (provider.runtimeReplacement !== undefined || this.provider !== provider)
-                return;
-            const replacement = (async () => {
-                await this.stopProviderRuntime(provider);
-                if (this.provider !== provider || this.activeIdentityDid !== identityDid)
-                    return;
-                this.ensureRealtimeSupervisor(provider);
-                this.ensureAgentConsumer(provider);
-            })();
-            const observed = replacement
-                .catch((error) => {
-                this.ctx.logger('awiki-realtime').warn('AWiki identity realtime replacement failed: %s', error instanceof Error ? error.message : 'unknown failure');
-            })
-                .finally(() => {
-                if (provider.runtimeReplacement === observed)
-                    delete provider.runtimeReplacement;
-                if (this.provider === provider)
-                    this.ensureProviderRuntime(provider);
-            });
-            provider.runtimeReplacement = observed;
-        }
-        ensureRealtimeSupervisor(provider) {
-            if (!this.resolved.realtimeEnabled
-                || provider.realtimeSupervisor !== undefined
-                || provider.realtimeStartup !== undefined
-                || this.provider !== provider
-                || (provider.client.realtime ?? provider.client.listener) === undefined)
-                return;
-            const generation = provider.realtimeGeneration;
-            const source = provider.client.realtime ?? provider.client.listener;
-            if (source === undefined)
-                return;
-            const logger = this.ctx.logger('awiki-realtime');
+        /** Start one exact identity-bound listener, atomically releasing a failed startup. */
+        startListener(provider) {
+            if (!this.resolved.listenerEnabled
+                || provider.listener !== undefined
+                || provider.listenerRecoveryBlocked
+                || this.provider !== provider) {
+                return Promise.resolve();
+            }
+            if (provider.listenerStartup !== undefined)
+                return provider.listenerStartup;
+            if (provider.listenerCleanup !== undefined || provider.listenerRestartTimer !== undefined)
+                return Promise.resolve();
+            const workspaceContext = this.workspaceContext;
+            const source = provider.client.listener;
+            if (workspaceContext === undefined || source === undefined)
+                return Promise.resolve();
+            const generation = provider.listenerGeneration;
+            const logger = this.ctx.logger('awiki-listener');
             const startup = (async () => {
                 if (await this.isSignedOut())
                     return;
-                const identity = await provider.client.getIdentity();
-                if (identity === null || !this.realtimeFenceMatches(provider, generation))
+                if (await provider.client.getIdentity() === null)
+                    return;
+                if (!this.listenerFenceMatches(provider, workspaceContext, generation))
                     return;
-                this.activeIdentityDid = identity.did;
-                const supervisor = new IdentityRealtimeSupervisor(source, {
-                    onSynchronized: cause => this.onRealtimeSynchronized(provider, generation, cause),
+                const agents = new DshAwikiListenerAgentRuntime(workspaceContext, this.resolved.listener.workspacePath);
+                const listener = new AwikiAgentListener(source, agents, {
+                    ...this.resolved.listener,
+                    stateRoot: this.activeTenant().stateRoot,
                 }, logger);
-                provider.realtimeSupervisor = supervisor;
-                provider.realtimeIdentityDid = identity.did;
-                supervisor.start();
-                this.ensureAgentConsumer(provider);
-            })();
-            const observed = startup
-                .catch((error) => {
-                logger.warn('AWiki realtime startup failed: %s', error instanceof Error ? error.message : 'unknown failure');
-            })
-                .finally(() => {
-                if (provider.realtimeStartup === observed)
-                    delete provider.realtimeStartup;
-            });
-            provider.realtimeStartup = observed;
-        }
-        realtimeFenceMatches(provider, generation) {
-            return this.provider === provider && provider.realtimeGeneration === generation;
-        }
-        async onRealtimeSynchronized(provider, generation, cause) {
-            if (!this.realtimeFenceMatches(provider, generation))
-                return;
-            if (cause === 'system_notification' || cause === 'stream_recovery') {
+                provider.listener = listener;
                 try {
-                    provider.localDeviceJoinRequestCountAfterSync = (await provider.client.listLocalDeviceJoinRequests()).length;
+                    await listener.start();
                 }
-                catch {
-                    this.ctx.logger('awiki-realtime').debug('AWiki realtime could not observe local device Join requests');
+                catch (error) {
+                    if (provider.listener === listener)
+                        delete provider.listener;
+                    try {
+                        await listener.dispose();
+                    }
+                    catch {
+                        provider.listenerRecoveryBlocked = true;
+                    }
+                    if (!provider.listenerRecoveryBlocked && provider.listenerRestartAttempt > 0) {
+                        this.scheduleListenerRestart(provider, workspaceContext, generation);
+                    }
+                    throw error;
                 }
-            }
-            if (!['session_start', 'connection_ready', 'reconnected', 'message', 'message_update'].includes(cause))
-                return;
-            this.ensureAgentConsumer(provider);
-            await provider.agentConsumerStartup;
-            if (!this.realtimeFenceMatches(provider, generation))
-                return;
-            await provider.agentConsumer?.reconcileOnce();
-        }
-        ensureAgentConsumer(provider) {
-            const workspaceContext = this.workspaceContext;
-            const source = provider.client.agentInbox ?? provider.client.listener;
-            const identityDid = this.activeIdentityDid;
-            if (!this.resolved.listenerEnabled
-                || workspaceContext === undefined
-                || source === undefined
-                || identityDid === undefined
-                || this.provider !== provider)
-                return;
-            if (provider.agentConsumer !== undefined && provider.agentConsumerIdentityDid === identityDid)
-                return;
-            if (provider.agentConsumerStartup !== undefined)
-                return;
-            const generation = ++provider.agentConsumerGeneration;
-            const logger = this.ctx.logger('awiki-listener');
-            const startup = (async () => {
-                await this.detachAgentConsumer(provider);
-                if (!this.agentConsumerFenceMatches(provider, workspaceContext, identityDid, generation))
+                if (!this.listenerFenceMatches(provider, workspaceContext, generation)) {
+                    if (provider.listener === listener)
+                        delete provider.listener;
+                    try {
+                        await listener.dispose();
+                    }
+                    catch (error) {
+                        provider.listenerRecoveryBlocked = true;
+                        throw error;
+                    }
                     return;
-                const agents = new DshAwikiListenerAgentRuntime(workspaceContext, this.resolved.listener.workspacePath);
-                const consumer = new AwikiAgentListener(source, agents, {
-                    ...this.resolved.listener,
-                    identityScope: identityDid,
-                }, logger);
-                provider.agentConsumer = consumer;
-                provider.agentConsumerIdentityDid = identityDid;
-                await consumer.reconcileOnce();
+                }
+                provider.listenerStartedAt = Date.now();
+                void listener.whenTerminated().then((result) => {
+                    if (result.kind === 'failed') {
+                        this.releaseFailedListener(provider, listener, workspaceContext, generation, result.error);
+                    }
+                });
             })();
             const observed = startup
                 .catch((error) => {
-                logger.warn('AWiki Agent consumer startup failed: %s', error instanceof Error ? error.message : 'unknown failure');
+                logger.warn('AWiki listener startup failed: %s', error instanceof Error ? error.message : 'unknown failure');
             })
                 .finally(() => {
-                if (provider.agentConsumerStartup === observed)
-                    delete provider.agentConsumerStartup;
+                if (provider.listenerStartup === observed)
+                    delete provider.listenerStartup;
             });
-            provider.agentConsumerStartup = observed;
+            provider.listenerStartup = observed;
+            return observed;
+        }
+        async stopListener(provider) {
+            provider.listenerGeneration += 1;
+            provider.listenerRestartAttempt = 0;
+            delete provider.listenerStartedAt;
+            const timer = provider.listenerRestartTimer;
+            if (timer !== undefined) {
+                delete provider.listenerRestartTimer;
+                clearTimeout(timer);
+            }
+            await provider.listenerStartup;
+            await provider.listenerCleanup;
+            const listener = provider.listener;
+            if (listener === undefined)
+                return;
+            delete provider.listener;
+            try {
+                await listener.dispose();
+            }
+            catch (error) {
+                provider.listenerRecoveryBlocked = true;
+                throw error;
+            }
         }
-        agentConsumerFenceMatches(provider, workspaceContext, identityDid, generation) {
+        listenerFenceMatches(provider, workspaceContext, generation) {
             return this.provider === provider
                 && this.workspaceContext === workspaceContext
-                && this.activeIdentityDid === identityDid
-                && provider.agentConsumerGeneration === generation;
+                && provider.listenerGeneration === generation;
         }
-        async detachAgentConsumer(provider) {
-            const consumer = provider.agentConsumer;
-            if (consumer === undefined)
+        releaseFailedListener(provider, listener, workspaceContext, generation, error) {
+            if (provider.listener !== listener)
                 return;
-            delete provider.agentConsumer;
-            delete provider.agentConsumerIdentityDid;
-            const cleanup = consumer.dispose();
+            delete provider.listener;
+            const startedAt = provider.listenerStartedAt;
+            delete provider.listenerStartedAt;
+            if (startedAt !== undefined && Date.now() - startedAt >= LISTENER_STABLE_RESET_MS) {
+                provider.listenerRestartAttempt = 0;
+            }
+            const logger = this.ctx.logger('awiki-listener');
+            logger.warn('AWiki listener lifecycle failed: %s', error instanceof Error ? error.message : 'unknown failure');
+            let disposed = false;
+            const cleanup = listener.dispose()
+                .then(() => { disposed = true; }, (cleanupError) => {
+                provider.listenerRecoveryBlocked = true;
+                logger.warn('AWiki listener cleanup failed: %s', cleanupError instanceof Error ? cleanupError.message : 'unknown failure');
+            });
             const observed = cleanup.finally(() => {
-                if (provider.agentConsumerCleanup === observed)
-                    delete provider.agentConsumerCleanup;
+                if (provider.listenerCleanup === observed)
+                    delete provider.listenerCleanup;
+                if (disposed)
+                    this.scheduleListenerRestart(provider, workspaceContext, generation);
             });
-            provider.agentConsumerCleanup = observed;
-            await observed;
-        }
-        async stopAgentConsumer(provider) {
-            provider.agentConsumerGeneration += 1;
-            await provider.agentConsumerStartup;
-            await provider.agentConsumerCleanup;
-            await this.detachAgentConsumer(provider);
-        }
-        async stopRealtimeSupervisor(provider) {
-            provider.realtimeGeneration += 1;
-            await provider.realtimeStartup;
-            const supervisor = provider.realtimeSupervisor;
-            if (supervisor === undefined)
-                return;
-            delete provider.realtimeSupervisor;
-            delete provider.realtimeIdentityDid;
-            await supervisor.dispose();
+            provider.listenerCleanup = observed;
         }
-        async stopProviderRuntime(provider) {
-            await Promise.all([
-                this.stopRealtimeSupervisor(provider),
-                this.stopAgentConsumer(provider),
-            ]);
+        scheduleListenerRestart(provider, workspaceContext, generation) {
+            if (provider.listenerRestartTimer !== undefined
+                || !this.listenerFenceMatches(provider, workspaceContext, generation))
+                return;
+            provider.listenerRestartAttempt = Math.min(provider.listenerRestartAttempt + 1, LISTENER_RESTART_MAX_ATTEMPT);
+            const exponent = provider.listenerRestartAttempt - 1;
+            const delay = Math.min(LISTENER_RESTART_BASE_DELAY_MS * 2 ** exponent, LISTENER_RESTART_MAX_DELAY_MS);
+            const timer = setTimeout(() => {
+                if (provider.listenerRestartTimer !== timer)
+                    return;
+                delete provider.listenerRestartTimer;
+                if (!this.listenerFenceMatches(provider, workspaceContext, generation))
+                    return;
+                void this.startListener(provider);
+            }, delay);
+            provider.listenerRestartTimer = timer;
         }
         /** Clear one exact provider slot before joining its one shared disposal. */
         disposeProvider(provider) {
-            if (this.provider === provider) {
+            if (this.provider === provider)
                 this.provider = undefined;
-                this.pendingDeviceJoin = undefined;
-                this.activeDeviceJoinSessionId = undefined;
-                this.invalidateSummaries();
-            }
             provider.disposal ??= (async () => {
                 try {
-                    await provider.runtimeReplacement;
-                    await this.stopProviderRuntime(provider);
+                    await this.stopListener(provider);
                 }
                 finally {
                     await provider.client.dispose();