@goodandready/dsh-subscriptions 0.6.1 → 0.6.2

package/README.md

@@ -195,10 +195,15 @@ dsh plugin --profile web add @goodandready/dsh-subscriptions
 ```
 
 > [!IMPORTANT]
-> Restart DSH Web UI after installation (`systemctl --user restart dsh-web`) and navigate to **Settings → Subscriptions** to link your accounts.
+> Restart DSH Web UI after installation (`systemctl --user restart dsh-web`) and navigate to **Settings → Plugins → Plugin Settings → Subscriptions** to link your accounts.
 
 ---
 
+
+> [!TIP]
+> **UI Settings Card vs YAML Overrides**:
+> All common options (account slots, autoLoopback, privacyMask, composerQuota, expiryNotifyDays, codexFastMode, codexVerbosity, ollamaFallback/baseUrl/model, and cooldown/probe intervals) can be managed directly in the Web UI card (**Settings → Plugins → Plugin Settings → Subscriptions**). Low-level parameters such as OAuth client IDs/redirect URIs, API base URL overrides, and custom vendors are configured in `settings.yaml`.
+
 ## ⚙️ Configuration Reference (`settings.yaml`)
 
 ```yaml

package/README.ru.md

@@ -172,6 +172,11 @@ dsh plugin --profile web add @goodandready/dsh-subscriptions
 
 ---
 
