npm - @edge-sky/dsh-oauth-adapter - Versions diffs - 0.1.2-dev.2 → 0.1.3-rc.0 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/README.i18n.yaml +2 -2
package/README.md +27 -60
package/README.zh.md +27 -62
package/lib/client.js +242 -162
package/lib/index.js +1 -1
package/lib/model-service.d.ts +1 -1
package/lib/model-service.js +11 -6
package/lib/model-types.d.ts +2 -0
package/lib/protocol.js +2 -2
package/lib/types/client/locales.d.ts +4 -3
package/lib/types/client/store.d.ts +1 -1
package/lib/types/client/styles.d.ts +1 -1
package/lib/types/model-types.d.ts +2 -0
package/package.json +1 -1

package/README.i18n.yaml CHANGED Viewed

@@ -1,4 +1,4 @@
 # Bilingual-pair consistency record: the git blob hash of each side as of the
 # last confirmed-consistent state. Both languages carry equal authority.
-README.md: fd0eef65a18d89c5e1dd49d9bc0fc89f9c2a770a
-README.zh.md: aeb4cf30a05c98c1b885c4c7eece00f3bb138c39
+README.md: 745b055c42ba308b7e9f33819f6c084bad98dda4
+README.zh.md: 6bcdf2437386378d19e0045d8c6397ba65637374

package/README.md CHANGED Viewed

@@ -2,84 +2,51 @@
 English | [中文](README.zh.md)
-OAuth sign-in and account model management for the DSH Web profile. The validation baseline is DSH `0.1.2-rc.1`, with an exact plugin dependency on pi-ai `0.84.4`. Synchronizing models never installs or upgrades packages.
+An OAuth account page for the DSH Web profile. It supports:
+| Provider | pi-ai sign-in path |
+| --- | --- |
+| OpenAI Codex | Browser callback or device code |
+| GitHub Copilot | GitHub or GitHub Enterprise device code |
+| Anthropic | Browser callback with manual code/redirect fallback |
+| Kimi For Coding | Device code |
+| OpenRouter | Browser PKCE callback |
+| xAI | Device code |
+The adapter has only been tested with DSH `0.1.1-rc.2`; compatibility with future versions is need to test.
 ## Install
 ```sh
 dsh plugin --profile web add @edge-sky/dsh-oauth-adapter
-dsh web
 ```
