@qmuse/qmuse-cli 1.0.5-dev.2 → 1.0.5-dev.4

package/dist/cli.js

@@ -634,7 +634,8 @@ async function cmdWhoami(flags) {
             log.info(`本地空间 : ${cfg.spaceId}`);
         return;
     }
-    const result = await api.whoami(cfg);
+    // 身份发现不能被上一个账号遗留的空间选择阻断。
+    const result = await api.whoami({ ...cfg, spaceId: undefined });
     if (!result.ok || !result.data?.userId) {
         if (result.status === 401) {
             if (flags['--json'] === true) {
@@ -654,6 +655,8 @@ async function cmdWhoami(flags) {
         fail(`查询当前用户失败: ${result.errorMessage ?? result.errorCode ?? `HTTP ${result.status}`}`);
     }
     const currentUser = result.data;
+    const tenantName = currentUser.tenantName?.trim() ||
+        (currentUser.tenantCode ? '企业专属版' : 'QMuse');
     if (flags['--json'] === true) {
         output({
             apiBaseUrl,
@@ -664,6 +667,7 @@ async function cmdWhoami(flags) {
             spaceId: currentUser.spaceId,
             spaceName: currentUser.spaceName ?? null,
             tenantCode: currentUser.tenantCode,
+            tenantName,
         }, flags);
         return;
     }
@@ -675,7 +679,7 @@ async function cmdWhoami(flags) {
         ? (spaceName ? `${spaceName} [${currentUser.spaceId}]` : currentUser.spaceId)
         : '(无)';
     log.info(`当前空间 : ${spaceLabel}`);
-    log.info(`业务租户 : ${currentUser.tenantCode ?? 'QMuse 默认'}`);
+    log.info(`所属产品 : ${tenantName}`);
 }
 async function cmdConfig(command, flags) {
     const sub = command[1];
@@ -700,7 +704,8 @@ async function cmdSpace(command, flags) {
     const sub = command[1];
     requireAuth(cfg);
     if (sub === 'list') {
-        const r = await api.listSpaces(num(flags, '--page-index', 1), num(flags, '--page-size', 20), cfg);
+        // 空间发现接口不携带当前空间，确保账号切换后仍能列出新账号的空间。
+        const r = await api.listSpaces(num(flags, '--page-index', 1), num(flags, '--page-size', 20), { ...cfg, spaceId: undefined });
         if (!r.ok || !r.data)
             fail(`查询空间失败: ${r.errorMessage ?? r.errorCode ?? `HTTP ${r.status}`}`);
         if (flags['--json'] === true) {
@@ -760,12 +765,14 @@ async function cmdLogin(flags) {
 }
 async function cmdLogout(flags) {
     const cfg = resolveCfg(flags);
-    if (!(cfg.sessionId || '').trim()) {
-        log.warn('当前未配置登录态，无需退出');
-        return;
-    }
+    const hadSession = !!(cfg.sessionId || '').trim();
     deleteSession(cfg);
-    log.success('已从系统凭证库清除当前环境的登录态');
+    if (hadSession) {
+        log.success('已清除当前环境的登录态和空间选择');
+    }
+    else {
+        log.info('当前未配置登录态；已清除空间选择');
+    }
 }
 // ---------------- 帮助 & 入口 ----------------
 const HELP = `QMuse CLI —— 将本地 React 项目导入 QMuse
@@ -783,7 +790,7 @@ const HELP = `QMuse CLI —— 将本地 React 项目导入 QMuse
 命令:
   whoami                                            查看当前环境、登录和空间状态
   login [--status] [--log] [--json]                 通过 QMuse 网页登录
-  logout                                            清除保存的登录态
+  logout                                            清除保存的登录态和空间选择
   config [get|path]                                 查看配置
 
   cloud init -d "<应用功能描述>"                    校验当前空间的 QMuse 云服务权益

package/dist/config.js

@@ -160,7 +160,7 @@ export function saveSession(sessionId, cfg, options = {}) {
     const user = migrateLegacy(path, credentials);
     storeVerified(credentials, origin, sessionId);
     writeConfig(path, {
-        spaceId: user.spaceId,
+        spaceId: options.clearSpaceId ? undefined : user.spaceId,
         credentialOrigins: [...new Set([...credentialOrigins(user), origin])],
     });
 }
@@ -175,7 +175,9 @@ export function deleteSession(cfg, options = {}) {
     credentials.delete(origin);
     if (credentials.get(origin))
         throw new Error('系统凭证库删除校验失败，请重试退出登录');
-    writeConfig(path, { spaceId: user.spaceId, credentialOrigins: credentialOrigins(user).filter(value => value !== origin) });
+    writeConfig(path, {
+        credentialOrigins: credentialOrigins(user).filter(value => value !== origin),
+    });
 }
 export function findConfigPath() {
     for (const path of configPaths()) {

package/dist/login.js

@@ -54,11 +54,11 @@ export function closePrompt() {
 export function openBrowser(url) {
     return open(url, { wait: false }).then(() => true, () => false);
 }
-export function persistSession(sessionId, targetConfig = loadConfig()) {
+export function persistSession(sessionId, targetConfig = loadConfig(), options = {}) {
     const origin = apiOrigin(targetConfig.baseUrl);
     if (!origin)
         throw new Error('登录目标不是有效的 HTTP(S) 地址');
-    saveSession(sessionId, targetConfig);
+    saveSession(sessionId, targetConfig, options);
     log.success('登录态已保存到系统凭证库');
     return origin;
 }
@@ -118,7 +118,7 @@ export async function loginBrowser(cfg, options = {}, dependencyOverrides) {
                     message: `登录态校验失败：${verified.errorMessage ?? verified.errorCode ?? `HTTP ${verified.status}`}`,
                 };
             }
-            dependencies.persist(verified.data.sessionId, cfg);
+            dependencies.persist(verified.data.sessionId, cfg, { clearSpaceId: true });
             return { success: true, sessionId: verified.data.sessionId, method: 'browser' };
         }
         if (!SESSION_EXCHANGE_PENDING_CODES.has(exchanged.errorCode || '')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qmuse/qmuse-cli",
-  "version": "1.0.5-dev.2",
+  "version": "1.0.5-dev.4",
   "description": "将本地 React 项目安全导入 QMuse 的命令行客户端",
   "type": "module",
   "bin": {