@gatemux/dsh-gatemux-login 1.0.1 → 1.0.3

package/README.md

@@ -22,8 +22,8 @@ keep another default.
 
 ## Requirements
 
-- DeepSeek Harness desktop app, `0.1.7.x`.
-  The plugin declares `@deepseek-ai/dsh-*` peer dependencies pinned to that line.
+- DeepSeek Harness desktop app, `0.1.7.x` or `0.2.x`.
+  The plugin declares `@deepseek-ai/dsh-*` peer dependencies across both lines.
   A different DSH release is rejected at install time; installing anyway needs a
   version exemption, which risks crashes and data loss.
 - A GateMux account.
@@ -105,7 +105,7 @@ module or the patch is skipped.
 | `ACCOUNT_QUOTA_EXCEEDED` | Your GateMux balance or spend cap is exhausted. Top up. |
 | `ip_not_allowed` (HTTP 403) | Your network is not in the GateMux application's trusted egress IP allowlist. Contact the plugin operator. Re-authorizing will not fix it. |
 | `scope_denied`, `model_not_allowed` (HTTP 403) | The application registration does not permit this request. Contact the plugin operator. |
-| Install refused for peer dependencies | Your DSH version is outside `0.1.7.x`. |
+| Install refused for peer dependencies | Your DSH version is outside `0.1.7.x` and `0.2.x`. |
 
 403 errors are reported as authorization faults, not retried: they are
 configuration problems on the application's side.

package/account.js

@@ -20,6 +20,7 @@
  */
 
 import { createHash, randomBytes, randomUUID, timingSafeEqual } from 'node:crypto'
+import { platform, release } from 'node:os'
 import { promises as streamPromises } from 'node:stream'
 
 import { Service } from '@deepseek-ai/cordis'
@@ -68,6 +69,16 @@ function parseGrant(payload, issuer) {
   return { version: 1, accessToken, refreshToken, expiresAt, issuer }
 }
 
+/**
+ * Read a stored record as a grant this deployment may use.
+ * @param record - record at this provider's key, or undefined when none is stored.
+ * @param issuer - origin a grant must carry to be usable here.
+ * @returns the parsed grant, or null when no record is stored or it is unusable.
+ */
+function usableGrant(record, issuer) {
+  return record !== undefined && record.kind === 'grant' ? parseGrant(record.payload, issuer) : null
+}
+
 /** Accept a bare HTTPS origin, rejecting paths, credentials, and non-HTTPS schemes. */
 function originOf(value) {
   let url
@@ -182,22 +193,27 @@ export class GateMuxAccount extends DeepSeekAccount {
   /** Discard a stored grant issued by another environment. */
   async [Service.init]() {
     const record = await this.ctx.credentials.readRecord(KEY)
-    if (record === undefined) return
-    const grant = record.kind === 'grant' ? parseGrant(record.payload, this.issuer) : null
-    if (grant !== null) return
+    if (record === undefined || usableGrant(record, this.issuer) !== null) return
     await this.ctx.credentials.deleteRecord(KEY)
     this.logger.warn('stored grant discarded', { reason: 'unreadable-or-foreign-issuer' })
   }
 
   async getState() {
     const record = await this.ctx.credentials.readRecord(KEY)
-    if (record !== undefined && (record.kind !== 'grant' || parseGrant(record.payload, this.issuer) === null)) {
-      throw new GateMuxAuthError('stored grant is unreadable', 'storage')
+    const grant = usableGrant(record, this.issuer)
+    // A record this deployment cannot use reads as absent instead of raising: every
+    // caller turns a throw into a failure with no diagnosis. `startSignIn` returns
+    // this outside its own catch, so a raise there rejects the start call and the
+    // dialog reports a sign-in failure for a record the person never supplied, and
+    // `watch` ends the account stream. The record is left in place for a sign-in to
+    // overwrite; discarding it here could delete a grant committed since the read.
+    if (record !== undefined && grant === null) {
+      this.logger.warn('stored grant is unreadable', { reason: 'unreadable-or-foreign-issuer' })
     }
     const attempt = this.attempt?.view ?? null
     return {
-      status: record === undefined ? 'signed-out' : 'credential-stored',
-      attempt: record === undefined && attempt?.phase === 'succeeded' ? null : attempt,
+      status: grant === null ? 'signed-out' : 'credential-stored',
+      attempt: grant === null && attempt?.phase === 'succeeded' ? null : attempt,
       links: {
         usageUrl: `${this.consoleOrigin}/app/usage`,
         topUpUrl: `${this.consoleOrigin}/app/billing`,
@@ -378,6 +394,27 @@ export class GateMuxAccount extends DeepSeekAccount {
     return null
   }
 
+  /**
+   * Read the signed-in account ID without a request and without credentials.
+   *
+   * GateMux registers no device, so `deviceId` is omitted rather than invented.
+   * The ID comes from the last successful profile read for this same grant; a
+   * caller that reads it before that profile read gets the OS version alone.
+   *
+   * @returns the Node platform version, plus the account ID while a profile for the stored grant is cached.
+   */
+  async getDeviceIdentity() {
+    const lifetime = this.detailsLifetime
+    const grant = await this.readGrant(lifetime)
+    const profile = grant !== null && this.lastProfile?.token === grant.accessToken
+      ? this.lastProfile.profile
+      : null
+    return {
+      ...(profile?.id == null ? {} : { userId: profile.id }),
+      osVersion: `${platform()} ${release()}`,
+    }
+  }
+
   /**
    * Run one authorization attempt: PKCE, browser callback, code exchange, commit.
    * @param session - the attempt's cancellation signal and commit channel.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gatemux/dsh-gatemux-login",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "type": "module",
   "description": "Sign in with GateMux for DeepSeek Harness: users pay from their own GateMux balance.",
   "publishConfig": {
@@ -29,22 +29,22 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.4",
-    "@deepseek-ai/dsh-authorization": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-credentials": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-deepseek-account": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-launch-environment": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-llm-deepseek": "^0.1.7-rc.2"
+    "@deepseek-ai/dsh-authorization": "^0.1.7-rc.2 || ^0.2.0-rc.2",
+    "@deepseek-ai/dsh-credentials": "^0.1.7-rc.2 || ^0.2.0-rc.2",
+    "@deepseek-ai/dsh-deepseek-account": "^0.1.7-rc.2 || ^0.2.0-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.7-rc.2 || ^0.2.0-rc.2",
+    "@deepseek-ai/dsh-launch-environment": "^0.1.7-rc.2 || ^0.2.0-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.1.7-rc.2 || ^0.2.0-rc.2",
+    "@deepseek-ai/dsh-llm-deepseek": "^0.1.7-rc.2 || ^0.2.0-rc.2"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.4",
-    "@deepseek-ai/dsh-authorization": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-credentials": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-deepseek-account": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-launch-environment": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-llm-deepseek": "^0.1.7-rc.2"
+    "@deepseek-ai/dsh-authorization": "^0.1.7-rc.2 || ^0.2.0-rc.2",
+    "@deepseek-ai/dsh-credentials": "^0.1.7-rc.2 || ^0.2.0-rc.2",
+    "@deepseek-ai/dsh-deepseek-account": "^0.1.7-rc.2 || ^0.2.0-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.7-rc.2 || ^0.2.0-rc.2",
+    "@deepseek-ai/dsh-launch-environment": "^0.1.7-rc.2 || ^0.2.0-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.1.7-rc.2 || ^0.2.0-rc.2",
+    "@deepseek-ai/dsh-llm-deepseek": "^0.1.7-rc.2 || ^0.2.0-rc.2"
   }
 }