@goodandready/dsh-subscriptions 0.6.71 → 0.6.82

package/lib/billing.js

@@ -0,0 +1,99 @@
+// Subscription Billing Cycle Renewal Countdown & Payment Status Notifier (#558)
+// Parses renewal dates, detects payment issues, formats countdowns and generates warnings.
+
+const ONE_DAY_MS = 24 * 60 * 60 * 1000
+
+/**
+ * Formats a renewal timestamp into a human-readable countdown string.
+ * @param {number|null} renewsAt
+ * @param {number} [nowMs]
+ * @returns {string}
+ */
+export function formatRenewalCountdown(renewsAt, nowMs = Date.now()) {
+  const ts = Number(renewsAt)
+  if (!Number.isFinite(ts) || ts <= 0) return ''
+
+  const diffMs = ts - nowMs
+  if (diffMs <= 0) {
+    return 'Renewal overdue'
+  }
+
+  const days = Math.floor(diffMs / ONE_DAY_MS)
+  const d = new Date(ts)
+  const yyyy = d.getUTCFullYear()
+  const mm = String(d.getUTCMonth() + 1).padStart(2, '0')
+  const dd = String(d.getUTCDate()).padStart(2, '0')
+  const dateStr = `${yyyy}-${mm}-${dd}`
+
+  if (days === 0) {
+    return `Renews today (${dateStr})`
+  }
+  if (days === 1) {
+    return `Renews in 1 day (${dateStr})`
+  }
+  return `Renews in ${days} days (${dateStr})`
+}
+
+/**
+ * Extracts billing cycle metadata and evaluates payment status for a slot.
+ * @param {object} [blob]
+ * @param {object} [slot]
+ * @param {number} [nowMs]
+ * @returns {object}
+ */
+export function extractBillingInfo(blob = {}, slot = {}, nowMs = Date.now()) {
+  const rawStatus = String(
+    blob?.subscriptionStatus ||
+    blob?.paymentStatus ||
+    blob?.planStatus ||
+    ''
+  ).toLowerCase().trim()
+
+  const rawRenew = (
+    blob?.billingCycleEnd ||
+    blob?.periodEnd ||
+    blob?.renewsAt ||
+    slot?.expiresAt ||
+    blob?.expiresAt ||
+    null
+  )
+
+  const renewsAt = Number.isFinite(Number(rawRenew)) && Number(rawRenew) > 0 ? Number(rawRenew) : null
+  const renewalCountdown = formatRenewalCountdown(renewsAt, nowMs)
+
+  let status = 'active'
+  let paymentFailed = false
+  let isOverdue = false
+  let badgeText = ''
+  let warning = ''
+
+  if (['past_due', 'unpaid', 'payment_failed', 'failed'].includes(rawStatus)) {
+    status = 'past_due'
+    paymentFailed = true
+    badgeText = 'Payment Failed'
+    warning = 'Payment failed or subscription past due - check provider billing'
+  } else if (['cancelled', 'canceled', 'revoked'].includes(rawStatus)) {
+    status = 'cancelled'
+    badgeText = 'Cancelled'
+    warning = 'Subscription has been cancelled with provider'
+  } else if (['trial_expired', 'expired'].includes(rawStatus)) {
+    status = 'trial_expired'
+    badgeText = 'Trial Expired'
+    warning = 'Subscription trial or plan has expired'
+  } else if (renewsAt && renewsAt < nowMs) {
+    status = 'past_due'
+    isOverdue = true
+    badgeText = 'Renewal Overdue'
+    warning = 'Subscription renewal date has passed'
+  }
+
+  return {
+    renewsAt,
+    renewalCountdown,
+    status,
+    isOverdue,
+    paymentFailed,
+    badgeText,
+    warning,
+  }
+}

package/lib/blob.js

