nolo-cli 0.54.0 → 0.61.0-alpha.3

package/{chunk-XOJRZUPF.js → chunk-KWSQR2KK.js}

@@ -3,6 +3,11 @@ import {
   getIsDesktopApp,
   isAbortError
 } from "./chunk-QOKAKDPE.js";
+import {
+  selectIdentityToken,
+  selectIdentityUser,
+  selectIdentityUserId
+} from "./chunk-SEJ5OS6F.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
@@ -2377,28 +2382,12 @@ function formatProdErrorMessage(code) {
   return `Minified Redux Toolkit error #${code}; visit https://redux-toolkit.js.org/Errors?code=${code} for the full message or use the non-minified dev environment for full errors. `;
 }
 
-// packages/identity/selectors.local.ts
-var LOCAL_USER_ID = process.env.NOLO_LOCAL_USER_ID || process.env.NOLO_USER_ID || "local";
-var LOCAL_USER = {
-  userId: LOCAL_USER_ID,
-  username: "Local User"
-};
-var selectIdentityUserId = (state) => LOCAL_USER_ID;
-var selectIdentityToken = (state) => {
-  if (state?.auth?.currentToken) return state.auth.currentToken;
-  return void 0;
-};
-var selectIdentityUser = (state) => LOCAL_USER;
-var selectIdentityUserBalance = (state) => void 0;
-
 // packages/app/stateViews/runtime.ts
 var selectCurrentToken = (state) => {
-  if (!state?.auth) return void 0;
   const token = selectIdentityToken(state);
   return typeof token === "string" ? token : void 0;
 };
 var selectCurrentUserId = (state) => {
-  if (!state?.auth) return void 0;
   const userId = selectIdentityUserId(state);
   return typeof userId === "string" ? userId : void 0;
 };
