dsh-plugin-subscriptions 0.1.1 → 0.1.2

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 V1ki
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.zh.md

@@ -2,7 +2,7 @@
 
 [English](README.md) | 中文
 
-把你的 **ChatGPT(Codex)**、**Claude**、**Grok(X Premium)**订阅当作 [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) 的 LLM provider 使用 —— 不需要 API key。登录在 dsh web 界面完成(设置 → 订阅);token 保存在 `~/.dsh/plugins/subscriptions/auth.json`(权限 0600),过期自动刷新。
+把你的 **ChatGPT(Codex)**、**Claude**、**Grok(X Premium)** 订阅当作 [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) 的 LLM provider 使用 —— 不需要 API key。登录在 dsh web 界面完成(设置 → 订阅);token 保存在 `~/.dsh/plugins/subscriptions/auth.json`(权限 0600),过期自动刷新。
 
 ## 演示
 

package/lib/index.js

@@ -1400,11 +1400,10 @@ var CodexAdapter = class extends LlmAdapter {
 		}));
 	}
 	async listModels(provider) {
-		const session = await this.options.tokens.peek();
-		if (session === void 0) return [];
+		if (await this.options.tokens.peek() === void 0) return [];
 		if (!this.options.discovery) return this.staticModels(provider);
 		try {
-			return (await this.catalog.get(() => fetchCodexModels(session, this.options.fetchFn))).map((model) => ({
+			return (await this.catalog.get(async () => fetchCodexModels(await this.options.tokens.session(), this.options.fetchFn))).map((model) => ({
 				provider,
 				id: model.id,
 				name: model.name,
@@ -1412,6 +1411,7 @@ var CodexAdapter = class extends LlmAdapter {
 				inputModalities: CODEX_MODALITIES
 			}));
 		} catch (error) {
+			if (error instanceof LlmError && (error.code === "MISSING_CREDENTIAL" || error.code === "INVALID_CREDENTIAL")) return [];
 			if (error instanceof OAuthEndpointError && error.status === 401) this.catalog.invalidate();
 			this.options.onWarn?.(`codex model discovery failed; using the built-in catalog (${errorChain(error)})`);
 			return this.staticModels(provider);
@@ -2281,17 +2281,17 @@ var GrokAdapter = class extends LlmAdapter {
 		}));
 	}
 	async listModels(provider) {
-		const session = await this.options.tokens.peek();
-		if (session === void 0) return [];
+		if (await this.options.tokens.peek() === void 0) return [];
 		if (!this.options.discovery) return this.staticModels(provider);
 		try {
-			return (await this.catalog.get(() => fetchGrokModels(session, this.options.fetchFn))).map((model) => ({
+			return (await this.catalog.get(async () => fetchGrokModels(await this.options.tokens.session(), this.options.fetchFn))).map((model) => ({
 				provider,
 				id: model.id,
 				name: model.name,
 				inputModalities: grokModalities(model.id)
 			}));
 		} catch (error) {
+			if (error instanceof LlmError && (error.code === "MISSING_CREDENTIAL" || error.code === "INVALID_CREDENTIAL")) return [];
 			if (error instanceof OAuthEndpointError && error.status === 401) this.catalog.invalidate();
 			this.options.onWarn?.(`grok model discovery failed; using the built-in catalog (${errorChain(error)})`);
 			return this.staticModels(provider);

package/lib/providers/codex.js

@@ -295,7 +295,10 @@ export class CodexAdapter extends LlmAdapter {
         if (!this.options.discovery)
             return this.staticModels(provider);
         try {
-            const discovered = await this.catalog.get(() => fetchCodexModels(session, this.options.fetchFn));
+            // The fetcher runs only on a cache miss, and resolves the session
+            // through the refresh-aware path so an expired access token renews here
+            // instead of failing discovery into the static fallback.
+            const discovered = await this.catalog.get(async () => fetchCodexModels(await this.options.tokens.session(), this.options.fetchFn));
             return discovered.map(model => ({
                 provider,
                 id: model.id,
@@ -305,6 +308,11 @@ export class CodexAdapter extends LlmAdapter {
             }));
         }
         catch (error) {
+            // A permanent refresh failure deletes the stored session: the provider
+            // is logged out, so hide it instead of showing a stale static catalog.
+            if (error instanceof LlmError
+                && (error.code === 'MISSING_CREDENTIAL' || error.code === 'INVALID_CREDENTIAL'))
+                return [];
             if (error instanceof OAuthEndpointError && error.status === 401)
                 this.catalog.invalidate();
             this.options.onWarn?.(`codex model discovery failed; using the built-in catalog (${errorChain(error)})`);

package/lib/providers/grok.js

@@ -252,7 +252,10 @@ export class GrokAdapter extends LlmAdapter {
         if (!this.options.discovery)
             return this.staticModels(provider);
         try {
-            const discovered = await this.catalog.get(() => fetchGrokModels(session, this.options.fetchFn));
+            // The fetcher runs only on a cache miss, and resolves the session
+            // through the refresh-aware path so an expired access token renews here
+            // instead of failing discovery into the static fallback.
+            const discovered = await this.catalog.get(async () => fetchGrokModels(await this.options.tokens.session(), this.options.fetchFn));
             return discovered.map(model => ({
                 provider,
                 id: model.id,
@@ -261,6 +264,11 @@ export class GrokAdapter extends LlmAdapter {
             }));
         }
         catch (error) {
+            // A permanent refresh failure deletes the stored session: the provider
+            // is logged out, so hide it instead of showing a stale static catalog.
+            if (error instanceof LlmError
+                && (error.code === 'MISSING_CREDENTIAL' || error.code === 'INVALID_CREDENTIAL'))
+                return [];
             if (error instanceof OAuthEndpointError && error.status === 401)
                 this.catalog.invalidate();
             this.options.onWarn?.(`grok model discovery failed; using the built-in catalog (${errorChain(error)})`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-subscriptions",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Use ChatGPT (Codex), Claude, and Grok (X Premium) subscriptions as DeepSeek Harness LLM providers, with OAuth login from the web Settings page",
   "license": "MIT",
   "repository": {