@@ -45,6 +45,15 @@ export function serializeBlob(obj) {
     email: asString(obj.email),
     accountId: asString(obj.accountId),
     projectId: asString(obj.projectId),
+    selectedOrgId: asString(obj.selectedOrgId),
+    selectedOrgName: asString(obj.selectedOrgName),
+    ...(Array.isArray(obj.organizations) ? { organizations: obj.organizations } : {}),
+    ...(Array.isArray(obj.workspaces) ? { workspaces: obj.workspaces } : {}),
+    ...(obj.organizationId ? { organizationId: asString(obj.organizationId) } : {}),
+    ...(obj.plan ? { plan: asString(obj.plan) } : {}),
+    ...(obj.avatarUrl ? { avatarUrl: asString(obj.avatarUrl) } : {}),
+    ...(Array.isArray(obj.scopes) ? { scopes: obj.scopes.map(asString) } : {}),
+    ...(obj.scopeWarning ? { scopeWarning: asString(obj.scopeWarning) } : {}),
     ...(obj.clientId ? { clientId: asString(obj.clientId) } : {}),
     ...(obj.clientSecret ? { clientSecret: asString(obj.clientSecret) } : {}),
     ...(obj.idToken ? { idToken: asString(obj.idToken) } : {}),
@@ -65,6 +74,15 @@ export function parseBlob(text) {
     email: asString(obj.email),
     accountId: asString(obj.accountId),
     projectId: asString(obj.projectId),
+    selectedOrgId: asString(obj.selectedOrgId),
+    selectedOrgName: asString(obj.selectedOrgName),
+    ...(Array.isArray(obj.organizations) ? { organizations: obj.organizations } : {}),
+    ...(Array.isArray(obj.workspaces) ? { workspaces: obj.workspaces } : {}),
+    ...(obj.organizationId ? { organizationId: asString(obj.organizationId) } : {}),
+    ...(obj.plan ? { plan: asString(obj.plan) } : {}),
+    ...(obj.avatarUrl ? { avatarUrl: asString(obj.avatarUrl) } : {}),
+    ...(Array.isArray(obj.scopes) ? { scopes: obj.scopes.map(asString) } : {}),
+    ...(obj.scopeWarning ? { scopeWarning: asString(obj.scopeWarning) } : {}),
     ...(obj.clientId ? { clientId: asString(obj.clientId) } : {}),
     ...(obj.clientSecret ? { clientSecret: asString(obj.clientSecret) } : {}),
     ...(obj.idToken ? { idToken: asString(obj.idToken) } : {}),

package/lib/capabilities.js

@@ -0,0 +1,208 @@
+// Subscription Capability Matrix & Context Limit Inspector (#556)
+// Determines per-account tier capabilities (context window, thinking mode, vision, tools)
+// and dynamically adapts outgoing requests to prevent HTTP 400 Bad Request rejections.
+
+export const PROVIDER_CAPABILITIES = {
+  codex: {
+    contextWindow: 128000,
+    contextLabel: '128K',
+    thinking: true,
+    thinkingType: 'low_med_high',
+    vision: true,
+    tools: true,
+    maxOutputTokens: 16384,
+  },
+  claude: {
+    contextWindow: 200000,
+    contextLabel: '200K',
+    thinking: true,
+    thinkingType: 'budget',
+    vision: true,
+    tools: true,
+    maxOutputTokens: 8192,
+  },
+  grok: {
+    contextWindow: 128000,
+    contextLabel: '128K',
+    thinking: true,
+    thinkingType: 'low_med_high',
+    vision: true,
+    tools: true,
+    maxOutputTokens: 8192,
+  },
+  antigravity: {
+    contextWindow: 1000000,
+    contextLabel: '1M',
+    thinking: true,
+    thinkingType: 'tiered',
+    vision: true,
+    tools: true,
+    maxOutputTokens: 8192,
+  },
+  copilot: {
+    contextWindow: 128000,
+    contextLabel: '128K',
+    thinking: false,
+    thinkingType: null,
+    vision: true,
+    tools: true,
+    maxOutputTokens: 4096,
+  },
+  kimi: {
+    contextWindow: 200000,
+    contextLabel: '200K',
+    thinking: true,
+    thinkingType: 'budget',
+    vision: false,
+    tools: true,
+    maxOutputTokens: 4096,
+  },
+  glm: {
+    contextWindow: 128000,
+    contextLabel: '128K',
+    thinking: false,
+    thinkingType: null,
+    vision: true,
+    tools: true,
+    maxOutputTokens: 4096,
+  },
+  cursor: {
+    contextWindow: 128000,
+    contextLabel: '128K',
+    thinking: true,
+    thinkingType: 'budget',
+    vision: true,
+    tools: true,
+    maxOutputTokens: 8192,
+  },
+  kiro: {
+    contextWindow: 128000,
+    contextLabel: '128K',
+    thinking: false,
+    thinkingType: null,
+    vision: false,
+    tools: true,
+    maxOutputTokens: 4096,
+  },
+  perplexity: {
+    contextWindow: 200000,
+    contextLabel: '200K',
+    thinking: true,
+    thinkingType: 'low_med_high',
+    vision: false,
+    tools: true,
+    maxOutputTokens: 8192,
+  },
+  jetbrains: {
+    contextWindow: 200000,
+    contextLabel: '200K',
+    thinking: true,
+    thinkingType: 'budget',
+    vision: true,
+    tools: true,
+    maxOutputTokens: 8192,
+  },
+  default: {
+    contextWindow: 128000,
+    contextLabel: '128K',
+    thinking: false,
+    thinkingType: null,
+    vision: true,
+    tools: true,
+    maxOutputTokens: 4096,
+  },
+}
+
+/**
+ * Inspects account capabilities based on provider, token blob metadata and plan.
+ * @param {string} provider
+ * @param {any} [blob]
+ * @param {any} [info]
+ * @returns {object}
+ */
+export function inspectAccountCapabilities(provider, blob = {}, info = {}) {
+  const p = String(provider || '').toLowerCase()
+  const base = PROVIDER_CAPABILITIES[p] || PROVIDER_CAPABILITIES.default
+  const plan = String(blob?.plan || blob?.paidTierName || info?.plan || info?.paidTierName || '').toLowerCase()
+
+  let contextWindow = base.contextWindow
+  let contextLabel = base.contextLabel
+  let thinking = base.thinking
+  let thinkingType = base.thinkingType
+  let vision = base.vision
+  let tools = base.tools
+  let maxOutputTokens = base.maxOutputTokens
+
+  // Tier upgrades for Team / Enterprise / Ultra subscriptions
+  if (p === 'claude') {
+    if (plan.includes('team') || plan.includes('enterprise') || plan.includes('500k')) {
+      contextWindow = 500000
+      contextLabel = '500K'
+    }
+  } else if (p === 'antigravity') {
+    if (plan.includes('ultra') || plan.includes('enterprise') || plan.includes('2m')) {
+      contextWindow = 2000000
+      contextLabel = '2M'
+    }
+  } else if (p === 'grok') {
+    if (plan.includes('pro') || plan.includes('team') || plan.includes('1m')) {
+      contextWindow = 1000000
+      contextLabel = '1M'
+    }
+  }
+
+  const tags = []
+  tags.push(`${contextLabel} Context`)
+  if (thinking) {
+    tags.push(thinkingType === 'budget' ? 'Extended Thinking' : (thinkingType === 'tiered' ? 'Tiered Thinking' : 'Adaptive Thinking'))
+  }
+  if (vision) tags.push('Vision')
+  if (tools) tags.push('Tools')
+
+  return {
+    provider: p,
+    contextWindow,
+    contextLabel,
+    thinking,
+    thinkingType,
+    vision,
+    tools,
+    maxOutputTokens,
+    tags,
+  }
+}
+
+/**
+ * Normalizes an outgoing stream request according to account capabilities to avoid 400 errors.
+ * @param {any} options
+ * @param {any} capabilities
+ * @returns {object}
+ */
+export function normalizeCapabilitiesRequest(options = {}, capabilities = {}) {
+  if (!options || typeof options !== 'object') return options
+  const out = { ...options }
+
+  // If upstream does not support tools, strip tool parameters
+  if (capabilities && capabilities.tools === false) {
+    if (out.tools) delete out.tools
+    if (out.tool_choice) delete out.tool_choice
+  }
+
+  // If upstream does not support reasoning/thinking, strip reasoning_effort
+  if (capabilities && capabilities.thinking === false) {
+    if (out.reasoning_effort) delete out.reasoning_effort
+    if (out.thinking) delete out.thinking
+  }
+
+  // Clamp maxTokens if exceeding maximum supported output tokens
+  if (capabilities && typeof capabilities.maxOutputTokens === 'number' && capabilities.maxOutputTokens > 0) {
+    if (typeof out.max_tokens === 'number' && out.max_tokens > capabilities.maxOutputTokens) {
+      out.max_tokens = capabilities.maxOutputTokens
+    }
+    if (typeof out.maxTokens === 'number' && out.maxTokens > capabilities.maxOutputTokens) {
+      out.maxTokens = capabilities.maxOutputTokens
+    }
+  }
+
+  return out
+}