@edge-sky/dsh-oauth-adapter 0.1.2-dev.2 → 0.1.2-rc.0

package/lib/index.js

@@ -3,31 +3,45 @@
  * `dsh-llm-pi-ai` plugin.
  * @module @edge-sky/dsh-oauth-adapter
  */
-import { OAuthModelService } from './model-service.js';
-import { ModelOperationError } from './model-discovery.js';
 import { randomUUID } from 'node:crypto';
 import { inspect } from 'node:util';
+import { settingsNamespace } from '@deepseek-ai/dsh-settings';
 import z from '@deepseek-ai/schemastery';
 import WebSocket, { WebSocketServer } from 'ws';
 import { MAX_FRAME_BYTES, OAUTH_SOCKET_PATH, OAUTH_SOCKET_PROTOCOL, PROVIDERS, parseClientCommand, } from './protocol.js';
 /** Runtime-validated plugin configuration. */
 export const Config = z.object({
     debug: z.boolean().default(false),
-    modelSyncTimeoutMs: z.number().min(1).max(2147483647).step(1).default(30000),
-    modelSyncMaxResponseBytes: z.number().min(1024).step(1).default(4194304),
-    modelSyncMaxPages: z.number().min(1).max(1000).step(1).default(100),
-    codexClientVersion: z.string().default('0.149.0'),
 });
 /** Cordis plugin name. */
 export const name = 'dsh-oauth-adapter';
 /** Official services required by the OAuth account surface. */