-Use **Settings → OAuth Accounts** to connect or reconnect an account. Successful authorization automatically synchronizes its models. Authorization and synchronization have separate results: a discovery failure does not undo successful sign-in.
-Use the **OAuth models** area of **Settings → Models** to synchronize an existing connection, configure unmatched models, and add, edit or delete manual entries. This area occupies the public `settings.models.footer` slot. No additional model settings page is installed.
-| Provider | Model protocol |
-| --- | --- |
-| GitHub Copilot | Select Chat Completions, Responses or Anthropic Messages per model |
-| OpenRouter | Select Chat Completions or Anthropic Messages per model |
-| OpenAI Codex | Codex Responses |
-| xAI | OpenAI Responses |
-| Anthropic, Kimi Coding | Anthropic Messages |
-Model ID is required; a blank display name uses the ID. Fixed-protocol providers have no protocol selector and reject protocol overrides on the server. An unknown model receives the provider's configured default capacities, text input and no inferred reasoning capability. Saving permits an attempted request; it does not prove the model exists, that the account can call it, or that all capabilities are known.
-## Synchronization
-Discovery uses each provider's authenticated endpoint, including Copilot's OAuth-resolved API host, Codex's account header, Anthropic cursor pagination and OpenRouter's account-filtered offset pagination. OpenRouter's public catalog is not used as a substitute. An unsupported endpoint or insufficient OAuth scope is reported and manual configuration remains available. Endpoint details and references are in [migration and operation](docs/oauth-models.md).
+or
-Only exact IDs within the same provider inherit pi-ai's full model metadata. No display-name matching or undocumented alias inference selects a protocol. Unknown IDs remain **Needs configuration**. Successful synchronization replaces automatic entries with the complete remote result, including a genuinely empty result. Manual entries survive and merge by ID with explicit user fields winning. Errors retain the last successful result. Before any successful discovery, the previous configured or built-in list remains available and is labeled unverified. Reconnection to a different or unidentifiable account clears the old account's automatic results before discovery.
+```sh
+npx @deepseek-ai/dsh plugin --profile web add @edge-sky/dsh-oauth-adapter
+```
-The plugin stores model settings in `oauth-models`, including a version, migration backup, cached remote IDs and manual entries. Credentials remain exclusively at `llm-pi-ai/<provider>` through DSH's credentials service. Public pi-ai authentication handles token refresh; tokens never enter model settings or browser messages. A future plugin dependency upgrade rematches cached IDs against the newly loaded catalog.
+Start DSH:
-Existing provider IDs and session references remain unchanged. Simple profiles generated by earlier plugin versions migrate automatically; custom profiles require a preview in Models. API-key references, composition-owned profiles and competing adapters are not overwritten. See [migration and recovery](docs/oauth-models.md#migration-and-recovery) before upgrading a customized installation.
+```sh
+npx @deepseek-ai/dsh web
+```
-## Configuration
+<img width="2940" height="1766" alt="image" src="https://github.com/user-attachments/assets/cbd98703-ee7a-491b-aa2f-02e42b99f6b9" />
-The optional Host plugin configuration accepts:
-| Field | Default | Meaning |
-| --- | --- | --- |
-| `debug` | `false` | Transport lifecycle diagnostics |
-| `modelSyncTimeoutMs` | `30000` | Discovery and route-release timeout |
-| `modelSyncMaxResponseBytes` | `4194304` | Maximum bytes per remote page |
-| `modelSyncMaxPages` | `100` | Maximum pages per synchronization |
-| `codexClientVersion` | `0.149.0` | Version sent to the Codex discovery endpoint |
-## Development and verification
+<img width="2270" height="1524" alt="image" src="https://github.com/user-attachments/assets/e0cc6591-73a4-4e87-9ef6-68950126b290" />
-```sh
-pnpm install
-pnpm run typecheck
-pnpm test
-```
-Tests cover provider responses, matching, retained results, revisions, migration recovery, cancellation, actual rc adapter requests with network interception, and published rc model-page bundles in a DOM environment with replayable snapshots. WebSocket tests bind a loopback port. All test credentials are synthetic; these checks do not establish live-account discovery or inference success for any provider. DSH source changes are not required.
+## How it works
-## Local package and installation verification
+DSH integrates pi-ai through the `@deepseek-ai/dsh-llm-pi-ai` adapter, but does not provide an OAuth entry point. `@edge-sky/dsh-oauth-adapter` exposes pi-ai's existing provider login flows through the DSH Authorization Service. Browser links, device codes, text and secret input, method selection, cancellation, and withdrawn prompts all use the same provider-neutral transport.
-`npm pack` and `npm publish` from the package directory run type checking, a fresh build, and tests through `prepack`; a failure stops packaging. Do not bypass this check with `--ignore-scripts`. Published versions cannot be overwritten, so a fixed release needs a new version number.
+Because DSH does not currently mount the `ctx.authorization` service, this plugin also mounts it manually.
-A temporary `DSH_HOME` lets you test a local tarball without affecting existing accounts or profiles or changing DSH code:
+The plugin itself does not manage OAuth credentials or maintain login state. Maybe DSH support this sign-in method in the future; but for now, this plugin lets you enjoy it.
-```sh
-pnpm install --frozen-lockfile
-artifact_dir=$(mktemp -d)
-npm pack --pack-destination "$artifact_dir"
-export DSH_HOME=$(mktemp -d)
-mkdir -p "$DSH_HOME/profiles/web"
-cat > "$DSH_HOME/profiles/web/pnpm-workspace.yaml" <<'YAML'
-packages:
-  - .
-nodeLinker: hoisted
-autoInstallPeers: false
-allowBuilds:
-  '@google/genai': false
-  protobufjs: false
-YAML
-npx @deepseek-ai/dsh@0.1.2-rc.1 plugin --profile web add "$artifact_dir"/*.tgz
-npx @deepseek-ai/dsh@0.1.2-rc.1 web --no-open
-```
+If this plugins is has helped you, please give a star for me, or create issues if you have any suggestion~
-After stopping the server, run `unset DSH_HOME` to restore the default directory. The test profile explicitly skips installation scripts for these two dependencies; the plugin repository's policy does not propagate to consumers. New users still need to configure this policy in their own profiles. Successful startup verifies plugin loading; real-account login, model discovery, and inference need separate verification.

package/README.zh.md CHANGED Viewed

@@ -2,84 +2,49 @@
 [English](README.md) | 中文
-为 DSH Web profile 提供 OAuth 登录和账号模型管理。验证基线为 DSH `0.1.2-rc.1`，插件精确依赖 pi-ai `0.84.4`。同步模型不会安装或升级依赖。
+为 DSH Web profile 提供独立的 OAuth 账户页面。当前支持：
+| 提供商 | pi-ai 登录路径 |
+| --- | --- |
+| OpenAI Codex | 浏览器回调或设备码 |
+| GitHub Copilot | GitHub 或 GitHub Enterprise 设备码 |
+| Anthropic | 浏览器回调，并支持手工粘贴授权码/重定向地址 |
+| Kimi For Coding | 设备码 |
+| OpenRouter | 浏览器 PKCE 回调 |
+| xAI | 设备码 |
+当前仅对 DSH`0.1.1-rc.2`进行了测试，其他版本的兼容性需要自行测试
 ## 安装
 ```sh
 dsh plugin --profile web add @edge-sky/dsh-oauth-adapter
-dsh web
 ```
-在 **设置 → OAuth 账户** 连接或重新连接账号。授权成功后自动同步模型。授权和同步分别报告结果：发现失败不会撤销成功的登录。
-在 **设置 → 模型** 的 **OAuth 模型** 区域同步已连接账号、补充待配置模型，以及添加、编辑或删除手动模型。该区域使用公开的 `settings.models.footer` 插槽，不增加独立模型设置页面。
-| 供应商 | 模型协议 |
-| --- | --- |
-| GitHub Copilot | 每个模型选择 Chat Completions、Responses 或 Anthropic Messages |
-| OpenRouter | 每个模型选择 Chat Completions 或 Anthropic Messages |
-| OpenAI Codex | Codex Responses |
-| xAI | OpenAI Responses |
-| Anthropic、Kimi Coding | Anthropic Messages |
-模型 ID 必填，显示名称留空时使用 ID。固定协议供应商不显示协议选择器，后端也拒绝协议覆盖。未知模型采用供应商配置的默认容量、文本输入，不根据名称推断思考能力。保存后可尝试发送请求，但不代表已验证模型存在、账号可调用或全部模型能力。
-## 同步行为
-发现使用各供应商的认证端点，包括 Copilot 经 OAuth 解析的 API 主机、Codex 账号请求头、Anthropic 游标分页及 OpenRouter 账号过滤列表的偏移分页。不会使用 OpenRouter 公开总目录代替账号列表。端点不支持或 OAuth 权限不足时明确报错，仍可手动配置。端点和依据见[迁移与运行说明](docs/oauth-models.zh.md)。
-只有同一供应商内精确匹配的 ID 才继承 pi-ai 的完整模型描述。不通过显示名称或未经证实的别名推断调用协议。未知 ID 保持为**待配置**。成功同步使用完整远端结果替换自动项，包括真正的空列表；手动项始终保留，同 ID 合并，用户明确填写的字段优先。失败保留最近成功结果。首次成功发现前，保留原配置或内置列表并标明未经验证。重新连接至不同或无法识别的账号时，先清除旧账号的自动结果，再进行发现。
+或
-插件使用 `oauth-models` 保存版本、迁移备份、远端 ID 缓存和手动项。凭据始终通过 DSH credentials 服务保存在 `llm-pi-ai/<provider>`。公开 pi-ai 认证能力负责 token 刷新，token 不进入模型设置或浏览器消息。后续升级插件依赖时，已保存的远端 ID 会与新加载的目录重新匹配。
+```sh
+npx @deepseek-ai/dsh plugin --profile web add @edge-sky/dsh-oauth-adapter
+```
-既有供应商 ID 和会话引用保持不变。旧插件生成的简单配置自动迁移；自定义配置需要在模型页预览确认。API-key 引用、组合基础层配置和其他适配器占用的路由不会被覆盖。升级自定义安装前请阅读[迁移与恢复](docs/oauth-models.zh.md#迁移与恢复)。
+启动 DSH：
-## 配置
+```sh
+npx @deepseek-ai/dsh web
+```
-Host 插件接受以下可选配置：
+<img width="2940" height="1766" alt="image" src="https://github.com/user-attachments/assets/7f1dc846-9cea-468c-8a1e-27f4fa34a4fe" />
-| 字段 | 默认值 | 含义 |
-| --- | --- | --- |
-| `debug` | `false` | 连接生命周期诊断 |
-| `modelSyncTimeoutMs` | `30000` | 模型发现及旧路由释放的超时 |
-| `modelSyncMaxResponseBytes` | `4194304` | 每页远端响应的最大字节数 |
-| `modelSyncMaxPages` | `100` | 一次同步的最大页数 |
-| `codexClientVersion` | `0.149.0` | Codex 发现端点所接收的客户端版本 |
-## 开发与验证
+<img width="2270" height="1524" alt="image" src="https://github.com/user-attachments/assets/8007002a-a036-4cf4-b015-d4e50eff25d9" />
-```sh
-pnpm install
-pnpm run typecheck
-pnpm test
-```
-测试覆盖供应商响应、匹配、失败保留、revision 冲突、迁移恢复、取消、经过网络拦截的真实 rc 适配器请求，以及 DOM 环境中加载已发布 rc 模型页产物的可重放快照。WebSocket 测试需要绑定回环端口。测试凭据全部为合成数据，这些验证不代表任何供应商的真实账号发现或推理调用已经通过。无需修改 DSH 源码。
-## 本地打包与安装验证
+## 工作原理
-`npm pack` 和从目录执行的 `npm publish` 通过 `prepack` 运行类型检查、重新构建和测试；任何一步失败都会终止打包。不要使用 `--ignore-scripts` 跳过该检查。已发布版本不能覆盖，修复后发布必须使用新版本号。
+DSH 通过 `@deepseek-ai/dsh-llm-pi-ai` 适配器接入 pi-ai，但并没有提供 OAuth 的入口。`@edge-sky/dsh-oauth-adapter` 通过 DSH Authorization Service 暴露 pi-ai 已有的 provider 登录流程。浏览器链接、设备码、文本与密码输入、登录方式选择、取消和撤回提示均通过同一套 provider-neutral 传输完成。
-使用临时 `DSH_HOME` 可以测试本地 tarball，不影响现有账号与 profile，也不需要修改 DSH 代码：
+由于 DSH 目前并没有挂载`ctx.authorization`服务，因此该插件同时手动对其进行了挂载
-```sh
-pnpm install --frozen-lockfile
-artifact_dir=$(mktemp -d)
-npm pack --pack-destination "$artifact_dir"
-export DSH_HOME=$(mktemp -d)
-mkdir -p "$DSH_HOME/profiles/web"
-cat > "$DSH_HOME/profiles/web/pnpm-workspace.yaml" <<'YAML'
-packages:
-  - .
-nodeLinker: hoisted
-autoInstallPeers: false
-allowBuilds:
-  '@google/genai': false
-  protobufjs: false
-YAML
-npx @deepseek-ai/dsh@0.1.2-rc.1 plugin --profile web add "$artifact_dir"/*.tgz
-npx @deepseek-ai/dsh@0.1.2-rc.1 web --no-open
-```
+插件本身并不承担 OAuth 凭证管理与维持登录态的职责，或许将来 DSH 会官方支持这一登录方式，但至少现在你可以通过这个插件体验它
-停止服务器后执行 `unset DSH_HOME` 恢复默认目录。测试 profile 的脚本策略显式跳过这两个依赖的安装脚本；插件仓库的策略不会传播到消费端。新用户仍需在自己的 profile 中配置该策略。启动成功只验证插件加载；真实账号登录、模型发现和推理需要单独验证。
+如果这个插件帮到了你，还请留下你的小星星，如果有任何建议，欢迎 issues~

package/lib/client.js CHANGED Viewed

@@ -98,6 +98,7 @@ window.__ModuleLoader__.load({
 				},
 				children: [
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [t("modelId"), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+						className: "dsh-oauth-input",
 						required: true,
 						maxLength: 256,
 						value: id,
@@ -105,12 +106,14 @@ window.__ModuleLoader__.load({
 						onChange: (event) => setId(event.target.value)
 					})] }),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [t("modelName"), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+						className: "dsh-oauth-input",
 						maxLength: 256,
 						value: name,
 						onChange: (event) => setName(event.target.value),
 						placeholder: id
 					})] }),
 					choices.length > 1 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [t("modelProtocol"), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("select", {
+						className: "dsh-oauth-select",
 						value: api,
 						onChange: (event) => setApi(event.target.value),
 						children: choices.map((choice) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
@@ -123,11 +126,13 @@ window.__ModuleLoader__.load({
 						children: t("manualModelHint")
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+						className: "dsh-oauth-button",
 						type: "submit",
 						disabled: busy || !validManual(provider, model),
 						children: t("saveModel")
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+						className: "dsh-oauth-button",
 						type: "button",
 						disabled: busy,
 						onClick: close,
@@ -137,6 +142,7 @@ window.__ModuleLoader__.load({
 			});
 		}
 		function ProviderModels({ page, controller, busy, error, t }) {
+			const [expanded, setExpanded] = (0, react.useState)(false);
 			const [editing, setEditing] = (0, react.useState)();
 			const [submitted, setSubmitted] = (0, react.useState)(false);
 			const [confirmMigration, setConfirmMigration] = (0, react.useState)(false);
@@ -155,144 +161,184 @@ window.__ModuleLoader__.load({
 			const disabled = busy || !page.connected || !page.writable;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("article", {
 				className: "dsh-oauth-model-provider",
-				children: [
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", { children: PROVIDERS.find((p) => p.id === page.provider)?.modelGroupLabel }),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", { children: [
-						page.connected ? t("modelConnected") : t("disconnected"),
-						" · ",
-						page.source === "account" ? t("accountCatalog") : t("builtinCatalog")
-					] }),
-					page.syncedAt && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", { children: [
-						t("lastModelSync"),
-						": ",
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("time", {
-							dateTime: page.syncedAt,
-							children: new Date(page.syncedAt).toLocaleString()
-						})
-					] }),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", { children: [
-						t("matchedModels"),
-						": ",
-						page.counts.matched,
-						" · ",
-						t("pendingModels"),
-						": ",
-						page.counts.pending,
-						" · ",
-						t("manualModels"),
-						": ",
-						page.counts.manual
-					] }),
-					(error || page.error) && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-						role: "alert",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t(errorLabel) }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("details", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("summary", { children: t("technicalDetails") }), error?.message ?? page.error] })]
-					}),
-					page.migration ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-						disabled,
-						onClick: () => setConfirmMigration(!confirmMigration),
-						children: t("reviewMigration")
-					}), confirmMigration && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("migrationDescription") }),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", { children: [
-							page.migration.fields.join(", "),
-							" · ",
-							page.migration.models,
-							" ",
-							t("modelsTitle")
-						] }),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-							disabled,
-							onClick: () => controller.migrateModels(page.provider),
-							children: t("confirmMigration")
-						})
-					] })] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-						disabled: disabled || !page.managed,
-						onClick: () => controller.syncModels(page.provider),
-						children: busy ? t("modelWorking") : t("syncModels")
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					className: "dsh-oauth-model-header",
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", {
+						className: "dsh-oauth-name",
+						children: PROVIDERS.find((p) => p.id === page.provider)?.modelGroupLabel
 					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-						disabled: disabled || !page.managed,