@@ -2477,7 +2466,7 @@ var resolveRuntimeUserAuthorityRegistry = (state) => {
   if (settingsRegistry && typeof settingsRegistry === "object") {
     return settingsRegistry;
   }
-  const userRegistry = state.auth?.currentUser?.authorityRegistry;
+  const userRegistry = selectIdentityUser(state)?.authorityRegistry;
   if (userRegistry && typeof userRegistry === "object") {
     return userRegistry;
   }
@@ -2502,7 +2491,7 @@ var noloRequest = async (server, config, state, signal) => {
   const headers = config.headers || {
     "Content-Type": "application/json"
   };
-  const token = state?.auth?.currentToken;
+  const token = selectIdentityToken(state) ?? null;
   if (token) {
     headers["Authorization"] = `Bearer ${token}`;
   }
@@ -2971,7 +2960,7 @@ var resolveRecordOwnerUserId = (record) => {
 // packages/database/actions/replication.ts
 var isReadonlyPublicRecordKey = (dbKey) => dbKey.startsWith("agent-pub-");
 var normalizeCurrentUserId = (state) => {
-  const userId = state?.auth?.currentUser?.userId;
+  const userId = selectIdentityUserId(state);
   return asOptionalTrimmedString(userId) ?? null;
 };
 var resolveReplicationServers = (currentServer, syncServers, preferredServerOrigin) => getAllServers(currentServer, syncServers, preferredServerOrigin);
@@ -2991,9 +2980,9 @@ var resolveAuthorityReplicationServers = ({
   const authority = resolveRecordAuthority({
     dbKey,
     record,
-    currentUserId: state?.auth?.currentUser?.userId,
+    currentUserId: selectIdentityUserId(state),
     currentServer,
-    userAuthorityRegistry: state?.settings?.userAuthorityRegistry ?? state?.auth?.currentUser?.authorityRegistry
+    userAuthorityRegistry: state?.settings?.userAuthorityRegistry ?? selectIdentityUser(state)?.authorityRegistry
   });
   if (isDeviceLocalOwnerId(authority.ownerUserId) || isDeviceLocalOwnerId(record?.userId) || isDeviceLocalDbKey(dbKey)) {
     return [];
@@ -3048,9 +3037,9 @@ var resolveUploadReplicationServers = ({
   const authority = resolveRecordAuthority({
     dbKey: uploadConfig.customKey,
     record: uploadConfig.metadata,
-    currentUserId: state?.auth?.currentUser?.userId,
+    currentUserId: selectIdentityUserId(state),
     currentServer,
-    userAuthorityRegistry: state?.settings?.userAuthorityRegistry ?? state?.auth?.currentUser?.authorityRegistry
+    userAuthorityRegistry: state?.settings?.userAuthorityRegistry ?? selectIdentityUser(state)?.authorityRegistry
   });
   if (authority.ownerUserId || authority.authorityServer) {
     return planAuthorityReadServers({
@@ -3082,7 +3071,7 @@ var scheduleExistingRecordReplication = ({
     record: localData,
     currentUserId,
     currentServer,
-    userAuthorityRegistry: state?.settings?.userAuthorityRegistry ?? state?.auth?.currentUser?.authorityRegistry
+    userAuthorityRegistry: state?.settings?.userAuthorityRegistry ?? selectIdentityUser(state)?.authorityRegistry
   });
   if (authority.ownerUserId && currentUserId && authority.ownerUserId !== currentUserId) {
     return [];
@@ -3103,7 +3092,7 @@ var scheduleExistingRecordReplication = ({
     {
       data: localData,
       customKey: dbKey,
-      userId: typeof localData?.userId === "string" ? localData.userId : state?.auth?.currentUser?.userId
+      userId: typeof localData?.userId === "string" ? localData.userId : selectIdentityUserId(state)
     },
     state
   );
@@ -3294,10 +3283,6 @@ export {
   asyncThunkCreator,
   buildCreateSlice,
   createEntityAdapter,
-  selectIdentityUserId,
-  selectIdentityToken,
-  selectIdentityUser,
-  selectIdentityUserBalance,
   selectRuntimeSnapshot,
   selectRuntimeCurrentServer,
   getRuntimeServerContext,

package/{chunk-2WBFJHQA.js → chunk-L7B47JXR.js}

@@ -10,7 +10,7 @@ import {
   scheduleExistingRecordReplication,
   shouldReplaceLocalWithRemoteRecord,
   shouldReplicateLocalRecord
-} from "./chunk-XOJRZUPF.js";
+} from "./chunk-KWSQR2KK.js";
 import {
   fetchFromClientDb,
   fetchFromServer,
@@ -37,7 +37,7 @@ var BUILTIN_AGENT_CATALOG = [
     group: "builtin",
     name: "nolo",
     provider: "nolo",
-    model: "glm-5-3-flash",
+    model: "deepseek-flash",
     runtimeFallback: true
   },
   {
@@ -45,7 +45,7 @@ var BUILTIN_AGENT_CATALOG = [
     group: "builtin",
     name: "\u5E94\u7528\u6784\u5EFA\u52A9\u624B",
     provider: "nolo",
-    model: "deepseek-v4-flash"
+    model: "deepseek-flash"
   },
   {
     id: "01ECOMMERCEAG00000001PYQ2J",
@@ -59,29 +59,33 @@ var BUILTIN_AGENT_CATALOG = [
     group: "builtin",
     name: "AI \u521B\u5EFA\u52A9\u624B",
     provider: "nolo",
-    model: "deepseek-v4-flash"
+    model: "deepseek-flash"
   },
   {
     id: "01NOLOFEEDBACKA000000000R2",
     group: "builtin",
     name: "\u53CD\u9988\u5165\u53E3",
     provider: "nolo",
-    model: "deepseek-v4-flash"
+    model: "deepseek-flash"
   },
   {
     id: "01CHROMEOPR000000000001",
     group: "builtin",
     name: "Chrome \u64CD\u4F5C\u5458",
     provider: "nolo",
-    model: "deepseek-v4-flash"
+    model: "deepseek-flash"
   },
-  // ── quick-chat 档位 / 图片档 public（runtimeFallback）──
+  // ── quick-chat 档位 public（图片助手已无 runtimeFallback，见下方图片档段） ──
+  // 2026-09-10 兜底最小化：runtimeFallback 只保留产品代码显式引用的条目
+  // （nolo 默认档、PLATFORM_TIER_AGENT_KEYS 的 flash/image-compat、
+  // SYSTEM_BUILTIN_TRUSTED 的 flash/pro/glm-flash）。广场档与图片助手不再
+  // 兜底——记录缺失时明确报 Agent not found，而不是合成无 prompt 的裸配置。
   {
     id: "01DSV4FLASHPB00000000JFPFD",
     group: "public",
-    name: "DeepSeek V4 Flash Vision Exp",
+    name: "DeepSeek Flash",
     provider: "nolo",
-    model: "deepseek-v4-flash-vision-exp",
+    model: "deepseek-flash",
     runtimeFallback: true
   },
   {
@@ -97,8 +101,7 @@ var BUILTIN_AGENT_CATALOG = [
     group: "public",
     name: "GLM 5.3",
     provider: "nolo",
-    model: "glm-5.3",
-    runtimeFallback: true
+    model: "glm-5.3"
   },
   {
     id: "01GLMFLASHPB00000000BT20BC",
@@ -120,59 +123,59 @@ var BUILTIN_AGENT_CATALOG = [
   // ── 广场公开聊天档（从 createSpaceAgents PUBLIC_AGENT_DEFS 收编，2026-08-19）──
   // ID 与 createSpaceAgents 的 deterministicId 结果一致；provider 按 agentSeedBuilder
   // 默认规则：显式 provider 用显式值，未写则 openai。
+  // 2026-09-10 预设收敛：GPT-5.6 Sol/Terra、GPT-5.5 Pro 从广场退场转 internal 兼容，
+  // 公开聊天档只保留 Luna + nolo 托管组 + 图片档（图片档仍在广场，但不再 runtimeFallback）。
   {
     id: "01GPT56SOLPB00000000VXMGCW",
-    group: "public",
-    name: "GPT-5.6 Sol",
+    // 已从广场/预设退场（2026-09-10）：保留 internal 兼容条目，仅为存量 agent
+    // 记录提供运行时路由；不再出现在广场与 createSpaceAgents 播种清单。
+    group: "internal",
+    name: "GPT-5.6 Sol\uFF08\u517C\u5BB9\uFF09",
     provider: "openai",
-    model: "gpt-5.6-sol",
-    runtimeFallback: true
+    model: "gpt-5.6-sol"
   },
   {
     id: "01GPT56TERPB00000001UX7RKW",
-    group: "public",
-    name: "GPT-5.6 Terra",
+    // 已从广场/预设退场（2026-09-10）：同 Sol，internal 兼容。
+    group: "internal",
+    name: "GPT-5.6 Terra\uFF08\u517C\u5BB9\uFF09",
     provider: "openai",
-    model: "gpt-5.6-terra",
-    runtimeFallback: true
+    model: "gpt-5.6-terra"
   },
   {
     id: "01GPT56LUNPB00000001VVVZHS",
     group: "public",
     name: "GPT-5.6 Luna",
     provider: "openai",
-    model: "gpt-5.6-luna",
-    runtimeFallback: true
+    model: "gpt-5.6-luna"
   },
   {
     id: "01GPT55PROPUB00000000IV47M",
-    group: "public",
-    name: "GPT-5.5 Pro",
+    // 已从广场/预设退场（2026-09-10）：internal 兼容，理由同 Sol。
+    group: "internal",
+    name: "GPT-5.5 Pro\uFF08\u517C\u5BB9\uFF09",
     provider: "openai",
-    model: "gpt-5.5-pro",
-    runtimeFallback: true
+    model: "gpt-5.5-pro"
   },
   // Claude Sonnet/Opus/Fable 5 已从广场下架（2026-09-01，平台停止维护 Claude 系）：
   // 存量记录由 modelUpgradeTable 迁移到 nolo/glm-5-3-flash，兼容期请求由
   // platformHostedRoutingTable 重映射；客户端下架提示走 publicAgents.removedFromPlaza。
   // Gemini 文本档只上架最新一代：旧版留在广场只会分散选择、拉长列表，而
-  // 用户想要的是「最新的那个 Gemini」。gemini-3.6-flash 这个**模型**仍然保留
+  // 用户想要的是「最新的那个 Gemini」。旧版模型仍可保留用于兼容历史请求，
   // （modelAbility / 定价表照旧），下架的只是广场入口。
   {
     id: "01GEM37FLPB00000000FJCRNC",
     group: "public",
-    name: "Gemini 3.7 Flash",
+    name: "Gemini 3.8 Flash",
     provider: "google",
-    model: "gemini-3.7-flash",
-    runtimeFallback: true
+    model: "gemini-3.8-flash"
   },
   {
     id: "01GROK46PLAZ00000001PTJZ3K",
     group: "public",
     name: "Grok 4.6",
     provider: "xai",
-    model: "grok-4.6",
-    runtimeFallback: true
+    model: "grok-4.6"
   },
   {
     id: "01GPTIMG2GEN00000000SSEBOS",
@@ -180,7 +183,6 @@ var BUILTIN_AGENT_CATALOG = [
     name: "GPT Image 2 \u56FE\u7247\u751F\u6210\u5668",
     provider: "openai",
     model: "gpt-5.6-luna",
-    runtimeFallback: true,
     hasImageOutput: true,
     imageModel: "gpt-image-2",
     imageWorkflow: "generate",
@@ -192,7 +194,6 @@ var BUILTIN_AGENT_CATALOG = [
     name: "GPT Image 2 \u56FE\u7247\u7F16\u8F91\u5668",
     provider: "openai",
     model: "gpt-5.6-luna",
-    runtimeFallback: true,
     hasImageOutput: true,
     imageModel: "gpt-image-2",
     imageWorkflow: "edit",
@@ -204,7 +205,6 @@ var BUILTIN_AGENT_CATALOG = [
     name: "GPT Image 2 \u8FDE\u7EED\u521B\u4F5C\u52A9\u624B",
     provider: "openai",
     model: "gpt-5.6-luna",
-    runtimeFallback: true,
     hasImageOutput: true,
     imageModel: "gpt-image-2",
     imageWorkflow: "continuous",
@@ -216,7 +216,6 @@ var BUILTIN_AGENT_CATALOG = [
     name: "Nano Banana 2 Lite \u6587\u751F\u56FE",
     provider: "google",
     model: "gemini-3.1-flash-lite-image",
-    runtimeFallback: true,
     hasImageOutput: true
   }
 ];
@@ -272,9 +271,6 @@ var PUBLIC_GPT_IMAGE_2_CONTINUOUS_AGENT_ID = entry("01GPTIMG2CNT00000000USKZFO")
 var PUBLIC_GPT_IMAGE_2_CONTINUOUS_AGENT_KEY = publicAgentKey(PUBLIC_GPT_IMAGE_2_CONTINUOUS_AGENT_ID);
 var PUBLIC_NANO_BANANA_2_LITE_AGENT_ID = entry("01NB2LITEGEN00000001XE1MNO").id;
 var PUBLIC_NANO_BANANA_2_LITE_AGENT_KEY = publicAgentKey(PUBLIC_NANO_BANANA_2_LITE_AGENT_ID);
-var DEFAULT_CODE_PLANNER_EXECUTOR_CANDIDATE_KEYS = [
-  PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY
-];
 var SYSTEM_BUILTIN_TRUSTED_AGENT_KEYS = [
   PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY,
   PUBLIC_DEEPSEEK_V4_PRO_AGENT_KEY,
@@ -705,7 +701,6 @@ export {
   BUILTIN_NOLO_AGENT_KEY,
   BUILTIN_NOLO_AGENT_NAME,
   BUILTIN_NOLO_AGENT_MODEL,
-  DEFAULT_CODE_PLANNER_EXECUTOR_CANDIDATE_KEYS,
   isSystemBuiltinTrustedAgentKey,
   isBuiltinPlatformAgentKey,
   resolveAgentReadServers,

package/{chunk-EICIFHVS.js → chunk-LAFC3B2I.js}

@@ -1,7 +1,7 @@
 import {
   DEFAULT_AGENT_BASE_POLICY,
   DEFAULT_USER_PREFERENCE_PROFILE
-} from "./chunk-SVC3GGUA.js";
+} from "./chunk-VMWYBIXG.js";
 
 // packages/ai/policy/runtimePolicy.ts
 var clampLevel = (value, fallback) => {

package/{chunk-N4JKMCY3.js → chunk-LJKICKVC.js}

@@ -1,11 +1,11 @@
 import {
   getModelConfig
-} from "./chunk-SVDMVX4G.js";
+} from "./chunk-MMZ6ZTVO.js";
 import {
   isPlatformHostedDeepseekModel,
   isPlatformHostedOpenAIImageModel,
   resolvePlatformHostedRouting
-} from "./chunk-HPW5MNDQ.js";
+} from "./chunk-22BTGNSP.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";

package/chunk-M3JEW6N6.js

@@ -0,0 +1,193 @@
+import {
+  API_VERSION
+} from "./chunk-LCBAMY2M.js";
+
+// packages/core/authRoutes.ts
+var authRoutes = {
+  login: {
+    path: `${API_VERSION}/users/login`,
+    method: "POST",
+    createPath: () => `${API_VERSION}/users/login`
+  },
+  signup: {
+    path: `${API_VERSION}/users/signup`,
+    method: "POST",
+    createPath: () => `${API_VERSION}/users/signup`
+  },
+  users: {
+    cliLoginStart: {
+      path: `${API_VERSION}/users/cli-login/start`,
+      method: "POST",
+      createPath: () => `${API_VERSION}/users/cli-login/start`
+    },
+    cliLoginAuthorize: {
+      path: `${API_VERSION}/users/cli-login/authorize`,
+      method: "POST",
+      createPath: () => `${API_VERSION}/users/cli-login/authorize`
+    },
+    cliLoginPoll: {
+      path: `${API_VERSION}/users/cli-login/poll`,
+      method: "POST",
+      createPath: () => `${API_VERSION}/users/cli-login/poll`
+    },
+    list: {
+      path: `${API_VERSION}/users`,
+      method: "GET",
+      createPath: () => `${API_VERSION}/users`
+    },
+    usageReport: {
+      path: `${API_VERSION}/users/usage-report`,
+      method: "GET",
+      createPath: () => `${API_VERSION}/users/usage-report`
+    },
+    failureReport: {
+      path: `${API_VERSION}/users/failure-report`,
+      method: "GET",
+      createPath: () => `${API_VERSION}/users/failure-report`
+    },
+    growthReport: {
+      path: `${API_VERSION}/users/growth-report`,
+      method: "GET",
+      createPath: () => `${API_VERSION}/users/growth-report`
+    },
+    providerBillingHealth: {
+      path: `${API_VERSION}/users/provider-billing-health`,
+      method: "GET",
+      createPath: () => `${API_VERSION}/users/provider-billing-health`
+    },
+    providerBillingDrilldown: {
+      path: `${API_VERSION}/users/provider-billing-drilldown`,
+      method: "GET",
+      createPath: () => `${API_VERSION}/users/provider-billing-drilldown`
+    },
+    providerCredentials: {
+      path: `${API_VERSION}/users/provider-credentials`,
+      method: "GET",
+      createPath: () => `${API_VERSION}/users/provider-credentials`
+    },
+    providerCredentialLifecycle: {
+      path: `${API_VERSION}/users/provider-credentials/lifecycle`,
+      method: "POST",
+      createPath: () => `${API_VERSION}/users/provider-credentials/lifecycle`
+    },
+    billingAnomalyLifecycle: {
+      path: `${API_VERSION}/users/billing-anomalies/lifecycle`,
+      method: "POST",
+      createPath: () => `${API_VERSION}/users/billing-anomalies/lifecycle`
+    },
+    billingAnomalyDrilldown: {
+      path: `${API_VERSION}/users/billing-anomalies/drilldown`,
+      method: "GET",
+      createPath: () => `${API_VERSION}/users/billing-anomalies/drilldown`
+    },
+    billingAnomalyAudit: {
+      path: `${API_VERSION}/users/billing-anomalies/audit`,
+      method: "POST",
+      createPath: () => `${API_VERSION}/users/billing-anomalies/audit`
+    },
+    detail: {
+      path: `${API_VERSION}/users/:userId`,
+      method: "GET",
+      createPath: (params) => `${API_VERSION}/users/${params.userId}`
+    },
+    sessionRevoke: {
+      path: `${API_VERSION}/users/session-revoke`,
+      method: "POST",
+      createPath: () => `${API_VERSION}/users/session-revoke`
+    },
+    transfer: {
+      path: `${API_VERSION}/users/:userId/transfer`,
+      method: "POST",
+      createPath: (params) => `${API_VERSION}/users/${params.userId}/transfer`
+    },
+    delete: {
+      path: `${API_VERSION}/users/:userId`,
+      method: "DELETE",
+      createPath: (params) => `${API_VERSION}/users/${params.userId}`
+    },
+    disable: {
+      path: `${API_VERSION}/users/:userId/disable`,
+      method: "POST",
+      createPath: (params) => `${API_VERSION}/users/${params.userId}/disable`
+    },
+    enable: {
+      path: `${API_VERSION}/users/:userId/enable`,
+      method: "POST",
+      createPath: (params) => `${API_VERSION}/users/${params.userId}/enable`
+    },
+    adminPermissions: {
+      path: `${API_VERSION}/users/:userId/admin-permissions`,
+      method: "POST",
+      createPath: (params) => `${API_VERSION}/users/${params.userId}/admin-permissions`
+    },
+    sendEmail: {
+      path: `${API_VERSION}/users/send-email`,
+      method: "POST",
+      createPath: () => `${API_VERSION}/users/send-email`
+    },
+    spaceInvite: {
+      path: `${API_VERSION}/users/space-invite`,
+      method: "POST",
+      createPath: () => `${API_VERSION}/users/space-invite`
+    },
+    spaceInviteStatus: {
+      path: `${API_VERSION}/users/space-invite/status`,
+      method: "GET",
+      createPath: () => `${API_VERSION}/users/space-invite/status`
+    },
+    spaceInviteAccept: {
+      path: `${API_VERSION}/users/space-invite/accept`,
+      method: "POST",
+      createPath: () => `${API_VERSION}/users/space-invite/accept`
+    },
+    emailPreferencesGet: {
+      path: `${API_VERSION}/users/email-preferences`,
+      method: "GET",
+      createPath: () => `${API_VERSION}/users/email-preferences`
+    },
+    emailPreferencesUpdate: {
+      path: `${API_VERSION}/users/email-preferences`,
+      method: "POST",
+      createPath: () => `${API_VERSION}/users/email-preferences`
+    },
+    emailReport: {
+      path: `${API_VERSION}/users/email-report`,
+      method: "GET",
+      createPath: () => `${API_VERSION}/users/email-report`
+    },
+    emailRetryRun: {
+      path: `${API_VERSION}/users/email-retry/run`,
+      method: "POST",
+      createPath: () => `${API_VERSION}/users/email-retry/run`
+    },
+    emailReplayFailures: {
+      path: `${API_VERSION}/users/email-replay-failures`,
+      method: "POST",
+      createPath: () => `${API_VERSION}/users/email-replay-failures`
+    },
+    emailConfigGet: {
+      path: `${API_VERSION}/users/email-config`,
+      method: "GET",
+      createPath: () => `${API_VERSION}/users/email-config`
+    },
+    emailConfigUpdate: {
+      path: `${API_VERSION}/users/email-config`,
+      method: "POST",
+      createPath: () => `${API_VERSION}/users/email-config`
+    },
+    emailUnsubscribe: {
+      path: `${API_VERSION}/users/email-unsubscribe`,
+      method: "GET",
+      createPath: () => `${API_VERSION}/users/email-unsubscribe`
+    },
+    rechargeHistory: {
+      path: `${API_VERSION}/users/:userId/recharge-history`,
+      method: "POST",
+      createPath: (params) => `${API_VERSION}/users/${params.userId}/recharge-history`
+    }
+  }
+};
+
+export {
+  authRoutes
+};

package/{chunk-LRGKOI5Y.js → chunk-MBOEV4L2.js}

@@ -7,11 +7,15 @@ import {
 } from "./chunk-UAD2WT54.js";
 import {
   toTimestampMs
-} from "./chunk-7NYDJAQ7.js";
+} from "./chunk-DNNSCSA2.js";
 import {
   fetchFromServer,
   getAllServers
 } from "./chunk-QOKAKDPE.js";
+import {
+  selectIdentityToken,
+  selectIdentityUserId
+} from "./chunk-SEJ5OS6F.js";
 import {
   isTombstoneRecord
 } from "./chunk-GBRG75BQ.js";
@@ -162,8 +166,8 @@ var resolveSpaceRemoteServers = (state2) => {
   return getAllServers(currentServer, syncServers);
 };
 var selectSpaceRemoteAuth = (state2) => ({
-  token: state2?.auth?.currentToken ?? null,
-  userId: state2?.auth?.currentUser?.userId ?? null,
+  token: selectIdentityToken(state2) ?? null,
+  userId: selectIdentityUserId(state2) ?? null,
   servers: resolveSpaceRemoteServers(state2)
 });
 var spaceListsUser = (spaceData, userId) => {