-export const inject = ['authorization', 'credentials', 'settings', 'webServer', 'llm'];
+export const inject = ['authorization', 'credentials', 'settings', 'webServer'];
+const MODEL_SETTINGS_NS = settingsNamespace('llm-pi-ai');
 function providerMeta(providerId) {
     const provider = PROVIDERS.find(candidate => candidate.id === providerId);
     if (provider === undefined)
         throw new Error(`unsupported provider: ${providerId}`);
     return provider;
 }
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function modelRouteEnabled(settings, provider) {
+    const section = settings.get(MODEL_SETTINGS_NS);
+    if (!isRecord(section) || !isRecord(section.providers))
+        return false;
+    return Object.hasOwn(section.providers, provider);
+}
+function pluginOwnsModelRoute(settings, provider) {
+    const descriptor = settings.describe().find(candidate => candidate.ns === MODEL_SETTINGS_NS);
+    if (!isRecord(descriptor?.user) || !isRecord(descriptor.user.providers))
+        return false;
+    const profile = descriptor.user.providers[provider.id];
+    return isRecord(profile)
+        && Object.keys(profile).length === 1
+        && profile.displayName === provider.modelGroupLabel;
+}
 const GITHUB_DOMAIN_PROMPT = 'GitHub Enterprise URL/domain (blank for github.com)';
 function promptView(prompt, provider) {
     if (prompt.kind === 'select') {
@@ -162,17 +176,14 @@ class OAuthConnection {
     socket;
     debug;
     changed;
-    models;
     active;
     queue = Promise.resolve();
     closed = false;
-    tasks = new Set();
-    constructor(ctx, socket, debug, changed, models) {
+    constructor(ctx, socket, debug, changed) {
         this.ctx = ctx;
         this.socket = socket;
         this.debug = debug;
         this.changed = changed;
-        this.models = models;
         socket.on('message', (raw, isBinary) => {
             if (isBinary || rawLength(raw) > MAX_FRAME_BYTES) {
                 this.sendError('invalid-message', 'message must be bounded UTF-8 JSON');
@@ -196,23 +207,16 @@ class OAuthConnection {
         this.debug('connection=opened');
         void this.sendSnapshot();
     }
-    modelChanged(provider) { this.send({ type: 'models-changed', provider }); }
     refresh() {
         void this.sendSnapshot();
     }
-    track(task) {
-        this.tasks.add(task);
-        void task.finally(() => this.tasks.delete(task)).catch(() => { });
-    }
-    async dispose() {
+    dispose() {
         this.closed = true;
         this.withdrawActive('OAuth surface stopped');
         this.socket.terminate();
-        await this.queue;
-        await Promise.allSettled([...this.tasks]);
     }
     send(message) {
-        if (!this.closed && this.socket.readyState === WebSocket.OPEN)
+        if (this.socket.readyState === WebSocket.OPEN)
             this.socket.send(JSON.stringify(message));
     }
     sendError(code, message, requestId, attemptId, detail) {
@@ -224,8 +228,6 @@ class OAuthConnection {
         });
     }
     async receive(raw) {
-        if (this.closed)
-            return;
         const parsed = parseClientCommand(raw);
         if (!parsed.ok) {
             this.sendError(parsed.message === 'provider is unsupported' ? 'unsupported-provider' : 'invalid-message', parsed.message, parsed.requestId);
@@ -234,10 +236,6 @@ class OAuthConnection {
         await this.handle(parsed.value);
     }
     async handle(command) {
-        if (command.type.startsWith('models-')) {
-            this.track(this.handleModels(command));
-            return;
-        }
         switch (command.type) {
             case 'refresh':
                 await this.sendSnapshot(command.requestId);
@@ -255,45 +253,41 @@ class OAuthConnection {
                 await this.forget(command);
         }
     }
-    async handleModels(command) {
-        try {
-            switch (command.type) {
-                case 'models-list': break;
-                case 'models-sync':
-                    await this.models.sync(command.provider, command.revision);
-                    break;
-                case 'models-migrate':
-                    await this.models.migrate(command.provider, command.revision);
-                    break;
-                case 'models-save':
-                    await this.models.saveManual(command.provider, command.model, command.revision);
-                    break;
-                case 'models-delete':
-                    await this.models.deleteManual(command.provider, command.id, command.revision);
-                    break;
-            }
-            if (!this.closed)
-                this.send({ type: 'models-page', requestId: command.requestId,
-                    page: await this.models.page(command.provider, command.type === 'models-list' ? command.offset : 0) });
-        }
-        catch (error) {
-            if (!this.closed)
-                this.send({ type: 'models-error', requestId: command.requestId, provider: command.provider,
-                    code: error instanceof ModelOperationError ? error.code : 'operation-failed',
-                    message: error instanceof ModelOperationError ? error.message : 'The model operation failed. Refresh and retry.' });
-        }
-    }
     async account(provider) {
-        await this.models.ready;
         const entry = this.ctx.authorization.describe(provider.key);
         const credential = await this.ctx.credentials.describeRecord(provider.key);
+        let modelsEnabled = modelRouteEnabled(this.ctx.settings, provider.id);
+        if (credential.configured && !modelsEnabled && this.ctx.settings.writable) {
+            try {
+                modelsEnabled = await this.enableModelRoute(provider);
+            }
+            catch (error) {
+                this.ctx.logger.warn('dsh-oauth-adapter: model route activation failed for %s', provider.id);
+                this.ctx.logger.warn(error);
+            }
+        }
         return {
-            provider: provider.id, label: entry?.label ?? provider.fallbackLabel,
+            provider: provider.id,
+            label: entry?.label ?? provider.fallbackLabel,
             available: entry?.methods.some(method => method.id === 'oauth') === true,
-            configured: credential.configured, modelsEnabled: this.models.isManaged(provider.id),
-            writable: credential.writable, inFlight: entry?.inFlight ?? false,
+            configured: credential.configured,
+            modelsEnabled,
+            writable: credential.writable,
+            inFlight: entry?.inFlight ?? false,
         };
     }
+    async enableModelRoute(provider) {
+        if (modelRouteEnabled(this.ctx.settings, provider.id))
+            return true;
+        if (!this.ctx.settings.writable)
+            return false;
+        await this.ctx.settings.mutate(MODEL_SETTINGS_NS, [{
+                op: 'set',
+                path: ['providers', provider.id],
+                value: { displayName: provider.modelGroupLabel },
+            }]);
+        return modelRouteEnabled(this.ctx.settings, provider.id);
+    }
     async sendSnapshot(requestId) {
         try {
             const accounts = await Promise.all(PROVIDERS.map(provider => this.account(provider)));
@@ -324,12 +318,11 @@ class OAuthConnection {
             id: randomUUID(), provider: command.provider, key: provider.key,
             controller: new AbortController(), prompts: new Map(),
         };
-        this.models.loginStarted(provider.id);
         this.active = attempt;
         this.changed();
         this.send({ type: 'started', requestId: command.requestId, attemptId: attempt.id, provider: attempt.provider });
         this.debug(`provider=${attempt.provider} stage=started`);
-        this.track(this.ctx.authorization.begin({
+        void this.ctx.authorization.begin({
             key: attempt.key,
             method: 'oauth',
             signal: attempt.controller.signal,
@@ -345,20 +338,26 @@ class OAuthConnection {
                 prompt: prompt => this.openPrompt(attempt, prompt),
             },
         }).then(async (outcome) => {
-            try {
-                await this.models.loginFinished(provider.id, outcome.status === 'authorized');
-            }
-            catch (error) {
-                this.sendError('model-route-unavailable', 'Sign-in completed, but model synchronization did not complete. Open Models to retry.', undefined, attempt.id, formatErrorDetail(error));
+            if (outcome.status === 'authorized') {
+                try {
+                    const enabled = await this.enableModelRoute(provider);
+                    if (!enabled) {
+                        this.sendError('model-route-unavailable', 'sign-in completed, but the OAuth model route could not be enabled', undefined, attempt.id);
+                    }
+                }
+                catch (error) {
+                    this.ctx.logger.warn('dsh-oauth-adapter: model route activation failed for %s', provider.id);
+                    this.ctx.logger.warn(error);
+                    this.sendError('model-route-unavailable', 'sign-in completed, but the OAuth model route could not be enabled', undefined, attempt.id, formatErrorDetail(error));
+                }
             }
             this.finish(attempt, outcome.status);
-        }, async (error) => {
-            await this.models.loginFinished(provider.id, false).catch(() => { });
+        }, (error) => {
             this.ctx.logger.warn('dsh-oauth-adapter: provider sign-in failed for %s', attempt.provider);
             this.ctx.logger.warn(error);
             this.sendError('sign-in-failed', 'sign-in failed', undefined, attempt.id, formatErrorDetail(error));
             this.finish(attempt, 'failed');
-        }));
+        });
     }
     openPrompt(attempt, prompt) {
         if (this.active !== attempt || this.closed)
@@ -429,7 +428,12 @@ class OAuthConnection {
             return;
         }
         try {
-            await this.models.forget(provider.id);
+            await this.ctx.credentials.deleteRecord(provider.key);
+            if (pluginOwnsModelRoute(this.ctx.settings, provider)) {
+                await this.ctx.settings.mutate(MODEL_SETTINGS_NS, [{
+                        op: 'unset', path: ['providers', provider.id],
+                    }]);
+            }
             this.send({ type: 'ack', requestId: command.requestId });
             await this.sendSnapshot();
         }
@@ -462,28 +466,21 @@ class OAuthConnection {
         attempt.prompts.clear();
     }
 }
-/** Mount the loopback-only OAuth WebSocket over official rc services. */
+/** Mount the loopback-only OAuth WebSocket over official rc2 services. */
 export function apply(ctx, config) {
     const debug = config.debug === true
         ? (message) => { ctx.logger.debug('dsh-oauth-adapter: %s', message); }
         : () => { };
     const connections = new Set();
-    const models = new OAuthModelService(ctx, {
-        timeoutMs: config.modelSyncTimeoutMs ?? 30000,
-        maxResponseBytes: config.modelSyncMaxResponseBytes ?? 4194304,
-        maxPages: config.modelSyncMaxPages ?? 100,
-        codexClientVersion: config.codexClientVersion ?? '0.149.0',
-    }, provider => { for (const connection of connections)
-        connection.modelChanged(provider); });
     const server = new WebSocketServer({
         noServer: true,
         maxPayload: MAX_FRAME_BYTES,
         handleProtocols: protocols => protocols.has(OAUTH_SOCKET_PROTOCOL) ? OAUTH_SOCKET_PROTOCOL : false,
     });
     server.on('connection', (socket) => {
-        const connection = new OAuthConnection(ctx, socket, debug, refresh, models);
+        const connection = new OAuthConnection(ctx, socket, debug, refresh);
         connections.add(connection);
-        socket.once('close', () => { void connection.dispose().then(() => { connections.delete(connection); }); });
+        socket.once('close', () => { connections.delete(connection); });
     });
     server.on('error', (error) => {
         ctx.logger.warn('dsh-oauth-adapter: WebSocket server failed');
@@ -510,10 +507,9 @@ export function apply(ctx, config) {
     return async () => {
         credentialDisposer();
         unregister();
-        const closing = [...connections].map(connection => connection.dispose());
+        for (const connection of connections)
+            connection.dispose();
         connections.clear();
-        await models.dispose();
-        await Promise.allSettled(closing);
         await new Promise((resolve) => { server.close(() => { resolve(); }); });
     };
 }

package/lib/protocol.d.ts

@@ -1,5 +1,4 @@
 /** Shared browser/Host wire vocabulary for the OAuth account surface. */
-import type { ModelCommand, ModelMessage } from './model-types.js';
 export declare const OAUTH_SOCKET_PATH = "/_edge-sky/dsh-oauth";
 export declare const OAUTH_SOCKET_PROTOCOL = "dsh-oauth-v1";
 export declare const MAX_FRAME_BYTES: number;
@@ -65,7 +64,7 @@ export type PromptView = {
         description?: string;
     }[];
 };
-export type ClientCommand = ModelCommand | {
+export type ClientCommand = {
     type: 'refresh';
     requestId: string;
 } | {
@@ -88,7 +87,7 @@ export type ClientCommand = ModelCommand | {
     provider: ProviderId;
 };
 export type OAuthErrorCode = 'invalid-message' | 'unsupported-provider' | 'authorization-unavailable' | 'busy' | 'invalid-attempt' | 'invalid-prompt' | 'credential-read-only' | 'model-route-unavailable' | 'sign-in-failed' | 'operation-failed';
-export type ServerMessage = ModelMessage | {
+export type ServerMessage = {
     type: 'snapshot';
     requestId?: string;
     accounts: readonly AccountView[];

package/lib/protocol.js

@@ -1,5 +1,4 @@
 /** Shared browser/Host wire vocabulary for the OAuth account surface. */
-import { validManual, modelText } from './model-types.js';
 export const OAUTH_SOCKET_PATH = '/_edge-sky/dsh-oauth';
 export const OAUTH_SOCKET_PROTOCOL = 'dsh-oauth-v1';
 export const MAX_FRAME_BYTES = 16 * 1024;
@@ -60,32 +59,6 @@ export function parseClientCommand(raw) {
     const requestId = isId(candidate.requestId) ? candidate.requestId : undefined;
     if (requestId === undefined)
         return { ok: false, message: 'requestId is invalid' };
-    if (candidate.type.startsWith('models-')) {
-        if (!isProviderId(candidate.provider))
-            return { ok: false, requestId, message: 'provider is unsupported' };
-        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;
-        }
-        if (!Number.isSafeInteger(candidate.revision) || Number(candidate.revision) < 0)
-            return fail;
-        const revision = Number(candidate.revision);
-        if (candidate.type === 'models-sync' || candidate.type === 'models-migrate') {
-            return exactKeys(candidate, ['type', 'requestId', 'provider', 'revision'])
-                ? { ok: true, value: { type: candidate.type, requestId, provider, revision } } : fail;
-        }
-        if (candidate.type === 'models-save') {
-            return exactKeys(candidate, ['type', 'requestId', 'provider', 'revision', 'model']) && validManual(provider, candidate.model)
-                ? { ok: true, value: { type: 'models-save', requestId, provider, revision, model: candidate.model } } : fail;
-        }
-        if (candidate.type === 'models-delete') {
-            return exactKeys(candidate, ['type', 'requestId', 'provider', 'revision', 'id']) && modelText(candidate.id)
-                ? { ok: true, value: { type: 'models-delete', requestId, provider, revision, id: candidate.id } } : fail;
-        }
-        return fail;
-    }
     switch (candidate.type) {
         case 'refresh':
             return exactKeys(candidate, ['requestId', 'type'])

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

@@ -1,5 +1,5 @@
 /** Browser half of the standalone DSH OAuth Accounts page. */
-import type { Context } from '@deepseek-ai/cordis';
+import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client';
 import { type OAuthLocaleKey } from './locales.js';
 export { OAuthAccountsSection } from './OAuthAccountsSection.js';
 export { OAuthAccountsController } from './store.js';
@@ -12,5 +12,5 @@ declare module '@deepseek-ai/dsh-client-ui-slots' {
 /** Required browser services for settings placement and localized copy. */
 export declare const inject: string[];
 /** Register the OAuth account page and its app-lifetime connection controller. */
-export declare function apply(ctx: Context): void;
+export declare function apply(ctx: ClientContext): void;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1,39 +1,5 @@
 /** English copy for the OAuth accounts page. */
 export declare const en: {
-    readonly modelUnsupported: "This provider does not support account discovery with the current credential. You can still add models manually.";
-    readonly modelAuthFailed: "Model discovery was denied. Reconnect or check this account’s permissions. The previous list was retained.";
-    readonly modelTimedOut: "Model synchronization timed out. The previous list was retained.";
-    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 modelId: "Model ID";
-    readonly modelName: "Display name";
-    readonly modelProtocol: "Request protocol";
-    readonly manualModelHint: "Saving configures a request; it does not verify account access or model capabilities.";
-    readonly saveModel: "Save model";
-    readonly modelConnected: "Connected";
-    readonly accountCatalog: "Account-synchronized list";
-    readonly builtinCatalog: "Built-in list · account access unverified";
-    readonly lastModelSync: "Last successful synchronization";
-    readonly matchedModels: "Matched";
-    readonly pendingModels: "Needs configuration";
-    readonly manualModels: "Manual";
-    readonly modelConflict: "Models changed elsewhere. The list was refreshed; review it and retry.";
-    readonly modelOperationFailed: "The model operation failed. Review the details before retrying.";
-    readonly reviewMigration: "Review migration";
-    readonly migrationDescription: "Move this OAuth provider configuration to plugin management while preserving its ID and credentials. The following configuration fields will be retained:";
-    readonly confirmMigration: "Migrate this provider";
-    readonly modelWorking: "Working…";
-    readonly syncModels: "Synchronize models";
-    readonly addModel: "Add model";
-    readonly configureModel: "Configure";
-    readonly editModel: "Edit";
-    readonly deleteModel: "Delete manual entry";
-    readonly noModels: "No selectable models. Configure an unmatched model or add one manually.";
-    readonly modelsPagination: "OAuth model pages";
-    readonly previousModels: "Previous";
-    readonly nextModels: "Next";
     readonly nav: "OAuth Accounts";
     readonly title: "OAuth Accounts";
     readonly intro: "Connect subscription-backed providers. Their models appear in separate OAuth groups, apart from API-key providers.";

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

@@ -1,6 +1,5 @@
 /** Browser state machine for the plugin-owned OAuth WebSocket. */
 import type { AccountView, PromptView, ProviderId, ServerMessage } from '../protocol.js';
-import type { ModelPage, ManualModel } from '../model-types.js';
 export interface NoticeView {
     message: string;
     url?: string;
@@ -22,12 +21,6 @@ export interface AttemptView {
 export interface OAuthAccountsSnapshot {
     connection: 'connecting' | 'open' | 'reconnecting' | 'closed';
     accounts: readonly AccountView[];
-    modelPages?: Partial<Record<ProviderId, ModelPage>>;
-    modelBusy?: Partial<Record<ProviderId, boolean>>;
-    modelErrors?: Partial<Record<ProviderId, {
-        code: string;
-        message: string;
-    }>>;
     attempt?: AttemptView;
     error?: string;
     errorDetail?: string;
@@ -47,9 +40,6 @@ export declare class OAuthAccountsController {
     private reconnectTimer;
     private reconnectDelay;
     private disposed;
-    private modelsVisible;
-    private readonly modelRequests;
-    private readonly latestModelReads;
     constructor();
     readonly subscribe: (listener: Listener) => (() => void);
     readonly getSnapshot: () => OAuthAccountsSnapshot;
@@ -57,13 +47,6 @@ export declare class OAuthAccountsController {
     respond(attemptId: string, promptId: string, value: string): void;
     cancel(attemptId: string): void;
     forget(provider: ProviderId): void;
-    loadModels(): void;
-    readModels(provider: ProviderId, offset?: number): void;
-    syncModels(provider: ProviderId): void;
-    migrateModels(provider: ProviderId): void;
-    saveModel(provider: ProviderId, model: ManualModel): void;
-    deleteModel(provider: ProviderId, id: string): void;
-    private writeModels;
     retry(): void;
     dispose(): void;
     private connect;

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";
 //# sourceMappingURL=styles.d.ts.map

package/lib/types/protocol.d.ts

@@ -1,5 +1,4 @@
 /** Shared browser/Host wire vocabulary for the OAuth account surface. */
-import type { ModelCommand, ModelMessage } from './model-types.js';
 export declare const OAUTH_SOCKET_PATH = "/_edge-sky/dsh-oauth";
 export declare const OAUTH_SOCKET_PROTOCOL = "dsh-oauth-v1";
 export declare const MAX_FRAME_BYTES: number;
@@ -65,7 +64,7 @@ export type PromptView = {
         description?: string;
     }[];
 };
-export type ClientCommand = ModelCommand | {
+export type ClientCommand = {
     type: 'refresh';
     requestId: string;
 } | {
@@ -88,7 +87,7 @@ export type ClientCommand = ModelCommand | {
     provider: ProviderId;
 };
 export type OAuthErrorCode = 'invalid-message' | 'unsupported-provider' | 'authorization-unavailable' | 'busy' | 'invalid-attempt' | 'invalid-prompt' | 'credential-read-only' | 'model-route-unavailable' | 'sign-in-failed' | 'operation-failed';
-export type ServerMessage = ModelMessage | {
+export type ServerMessage = {
     type: 'snapshot';
     requestId?: string;
     accounts: readonly AccountView[];