-						onClick: () => setEditing(null),
-						children: t("addModel")
-					})] }),
-					editing !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ModelForm, {
-						provider: page.provider,
-						...editing === null ? {} : { initial: editing },
-						busy,
-						t,
-						save: (model) => {
-							setSubmitted(true);
-							controller.saveModel(page.provider, model);
-						},
-						close: () => setEditing(void 0)
-					}, editing?.id ?? "new"),
-					[
-						"matched",
-						"pending",
-						"manual"
-					].map((source) => {
-						const rows = page.rows.filter((row) => (row.source === "catalog" ? "matched" : row.source) === source);
-						if (!rows.length) return null;
-						return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
-							"aria-label": t(source === "pending" ? "pendingModels" : source === "manual" ? "manualModels" : "matchedModels"),
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h4", { children: t(source === "pending" ? "pendingModels" : source === "manual" ? "manualModels" : "matchedModels") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", {
-								className: "dsh-oauth-model-list",
-								children: rows.map((row) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", { children: [
-									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: row.name }),
-										" ",
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: row.id }),
-										" ",
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t(row.source === "pending" ? "pendingModels" : row.source === "manual" ? "manualModels" : "matchedModels") })
-									] }),
-									row.source === "pending" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-										disabled: disabled || !page.managed,
-										onClick: () => setEditing({
-											id: row.id,
-											name: row.name
-										}),
-										children: t("configureModel")
+						className: "dsh-oauth-button",
+						type: "button",
+						"aria-expanded": expanded,
+						"aria-controls": `dsh-oauth-models-${page.provider}`,
+						onClick: () => setExpanded(!expanded),
+						children: t(expanded ? "collapseModels" : "editModel")
+					})]
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					className: "dsh-oauth-model-details",
+					id: `dsh-oauth-models-${page.provider}`,
+					hidden: !expanded,
+					children: [
+						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
+							className: "dsh-oauth-muted",
+							children: [
+								page.connected ? t("modelConnected") : t("disconnected"),
+								" · ",
+								page.source === "account" ? t("accountCatalog") : t("builtinCatalog")
+							]
+						}),
+						page.syncedAt && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
+							className: "dsh-oauth-muted",
+							children: [
+								t("lastModelSync"),
+								": ",
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("time", {
+									dateTime: page.syncedAt,
+									children: new Date(page.syncedAt).toLocaleString()
+								})
+							]
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
+							className: "dsh-oauth-muted",
+							children: [
+								t("matchedModels"),
+								": ",
+								page.counts.matched,
+								" · ",
+								t("manualModels"),
+								": ",
+								page.counts.manual
+							]
+						}),
+						(error || page.error) && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "dsh-oauth-error",
+							role: "alert",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t(errorLabel) }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("details", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("summary", { children: t("technicalDetails") }), error?.message ?? page.error] })]
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							className: "dsh-oauth-model-actions",
+							children: page.migration ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								className: "dsh-oauth-button",
+								disabled,
+								onClick: () => setConfirmMigration(!confirmMigration),
+								children: t("reviewMigration")
+							}), confirmMigration && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("migrationDescription") }),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", { children: [
+									page.migration.fields.join(", "),
+									" · ",
+									page.migration.models,
+									" ",
+									t("modelsTitle")
+								] }),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									className: "dsh-oauth-button",
+									disabled,
+									onClick: () => controller.migrateModels(page.provider),
+									children: t("confirmMigration")
+								})
+							] })] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								className: "dsh-oauth-button",
+								disabled: disabled || !page.managed,
+								onClick: () => controller.syncModels(page.provider),
+								children: busy ? t("modelWorking") : t("syncModels")
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								className: "dsh-oauth-button",
+								disabled: disabled || !page.managed,
+								onClick: () => setEditing(null),
+								children: t("addModel")
+							})] })
+						}),
+						editing === null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ModelForm, {
+							provider: page.provider,
+							busy,
+							t,
+							save: (model) => {
+								setSubmitted(true);
+								controller.saveModel(page.provider, model);
+							},
+							close: () => setEditing(void 0)
+						}, "new"),
+						["manual", "matched"].map((source) => {
+							const label = t(source === "manual" ? "manualModels" : "matchedModels");
+							const rows = page.rows.filter((row) => source === "manual" ? row.source === "manual" : row.source === "catalog" || row.source === "matched");
+							const offset = source === "manual" ? page.manualOffset : page.offset;
+							const total = page.counts[source];
+							const move = (next) => controller.readModels(page.provider, source === "matched" ? next : page.offset, source === "manual" ? next : page.manualOffset);
+							return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
+								className: "dsh-oauth-model-group",
+								"aria-label": label,
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h4", { children: label }),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", {
+										className: "dsh-oauth-model-list",
+										children: rows.map((row) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("li", { children: source === "manual" && editing?.id === row.id ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ModelForm, {
+											provider: page.provider,
+											initial: editing,
+											busy,
+											t,
+											save: (model) => {
+												setSubmitted(true);
+												controller.saveModel(page.provider, model);
+											},
+											close: () => setEditing(void 0)
+										}, row.id) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											className: "dsh-oauth-model-identity",
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: row.name }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: row.id })]
+										}), source === "manual" && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											className: "dsh-oauth-model-actions",
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+												className: "dsh-oauth-button",
+												disabled,
+												onClick: () => setEditing({
+													id: row.id,
+													name: row.name,
+													...MODEL_PROTOCOLS[page.provider].length > 1 ? { api: row.api } : {}
+												}),
+												children: t("editModel")
+											}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+												className: "dsh-oauth-button",
+												"data-variant": "danger",
+												disabled,
+												onClick: () => controller.deleteModel(page.provider, row.id),
+												children: t("deleteModel")
+											})]
+										})] }) }, row.id))
 									}),
