dsh-connect-minimaxcode 0.5.5 → 0.5.6

package/README.md

@@ -89,7 +89,7 @@ Web profile 把 `--profile desktop` 换成 `--profile web`。
 
 ```bash
 pnpm pack
-dsh plugin --profile desktop add ./dsh-connect-minimaxcode-0.5.5.tgz
+dsh plugin --profile desktop add ./dsh-connect-minimaxcode-0.5.6.tgz
 ```
 > 桌面版的 profile 由 Electron 应用独占，若 `dsh` 命令不在 PATH 中，请使用 DSH 应用自带的载体 CLI（路径随安装位置而变，例如 `<DSH安装目录>\resources\runtime\cli\bin\dsh.cmd`）。
 
@@ -340,6 +340,13 @@ OAuth 令牌有效期约 1 小时，由客户端自动续期。插件**只在自
 
 ## 更新记录
 
+### 0.5.6（2026-11-09）
+
+- **修复「模型请求全部失败，但积分/签到正常」**：这是两条凭证路径读的不是同一个文件。模型网关此前只认插件自登录与桌面 App 留下的**旧版 JWT**（`local-runtime.auth.json`），而新版 App 早已改用 OAuth 存储（`auth/prod/<region>/mcode-public/auth.json`，`mmoat_` 令牌）。旧 JWT 过期后网关一律回 `401 auth failed`，而积分走的是 OAuth 文件，于是出现「积分能看、模型不通」。现在网关依次尝试：插件自登录 → **桌面 App 的 OAuth 授权** → 旧版 JWT，三者取第一个可用的。
+- **修复「令牌被上游吊销后永不重登」**：吊销不会改动本地记录的过期时间，而此前的续期判断**只看过期时间**，于是死令牌被一直使用，所有请求 401，界面却仍显示已登录、也没有重新登录入口。现在账户接口返回 `401` 会触发一次强制续期；续期被拒（`400`/`401`/`invalid_grant`，或凭据本身没有 refresh token）则删除该凭据、清空缓存状态，卡片改为提示重新登录。**续期的网络错误与 `5xx` 不算吊销**，不会因为上游一时抽风就把人登出。
+- **修复状态卡把「可用」报成「已过期」**：卡片的登录态此前只读旧 JWT，因此网关明明能通也显示 `expired`。现在它描述的是**网关实际会用的那枚凭据**，并新增 `credential-revoked` / `credential-expired` 两种更贴切的提示文案（指向卡片上的登录按钮，而不是「去桌面 App 登录后重启 DSH」）。
+- 新增 `tests/revoked-credential.spec.ts`（6 个用例）钉住：401 后凭据被删除且卡片转为未登录、被拒时给出「重新登录」提示、`503` 不会误删凭据、无桌面 App 时插件自登录显示为已登录、OAuth 授权优先于旧 JWT、状态文档不泄露任何令牌。全量 193 个用例通过。
+
 ### 0.5.5（2026-11-07）
 
 - **新增「限额窗口」显示**：读取开放平台的 `GET /backend/account/token_plan/remains_percent`（该接口来自桌面 App 每天真实调用的日志，同样未在官方文档中公开），展示套餐的**5 小时窗口**与**每周窗口**的已用百分比与重置倒计时。窗口时长从响应自身的起止字段推导，不写死 5 小时或 7 天——套餐条款变过不止一次，显示应跟随服务端所说。

package/lib/index.d.ts

@@ -611,6 +611,8 @@ declare function pluginStatePath(env?: NodeJS.ProcessEnv): string;
 declare function readPluginCredential(env?: NodeJS.ProcessEnv): Promise<PluginCredential | undefined>;
 /** Write the plugin's own credential. */
 declare function writePluginCredential(credential: PluginCredential, env?: NodeJS.ProcessEnv): Promise<void>;
+/** Remove the plugin's own credential, which is what signing out means. */
+declare function deletePluginCredential(env?: NodeJS.ProcessEnv): Promise<void>;
 /** Read the plugin's own state. */
 declare function readPluginState(env?: NodeJS.ProcessEnv): Promise<PluginState>;
 /** Write the plugin's own state. */
