dsh-agy-link 0.6.22 → 0.6.23

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,15 @@
1
1
  # Changelog
2
2
 
3
+ ## 0.6.23 (2026-11-14)
4
+
5
+ ### English
6
+
7
+ - **Feat(models): opt-in pool-wide model catalog (fixes #107).** Since v0.6.21 the picker showed only the ACTIVE account's models, so a model owned by another account (e.g. Argon on a backup account) could not be selected even though `selectSessionAccount()` already routes via `pool.selectAccount(family, model)` and self-heals on a "model not recognized" refusal. The new `poolWideCatalog` switch (default `false`) makes `listAvailableModels()` use the already-tested `getUnion(enabledAccounts, pool)`; the scheduler then routes to an account that can serve the chosen model without a manual "set active" round-trip. Available in Settings, via `DSH_AGY_POOL_WIDE_CATALOG`, and through the guarded `/config` endpoint; `/status` exposes its state. Default off keeps strict single-account isolation unchanged. Covered by a two-account heterogeneous-catalog regression test, config-precedence, HTTP-contract, SSR row and four-locale dictionary tests. Thanks to @Ronnoc for the proposal and the precise code walkthrough.
8
+
9
+ ### 中文
10
+
11
+ - **新增(模型):号池全量模型并集开关(修复 #107)。** v0.6.21 起模型选择器只显示当前活动账号的模型,异构权限多账号场景下,备用账号独有的模型(如 Argon)即使底层已支持按模型自动调度也无法被选中。`poolWideCatalog`(默认关闭)让 `listAvailableModels()` 改走现成的 `getUnion(enabledAccounts, pool)`,选中后由 `selectAccount(family, model)` 自动路由到支持该模型的账号,无需先手动「设为当前使用」。设置面板、`DSH_AGY_POOL_WIDE_CATALOG` 环境变量与受白名单保护的 `/config` 均可配置,`/status` 同步状态;默认关闭保持严格单账号隔离不变。异构双账号目录回归测试、配置优先级、HTTP 契约、SSR 行与四语言字典测试均已覆盖。感谢 @Ronnoc 的提案与精确定位。
12
+
3
13
  ## 0.6.22 (2026-11-13)
4
14
 
5
15
  ### English
@@ -171,6 +171,7 @@ function defaultConfig() {
171
171
  translateMinIntervalMs: 3e3,
172
172
  showHeaderBadge: true,
173
173
  showTranslateAction: true,
174
+ poolWideCatalog: false,
174
175
  imageModel: "",
175
176
  imageEffort: "low",
176
177
  imageTimeoutMs: 24e4,
@@ -613,6 +614,7 @@ function resolveConfig(entry, env = process.env, overrides = readOverrides()) {
613
614
  translateMinIntervalMs: asNum(get("translateMinIntervalMs")) ?? base.translateMinIntervalMs,
614
615
  showHeaderBadge: asBool(get("showHeaderBadge")) ?? base.showHeaderBadge,
615
616
  showTranslateAction: asBool(get("showTranslateAction")) ?? base.showTranslateAction,
617
+ poolWideCatalog: asBool(get("poolWideCatalog")) ?? base.poolWideCatalog,
616
618
  imageModel: asString(get("imageModel")) ?? base.imageModel,
617
619
  imageEffort: asString(get("imageEffort")) ?? base.imageEffort,
618
620
  imageTimeoutMs: asNum(get("imageTimeoutMs")) ?? base.imageTimeoutMs,
@@ -725,6 +727,10 @@ function resolveConfig(entry, env = process.env, overrides = readOverrides()) {
725
727
  const sta = asBool(env.DSH_AGY_SHOW_TRANSLATE_ACTION);
726
728
  if (sta !== void 0) cfg.showTranslateAction = sta;
727
729
  }
730
+ if (env.DSH_AGY_POOL_WIDE_CATALOG !== void 0) {
731
+ const pwc = asBool(env.DSH_AGY_POOL_WIDE_CATALOG);
732
+ if (pwc !== void 0) cfg.poolWideCatalog = pwc;
733
+ }
728
734
  if (env.DSH_AGY_IMAGE_MODEL) cfg.imageModel = env.DSH_AGY_IMAGE_MODEL;
729
735
  if (env.DSH_AGY_IMAGE_EFFORT) cfg.imageEffort = env.DSH_AGY_IMAGE_EFFORT;
730
736
  if (env.DSH_AGY_IMAGE_TIMEOUT_MS) {
@@ -4373,7 +4379,7 @@ function listAvailableModels(deps) {
4373
4379
  const cfg = deps.getConfig();
4374
4380
  const activeAcc = activeAccount(deps);
4375
4381
  let models;
4376
- if (activeAcc && pool) {
4382
+ if (activeAcc && pool && !cfg.poolWideCatalog) {
4377
4383
  models = deps.catalog.getModelsForAccount(activeAcc, pool);
4378
4384
  if (!deps.catalog.hasAccountCatalog(activeAcc.id)) deps.catalog.ensureAccountCatalog(activeAcc.id).catch(() => void 0);
4379
4385
  } else models = deps.catalog.getUnion(accounts, pool);
package/dist/client.js CHANGED
@@ -190,6 +190,8 @@ window.__ModuleLoader__.load({
190
190
  "config.showHeaderBadgeDesc": "在会话头部工具栏显示 Antigravity 状态与账号徽标(窄屏/手机端会自动隐藏文字标签)",
191
191
  "config.showTranslateAction": "单条翻译按钮",
192
192
  "config.showTranslateActionDesc": "在助理消息下方操作栏显示「译成人话」按钮",
193
+ "config.poolWideCatalog": "号池全量模型并集",
194
+ "config.poolWideCatalogDesc": "在模型选择器展示所有启用账号支持的模型;选中后自动路由到支持该模型的账号(默认关闭:只显示当前账号的模型)",
193
195
  "config.on": "开启",
194
196
  "config.off": "关闭",
195
197
  "config.runtimeTitle": "运行方式",
@@ -396,6 +398,8 @@ window.__ModuleLoader__.load({
396
398
  "config.showHeaderBadgeDesc": "Show the Antigravity status badge in the conversation header toolbar (text hidden on small screens)",
397
399
  "config.showTranslateAction": "Translate button",
398
400
  "config.showTranslateActionDesc": "Show the \"Translate to plain text\" button under assistant messages",
401
+ "config.poolWideCatalog": "Pool-wide model catalog",
402
+ "config.poolWideCatalogDesc": "Show every model supported by any enabled account in the picker; the scheduler routes to an account that can serve it (default off: active account only)",
399
403
  "config.on": "On",
400
404
  "config.off": "Off",
401
405
  "config.runtimeTitle": "Runtime",
@@ -602,6 +606,8 @@ window.__ModuleLoader__.load({
602
606
  "config.showHeaderBadgeDesc": "Exibe o emblema de status do Antigravity na barra de ferramentas do cabeçalho da conversa",
603
607
  "config.showTranslateAction": "Botão de tradução",
604
608
  "config.showTranslateActionDesc": "Exibe o botão de tradução sob as mensagens do assistente",
609
+ "config.poolWideCatalog": "Catálogo de modelos de todo o pool",
610
+ "config.poolWideCatalogDesc": "Mostra no seletor todos os modelos suportados por qualquer conta ativa; o escalonador escolhe a conta capaz de executá-lo (padrão desativado: apenas a conta atual)",
605
611
  "config.on": "Ativado",
606
612
  "config.off": "Desativado",
607
613
  "config.runtimeTitle": "Execução",
@@ -808,6 +814,8 @@ window.__ModuleLoader__.load({
808
814
  "config.showHeaderBadgeDesc": "Muestra la insignia de estado de Antigravity en la barra de la cabecera de la conversación (el texto se oculta en pantallas pequeñas)",
809
815
  "config.showTranslateAction": "Botón de traducción",
810
816
  "config.showTranslateActionDesc": "Muestra el botón «Traducir a lenguaje sencillo» bajo los mensajes del asistente",
817
+ "config.poolWideCatalog": "Catálogo de modelos de todo el pool",
818
+ "config.poolWideCatalogDesc": "Muestra en el selector todos los modelos admitidos por cualquier cuenta activa; el planificador elige la cuenta que puede servirlo (desactivado por defecto: solo la cuenta actual)",
811
819
  "config.on": "Activado",
812
820
  "config.off": "Desactivado",
813
821
  "config.runtimeTitle": "Ejecución",
@@ -8743,6 +8751,31 @@ body[data-ds-dark-theme] select.agy-select { color-scheme: dark; }
8743
8751
  })];
8744
8752
  }
8745
8753
  //#endregion
8754
+ //#region src/client/sections/CatalogRows.ts
8755
+ function renderPoolWideCatalogRow(args) {
8756
+ const { t, status, loadingAction, setCfg } = args;
8757
+ const on = status.poolWideCatalog === true;
8758
+ return h(Row, {
8759
+ left: h("div", { style: {
8760
+ display: "flex",
8761
+ flexDirection: "column"
8762
+ } }, h("span", { style: {
8763
+ color: "var(--agy-text-primary)",
8764
+ fontWeight: 600,
8765
+ fontSize: "12.5px"
8766
+ } }, t("config.poolWideCatalog")), h("span", { style: S.muted }, t("config.poolWideCatalogDesc"))),
8767
+ right: segGroup([h(Button, {
8768
+ variant: on ? "segActive" : "seg",
8769
+ disabled: loadingAction === "config:poolWideCatalog",
8770
+ onClick: () => void setCfg("poolWideCatalog", true)
8771
+ }, t("config.on")), h(Button, {
8772
+ variant: !on ? "segActive" : "seg",
8773
+ disabled: loadingAction === "config:poolWideCatalog",
8774
+ onClick: () => void setCfg("poolWideCatalog", false)
8775
+ }, t("config.off"))])
8776
+ });
8777
+ }
8778
+ //#endregion
8746
8779
  //#region src/client/sections/SettingsSection.ts
8747
8780
  /**
8748
8781
  * BUSY-STATE WATCHDOG. Every action sets a busy flag and clears it when its
@@ -9241,6 +9274,11 @@ body[data-ds-dark-theme] select.agy-select { color-scheme: dark; }
9241
9274
  status,
9242
9275
  loadingAction,
9243
9276
  setCfg
9277
+ }), renderPoolWideCatalogRow({
9278
+ t,
9279
+ status,
9280
+ loadingAction,
9281
+ setCfg
9244
9282
  }), renderDefaultEffortRow(t, status, catalogModels, loadingAction, setCfg), h(ModelsPanel, {
9245
9283
  t,
9246
9284
  catalogModels,
package/dist/index.js CHANGED
@@ -171,6 +171,7 @@ function defaultConfig() {
171
171
  translateMinIntervalMs: 3e3,
172
172
  showHeaderBadge: true,
173
173
  showTranslateAction: true,
174
+ poolWideCatalog: false,
174
175
  imageModel: "",
175
176
  imageEffort: "low",
176
177
  imageTimeoutMs: 24e4,
@@ -5713,7 +5714,7 @@ function listAvailableModels(deps) {
5713
5714
  const cfg = deps.getConfig();
5714
5715
  const activeAcc = activeAccount(deps);
5715
5716
  let models;
5716
- if (activeAcc && pool) {
5717
+ if (activeAcc && pool && !cfg.poolWideCatalog) {
5717
5718
  models = deps.catalog.getModelsForAccount(activeAcc, pool);
5718
5719
  if (!deps.catalog.hasAccountCatalog(activeAcc.id)) deps.catalog.ensureAccountCatalog(activeAcc.id).catch(() => void 0);
5719
5720
  } else models = deps.catalog.getUnion(accounts, pool);
@@ -5987,6 +5988,7 @@ function resolveConfig(entry, env = process.env, overrides = readOverrides()) {
5987
5988
  translateMinIntervalMs: asNum(get("translateMinIntervalMs")) ?? base.translateMinIntervalMs,
5988
5989
  showHeaderBadge: asBool(get("showHeaderBadge")) ?? base.showHeaderBadge,
5989
5990
  showTranslateAction: asBool(get("showTranslateAction")) ?? base.showTranslateAction,
5991
+ poolWideCatalog: asBool(get("poolWideCatalog")) ?? base.poolWideCatalog,
5990
5992
  imageModel: asString(get("imageModel")) ?? base.imageModel,
5991
5993
  imageEffort: asString(get("imageEffort")) ?? base.imageEffort,
5992
5994
  imageTimeoutMs: asNum(get("imageTimeoutMs")) ?? base.imageTimeoutMs,
@@ -6099,6 +6101,10 @@ function resolveConfig(entry, env = process.env, overrides = readOverrides()) {
6099
6101
  const sta = asBool(env.DSH_AGY_SHOW_TRANSLATE_ACTION);
6100
6102
  if (sta !== void 0) cfg.showTranslateAction = sta;
6101
6103
  }
6104
+ if (env.DSH_AGY_POOL_WIDE_CATALOG !== void 0) {
6105
+ const pwc = asBool(env.DSH_AGY_POOL_WIDE_CATALOG);
6106
+ if (pwc !== void 0) cfg.poolWideCatalog = pwc;
6107
+ }
6102
6108
  if (env.DSH_AGY_IMAGE_MODEL) cfg.imageModel = env.DSH_AGY_IMAGE_MODEL;
6103
6109
  if (env.DSH_AGY_IMAGE_EFFORT) cfg.imageEffort = env.DSH_AGY_IMAGE_EFFORT;
6104
6110
  if (env.DSH_AGY_IMAGE_TIMEOUT_MS) {
@@ -40014,7 +40020,9 @@ function handleStatus(services, req, res) {
40014
40020
  const poolData = pool?.getPoolData ? pool.getPoolData(cfg.proxyUrl?.trim() || void 0) : void 0;
40015
40021
  const activeId = typeof pool?.getActiveAccountId === "function" ? pool.getActiveAccountId("google") : poolData?.lastActiveAccountId ?? poolData?.primaryAccountId;
40016
40022
  const activeAcc = activeId && typeof pool?.getAccount === "function" ? pool.getAccount(activeId) : void 0;
40017
- const supportedModels = activeAcc && pool && typeof catalog.getModelsForAccount === "function" ? catalog.getModelsForAccount(activeAcc, pool) : typeof catalog.getUnion === "function" ? catalog.getUnion(pool?.getAccounts ? pool.getAccounts() : [], pool) : typeof catalog.getAllKnownModels === "function" ? catalog.getAllKnownModels(pool?.getAccounts ? pool.getAccounts() : []) : catalog.get().models ?? [];
40023
+ let supportedModels;
40024
+ if (cfg.poolWideCatalog || !activeAcc || !pool || typeof catalog.getModelsForAccount !== "function") supportedModels = typeof catalog.getUnion === "function" ? catalog.getUnion(pool?.getAccounts ? pool.getAccounts() : [], pool) : typeof catalog.getAllKnownModels === "function" ? catalog.getAllKnownModels(pool?.getAccounts ? pool.getAccounts() : []) : catalog.get().models ?? [];
40025
+ else supportedModels = catalog.getModelsForAccount(activeAcc, pool);
40018
40026
  sendJson(res, 200, {
40019
40027
  plugin: "dsh-agy-link",
40020
40028
  bin: bin(),
@@ -40044,6 +40052,7 @@ function handleStatus(services, req, res) {
40044
40052
  translateTargetLanguage: cfg.translateTargetLanguage,
40045
40053
  showHeaderBadge: cfg.showHeaderBadge,
40046
40054
  showTranslateAction: cfg.showTranslateAction,
40055
+ poolWideCatalog: cfg.poolWideCatalog,
40047
40056
  imageModel: cfg.imageModel,
40048
40057
  imageEffort: cfg.imageEffort,
40049
40058
  imageOutputDir: cfg.imageOutputDir,
@@ -40672,7 +40681,8 @@ function handleConfig(services, req, res) {
40672
40681
  "imageOutputDir",
40673
40682
  "imageRetries",
40674
40683
  "showHeaderBadge",
40675
- "showTranslateAction"
40684
+ "showTranslateAction",
40685
+ "poolWideCatalog"
40676
40686
  ].includes(key)) {
40677
40687
  sendJson(res, 400, { error: "key not settable" });
40678
40688
  return;
@@ -22,6 +22,7 @@ Resolution order (highest first): `DSH_AGY_*` environment variable → runtime o
22
22
  | --- | --- | --- | --- |
23
23
  | `defaultModel` | `DSH_AGY_DEFAULT_MODEL` | `''` (agy default) | Initial model slug |
24
24
  | `defaultEffort` | `DSH_AGY_DEFAULT_EFFORT` | `high` | Initial thinking effort; the settings row and the session menu offer exactly the levels the live catalog advertises (`low` / `medium` / `high` / `xhigh` (Extra) / `max`), plus `auto` |
25
+ | `poolWideCatalog` | `DSH_AGY_POOL_WIDE_CATALOG` | `false` | Show the union of models supported by **all** enabled accounts in the picker instead of only the active account's models; `selectAccount(family, model)` then routes automatically to an account that can serve the chosen model (issue #107) |
25
26
  | `hiddenModels` | `DSH_AGY_HIDDEN_MODELS` | `[]` | Slugs hidden from the model picker (comma separated) |
26
27
  | `fallbackModels` | `—` | agy 1.5.7 lineup: Gemini 4 Argon, Gemini 4 Hydrogen, Orchestrator (Argon), Gemini 3.8 Flash, Claude Opus 5.5, Claude Sonnet 5.5, GPT-OSS 120B (Medium) | Catalog shown before `agy models` succeeds (signed out or offline); mirrors `agy models` exactly, no retired entries |
27
28
  | `autoFallbackModel` | `DSH_AGY_AUTO_FALLBACK_MODEL` | `false` | Retry on a fallback model when the selected one cannot run |
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dsh-agy-link",
3
- "version": "0.6.22",
3
+ "version": "0.6.23",
4
4
  "description": "Google Antigravity (agy CLI) models for DeepSeek Harness — stream Gemini/Claude/GPT-OSS subscriptions into DSH with thinking, tool activity, token usage and in-GUI Google OAuth login.",
5
5
  "type": "module",
6
6
  "license": "MIT",