-									row.source === "manual" && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-										disabled,
-										onClick: () => setEditing({
-											id: row.id,
-											name: row.name,
-											...MODEL_PROTOCOLS[page.provider].length > 1 ? { api: row.api } : {}
-										}),
-										children: t("editModel")
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-										disabled,
-										onClick: () => controller.deleteModel(page.provider, row.id),
-										children: t("deleteModel")
-									})] })
-								] }, row.id))
-							})]
-						}, source);
-					}),
-					page.total === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("noModels") }),
-					page.total > 10 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("nav", {
-						"aria-label": t("modelsPagination"),
-						children: [
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-								disabled: page.offset === 0 || busy,
-								onClick: () => controller.readModels(page.provider, Math.max(0, page.offset - 10)),
-								children: t("previousModels")
-							}),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [
-								page.offset + 1,
-								"–",
-								Math.min(page.offset + 10, page.total),
-								" / ",
-								page.total
-							] }),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-								disabled: page.offset + 10 >= page.total || busy,
-								onClick: () => controller.readModels(page.provider, page.offset + 10),
-								children: t("nextModels")
-							})
-						]
-					})
-				]
+									total === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+										className: "dsh-oauth-muted",
+										children: t("noModels")
+									}),
+									total > 10 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("nav", {
+										className: "dsh-oauth-pagination",
+										"aria-label": `${label} · ${t("modelsPagination")}`,
+										children: [
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+												className: "dsh-oauth-button",
+												disabled: offset === 0 || busy,
+												onClick: () => move(Math.max(0, offset - 10)),
+												children: t("previousModels")
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [
+												offset + 1,
+												"–",
+												Math.min(offset + 10, total),
+												" / ",
+												total
+											] }),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+												className: "dsh-oauth-button",
+												disabled: offset + 10 >= total || busy,
+												onClick: () => move(offset + 10),
+												children: t("nextModels")
+											})
+										]
+									})
+								]
+							}, source);
+						})
+					]
+				})]
 			});
 		}
 		function OAuthModelsSection(props) {
@@ -311,8 +357,14 @@ window.__ModuleLoader__.load({
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 				className: "dsh-oauth-section",
 				children: [
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h2", { children: t("modelsTitle") }),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("modelsIntro") }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h2", {
+						className: "dsh-oauth-title",
+						children: t("modelsTitle")
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						className: "dsh-oauth-intro",
+						children: t("modelsIntro")
+					}),
 					snapshot.connection !== "open" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 						role: "status",
 						children: t("hostDisconnected")
@@ -320,7 +372,7 @@ window.__ModuleLoader__.load({
 					PROVIDERS.map((provider) => {
 						const page = snapshot.modelPages?.[provider.id];
 						if (!page) return null;
-						if (!page.connected && !page.managed && page.counts.manual === 0) return null;
+						if (!page.connected || !snapshot.accounts.some((account) => account.provider === provider.id && account.configured)) return null;
 						const error = snapshot.modelErrors?.[provider.id];
 						return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ProviderModels, {
 							page,
@@ -588,7 +640,7 @@ window.__ModuleLoader__.load({
 			modelRouteConflict: "This provider is owned by an existing configuration. Review the details before migration.",
 			loginSyncFailed: "Sign-in succeeded, but model synchronization failed. Open Models to retry.",
 			modelsTitle: "OAuth models",
-			modelsIntro: "Synchronize account-visible models or add a model manually. Manual models survive synchronization.",
+			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.",
 			modelId: "Model ID",
 			modelName: "Display name",
 			modelProtocol: "Request protocol",
@@ -598,7 +650,7 @@ window.__ModuleLoader__.load({
 			accountCatalog: "Account-synchronized list",
 			builtinCatalog: "Built-in list · account access unverified",
 			lastModelSync: "Last successful synchronization",
-			matchedModels: "Matched",
+			matchedModels: "Automatic matches",
 			pendingModels: "Needs configuration",
 			manualModels: "Manual",
 			modelConflict: "Models changed elsewhere. The list was refreshed; review it and retry.",
@@ -611,8 +663,9 @@ window.__ModuleLoader__.load({
 			addModel: "Add model",
 			configureModel: "Configure",
 			editModel: "Edit",
+			collapseModels: "Collapse",
 			deleteModel: "Delete manual entry",
-			noModels: "No selectable models. Configure an unmatched model or add one manually.",
+			noModels: "No models in this group.",
 			modelsPagination: "OAuth model pages",
 			previousModels: "Previous",
 			nextModels: "Next",
@@ -654,7 +707,7 @@ window.__ModuleLoader__.load({
 			modelRouteConflict: "该供应商由现有配置管理，请查看详情后再迁移。",
 			loginSyncFailed: "登录成功，但模型同步失败。请前往模型页面重试。",
 			modelsTitle: "OAuth 模型",
-			modelsIntro: "同步账号可见模型，或手动添加模型。同步时会保留手动模型。",
+			modelsIntro: "模型由 DSH 内置 pi-ai 自动匹配。若未匹配到你需要的模型，请尝试手动添加。",
 			modelId: "模型 ID",
 			modelName: "显示名称",
 			modelProtocol: "调用协议",
@@ -664,9 +717,9 @@ window.__ModuleLoader__.load({
 			accountCatalog: "已同步账号列表",
 			builtinCatalog: "内置列表 · 尚未验证账号权限",
 			lastModelSync: "最近成功同步",
-			matchedModels: "已匹配",
+			matchedModels: "自动匹配",
 			pendingModels: "待配置",
-			manualModels: "手动模型",
+			manualModels: "手动配置",
 			modelConflict: "模型已被其他操作修改。列表已刷新，请确认后重试。",
 			modelOperationFailed: "模型操作失败，请查看详情后重试。",
 			reviewMigration: "预览迁移",
@@ -677,8 +730,9 @@ window.__ModuleLoader__.load({
 			addModel: "手动添加",
 			configureModel: "补充配置",
 			editModel: "编辑",
+			collapseModels: "收起",
 			deleteModel: "删除手动项",
-			noModels: "暂无可选模型，请补充待配置项或手动添加。",
+			noModels: "此分组暂无模型。",
 			modelsPagination: "OAuth 模型分页",
 			previousModels: "上一页",
 			nextModels: "下一页",
@@ -811,9 +865,9 @@ window.__ModuleLoader__.load({
 			}
 			loadModels() {
 				this.modelsVisible = true;
-				for (const provider of this.snapshot.accounts) this.readModels(provider.provider);
+				for (const provider of this.snapshot.accounts) if (provider.configured) this.readModels(provider.provider);
 			}
-			readModels(provider, offset = 0) {
+			readModels(provider, offset = 0, manualOffset = 0) {
 				if (this.snapshot.connection !== "open") return;
 				const requestId = crypto.randomUUID();
 				this.latestModelReads.set(provider, requestId);
@@ -825,7 +879,8 @@ window.__ModuleLoader__.load({
 					type: "models-list",
 					requestId,
 					provider,
-					offset
+					offset,
+					manualOffset
 				});
 			}
 			syncModels(provider) {
@@ -977,12 +1032,12 @@ window.__ModuleLoader__.load({
 			receive(message) {
 				switch (message.type) {
 					case "models-changed":
-						if (this.modelsVisible) this.readModels(message.provider, this.snapshot.modelPages?.[message.provider]?.offset ?? 0);
+						if (this.modelsVisible) this.readModels(message.provider, this.snapshot.modelPages?.[message.provider]?.offset ?? 0, this.snapshot.modelPages?.[message.provider]?.manualOffset ?? 0);
 						return;
 					case "models-page": {
 						const request = this.modelRequests.get(message.requestId);
 						this.modelRequests.delete(message.requestId);
-						if (!request) return;
+						if (!request || !this.snapshot.accounts.some((account) => account.provider === request.provider && account.configured)) return;
 						if (!request.write && this.latestModelReads.get(request.provider) !== message.requestId) return;
 						const current = this.snapshot.modelPages?.[request.provider];
 						if (current && message.page.revision < current.revision) {
@@ -1011,7 +1066,7 @@ window.__ModuleLoader__.load({
 					case "models-error": {
 						const request = this.modelRequests.get(message.requestId);
 						this.modelRequests.delete(message.requestId);
-						if (!request) return;
+						if (!request || !this.snapshot.accounts.some((account) => account.provider === request.provider && account.configured)) return;
 						if (!request.write && this.latestModelReads.get(request.provider) !== message.requestId) return;
 						this.update({
 							...this.snapshot,
@@ -1033,14 +1088,30 @@ window.__ModuleLoader__.load({
 					case "snapshot":
 						const accounts = [...message.accounts];
 						const reconciled = reconcileAttemptView(this.snapshot.attempt, accounts);
+						const modelPages = { ...this.snapshot.modelPages };
+						const modelBusy = { ...this.snapshot.modelBusy };
+						const modelErrors = { ...this.snapshot.modelErrors };
+						for (const account of accounts) {
+							if (account.configured) continue;
+							delete modelPages[account.provider];
+							delete modelBusy[account.provider];
+							delete modelErrors[account.provider];
+							this.latestModelReads.delete(account.provider);
+							for (const [id, request] of this.modelRequests) if (request.provider === account.provider) this.modelRequests.delete(id);
+						}
 						const nextSnapshot = {
 							...this.snapshot,
-							accounts
+							accounts,
+							modelPages,
+							modelBusy,
+							modelErrors
 						};
 						if (reconciled === void 0) delete nextSnapshot.attempt;
 						else nextSnapshot.attempt = reconciled;
 						this.update(nextSnapshot);
-						if (this.modelsVisible) for (const account of accounts) this.readModels(account.provider, this.snapshot.modelPages?.[account.provider]?.offset ?? 0);
+						if (this.modelsVisible) {
+							for (const account of accounts) if (account.configured) this.readModels(account.provider, this.snapshot.modelPages?.[account.provider]?.offset ?? 0, this.snapshot.modelPages?.[account.provider]?.manualOffset ?? 0);
+						}
 						return;
 					case "started":
 						const { error: _error, errorDetail: _errorDetail, ...current } = this.snapshot;
@@ -1152,14 +1223,23 @@ window.__ModuleLoader__.load({
 .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}
 .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)}
-.dsh-oauth-model-provider { border: 1px solid var(--border-color, currentColor); border-radius: 8px; padding: 16px; margin-block: 16px; }
-.dsh-oauth-model-provider button { margin: 4px; }
-.dsh-oauth-model-list { padding: 0; list-style: none; }
-.dsh-oauth-model-list li { padding-block: 8px; border-bottom: 1px solid var(--border-color, currentColor); overflow-wrap: anywhere; }
-.dsh-oauth-model-list code { margin-inline: 8px; }
-.dsh-oauth-model-form { display: grid; gap: 12px; margin-block: 12px; }
-.dsh-oauth-model-form label { display: grid; gap: 4px; }
-.dsh-oauth-model-provider nav { display: flex; align-items: center; gap: 8px; }
+.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}
+.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}
+.dsh-oauth-model-details{display:flex;flex-direction:column;gap:10px}.dsh-oauth-model-details[hidden]{display:none}
+.dsh-oauth-model-provider h3,.dsh-oauth-model-provider h4{margin:0;line-height:22px;font-weight:500}
+.dsh-oauth-model-provider h4{font-size:13px;color:var(--dsw-alias-label-secondary)}
+.dsh-oauth-model-actions{display:flex;align-items:center;gap:6px;flex-wrap:wrap}
+.dsh-oauth-model-group{display:flex;flex-direction:column;gap:8px;padding-top:12px;border-top:1px solid var(--dsw-alias-border-l2)}
+.dsh-oauth-model-list{display:flex;flex-direction:column;gap:0;margin:0;padding:0;list-style:none}
+.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}
+.dsh-oauth-model-list li>.dsh-oauth-model-form{box-sizing:border-box;width:100%;min-width:0}
+.dsh-oauth-model-list li+li{border-top:1px solid var(--dsw-alias-border-l2)}
+.dsh-oauth-model-identity{display:flex;flex-direction:column;gap:3px;min-width:0;overflow-wrap:anywhere}
+.dsh-oauth-model-identity strong{font-size:13px;line-height:20px;font-weight:500}
+.dsh-oauth-model-identity code{font:12px/18px ui-monospace,SFMono-Regular,Menlo,monospace;color:var(--dsw-alias-label-tertiary);overflow-wrap:anywhere}
+.dsh-oauth-model-form{display:flex;flex-direction:column;gap:10px;padding:12px;border:1px solid var(--dsw-alias-border-l2);border-radius:10px}
+.dsh-oauth-model-form label{display:flex;flex-direction:column;gap:5px;font-size:13px;line-height:20px}
+.dsh-oauth-pagination{display:flex;align-items:center;justify-content:space-between;gap:8px;font-size:12px;color:var(--dsw-alias-label-tertiary)}
 `;
 		//#endregion
 		//#region src/client/index.ts

package/lib/index.js CHANGED Viewed

@@ -274,7 +274,7 @@ class OAuthConnection {
             }
             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) });
+                    page: await this.models.page(command.provider, command.type === 'models-list' ? command.offset : 0, command.type === 'models-list' ? command.manualOffset : 0) });
         }
         catch (error) {
             if (!this.closed)

package/lib/model-service.d.ts CHANGED Viewed

@@ -51,7 +51,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 CHANGED Viewed

@@ -214,20 +214,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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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-rc.0",
   "author": {
     "name": "edge-sky",
     "url": "https://github.com/edge-sky"