+
+> [!TIP]
+> **Карточка настроек в UI vs Настройки в YAML**:
+> Все основные параметры (слоты аккаунтов, перехват autoLoopback, privacyMask, индикатор composerQuota, оповещение expiryNotifyDays, codexFastMode, codexVerbosity, ollamaFallback/baseUrl/model, интервалы cooldown и probe) настраиваются напрямую в Web UI: **«Настройки → Плагины → Настройки плагинов → Subscriptions»**. Низкоуровневые оверрайды (собственные OAuth Client ID / Redirect URI, Base URL для прокси, кастомные вендоры) задаются в `settings.yaml`.
+
 ## ⚙️ Пример конфигурации (`settings.yaml`)
 
 ```yaml

package/lib/client.js

@@ -103,6 +103,10 @@ window.__ModuleLoader__.load({
     '.dsub-heroHead{display:flex;align-items:center;justify-content:space-between;margin-bottom:10px}' +
     '.dsub-heroTitle{font-size:14px;font-weight:700;display:flex;align-items:center;gap:6px}' +
     '.dsub-heroModel{font-size:11.5px;color:var(--dsw-alias-label-secondary);font-family:ui-monospace,monospace}' +
+    '.dsub-select{appearance:none;height:30px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);color:var(--dsw-alias-label-primary);border-radius:6px;padding:0 24px 0 8px;font-size:12px;cursor:pointer}' +
+    '.dsub-details{margin-top:12px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;padding:8px 12px;background:var(--dsw-alias-bg-layer-2)}' +
+    '.dsub-summary{cursor:pointer;font-weight:600;font-size:12.5px;color:var(--dsw-alias-label-secondary);user-select:none}' +
+    '.dsub-summary:hover{color:var(--dsw-alias-label-primary)}' +
     '.dsub-heroBars{display:flex;flex-direction:column;gap:8px;margin-top:10px}' +
     '.dsub-barLabelRow{display:flex;justify-content:space-between;font-size:11.5px;color:var(--dsw-alias-label-secondary);margin-bottom:3px}' +
     '.dsub-barTrack{height:6px;border-radius:3px;background:var(--dsw-alias-bg-layer-1);overflow:hidden}' +
@@ -308,6 +312,37 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       'useOriginHint': 'Leave off unless you registered your own OAuth client for this origin. Vendor CLI clients usually require their published redirect URI plus the paste step.',
       'privacyMask': 'Mask emails and account identifiers',
       'privacyMaskHint': 'For demos and screen sharing: emails show as j***n@example.com.',
+      'autoLoopback': 'Auto Loopback',
+      'autoLoopbackHint': 'Listen on local callback port to catch OAuth tokens automatically without manual copy-paste.',
+      'hideDeprecated': 'Hide deprecated models',
+      'hideDeprecatedHint': 'Hide older or superseded model variants from model dropdowns.',
+      'composerQuota': 'Composer quota indicator',
+      'composerQuotaHint': 'Display subscription usage indicator directly in the composer toolbar.',
+      'composerQuotaOff': 'Disabled',
+      'composerQuotaPercent': 'Percentage',
+      'composerQuotaBar': 'Progress Bar',
+      'composerQuotaForecast': 'Remaining Forecast',
+      'expiryNotifyDays': 'Expiry warning threshold (days)',
+      'expiryNotifyDaysHint': 'Notify when subscription renewal or token expiration is within this many days (0 to disable).',
+      'codexFastMode': 'Codex fast mode (1.5x)',
+      'codexFastModeHint': 'Enable high-throughput mode for OpenAI Codex models if supported by subscription.',
+      'codexVerbosity': 'Codex streaming verbosity',
+      'codexVerbosityHint': 'Control streaming chunking detail level from the Codex provider.',
+      'codexVerbosityDefault': 'Default',
+      'codexVerbosityLow': 'Low',
+      'codexVerbosityMedium': 'Medium',
+      'codexVerbosityHigh': 'High',
+      'ollamaFallback': 'Ollama local fallback',
+      'ollamaFallbackHint': 'Automatically route queries to a local Ollama instance when cloud quota is exhausted.',
+      'ollamaBaseUrl': 'Ollama Base URL',
+      'ollamaFallbackModel': 'Ollama Fallback Model',
+      'advancedSettings': 'Advanced Settings & Monitoring',
+      'cooldownMs': 'Failure cooldown (minutes)',
+      'cooldownMsHint': 'How long to pause a failing or rate-limited account before retrying.',
+      'probeIntervalMin': 'Health probe interval (minutes)',
+      'probeIntervalMinHint': 'Interval for background checks to refresh account status and quota balance.',
+      'notifyLimits': 'Notify on rate limits',
+      'notifyLimitsHint': 'Show notification alerts when account usage reaches quota ceiling.',
       'resetCredits': 'Reset credits',
       'resetCreditsHint': 'ChatGPT reset cards: emergency reset for the 5-hour window. Requires a 5s confirmation.',
       'resetCreditsAction': 'Reset ChatGPT Limit',
@@ -847,6 +882,146 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           ),
           React.createElement('div', { className: 'dsub-sub' },
             t('privacyMaskHint')),
+          React.createElement('label', { className: 'dsub-row' },
+            React.createElement('input', {
+              type: 'checkbox',
+              checked: !!draft.autoLoopback,
+              onChange: (e) => setDraft((d) => Object.assign({}, d, { autoLoopback: e.target.checked })),
+            }),
+            React.createElement('span', null, t('autoLoopback')),
+          ),
+          React.createElement('div', { className: 'dsub-sub' },
+            t('autoLoopbackHint')),
+          React.createElement('label', { className: 'dsub-row' },
+            React.createElement('input', {
+              type: 'checkbox',
+              checked: !!draft.hideDeprecatedModels,
+              onChange: (e) => setDraft((d) => Object.assign({}, d, { hideDeprecatedModels: e.target.checked })),
+            }),
+            React.createElement('span', null, t('hideDeprecated')),
+          ),
+          React.createElement('div', { className: 'dsub-sub' },
+            t('hideDeprecatedHint')),
+          React.createElement('div', { className: 'dsub-row' },
+            React.createElement('span', { className: 'dsub-h' }, t('composerQuota')),
+            React.createElement('select', {
+              className: 'dsub-select',
+              value: draft.composerQuota || 'percent',
+              onChange: (e) => setDraft((d) => Object.assign({}, d, { composerQuota: e.target.value })),
+            },
+              React.createElement('option', { value: 'off' }, t('composerQuotaOff')),
+              React.createElement('option', { value: 'percent' }, t('composerQuotaPercent')),
+              React.createElement('option', { value: 'bar' }, t('composerQuotaBar')),
+              React.createElement('option', { value: 'forecast' }, t('composerQuotaForecast')),
+            ),
+          ),
+          React.createElement('div', { className: 'dsub-sub' },
+            t('composerQuotaHint')),
+          React.createElement('div', { className: 'dsub-row' },
+            React.createElement('span', { className: 'dsub-h' }, t('expiryNotifyDays')),
+            React.createElement('input', {
+              type: 'number',
+              className: 'dsub-inp',
+              style: { width: '80px', minWidth: '80px' },
+              min: 0,
+              max: 90,
+              value: draft.expiryNotifyDays != null ? draft.expiryNotifyDays : 7,
+              onChange: (e) => setDraft((d) => Object.assign({}, d, { expiryNotifyDays: Number(e.target.value) || 0 })),
+            }),
+          ),
+          React.createElement('div', { className: 'dsub-sub' },
+            t('expiryNotifyDaysHint')),
+          React.createElement('label', { className: 'dsub-row' },
+            React.createElement('input', {
+              type: 'checkbox',
+              checked: !!draft.codexFastMode,
+              onChange: (e) => setDraft((d) => Object.assign({}, d, { codexFastMode: e.target.checked })),
+            }),
+            React.createElement('span', null, t('codexFastMode')),
+          ),
+          React.createElement('div', { className: 'dsub-sub' },
+            t('codexFastModeHint')),
+          React.createElement('div', { className: 'dsub-row' },
+            React.createElement('span', { className: 'dsub-h' }, t('codexVerbosity')),
+            React.createElement('select', {
+              className: 'dsub-select',
+              value: draft.codexVerbosity || 'default',
+              onChange: (e) => setDraft((d) => Object.assign({}, d, { codexVerbosity: e.target.value })),
+            },
+              React.createElement('option', { value: 'default' }, t('codexVerbosityDefault')),
+              React.createElement('option', { value: 'low' }, t('codexVerbosityLow')),
+              React.createElement('option', { value: 'medium' }, t('codexVerbosityMedium')),
+              React.createElement('option', { value: 'high' }, t('codexVerbosityHigh')),
+            ),
+          ),
+          React.createElement('div', { className: 'dsub-sub' },
+            t('codexVerbosityHint')),
+          React.createElement('label', { className: 'dsub-row' },
+            React.createElement('input', {
+              type: 'checkbox',
+              checked: !!draft.ollamaFallback,
+              onChange: (e) => setDraft((d) => Object.assign({}, d, { ollamaFallback: e.target.checked })),
+            }),
+            React.createElement('span', null, t('ollamaFallback')),
+          ),
+          React.createElement('div', { className: 'dsub-sub' },
+            t('ollamaFallbackHint')),
+          draft.ollamaFallback ? React.createElement('div', { className: 'dsub-row' },
+            React.createElement('input', {
+              type: 'text',
+              className: 'dsub-inp dsub-grow',
+              placeholder: 'http://localhost:11434',
+              value: draft.ollamaBaseUrl || '',
+              onChange: (e) => setDraft((d) => Object.assign({}, d, { ollamaBaseUrl: e.target.value })),
+            }),
+            React.createElement('input', {
+              type: 'text',
+              className: 'dsub-inp dsub-grow',
+              placeholder: 'llama3:latest',
+              value: draft.ollamaFallbackModel || '',
+              onChange: (e) => setDraft((d) => Object.assign({}, d, { ollamaFallbackModel: e.target.value })),
+            }),
+          ) : null,
+          React.createElement('details', { className: 'dsub-details' },
+            React.createElement('summary', { className: 'dsub-summary' }, t('advancedSettings')),
+            React.createElement('div', { className: 'dsub-block' },
+              React.createElement('div', { className: 'dsub-row' },
+                React.createElement('span', { className: 'dsub-h' }, t('cooldownMs')),
+                React.createElement('input', {
+                  type: 'number',
+                  className: 'dsub-inp',
+                  style: { width: '80px', minWidth: '80px' },
+                  min: 1,
+                  max: 120,
+                  value: Math.round((draft.cooldownMs || 600000) / 60000),
+                  onChange: (e) => setDraft((d) => Object.assign({}, d, { cooldownMs: (Number(e.target.value) || 10) * 60000 })),
+                }),
+              ),
+              React.createElement('div', { className: 'dsub-sub' }, t('cooldownMsHint')),
+              React.createElement('div', { className: 'dsub-row' },
+                React.createElement('span', { className: 'dsub-h' }, t('probeIntervalMin')),
+                React.createElement('input', {
+                  type: 'number',
+                  className: 'dsub-inp',
+                  style: { width: '80px', minWidth: '80px' },
+                  min: 1,
+                  max: 1440,
+                  value: draft.probeIntervalMin != null ? draft.probeIntervalMin : 15,
+                  onChange: (e) => setDraft((d) => Object.assign({}, d, { probeIntervalMin: Number(e.target.value) || 15 })),
+                }),
+              ),
+              React.createElement('div', { className: 'dsub-sub' }, t('probeIntervalMinHint')),
+              React.createElement('label', { className: 'dsub-row' },
+                React.createElement('input', {
+                  type: 'checkbox',
+                  checked: draft.notifyLimits !== false,
+                  onChange: (e) => setDraft((d) => Object.assign({}, d, { notifyLimits: e.target.checked })),
+                }),
+                React.createElement('span', null, t('notifyLimits')),
+              ),
+              React.createElement('div', { className: 'dsub-sub' }, t('notifyLimitsHint')),
+            ),
+          ),
         ),
         React.createElement('div', { className: 'dsub-block' },
           React.createElement('div', { className: 'dsub-row' },
@@ -1258,9 +1433,8 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       // The canonical place is the Plugins tab: a card with its own header
       // and collapse instead of a row in the side list. The registration key must
       // equal the settings namespace, otherwise the tab silently hides the slot.
-      let moved = false
       try {
-        moved = !!ctx.slots.inject('settings.plugin.item', () => ctx.slots.register(
+        ctx.slots.inject('settings.plugin.item', () => ctx.slots.register(
           {
             name: 'settings.plugin.item',
             key: NS,
@@ -1269,27 +1443,8 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           },
           PluginCard,
         ))
-      } catch { moved = false }
-      if (moved) return
-      // #244: Fallback for harness cores before settings.plugin.item slot was
-      // introduced (< 0.1.2-rc.1). Once all production profiles run a core
-      // that has settings.plugin.item, this block can be safely removed.
-      // Tracked in Gitea #244 — do not remove without verifying minimum core.
-      try {
-        ctx.slots.inject('settings.section', () => ctx.slots.register(
-          {
-            name: 'settings.section',
-            id: '@goodandready/dsh-subscriptions',
-            order: 28,
-            locale: NS,
-            label: () => t('title'),
-            inject: () => ({ ctx: ctx }),
-          },
-          SubsSection,
-        ))
       } catch (e) {
-        // Neither slot system available — settings panel will not render.
-        // This is expected on headless / non-web profiles.
+        // Slot system not available — expected on headless / non-web profiles.
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Use ChatGPT Codex, Claude, Grok, Antigravity, Kimi, GLM, Cursor, Kiro, Copilot, Qwen, ERNIE, Spark, JetBrains, Perplexity, Replit, and Cody subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",
@@ -34,9 +34,6 @@
   "bugs": {
     "url": "https://github.com/GooDAnDReaDY/dsh-subscriptions/issues"
   },
-  "scripts": {
-    "test": "eslint lib/ && node --test test/*.test.mjs"
-  },
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"
@@ -63,5 +60,8 @@
   },
   "devDependencies": {
     "@deepseek-ai/dsh-llm": "0.1.0-rc.8"
+  },
+  "scripts": {
+    "test": "eslint lib/ && node --test test/*.test.mjs"
   }
-}
+}