@edge-sky/dsh-oauth-adapter 0.1.2-dev.2 → 0.1.3-beta.3

package/lib/model-catalog.js

@@ -21,10 +21,10 @@ export const providerFactories = {
 /** Validate data loaded from the settings file, including the opaque legacy profile. */
 export function validateModelStore(value) {
     if (!value || typeof value !== 'object')
-        throw new Error('Invalid oauth-models settings');
+        throw new Error('Invalid OAuth modelStore settings');
     const store = value;
     if (store.version !== 1 || !store.providers || typeof store.providers !== 'object' || Array.isArray(store.providers))
-        throw new Error('Unsupported oauth-models format');
+        throw new Error('Unsupported OAuth modelStore format');
     for (const [id, entry] of Object.entries(store.providers)) {
         if (!PROVIDERS.some(p => p.id === id) || !entry || !['pending', 'managed'].includes(entry.phase))
             throw new Error('Invalid OAuth model provider');
@@ -47,7 +47,7 @@ export function validateModelStore(value) {
 /** Exact IDs only: unrelated providers and display-name similarities confer no compatibility. */
 export function materialize(provider, state, catalog = providerFactories[provider]()) {
     const defaults = new Map(catalog.getModels().map(m => [m.id, m]));
-    const parsed = PiConfig({ providers: { [provider]: state.legacy } }).providers?.[provider];
+    const parsed = structuredClone(PiConfig({ providers: { [provider]: state.legacy } }).providers.get()[provider]);
     if (!parsed)
         throw new Error('Missing provider profile');
     const manual = new Map(state.manual.map(m => [m.id, m]));
@@ -127,8 +127,9 @@ export function materialize(provider, state, catalog = providerFactories[provide
             maxRequestImageBytes: parsed.maxRequestImageBytes ?? 20971520,
             requestImagePixelBudget: parsed.requestImagePixelBudget ?? 4194304,
             requestImageMaxBytes: parsed.requestImageMaxBytes ?? 1048576,
-            retryPolicy: resolveRetryPolicy(parsed.retryPolicy, `oauth-models/${provider}`),
+            retryPolicy: resolveRetryPolicy(parsed.retryPolicy, `dsh-oauth-adapter/${provider}`),
             configuredMaxTokens: caps,
+            modelErrors: new Map(),
             piProvider,
         },
     };

package/lib/model-service.d.ts

@@ -1,10 +1,11 @@
 /** Persistent OAuth model management and reversible ownership of existing provider routes. */
-import type { Context } from '@deepseek-ai/cordis';
+import type { Context, Volatile } from '@deepseek-ai/cordis';
 import type { CredentialProvider } from '@deepseek-ai/dsh-credentials';
-import type { SettingsProvider } from '@deepseek-ai/dsh-settings';
+import type SettingsForms from '@deepseek-ai/dsh-settings';
 import type LlmRuntime from '@deepseek-ai/dsh-llm';
 import { type ProviderId } from './protocol.js';
 import { type ModelPage, type ManualModel } from './model-types.js';
+import { type ModelStore } from './model-catalog.js';
 export interface ModelServiceOptions {
     timeoutMs: number;
     maxResponseBytes: number;
@@ -12,7 +13,7 @@ export interface ModelServiceOptions {
     codexClientVersion: string;
 }
 export type ModelContext = Context & {
-    settings: SettingsProvider;
+    settings: SettingsForms;
     credentials: CredentialProvider;
     llm: LlmRuntime;
 };
@@ -20,6 +21,7 @@ export declare class OAuthModelService {
     private readonly ctx;
     private readonly options;
     private readonly changed;
+    private readonly modelStore;
     private profiles;
     private handle;
     private readonly queues;
@@ -34,7 +36,7 @@ export declare class OAuthModelService {
     private readonly signedOut;
     private readonly adapter;
     readonly ready: Promise<void>;
-    constructor(ctx: ModelContext, options: ModelServiceOptions, changed: (provider: ProviderId) => void);
+    constructor(ctx: ModelContext, options: ModelServiceOptions, changed: (provider: ProviderId) => void, modelStore: Volatile<ModelStore>);
     private state;
     revision(): number;
     isManaged(provider: ProviderId): boolean;
@@ -51,7 +53,7 @@ export declare class OAuthModelService {
     /** Wait on the actual route registry; settings persistence alone does not imply adapter release. */
     private releaseLegacy;
     private ensureManaged;
-    page(provider: ProviderId, offset: number): Promise<ModelPage>;
+    page(provider: ProviderId, offset: number, manualOffset?: number): Promise<ModelPage>;
     migrate(provider: ProviderId, revision: number): Promise<void>;
     saveManual(provider: ProviderId, model: ManualModel, revision: number): Promise<void>;
     deleteManual(provider: ProviderId, id: string, revision: number): Promise<void>;

package/lib/model-service.js

@@ -1,4 +1,3 @@
-import z from '@deepseek-ai/schemastery';
 import { createModels } from '@earendil-works/pi-ai';
 import { SettingsConflictError } from '@deepseek-ai/dsh-settings';
 import { resolveImageAttachmentAccess } from '@deepseek-ai/dsh-llm';
@@ -8,15 +7,15 @@ import { MODEL_PAGE_SIZE, MODEL_PROTOCOLS, validManual } from './model-types.js'
 import { accountIdentity, credentialBridge, fromRecord } from './model-auth.js';
 import { materialize, providerFactories, validateModelStore } from './model-catalog.js';
 import { discoverAccountModels, ModelOperationError } from './model-discovery.js';
-const NS = 'oauth-models';
+const NS = 'dsh-oauth-adapter';
 const LEGACY_NS = 'llm-pi-ai';
-const Schema = z.object({ version: z.const(1).default(1), providers: z.dict(z.any()).default({}) });
 function object(value) { return value && typeof value === 'object' && !Array.isArray(value) ? value : undefined; }
 function failure(code, message) { throw new ModelOperationError(code, message); }
 export class OAuthModelService {
     ctx;
     options;
     changed;
+    modelStore;
     profiles = new Map();
     handle;
     queues = new Map();
@@ -31,11 +30,11 @@ export class OAuthModelService {
     signedOut = new Set();
     adapter;
     ready;
-    constructor(ctx, options, changed) {
+    constructor(ctx, options, changed, modelStore) {
         this.ctx = ctx;
         this.options = options;
         this.changed = changed;
-        const scope = ctx.settings.register(NS, Schema, { base: { version: 1, providers: {} }, validate: value => { validateModelStore(value); } });
+        this.modelStore = modelStore;
         this.adapter = new PiAiAdapter({
             profiles: () => this.profiles,
             resolveApiKey: async () => undefined,
@@ -47,8 +46,8 @@ export class OAuthModelService {
             resolveImageAccess: (attachments, ref) => resolveImageAttachmentAccess(attachments, hostPath => ctx.get('fs')?.processPathFromHostPath(hostPath), ref),
         });
         this.ready = this.initialize();
-        this.disposers.push(scope.watch(() => {
-            if (this.closed)
+        this.disposers.push(ctx.on('settings/document-updated', ns => {
+            if (this.closed || ns !== NS)
                 return;
             for (const p of PROVIDERS)
                 void this.enqueue(p.id, async () => { await this.reconcile(p.id); }).catch(error => this.report(p.id, error));
@@ -60,7 +59,7 @@ export class OAuthModelService {
             void this.enqueue(provider, async () => { await this.reconcile(provider); }).catch(error => this.report(provider, error));
         }));
     }
-    state() { return validateModelStore(this.ctx.settings.get(NS)); }
+    state() { return validateModelStore(this.modelStore.get()); }
     revision() { return this.ctx.settings.describe().find(s => s.ns === NS)?.revision ?? 0; }
     isManaged(provider) { return this.profiles.has(provider); }
     checkRevision(revision) { if (revision !== this.revision())
@@ -71,7 +70,7 @@ export class OAuthModelService {
         this.checkOpen();
         materialize(provider, state);
         try {
-            await this.ctx.settings.mutate(NS, [{ op: 'set', path: ['providers', provider], value: state }], revision);
+            await this.ctx.settings.mutate(NS, [{ op: 'set', path: ['modelStore', 'providers', provider], value: state }], revision);
         }
         catch (error) {
             if (error instanceof SettingsConflictError)
@@ -214,20 +213,25 @@ export class OAuthModelService {
             throw error;
         }
     }
-    async page(provider, offset) {
+    async page(provider, offset, manualOffset = 0) {
         await this.ready;
         const state = this.state().providers[provider];
         const fallback = { phase: 'pending', legacy: this.legacy(provider).profile ?? {}, manual: [] };
-        const rows = materialize(provider, state ?? fallback).rows;
+        const connected = await this.connected(provider);
+        const rows = connected ? materialize(provider, state ?? fallback).rows : [];
+        const automatic = rows.filter(row => row.source === 'catalog' || row.source === 'matched');
+        const manual = rows.filter(row => row.source === 'manual');
         const legacy = this.legacy(provider);
-        offset = Math.min(offset, Math.max(0, Math.floor((rows.length - 1) / MODEL_PAGE_SIZE) * MODEL_PAGE_SIZE));
+        offset = Math.min(offset, Math.max(0, Math.floor((automatic.length - 1) / MODEL_PAGE_SIZE) * MODEL_PAGE_SIZE));
+        manualOffset = Math.min(manualOffset, Math.max(0, Math.floor((manual.length - 1) / MODEL_PAGE_SIZE) * MODEL_PAGE_SIZE));
         return {
-            provider, revision: this.revision(), offset, total: rows.length, rows: rows.slice(offset, offset + MODEL_PAGE_SIZE),
+            provider, revision: this.revision(), offset, manualOffset, total: automatic.length + manual.length,
+            rows: [...automatic.slice(offset, offset + MODEL_PAGE_SIZE), ...manual.slice(manualOffset, manualOffset + MODEL_PAGE_SIZE)],
             source: state?.discovered ? 'account' : 'catalog',
             counts: { matched: rows.filter(r => r.source === 'matched' || r.source === 'catalog').length, pending: rows.filter(r => r.source === 'pending').length, manual: rows.filter(r => r.source === 'manual').length },
-            connected: await this.connected(provider), writable: this.ctx.settings.writable,
+            connected, writable: this.ctx.settings.writable,
             managed: this.isManaged(provider), busy: this.syncs.has(provider),
-            ...(state?.syncedAt === undefined ? {} : { syncedAt: state.syncedAt }),
+            ...(!connected || state?.syncedAt === undefined ? {} : { syncedAt: state.syncedAt }),
             ...(this.errors.has(provider) ? { error: this.errors.get(provider).message, errorCode: this.errors.get(provider).code } : {}),
             ...((state?.phase === 'pending' || !state && legacy.custom) && !legacy.blocked ? { migration: { fields: Object.keys(state?.legacy ?? legacy.profile ?? {}), models: (state?.legacy ?? legacy.profile)?.models?.length ?? 0 } } : {}),
         };

package/lib/model-types.d.ts

@@ -29,6 +29,7 @@ export interface ModelPage {
     provider: ProviderId;
     revision: number;
     offset: number;
+    manualOffset: number;
     total: number;
     rows: ModelRow[];
     source: 'catalog' | 'account';
@@ -54,6 +55,7 @@ export type ModelCommand = {
     requestId: string;
     provider: ProviderId;
     offset: number;
+    manualOffset: number;
 } | {
     type: 'models-sync' | 'models-migrate';
     requestId: string;

package/lib/protocol.js

@@ -66,8 +66,8 @@ export function parseClientCommand(raw) {
         const provider = candidate.provider;
         const fail = { ok: false, requestId, message: 'model command fields are invalid' };
         if (candidate.type === 'models-list') {
-            return exactKeys(candidate, ['type', 'requestId', 'provider', 'offset']) && Number.isSafeInteger(candidate.offset) && Number(candidate.offset) >= 0
-                ? { ok: true, value: { type: 'models-list', requestId, provider, offset: Number(candidate.offset) } } : fail;
+            return exactKeys(candidate, ['type', 'requestId', 'provider', 'offset', 'manualOffset']) && Number.isSafeInteger(candidate.offset) && Number(candidate.offset) >= 0 && Number.isSafeInteger(candidate.manualOffset) && Number(candidate.manualOffset) >= 0
+                ? { ok: true, value: { type: 'models-list', requestId, provider, offset: Number(candidate.offset), manualOffset: Number(candidate.manualOffset) } } : fail;
         }
         if (!Number.isSafeInteger(candidate.revision) || Number(candidate.revision) < 0)
             return fail;

package/lib/types/client/locales.d.ts

@@ -6,7 +6,7 @@ export declare const en: {
     readonly modelRouteConflict: "This provider is owned by an existing configuration. Review the details before migration.";
     readonly loginSyncFailed: "Sign-in succeeded, but model synchronization failed. Open Models to retry.";
     readonly modelsTitle: "OAuth models";
-    readonly modelsIntro: "Synchronize account-visible models or add a model manually. Manual models survive synchronization.";
+    readonly modelsIntro: "Models are automatically matched against the pi-ai catalog built into DSH. If a model you need is not matched, try adding it manually.";
     readonly modelId: "Model ID";
     readonly modelName: "Display name";
     readonly modelProtocol: "Request protocol";
@@ -16,7 +16,7 @@ export declare const en: {
     readonly accountCatalog: "Account-synchronized list";
     readonly builtinCatalog: "Built-in list · account access unverified";
     readonly lastModelSync: "Last successful synchronization";
-    readonly matchedModels: "Matched";
+    readonly matchedModels: "Automatic matches";
     readonly pendingModels: "Needs configuration";
     readonly manualModels: "Manual";
     readonly modelConflict: "Models changed elsewhere. The list was refreshed; review it and retry.";
@@ -29,8 +29,9 @@ export declare const en: {
     readonly addModel: "Add model";
     readonly configureModel: "Configure";
     readonly editModel: "Edit";
+    readonly collapseModels: "Collapse";
     readonly deleteModel: "Delete manual entry";
-    readonly noModels: "No selectable models. Configure an unmatched model or add one manually.";
+    readonly noModels: "No models in this group.";
     readonly modelsPagination: "OAuth model pages";
     readonly previousModels: "Previous";
     readonly nextModels: "Next";

package/lib/types/client/store.d.ts

@@ -58,7 +58,7 @@ export declare class OAuthAccountsController {
     cancel(attemptId: string): void;
     forget(provider: ProviderId): void;
     loadModels(): void;
-    readModels(provider: ProviderId, offset?: number): void;
+    readModels(provider: ProviderId, offset?: number, manualOffset?: number): void;
     syncModels(provider: ProviderId): void;
     migrateModels(provider: ProviderId): void;
     saveModel(provider: ProviderId, model: ManualModel): void;

package/lib/types/client/styles.d.ts

@@ -1,3 +1,3 @@
 /** Plugin-owned styles, injected and removed with the browser Cordis fiber. */
-export declare const styles = "\n.dsh-oauth-section{display:flex;flex-direction:column;gap:12px;max-width:720px;color:var(--dsw-alias-label-primary)}\n.dsh-oauth-title{margin:0;font-size:16px;line-height:24px;font-weight:500}\n.dsh-oauth-intro,.dsh-oauth-muted{margin:0;font-size:13px;line-height:20px;color:var(--dsw-alias-label-tertiary)}\n.dsh-oauth-error{display:flex;flex-direction:column;gap:6px;margin:0;padding:8px 10px;border-radius:8px;background:var(--dsw-alias-interactive-bg-hover-danger);color:var(--dsw-alias-state-error-primary);font-size:12px;line-height:18px}.dsh-oauth-error p{margin:0}.dsh-oauth-error pre{box-sizing:border-box;max-width:100%;max-height:320px;margin:0;padding:8px;border:1px solid var(--dsw-alias-border-l2);border-radius:6px;overflow:auto;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-primary);font:11px/17px ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;white-space:pre-wrap;overflow-wrap:anywhere}.dsh-oauth-error-details summary{cursor:pointer;color:var(--dsw-alias-label-secondary);user-select:none}.dsh-oauth-error-details[open] summary{margin-bottom:6px}\n.dsh-oauth-list{display:flex;flex-direction:column;gap:8px;margin:4px 0 0;padding:0;list-style:none}\n.dsh-oauth-card{display:flex;flex-direction:column;gap:10px;padding:12px 14px;border:1px solid var(--dsw-alias-border-l2);border-radius:12px}\n.dsh-oauth-head{display:flex;align-items:center;gap:8px;flex-wrap:wrap}.dsh-oauth-name{font-size:14px;font-weight:500}.dsh-oauth-state{display:inline-flex;align-items:center;gap:6px;padding:3px 8px;border-radius:999px;background:var(--dsw-alias-interactive-bg-hover);font-size:12px;color:var(--dsw-alias-label-secondary)}\n.dsh-oauth-dot{width:7px;height:7px;border-radius:50%;background:var(--dsw-alias-label-tertiary)}.dsh-oauth-state[data-state=ready] .dsh-oauth-dot{background:var(--dsw-alias-state-success-primary)}.dsh-oauth-state[data-state=warning] .dsh-oauth-dot{background:var(--dsw-alias-state-error-primary)}.dsh-oauth-state[data-state=authorizing] .dsh-oauth-dot{background:var(--dsw-alias-button-info-fill)}\n.dsh-oauth-actions{display:flex;gap:6px;margin-left:auto}.dsh-oauth-button{box-sizing:border-box;display:inline-flex;align-items:center;justify-content:center;min-height:30px;padding:0 12px;border:1px solid var(--dsw-alias-border-l2);border-radius:15px;background:transparent;color:var(--dsw-alias-label-primary);font:inherit;font-size:12px;line-height:18px;cursor:pointer}.dsh-oauth-button[data-variant=primary]{border-color:transparent;background:var(--dsw-alias-button-primary-fill);color:var(--dsw-alias-label-primary-foreground)}.dsh-oauth-button[data-variant=danger]{border-color:transparent;color:var(--dsw-alias-state-error-primary)}.dsh-oauth-button:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover-solid)}.dsh-oauth-button[data-variant=primary]:hover:not(:disabled){background:var(--dsw-alias-button-primary-hover);color:var(--dsw-alias-label-primary-foreground)}.dsh-oauth-button[data-variant=danger]:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover-danger)}.dsh-oauth-button:focus-visible{outline:none;box-shadow:0 0 0 2px var(--dsw-alias-border-l3)}.dsh-oauth-button:disabled{cursor:not-allowed;opacity:.4}\n.dsh-oauth-flow{display:flex;flex-direction:column;gap:8px;padding-top:10px;border-top:1px solid var(--dsw-alias-border-l3);font-size:13px;line-height:20px}.dsh-oauth-link{display:grid;grid-template-columns:minmax(0,1fr) auto auto;align-items:center;gap:8px;padding:9px 10px;border:1px solid var(--dsw-alias-border-l2);border-radius:9px;background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary);text-decoration:none}.dsh-oauth-link:hover{background:var(--dsw-alias-interactive-bg-hover-solid)}.dsh-oauth-link-label{font-weight:500}.dsh-oauth-link-host{max-width:240px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--dsw-alias-label-tertiary);font-size:12px}.dsh-oauth-link-icon{color:var(--dsw-alias-brand-text)}.dsh-oauth-code{display:flex;align-items:center;gap:8px}.dsh-oauth-code code{padding:5px 8px;border-radius:6px;background:var(--dsw-alias-bg-module-platform);font-size:14px;letter-spacing:.08em}\n.dsh-oauth-prompt{display:flex;flex-direction:column;gap:7px}.dsh-oauth-input,.dsh-oauth-select{box-sizing:border-box;width:100%;height:34px;padding:0 10px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-primary)}\n\n.dsh-oauth-model-provider { border: 1px solid var(--border-color, currentColor); border-radius: 8px; padding: 16px; margin-block: 16px; }\n.dsh-oauth-model-provider button { margin: 4px; }\n.dsh-oauth-model-list { padding: 0; list-style: none; }\n.dsh-oauth-model-list li { padding-block: 8px; border-bottom: 1px solid var(--border-color, currentColor); overflow-wrap: anywhere; }\n.dsh-oauth-model-list code { margin-inline: 8px; }\n.dsh-oauth-model-form { display: grid; gap: 12px; margin-block: 12px; }\n.dsh-oauth-model-form label { display: grid; gap: 4px; }\n.dsh-oauth-model-provider nav { display: flex; align-items: center; gap: 8px; }\n";
+export declare const styles = "\n.dsh-oauth-section{display:flex;flex-direction:column;gap:12px;max-width:720px;color:var(--dsw-alias-label-primary)}\n.dsh-oauth-title{margin:0;font-size:16px;line-height:24px;font-weight:500}\n.dsh-oauth-intro,.dsh-oauth-muted{margin:0;font-size:13px;line-height:20px;color:var(--dsw-alias-label-tertiary)}\n.dsh-oauth-error{display:flex;flex-direction:column;gap:6px;margin:0;padding:8px 10px;border-radius:8px;background:var(--dsw-alias-interactive-bg-hover-danger);color:var(--dsw-alias-state-error-primary);font-size:12px;line-height:18px}.dsh-oauth-error p{margin:0}.dsh-oauth-error pre{box-sizing:border-box;max-width:100%;max-height:320px;margin:0;padding:8px;border:1px solid var(--dsw-alias-border-l2);border-radius:6px;overflow:auto;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-primary);font:11px/17px ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;white-space:pre-wrap;overflow-wrap:anywhere}.dsh-oauth-error-details summary{cursor:pointer;color:var(--dsw-alias-label-secondary);user-select:none}.dsh-oauth-error-details[open] summary{margin-bottom:6px}\n.dsh-oauth-list{display:flex;flex-direction:column;gap:8px;margin:4px 0 0;padding:0;list-style:none}\n.dsh-oauth-card{display:flex;flex-direction:column;gap:10px;padding:12px 14px;border:1px solid var(--dsw-alias-border-l2);border-radius:12px}\n.dsh-oauth-head{display:flex;align-items:center;gap:8px;flex-wrap:wrap}.dsh-oauth-name{font-size:14px;font-weight:500}.dsh-oauth-state{display:inline-flex;align-items:center;gap:6px;padding:3px 8px;border-radius:999px;background:var(--dsw-alias-interactive-bg-hover);font-size:12px;color:var(--dsw-alias-label-secondary)}\n.dsh-oauth-dot{width:7px;height:7px;border-radius:50%;background:var(--dsw-alias-label-tertiary)}.dsh-oauth-state[data-state=ready] .dsh-oauth-dot{background:var(--dsw-alias-state-success-primary)}.dsh-oauth-state[data-state=warning] .dsh-oauth-dot{background:var(--dsw-alias-state-error-primary)}.dsh-oauth-state[data-state=authorizing] .dsh-oauth-dot{background:var(--dsw-alias-button-info-fill)}\n.dsh-oauth-actions{display:flex;gap:6px;margin-left:auto}.dsh-oauth-button{box-sizing:border-box;display:inline-flex;align-items:center;justify-content:center;min-height:30px;padding:0 12px;border:1px solid var(--dsw-alias-border-l2);border-radius:15px;background:transparent;color:var(--dsw-alias-label-primary);font:inherit;font-size:12px;line-height:18px;cursor:pointer}.dsh-oauth-button[data-variant=primary]{border-color:transparent;background:var(--dsw-alias-button-primary-fill);color:var(--dsw-alias-label-primary-foreground)}.dsh-oauth-button[data-variant=danger]{border-color:transparent;color:var(--dsw-alias-state-error-primary)}.dsh-oauth-button:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover-solid)}.dsh-oauth-button[data-variant=primary]:hover:not(:disabled){background:var(--dsw-alias-button-primary-hover);color:var(--dsw-alias-label-primary-foreground)}.dsh-oauth-button[data-variant=danger]:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover-danger)}.dsh-oauth-button:focus-visible{outline:none;box-shadow:0 0 0 2px var(--dsw-alias-border-l3)}.dsh-oauth-button:disabled{cursor:not-allowed;opacity:.4}\n.dsh-oauth-flow{display:flex;flex-direction:column;gap:8px;padding-top:10px;border-top:1px solid var(--dsw-alias-border-l3);font-size:13px;line-height:20px}.dsh-oauth-link{display:grid;grid-template-columns:minmax(0,1fr) auto auto;align-items:center;gap:8px;padding:9px 10px;border:1px solid var(--dsw-alias-border-l2);border-radius:9px;background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary);text-decoration:none}.dsh-oauth-link:hover{background:var(--dsw-alias-interactive-bg-hover-solid)}.dsh-oauth-link-label{font-weight:500}.dsh-oauth-link-host{max-width:240px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--dsw-alias-label-tertiary);font-size:12px}.dsh-oauth-link-icon{color:var(--dsw-alias-brand-text)}.dsh-oauth-code{display:flex;align-items:center;gap:8px}.dsh-oauth-code code{padding:5px 8px;border-radius:6px;background:var(--dsw-alias-bg-module-platform);font-size:14px;letter-spacing:.08em}\n.dsh-oauth-prompt{display:flex;flex-direction:column;gap:7px}.dsh-oauth-input,.dsh-oauth-select{box-sizing:border-box;width:100%;height:34px;padding:0 10px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-primary)}\n\n.dsh-oauth-model-provider{display:flex;flex-direction:column;gap:10px;min-width:0;padding:14px;border:1px solid var(--dsw-alias-border-l2);border-radius:12px}\n.dsh-oauth-model-header{display:flex;align-items:center;justify-content:space-between;gap:12px}.dsh-oauth-model-header h3{min-width:0;overflow-wrap:anywhere}.dsh-oauth-model-header button{flex-shrink:0}\n.dsh-oauth-model-details{display:flex;flex-direction:column;gap:10px}.dsh-oauth-model-details[hidden]{display:none}\n.dsh-oauth-model-provider h3,.dsh-oauth-model-provider h4{margin:0;line-height:22px;font-weight:500}\n.dsh-oauth-model-provider h4{font-size:13px;color:var(--dsw-alias-label-secondary)}\n.dsh-oauth-model-actions{display:flex;align-items:center;gap:6px;flex-wrap:wrap}\n.dsh-oauth-model-group{display:flex;flex-direction:column;gap:8px;padding-top:12px;border-top:1px solid var(--dsw-alias-border-l2)}\n.dsh-oauth-model-list{display:flex;flex-direction:column;gap:0;margin:0;padding:0;list-style:none}\n.dsh-oauth-model-list li{display:flex;align-items:center;justify-content:space-between;gap:10px;flex-wrap:wrap;padding:10px 0;min-width:0}\n.dsh-oauth-model-list li>.dsh-oauth-model-form{box-sizing:border-box;width:100%;min-width:0}\n.dsh-oauth-model-list li+li{border-top:1px solid var(--dsw-alias-border-l2)}\n.dsh-oauth-model-identity{display:flex;flex-direction:column;gap:3px;min-width:0;overflow-wrap:anywhere}\n.dsh-oauth-model-identity strong{font-size:13px;line-height:20px;font-weight:500}\n.dsh-oauth-model-identity code{font:12px/18px ui-monospace,SFMono-Regular,Menlo,monospace;color:var(--dsw-alias-label-tertiary);overflow-wrap:anywhere}\n.dsh-oauth-model-form{display:flex;flex-direction:column;gap:10px;padding:12px;border:1px solid var(--dsw-alias-border-l2);border-radius:10px}\n.dsh-oauth-model-form label{display:flex;flex-direction:column;gap:5px;font-size:13px;line-height:20px}\n.dsh-oauth-pagination{display:flex;align-items:center;justify-content:space-between;gap:8px;font-size:12px;color:var(--dsw-alias-label-tertiary)}\n";
 //# sourceMappingURL=styles.d.ts.map

package/lib/types/model-types.d.ts

@@ -29,6 +29,7 @@ export interface ModelPage {
     provider: ProviderId;
     revision: number;
     offset: number;
+    manualOffset: number;
     total: number;
     rows: ModelRow[];
     source: 'catalog' | 'account';
@@ -54,6 +55,7 @@ export type ModelCommand = {
     requestId: string;
     provider: ProviderId;
     offset: number;
+    manualOffset: number;
 } | {
     type: 'models-sync' | 'models-migrate';
     requestId: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@edge-sky/dsh-oauth-adapter",
   "description": "Web OAuth account surface for official DSH authorization flows",
-  "version": "0.1.2-dev.2",
+  "version": "0.1.3-beta.3",
   "author": {
     "name": "edge-sky",
     "url": "https://github.com/edge-sky"
@@ -13,7 +13,7 @@
     "type": "git",
     "url": "git+https://github.com/edge-sky/dsh-oauth-adapter.git"
   },
-  "packageManager": "pnpm@11.7.0",
+  "packageManager": "pnpm@11.23.0",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"
   },
@@ -68,22 +68,22 @@
     }
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": ">=4.0.2",
-    "@deepseek-ai/dsh-authorization": ">=0.1.2-rc.1 <0.2.0-0",
-    "@deepseek-ai/dsh-client-locale": ">=0.1.2-rc.1 <0.2.0-0",
-    "@deepseek-ai/dsh-client-ui-settings": ">=0.1.2-rc.1 <0.2.0-0",
-    "@deepseek-ai/dsh-client-ui-slots": ">=0.1.2-rc.1 <0.2.0-0",
-    "@deepseek-ai/dsh-credentials": ">=0.1.2-rc.1 <0.2.0-0",
-    "@deepseek-ai/dsh-host-webserver": ">=0.1.2-rc.1 <0.2.0-0",
-    "@deepseek-ai/dsh-invariants": ">=0.1.2-rc.1 <0.2.0-0",
-    "@deepseek-ai/dsh-llm": ">=0.1.2-rc.1 <0.2.0-0",
-    "@deepseek-ai/dsh-llm-pi-ai": ">=0.1.2-rc.1 <0.2.0-0",
-    "@deepseek-ai/dsh-settings": ">=0.1.2-rc.1 <0.2.0-0",
+    "@deepseek-ai/cordis": ">=4.0.4 <5",
+    "@deepseek-ai/dsh-authorization": ">=0.2.0-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-client-locale": ">=0.2.0-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-client-ui-settings": ">=0.2.0-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-client-ui-slots": ">=0.2.0-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-credentials": ">=0.2.0-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-host-webserver": ">=0.2.0-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-invariants": ">=0.2.0-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-llm": ">=0.2.0-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-llm-pi-ai": ">=0.2.0-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-settings": ">=0.2.0-rc.2 <0.3.0-0",
     "react": ">=18.2.0",
-    "@deepseek-ai/dsh-client-ui-settings-models": ">=0.1.2-rc.1 <0.2.0-0",
-    "@deepseek-ai/dsh-attachment": ">=0.1.2-rc.1 <0.2.0-0",
-    "@deepseek-ai/dsh-fs": ">=0.1.2-rc.1 <0.2.0-0",
-    "@deepseek-ai/dsh-client-ui-renderer": ">=0.1.2-rc.1 <0.2.0-0"
+    "@deepseek-ai/dsh-client-ui-settings-models": ">=0.2.0-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-attachment": ">=0.2.0-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-fs": ">=0.2.0-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-client-ui-renderer": ">=0.2.0-rc.2 <0.3.0-0"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/cordis": {
@@ -133,22 +133,22 @@
     }
   },
   "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.2",
+    "@deepseek-ai/schemastery": "~3.18.4",
     "ws": "^8.18.3",
-    "@earendil-works/pi-ai": "0.84.4"
+    "@earendil-works/pi-ai": "^0.87.1"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-authorization": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-locale": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-credentials": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-host-webserver": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-invariants": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-llm": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-llm-pi-ai": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-settings": "0.1.2-rc.1",
+    "@deepseek-ai/cordis": "~4.0.4",
+    "@deepseek-ai/dsh-authorization": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-locale": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-credentials": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-invariants": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-llm": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-llm-pi-ai": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-settings": "0.2.0-rc.2",
     "@types/node": "^22.20.0",
     "@types/react": "~18.3.1",
     "@types/react-dom": "~18.3.1",
@@ -158,19 +158,40 @@
     "tsdown": "^0.22.2",
     "typescript": "^6.0.3",
     "vitest": "^4.1.8",
-    "@deepseek-ai/dsh-client-ui-settings-models": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-attachment": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-fs": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-settings-file": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-credentials-local": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-settings-models": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-attachment": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-fs": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-credentials-local": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "0.2.0-rc.2",
     "jsdom": "^26.1.0",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-store": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-atomic-write": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-home-paths": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-launch-environment": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-session": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-scope": "0.1.2-rc.1"
+    "@deepseek-ai/dsh-client-ui-primitives": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-store": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-atomic-write": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-home-paths": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-launch-environment": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-session": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-scope": "0.2.0-rc.2",
+    "clsx": "^2.0.0",
+    "anser": "^2.3.5",
+    "shiki": "^4.3.1",
+    "@shikijs/langs": "^4.3.1",
+    "mdast-util-from-markdown": "^2.0.3",
+    "mdast-util-gfm": "^3.1.0",
+    "mdast-util-math": "^3.0.0",
+    "micromark-extension-gfm": "^3.0.0",
+    "micromark-extension-math": "^3.1.0",
+    "micromark-core-commonmark": "^2.0.3",
+    "micromark-util-character": "^2.1.1",
+    "micromark-util-classify-character": "^2.0.1",
+    "micromark-util-symbol": "^2.0.1",
+    "micromark-factory-space": "^2.0.1",
+    "micromark-util-sanitize-uri": "^2.0.1",
+    "katex": "^0.16.47",
+    "zustand": "~4.4.7",
+    "immer": "^10.1.1",
+    "@deepseek-ai/dsh-util-workspace-path": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-util-code-language": "0.2.0-rc.2",
+    "diff": "^9.0.0",
+    "simple-icons": "16.31.0"
   }
 }