@@ -1037,7 +1039,6 @@ interface AdapterBundle {
 declare function createMinimaxCodeAdapter(options: AdapterOptions): AdapterBundle;
 //#endregion
 //#region src/index.d.ts
-/** Loader entry name; also the id the bundle patch inserts. */
 declare const name = "dsh-connect-minimaxcode";
 /** Services this plugin needs before it can serve anything. */
 declare const inject: string[];
@@ -1052,4 +1053,4 @@ declare const inject: string[];
  */
 declare function apply(ctx: Context): void;
 //#endregion
-export { type AuthState, type CatalogModel, type CatalogSource, type Credential, type CreditSummary, DEVICE_CODE_GRANT, DEVICE_CODE_PATH, type DeviceLoginState, EMPTY_USAGE, FALLBACK_MODELS, MEMBERSHIP_PATH, MINIMAXCODE_PROVIDER_ID, MINIMAX_ACTION_PATH, MINIMAX_AUTH_FILENAME, MINIMAX_DATA_DIR, MINIMAX_GATEWAYS, MINIMAX_OAUTH_CLIENT_ID, MINIMAX_REGIONS, MINIMAX_STATUS_PATH, MINIMAX_STREAM_IDLE_TIMEOUT_MS, MODEL_PRICES, MinimaxCatalog, MinimaxCredits, type MinimaxRegion, type ModelUsage, type OAuthCredential, type OAuthState, PLUGIN_CREDENTIAL_FILENAME, PLUGIN_STATE_FILENAME, type PluginCredential, type PluginState, REMAINS_PERCENT_PATH, type RateLimitWindows, SIGNIN_CLAIM_PATH, SIGNIN_CLAIM_RESULT, SIGNIN_CYCLE_DAYS, SIGNIN_DAY_STATUS, SIGNIN_PANEL_PATH, type SigninClaim, type SigninDay, type SigninPanel, type StatusDocument, type TokenClaims, UsageMeter, apply, authPath, bearerToken, catalogUrl, chatBaseUrl, claimSignin, createMinimaxCodeAdapter, dataDir, daysRemaining, decodeClaims, dshHome, ensureOAuthCredential, estimateCny, expiresInMs, expiryLevel, fetchCreditSummary, fetchRateLimitWindows, fetchSigninPanel, inject, localDay, makePkce, name, parseAuthDocument, parseCatalog, parseCreditSummary, parseOAuthDocument, parseRateLimitWindows, parseSigninClaim, parseSigninPanel, pluginCredentialPath, pluginStatePath, pollDeviceLogin, priceFor, readCredential, readOAuthCredential, readPluginCredential, readPluginState, refreshOAuthCredential, refreshPluginCredential, startDeviceLogin, statusDocument, timezoneId, writeOAuthCredential, writePluginCredential, writePluginState };
+export { type AuthState, type CatalogModel, type CatalogSource, type Credential, type CreditSummary, DEVICE_CODE_GRANT, DEVICE_CODE_PATH, type DeviceLoginState, EMPTY_USAGE, FALLBACK_MODELS, MEMBERSHIP_PATH, MINIMAXCODE_PROVIDER_ID, MINIMAX_ACTION_PATH, MINIMAX_AUTH_FILENAME, MINIMAX_DATA_DIR, MINIMAX_GATEWAYS, MINIMAX_OAUTH_CLIENT_ID, MINIMAX_REGIONS, MINIMAX_STATUS_PATH, MINIMAX_STREAM_IDLE_TIMEOUT_MS, MODEL_PRICES, MinimaxCatalog, MinimaxCredits, type MinimaxRegion, type ModelUsage, type OAuthCredential, type OAuthState, PLUGIN_CREDENTIAL_FILENAME, PLUGIN_STATE_FILENAME, type PluginCredential, type PluginState, REMAINS_PERCENT_PATH, type RateLimitWindows, SIGNIN_CLAIM_PATH, SIGNIN_CLAIM_RESULT, SIGNIN_CYCLE_DAYS, SIGNIN_DAY_STATUS, SIGNIN_PANEL_PATH, type SigninClaim, type SigninDay, type SigninPanel, type StatusDocument, type TokenClaims, UsageMeter, apply, authPath, bearerToken, catalogUrl, chatBaseUrl, claimSignin, createMinimaxCodeAdapter, dataDir, daysRemaining, decodeClaims, deletePluginCredential, dshHome, ensureOAuthCredential, estimateCny, expiresInMs, expiryLevel, fetchCreditSummary, fetchRateLimitWindows, fetchSigninPanel, inject, localDay, makePkce, name, parseAuthDocument, parseCatalog, parseCreditSummary, parseOAuthDocument, parseRateLimitWindows, parseSigninClaim, parseSigninPanel, pluginCredentialPath, pluginStatePath, pollDeviceLogin, priceFor, readCredential, readOAuthCredential, readPluginCredential, readPluginState, refreshOAuthCredential, refreshPluginCredential, startDeviceLogin, statusDocument, timezoneId, writeOAuthCredential, writePluginCredential, writePluginState };

package/lib/index.js

@@ -693,7 +693,9 @@ const HINTS = {
 	"app-missing": "未找到 MiniMax Code 的登录信息。请先安装并登录 MiniMax Code 桌面 App，然后重启 DSH。",
 	"not-signed-in": "MiniMax Code 尚未登录。请在 MiniMax Code 桌面 App 中登录后重启 DSH。",
 	unreadable: "登录信息文件无法读取。请确认 MiniMax Code 仍处于登录状态。",
-	malformed: "登录令牌格式无法解析。请在 MiniMax Code 中重新登录后重启 DSH。"
+	malformed: "登录令牌格式无法解析。请在 MiniMax Code 中重新登录后重启 DSH。",
+	"credential-revoked": "登录凭据已被服务器撤销，模型请求无法通过。请点击下方登录按钮重新登录 MiniMax Code。",
+	"credential-expired": "登录凭据已过期。请点击下方登录按钮重新登录 MiniMax Code。"
 };
 /**
 * Build the card's status document.
@@ -721,7 +723,7 @@ function statusDocument(deps) {
 		...base,
 		expiry: "expired",
 		daysRemaining: 0,
-		hint: "登录令牌已过期。请打开并登录 MiniMax Code 桌面 App 以获取新令牌，然后重启 DSH。"
+		hint: HINTS[auth.reason ?? ""] ?? "登录令牌已过期。请打开并登录 MiniMax Code 桌面 App 以获取新令牌，然后重启 DSH。"
 	};
 	if (auth.state === "signed-out") return {
 		...base,
@@ -1405,6 +1407,11 @@ async function readPluginCredential(env = process.env) {
 async function writePluginCredential(credential, env = process.env) {
 	await writePrivate(pluginCredentialPath(env), credential);
 }
+/** Remove the plugin's own credential, which is what signing out means. */
+async function deletePluginCredential(env = process.env) {
+	const { rm } = await import("node:fs/promises");
+	await rm(pluginCredentialPath(env), { force: true });
+}
 /** Read the plugin's own state. */
 async function readPluginState(env = process.env) {
 	let text;
@@ -2012,6 +2019,25 @@ var UsageMeter = class {
 //#endregion
 //#region src/index.ts
 /** Loader entry name; also the id the bundle patch inserts. */
+/**
+* Whether a message says the server refused the credential itself.
+*
+* The account and catalog endpoints answer a revoked or unknown bearer with
+* `401`, and the only place that surfaces is the message the request layer
+* built. Matching the status code rather than the wording keeps this working
+* whatever language the message is written in.
+*/
+const isUnauthorized = (message) => message !== void 0 && /\bHTTP 401\b/.test(message);
+/**
+* Whether a failed refresh means the credential can never be used again.
+*
+* The authorization server answers a revoked or already-spent refresh token
+* with `400`/`401`, and a credential that carries no refresh token can never
+* be renewed at all. Both are final. A `5xx` or a dropped connection is not:
+* throwing the credential away over a bad minute upstream would sign the
+* person out for nothing.
+*/
+const isRefreshRefused = (message) => message.includes("没有可用于续期的 refresh token") || /\bHTTP (400|401)\b/.test(message);
 const name = "dsh-connect-minimaxcode";
 /** Services this plugin needs before it can serve anything. */
 const inject = ["llm"];
@@ -2072,14 +2098,50 @@ function apply(ctx) {
 	let loginSource;
 	/** Whether a device login is waiting to be authorized. */
 	let loginPending = false;
+	/** Whether the server refused the plugin's own credential. */
+	let revokedByServer = false;
+	/**
+	* Give up on the plugin's own credential after the server refused it.
+	*
+	* A revoked token keeps its expiry date, so every later call would send the
+	* same dead token and fail the same way. The only way back is a new sign-in,
+	* so the credential is deleted, the cached views of the account it belonged
+	* to are dropped, and the card is left asking for one.
+	*/
+	const revokePluginCredential = async () => {
+		await deletePluginCredential();
+		if (pluginState.deviceLogin !== void 0) {
+			pluginState = {
+				...pluginState,
+				deviceLogin: void 0
+			};
+			await writePluginState(pluginState);
+		}
+		revokedByServer = true;
+		modelToken = void 0;
+		loginSource = void 0;
+		loginPending = false;
+		creditState = "signed-out";
+		signinPanel = void 0;
+		signinClaim = void 0;
+		signinError = void 0;
+		catalog.invalidate();
+		lastCreditAtMs = Date.now();
+		lastSigninAtMs = Date.now();
+		lastCatalogAtMs = 0;
+	};
 	/**
 	* The credential the model gateway is called with.
 	*
 	* The plugin's own sign-in comes first: it is the credential the person
 	* chose, and on a machine where the desktop app was never installed it is
-	* the only one there is. The desktop app's token is the fallback, and the
-	* two are interchangeable as far as the gateway is concerned — it accepts
-	* either bearer.
+	* the only one there is.
+	*
+	* The desktop app's OAuth grant is next, and it is not a mere fallback: it
+	* is the credential a current install actually holds. Its `mmoat_` bearer is
+	* what the gateway accepts, while the legacy JWT older installs left behind
+	* is refused with `401 auth failed` — so the OAuth file has to be consulted
+	* before that JWT, or a working machine looks broken.
 	*/
 	const resolveGatewayCredential = async () => {
 		const own = await readPluginCredential();
@@ -2089,11 +2151,18 @@ function apply(ctx) {
 				await writePluginCredential(next);
 				loginSource = "plugin";
 				modelToken = next.accessToken;
+				revokedByServer = false;
 				return {
 					token: next.accessToken,
 					claims: { exp: Math.floor((next.expiresAtMs ?? Date.now()) / 1e3) }
 				};
-			} catch {}
+			} catch (error) {
+				const message = error instanceof Error ? error.message : String(error);
+				if (isRefreshRefused(message)) {
+					await revokePluginCredential();
+					return;
+				}
+			}
 			else {
 				loginSource = "plugin";
 				modelToken = own.accessToken;
@@ -2103,6 +2172,15 @@ function apply(ctx) {
 				};
 			}
 		}
+		const oauth = await ensureOAuthCredential(region, process.env);
+		if (oauth.state === "signed-in") {
+			loginSource = "desktop-app";
+			modelToken = oauth.credential.token;
+			return {
+				token: oauth.credential.token,
+				claims: { exp: Math.floor((oauth.credential.expiresAtMs ?? Date.now()) / 1e3) }
+			};
+		}
 		const state = await readCredential();
 		if (state.state !== "signed-in") {
 			loginSource = void 0;
@@ -2130,7 +2208,15 @@ function apply(ctx) {
 					state: "signed-in",
 					credential: toOAuthCredential(next)
 				};
-			} catch {
+			} catch (error) {
+				const message = error instanceof Error ? error.message : String(error);
+				if (isRefreshRefused(message)) {
+					await revokePluginCredential();
+					return {
+						state: "signed-out",
+						reason: "not-signed-in"
+					};
+				}
 				return {
 					state: "expired",
 					credential: toOAuthCredential(own)
@@ -2185,6 +2271,15 @@ function apply(ctx) {
 		}
 		await credits.refresh(state.credential, region, fetch, now);
 		creditState = credits.snapshot === void 0 ? "unavailable" : "ok";
+		if ([
+			credits.error,
+			credits.ledgerError,
+			credits.rateLimitError
+		].find((message) => isUnauthorized(message)) !== void 0) {
+			await revokePluginCredential();
+			return;
+		}
+		if (credits.snapshot !== void 0) revokedByServer = false;
 	};
 	/**
 	* Read the check-in cycle, and claim the day's grant when asked to.
@@ -2210,7 +2305,12 @@ function apply(ctx) {
 			signinPanel = panel;
 			signinError = void 0;
 		} catch (error) {
-			signinError = error instanceof Error ? error.message : String(error);
+			const message = error instanceof Error ? error.message : String(error);
+			if (isUnauthorized(message)) {
+				await revokePluginCredential();
+				return;
+			}
+			signinError = message;
 			return;
 		}
 		if (!pluginState.autoCheckin || panel === void 0) return;
@@ -2241,7 +2341,12 @@ function apply(ctx) {
 			refreshCredits();
 			return claim;
 		} catch (error) {
-			signinError = error instanceof Error ? error.message : String(error);
+			const message = error instanceof Error ? error.message : String(error);
+			if (isUnauthorized(message)) {
+				await revokePluginCredential();
+				return;
+			}
+			signinError = message;
 			return;
 		}
 	};
@@ -2363,21 +2468,47 @@ function apply(ctx) {
 		}
 	});
 	ctx.llm.registerAdapter(["minimaxcode"], adapter);
-	/** Build the document the card renders, without ever exposing the token. */
-	const buildStatus = async () => {
+	/**
+	* The sign-in state the card reports.
+	*
+	* It describes the credential the gateway will actually be called with, not
+	* a particular file on disk: the card exists to answer "will a request
+	* work", and a token the server refused is not a sign-in however unexpired
+	* it looks. Reading the legacy JWT alone is what made a machine whose model
+	* gateway was working report a signed-out, expired card.
+	*/
+	const buildAuthStatus = async () => {
+		if (revokedByServer) return {
+			state: "signed-out",
+			reason: "credential-revoked"
+		};
+		const current = await readNow();
+		if (current !== void 0) {
+			const remaining = expiresInMs(current.claims);
+			if (remaining <= 0) return {
+				state: "expired",
+				reason: "credential-expired"
+			};
+			return {
+				state: "signed-in",
+				daysRemaining: Math.ceil(remaining / 864e5),
+				expiry: expiryLevel(current.claims)
+			};
+		}
 		const state = await readCredential();
-		const auth = state.state === "signed-in" ? {
-			state: "signed-in",
-			daysRemaining: Math.ceil(expiresInMs(state.credential.claims) / 864e5),
-			expiry: expiryLevel(state.credential.claims)
-		} : state.state === "expired" ? { state: "expired" } : {
+		if (state.state === "expired") return { state: "expired" };
+		if (state.state === "signed-out") return {
 			state: "signed-out",
 			reason: state.reason
 		};
+		return { state: "signed-in" };
+	};
+	/** Build the document the card renders, without ever exposing the token. */
+	const buildStatus = async () => {
 		await refreshCredits();
 		await refreshSignin();
 		return statusDocument({
-			auth,
+			auth: await buildAuthStatus(),
 			region,
 			catalogSource: catalog.source,
 			catalogError: catalog.error,
@@ -2465,6 +2596,7 @@ function apply(ctx) {
 					};
 					await writePluginState(pluginState);
 					loginPending = false;
+					revokedByServer = false;
 					loginSource = "plugin";
 					modelToken = result.credential.accessToken;
 					catalog.invalidate();
@@ -2582,4 +2714,4 @@ async function readRequestBody(req) {
 	return text;
 }
 //#endregion
-export { DEVICE_CODE_GRANT, DEVICE_CODE_PATH, EMPTY_USAGE, FALLBACK_MODELS, MEMBERSHIP_PATH, MINIMAXCODE_PROVIDER_ID, MINIMAX_ACTION_PATH, MINIMAX_AUTH_FILENAME, MINIMAX_DATA_DIR, MINIMAX_GATEWAYS, MINIMAX_OAUTH_CLIENT_ID, MINIMAX_REGIONS, MINIMAX_STATUS_PATH, MINIMAX_STREAM_IDLE_TIMEOUT_MS, MODEL_PRICES, MinimaxCatalog, MinimaxCredits, PLUGIN_CREDENTIAL_FILENAME, PLUGIN_STATE_FILENAME, REMAINS_PERCENT_PATH, SIGNIN_CLAIM_PATH, SIGNIN_CLAIM_RESULT, SIGNIN_CYCLE_DAYS, SIGNIN_DAY_STATUS, SIGNIN_PANEL_PATH, UsageMeter, apply, authPath, bearerToken, catalogUrl, chatBaseUrl, claimSignin, createMinimaxCodeAdapter, dataDir, daysRemaining, decodeClaims, dshHome, ensureOAuthCredential, estimateCny, expiresInMs, expiryLevel, fetchCreditSummary, fetchRateLimitWindows, fetchSigninPanel, inject, localDay, makePkce, name, parseAuthDocument, parseCatalog, parseCreditSummary, parseOAuthDocument, parseRateLimitWindows, parseSigninClaim, parseSigninPanel, pluginCredentialPath, pluginStatePath, pollDeviceLogin, priceFor, readCredential, readOAuthCredential, readPluginCredential, readPluginState, refreshOAuthCredential, refreshPluginCredential, startDeviceLogin, statusDocument, timezoneId, writeOAuthCredential, writePluginCredential, writePluginState };
+export { DEVICE_CODE_GRANT, DEVICE_CODE_PATH, EMPTY_USAGE, FALLBACK_MODELS, MEMBERSHIP_PATH, MINIMAXCODE_PROVIDER_ID, MINIMAX_ACTION_PATH, MINIMAX_AUTH_FILENAME, MINIMAX_DATA_DIR, MINIMAX_GATEWAYS, MINIMAX_OAUTH_CLIENT_ID, MINIMAX_REGIONS, MINIMAX_STATUS_PATH, MINIMAX_STREAM_IDLE_TIMEOUT_MS, MODEL_PRICES, MinimaxCatalog, MinimaxCredits, PLUGIN_CREDENTIAL_FILENAME, PLUGIN_STATE_FILENAME, REMAINS_PERCENT_PATH, SIGNIN_CLAIM_PATH, SIGNIN_CLAIM_RESULT, SIGNIN_CYCLE_DAYS, SIGNIN_DAY_STATUS, SIGNIN_PANEL_PATH, UsageMeter, apply, authPath, bearerToken, catalogUrl, chatBaseUrl, claimSignin, createMinimaxCodeAdapter, dataDir, daysRemaining, decodeClaims, deletePluginCredential, dshHome, ensureOAuthCredential, estimateCny, expiresInMs, expiryLevel, fetchCreditSummary, fetchRateLimitWindows, fetchSigninPanel, inject, localDay, makePkce, name, parseAuthDocument, parseCatalog, parseCreditSummary, parseOAuthDocument, parseRateLimitWindows, parseSigninClaim, parseSigninPanel, pluginCredentialPath, pluginStatePath, pollDeviceLogin, priceFor, readCredential, readOAuthCredential, readPluginCredential, readPluginState, refreshOAuthCredential, refreshPluginCredential, startDeviceLogin, statusDocument, timezoneId, writeOAuthCredential, writePluginCredential, writePluginState };

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-connect-minimaxcode",
   "displayName": "DSH Connect MiniMax Code",
   "description": "把本机已登录的 MiniMax Code 桌面 App 模型接入 DeepSeek Harness：零配置、Anthropic Messages 兼容、动态模型目录，并显示积分余额与到期 — bring MiniMax Code desktop app models into DSH with a dynamic model catalog and a credit balance with expiry details.",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "author": "JeffTsuiCUG",
   "contributors": [
     {