@goodandready/dsh-subscriptions 0.6.91 → 0.7.3

package/lib/vault-sync.js

@@ -244,6 +244,40 @@ export async function pullFromS3({ endpoint, bucket, key = 'dsh-subscriptions-va
   return res.text()
 }
 
+// #691: v2 sync primitives — deterministic slot merge, encrypted snapshots and
+// provider-level selection. Remote wins on conflicts, but conflicting rows are
+// reported so the caller can surface them instead of silently dropping local state.
+export function mergeVaultSlots(localSlots, remoteSlots) {
+  const out = (Array.isArray(localSlots) ? localSlots : []).map((slot) => ({ ...slot }))
+  const keyOf = (slot) => slot && (slot.ref || (slot.provider + ':' + (slot.index == null ? 1 : slot.index)))
+  const indexByKey = new Map(out.map((slot, idx) => [keyOf(slot), idx]))
+  const conflicts = []
+  for (const remote of (Array.isArray(remoteSlots) ? remoteSlots : [])) {
+    if (!remote) continue
+    const key = keyOf(remote)
+    const idx = indexByKey.get(key)
+    if (idx == null) {
+      out.push({ ...remote })
+      indexByKey.set(key, out.length - 1)
+      continue
+    }
+    if (JSON.stringify(out[idx]) !== JSON.stringify(remote)) conflicts.push({ key, local: out[idx], remote })
+    out[idx] = { ...out[idx], ...remote }
+  }
+  return { slots: out, conflicts }
+}
+
+export function createVaultSnapshot({ slots, blobs = {} }, passphrase, label = '') {
+  if (!passphrase) throw new Error('passphrase is required for a vault snapshot')
+  const { vault, slotCount, blobCount } = exportVault({ slots: slots || [], blobs }, passphrase)
+  return { version: 2, label: String(label || ''), createdAt: new Date().toISOString(), vault, slotCount, blobCount }
+}
+
+export function restoreVaultSnapshot(snapshot, passphrase) {
+  if (!snapshot || typeof snapshot.vault !== 'string' || !snapshot.vault) throw new Error('snapshot is missing its encrypted vault')
+  return importVault(snapshot.vault, passphrase)
+}
+
 // --- Sync Coordination: Push & Pull ---
 
 export async function syncVaultPush({ live, store, fetchFn = fetch }) {
@@ -258,7 +292,9 @@ export async function syncVaultPush({ live, store, fetchFn = fetch }) {
   syncStatus.lastPushStatus = 'running'
 
   try {
-    const slots = cfg.slots || []
+    const providerFilter = new Set((cfg.vaultSyncProviders || []).map((p) => String(p)))
+    const allSlots = cfg.slots || []
+    const slots = providerFilter.size ? allSlots.filter((slot) => providerFilter.has(String(slot && slot.provider))) : allSlots
     const blobs = {}
     for (const slot of normalizeSlots(slots)) {
       try {
@@ -366,26 +402,27 @@ export async function syncVaultPull({ live, store, settingsApi, syncAdapter, ref
     }
 
     const result = importVault(encryptedData, passphrase)
-
-    // Merge slots into live configuration
-    if (result.slots.length && settingsApi) {
+    const providerFilter = new Set((cfg.vaultSyncProviders || []).map((p) => String(p)))
+    const remoteSlots = providerFilter.size
+      ? result.slots.filter((slot) => providerFilter.has(String(slot && slot.provider)))
+      : result.slots
+    const allowedRefs = new Set(remoteSlots.map((slot) => slot && slot.ref))
+    const remoteBlobs = Object.fromEntries(Object.entries(result.blobs || {}).filter(([ref]) =>
+      !providerFilter.size || allowedRefs.has(ref)))
+
+    // Merge slots into live configuration; keep local-only rows and report conflicts.
+    let conflicts = []
+    if (remoteSlots.length && settingsApi) {
       const revision = revisionOf(settingsApi)
-      const curSlots = Array.isArray(cfg.slots) ? cfg.slots.slice() : []
-      for (const s of result.slots) {
-        const idx = curSlots.findIndex((c) => c.provider === s.provider && Number(c.index) === Number(s.index))
-        if (idx >= 0) {
-          curSlots[idx] = { ...curSlots[idx], ...s }
-        } else {
-          curSlots.push(s)
-        }
-      }
-      const parsed = plainConfig(Config({ ...cfg, slots: curSlots }))
+      const merged = mergeVaultSlots(Array.isArray(cfg.slots) ? cfg.slots.slice() : [], remoteSlots)
+      conflicts = merged.conflicts
+      const parsed = plainConfig(Config({ ...cfg, slots: merged.slots }))
       await settingsApi.replace(parsed, revision)
     }
 
     // Save blobs into store
     let blobCount = 0
-    for (const [ref, blob] of Object.entries(result.blobs)) {
+    for (const [ref, blob] of Object.entries(remoteBlobs)) {
       await store.saveBlob(ref, validateCredentialBlob(blob))
       blobCount++
     }
@@ -403,6 +440,7 @@ export async function syncVaultPull({ live, store, settingsApi, syncAdapter, ref
       backend,
       slotCount: result.slots.length,
       blobCount,
+      conflicts: conflicts.length,
       exportedAt: result.exportedAt,
       timestamp: syncStatus.lastPullAt,
     }

package/lib/vendor-pack.js

@@ -0,0 +1,36 @@
+import { validateProfile, createVendorFromProfile } from './vendor-factory.js'
+
+/**
+ * A vendor pack is a data-only provider declaration. It reuses the declarative
+ * profile contract but also carries the built vendor object, so a pack can be
+ * registered by another plugin without touching providers/vendors/cascade.
+ */
+export function normalizeVendorPack(raw) {
+  const pack = raw && typeof raw === 'object' ? raw : {}
+  const profile = validateProfile({
+    id: pack.id,
+    displayName: pack.displayName,
+    authUrl: pack.authUrl,
+    tokenUrl: pack.tokenUrl,
+    baseUrl: pack.baseUrl,
+    scope: pack.scope,
+    tokenStyle: pack.tokenStyle,
+    clientId: pack.clientId,
+    redirectUri: pack.redirectUri,
+    modelsPath: pack.modelsPath,
+    models: pack.models,
+    headers: pack.headers,
+  })
+  return { ...profile, vendor: createVendorFromProfile(profile) }
+}
+
+export function registerVendorPack(raw, registry = {}) {
+  const pack = normalizeVendorPack(raw)
+  if (typeof registry.registerVendor !== 'function') throw new Error('vendor pack registry is unavailable')
+  registry.registerVendor(pack.vendor)
+  if (typeof registry.registerProviderId === 'function') registry.registerProviderId([pack.id])
+  if (typeof registry.registerDisplayName === 'function' && pack.displayName) {
+    registry.registerDisplayName(pack.id, pack.displayName)
+  }
+  return pack
+}

package/overlay.example.yml

@@ -0,0 +1,8 @@
+# Headless/TUI overlay for a profile that has no web UI.
+# Usage: dsh --profile headless --patch /absolute/path/overlay.example.yml "your task"
+- id: dsh-subscriptions
+  name: '@goodandready/dsh-subscriptions'
+  config:
+    composerQuota: percent
+    composerQuotaDisplay: current
+    rotationStrategy: least-loaded

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.6.91",
+  "version": "0.7.3",
   "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",
@@ -17,7 +17,9 @@
     "README.md",
     "README.ru.md",
     "README.zh.md",
-    "LICENSE"
+    "LICENSE",
+    "bin/",
+    "overlay.example.yml"
   ],
   "keywords": [
     "dsh",
@@ -50,6 +52,32 @@
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-ui-slots"
       ]
+    },
+    "market": {
+      "name": {
+        "en": "Subscriptions",
+        "zh": "订阅管理"
+      },
+      "description": {
+        "en": "Use ChatGPT, Claude, Grok, Antigravity and 12 more subscriptions as DSH providers with account pools, quota tools and OAuth.",
+        "zh": "将 ChatGPT、Claude、Grok、Antigravity 等 16 种订阅接入 DSH，支持账户池、额度工具和 OAuth。"
+      },
+      "category": "providers",
+      "icon": "subscriptions",
+      "tags": [
+        "subscriptions",
+        "oauth",
+        "rotation",
+        "quota",
+        "providers",
+        "media"
+      ],
+      "defaultProviders": [
+        "codex",
+        "claude",
+        "grok",
+        "antigravity"
+      ]
     }
   },
   "peerDependencies": {
@@ -77,5 +105,8 @@
     "@types/node": "^22.20.2",
     "eslint": "^10.4.0",
     "typescript": "^7.0.2"
+  },
+  "bin": {
+    "dsh-subscriptions": "./bin/dsh-subscriptions.mjs"
   }
 }