dsh-agy-link 0.6.6 → 0.6.8
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 +34 -0
- package/README.md +4 -0
- package/dist/index.js +42 -16
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,39 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.6.8 (2026-11-08)
|
|
4
|
+
|
|
5
|
+
### English
|
|
6
|
+
|
|
7
|
+
- **Fix(warmup): the 7-day warmup no longer freezes on a floating post-reset window, and probes use models each account actually has.** (thanks @Ronnoc, #88)
|
|
8
|
+
- After an upstream weekly reset (or for an account with zero usage), Google returns a floating `resetTime = now + 7 days` with no `description`. The old trigger only fired at `now >= resetTs - 60s`, so those accounts were never probed and the weekly timer floated at "7d 0h" forever. A probe now also fires when `remainingMs >= 6 days`, and the cooldown key is deterministic (`identity:family:weekly`) so a floating reset can no longer invalidate it.
|
|
9
|
+
- Argon is exposed with effort tiers; probing the bare `gemini-4-argon` got a 404. It maps to `gemini-4-argon-low`, and when the account's quota row lists Argon models the low tier is picked from it.
|
|
10
|
+
- Accounts differ in which Claude generation they can use (legacy `claude-sonnet-4-6` vs migrated `claude-sonnet-5-5-*`). The probe model is now chosen per account from `quotas.anthropic.models` (monitored pick → any Sonnet low/medium → any Sonnet → any Claude), instead of a global `claude-sonnet-4-6`.
|
|
11
|
+
|
|
12
|
+
### 中文
|
|
13
|
+
|
|
14
|
+
- **修复(warmup):7 天预热不再卡在「重置后的浮动窗口」,且探测模型按账号实际可用选择。**(感谢 @Ronnoc,#88)
|
|
15
|
+
- 上游周额度重置后(或本周期零使用),Google 返回浮动的 `resetTime = now + 7 天` 且无 `description`;旧逻辑只在 `now >= resetTs - 60s` 时触发,于是这些账号永远不被探活,周计时器一直显示浮动「7d 0h」。现在 `remainingMs >= 6 天` 也会触发,且冷却键固定为 `identity:family:weekly`,浮动 reset 不会再让它失效。
|
|
16
|
+
- Argon 上游按思考档位暴露模型,直接探测 `gemini-4-argon` 会 404;现映射到 `gemini-4-argon-low`,并优先从该账号的配额模型列表里取 low 档。
|
|
17
|
+
- 不同账号可用的 Claude 代际不同(旧账号 `claude-sonnet-4-6`,迁移账号 `claude-sonnet-5-5-*`);探测模型改为按 `quotas.anthropic.models` **逐账号**选择(monitored 命中 → 任意 Sonnet low/medium → 任意 Sonnet → 任意 Claude),不再全局写死 `claude-sonnet-4-6`。
|
|
18
|
+
|
|
19
|
+
**Full Changelog**: https://github.com/amlyczz/dsh-agy-link/compare/v0.6.7...v0.6.8
|
|
20
|
+
|
|
21
|
+
## 0.6.7 (2026-11-08)
|
|
22
|
+
|
|
23
|
+
### English
|
|
24
|
+
|
|
25
|
+
- **Fix(config): the model context window and output cap are set via env, so a 256K model stops showing as 1M (issue #83).**
|
|
26
|
+
- `contextWindowDefault` / `maxTokensDefault` drive DSH's per-model `context.contextWindow` — and therefore the "context used %" tooltip — but agy's model list carries no window, and neither key was exposed through an env var or the settings UI. A user whose model is really 262 144 tokens could only see the 1 048 576 default.
|
|
27
|
+
- `DSH_AGY_CONTEXT_WINDOW` and `DSH_AGY_MAX_TOKENS` now override them (positive integers only; invalid values fall back), with README rows in 中文 and English.
|
|
28
|
+
|
|
29
|
+
### 中文
|
|
30
|
+
|
|
31
|
+
- **修复(config):模型上下文窗口与输出上限可用环境变量设置,256K 模型不再显示成 1M(issue #83)。**
|
|
32
|
+
- `contextWindowDefault` / `maxTokensDefault` 决定上报给 DSH 的每模型 `context.contextWindow`(也就是「上下文已用 %」浮层),但 agy 的模型列表不上报窗口,且这两个键此前既没有环境变量也没有设置面板入口——真实窗口是 262144 的用户只能看到 1048576 的默认值。
|
|
33
|
+
- 现支持 `DSH_AGY_CONTEXT_WINDOW` / `DSH_AGY_MAX_TOKENS`(仅接受正整数,非法值回落),并在中英 README 配置表中补充说明。
|
|
34
|
+
|
|
35
|
+
**Full Changelog**: https://github.com/amlyczz/dsh-agy-link/compare/v0.6.6...v0.6.7
|
|
36
|
+
|
|
3
37
|
## 0.6.6 (2026-11-08)
|
|
4
38
|
|
|
5
39
|
### English
|
package/README.md
CHANGED
|
@@ -162,6 +162,8 @@ dsh plugin --profile web add dsh-agy-link
|
|
|
162
162
|
| `hiddenModels` | `DSH_AGY_HIDDEN_MODELS` | `[]` | 在 `/model` 选择器中隐藏的模型 slug 列表(黑名单语义,新模型默认可见;建议直接在设置面板"模型显示"中点选管理) |
|
|
163
163
|
| `timeoutMs` | `DSH_AGY_TIMEOUT_MS` | `600000` | 单轮活跃看门狗超时(毫秒) |
|
|
164
164
|
| `longToolIdleMinutes` | `DSH_AGY_LONG_TOOL_IDLE_MINUTES` | `240` | 存在未完成工具步骤(ACTIVE)时的空闲预算(分钟);`0` = 不抬高预算,卡死的工具按 `timeoutMs` 快速失败 |
|
|
165
|
+
| `contextWindowDefault` | `DSH_AGY_CONTEXT_WINDOW` | `1048576` | 上报给 DSH 的模型上下文窗口(token)。agy 的模型列表不上报窗口,所以统一用该值;若你的模型实际是 256K(如部分 Claude/Gemini 配置),设为 `262144` 即可让「上下文已用 %」正确 |
|
|
166
|
+
| `maxTokensDefault` | `DSH_AGY_MAX_TOKENS` | `65536` | 单次输出 token 上限(上报给 DSH) |
|
|
165
167
|
| `workspaceRoot` | `DSH_AGY_WORKSPACE_ROOT` | 会话 cwd | agy 工作区根目录(默认跟随当前会话工作区) |
|
|
166
168
|
| `proxyUrl` | `DSH_AGY_PROXY_URL` | 空字符串 | 全局代理 URL;若在控制台中单独配置了代理,优先使用账号独立代理 |
|
|
167
169
|
| `suppressAgyAutoUpdate` | `DSH_AGY_SUPPRESS_AUTOUPDATE` | Windows `true`,其他平台 `false` | 每次 spawn 前刷新 agy 的更新检查时间戳,阻断 `--bg-updater` 子进程链(Windows 闪窗根因)。关闭后 agy 恢复自动更新检查 |
|
|
@@ -393,6 +395,8 @@ dsh plugin --profile web add dsh-agy-link
|
|
|
393
395
|
| `hiddenModels` | `DSH_AGY_HIDDEN_MODELS` | `[]` | Model slugs hidden from the `/model` picker (deny-list, newly discovered models stay visible; manage them via the "Model visibility" row in the settings panel) |
|
|
394
396
|
| `timeoutMs` | `DSH_AGY_TIMEOUT_MS` | `600000` | Activity watchdog timeout in milliseconds |
|
|
395
397
|
| `longToolIdleMinutes` | `DSH_AGY_LONG_TOOL_IDLE_MINUTES` | `240` | Idle budget while a tool step is ACTIVE (minutes); `0` keeps the normal `timeoutMs` budget so wedged tools fail fast |
|
|
398
|
+
| `contextWindowDefault` | `DSH_AGY_CONTEXT_WINDOW` | `1048576` | Model context window (tokens) reported to DSH. agy's model list carries no window, so this single value is used for every model; if yours is really 256K, set `262144` and the "context used %" becomes correct |
|
|
399
|
+
| `maxTokensDefault` | `DSH_AGY_MAX_TOKENS` | `65536` | Output token cap reported to DSH |
|
|
396
400
|
| `workspaceRoot` | `DSH_AGY_WORKSPACE_ROOT` | session cwd | Working directory root |
|
|
397
401
|
| `proxyUrl` | `DSH_AGY_PROXY_URL` | empty string | Global proxy URL; per-account proxies configured in console take precedence |
|
|
398
402
|
| `suppressAgyAutoUpdate` | `DSH_AGY_SUPPRESS_AUTOUPDATE` | `true` on Windows, `false` elsewhere | Refreshes agy's update-check timestamp before every spawn so its `--bg-updater` child chain (the Windows console-flash root cause) never starts. `false` restores agy's own auto-update checks |
|
package/dist/index.js
CHANGED
|
@@ -605,6 +605,14 @@ function resolveConfig(entry, env = process.env, overrides = readOverrides()) {
|
|
|
605
605
|
const t = asNum(env.DSH_AGY_LONG_TOOL_IDLE_MINUTES);
|
|
606
606
|
if (t !== void 0 && t >= 0) cfg.longToolIdleMinutes = t;
|
|
607
607
|
}
|
|
608
|
+
if (env.DSH_AGY_CONTEXT_WINDOW) {
|
|
609
|
+
const w = asNum(env.DSH_AGY_CONTEXT_WINDOW);
|
|
610
|
+
if (w !== void 0 && w > 0) cfg.contextWindowDefault = Math.floor(w);
|
|
611
|
+
}
|
|
612
|
+
if (env.DSH_AGY_MAX_TOKENS) {
|
|
613
|
+
const m = asNum(env.DSH_AGY_MAX_TOKENS);
|
|
614
|
+
if (m !== void 0 && m > 0) cfg.maxTokensDefault = Math.floor(m);
|
|
615
|
+
}
|
|
608
616
|
if (env.DSH_AGY_EXTRA_ARGS) cfg.extraArgs = env.DSH_AGY_EXTRA_ARGS.split(/\s+/).filter(Boolean);
|
|
609
617
|
if (env.DSH_AGY_HIDDEN_MODELS) {
|
|
610
618
|
const list = asStringArray(env.DSH_AGY_HIDDEN_MODELS.split(","));
|
|
@@ -35829,14 +35837,31 @@ function toCanonicalWarmupModel(model) {
|
|
|
35829
35837
|
const clean = model.trim().toLowerCase();
|
|
35830
35838
|
if (clean === "gemini-3-flash") return "gemini-3.8-flash-tiered";
|
|
35831
35839
|
if (/^gemini-3\.\d+-flash$/.test(clean)) return clean + "-tiered";
|
|
35832
|
-
if (clean
|
|
35840
|
+
if (clean === "gemini-4-argon" || clean === "argon") return "gemini-4-argon-low";
|
|
35833
35841
|
return model.trim();
|
|
35834
35842
|
}
|
|
35835
35843
|
/** Select target model for a given family honoring user monitored_models preferences. */
|
|
35836
|
-
function pickWarmupModelForFamily(family, monitoredModels = []) {
|
|
35837
|
-
if (family === "
|
|
35844
|
+
function pickWarmupModelForFamily(family, monitoredModels = [], account) {
|
|
35845
|
+
if (family === "argon") {
|
|
35846
|
+
if (account?.quotas?.argon?.models?.length) {
|
|
35847
|
+
const m = account.quotas.argon.models.find((x) => x.modelId.includes("argon-low")) ?? account.quotas.argon.models.find((x) => x.modelId.includes("argon"));
|
|
35848
|
+
if (m) return m.modelId;
|
|
35849
|
+
}
|
|
35850
|
+
return "gemini-4-argon-low";
|
|
35851
|
+
}
|
|
35852
|
+
if (family === "anthropic") {
|
|
35853
|
+
const accountModels = account?.quotas?.anthropic?.models?.map((m) => m.modelId) ?? [];
|
|
35854
|
+
if (accountModels.length > 0) {
|
|
35855
|
+
const preferred = monitoredModels.find((m) => accountModels.includes(m));
|
|
35856
|
+
if (preferred) return preferred;
|
|
35857
|
+
const sonnet = accountModels.find((m) => m.includes("sonnet") && (m.includes("low") || m.includes("medium"))) ?? accountModels.find((m) => m.includes("sonnet"));
|
|
35858
|
+
if (sonnet) return sonnet;
|
|
35859
|
+
const anyClaude = accountModels.find((m) => m.toLowerCase().includes("claude"));
|
|
35860
|
+
if (anyClaude) return anyClaude;
|
|
35861
|
+
}
|
|
35862
|
+
return monitoredModels.find((m) => m.toLowerCase().includes("claude")) ?? "claude-sonnet-4-6";
|
|
35863
|
+
}
|
|
35838
35864
|
if (family === "openai") return monitoredModels.find((m) => m.toLowerCase().includes("gpt")) ?? "gpt-oss-120b-medium";
|
|
35839
|
-
if (family === "argon") return "gemini-4-argon";
|
|
35840
35865
|
return monitoredModels.find((m) => m.toLowerCase().includes("gemini") && !m.toLowerCase().includes("argon")) ?? "gemini-3.8-flash";
|
|
35841
35866
|
}
|
|
35842
35867
|
/**
|
|
@@ -36168,23 +36193,24 @@ var WarmupService = class {
|
|
|
36168
36193
|
const weeklyFrac = q.weeklyFraction;
|
|
36169
36194
|
if (weeklyFrac === void 0 || weeklyFrac < .999) continue;
|
|
36170
36195
|
let shouldWarm = false;
|
|
36171
|
-
|
|
36172
|
-
|
|
36173
|
-
|
|
36174
|
-
|
|
36175
|
-
|
|
36176
|
-
|
|
36177
|
-
|
|
36196
|
+
const historyKey = `${identity}:${fam}:weekly`;
|
|
36197
|
+
const hasRecentWarmup = this.history.checkCooldown(historyKey, SIX_DAYS_MS, now);
|
|
36198
|
+
if (options.force) shouldWarm = true;
|
|
36199
|
+
else if (!hasRecentWarmup) {
|
|
36200
|
+
if (!q.weeklyResetTime) shouldWarm = true;
|
|
36201
|
+
else {
|
|
36202
|
+
const resetTs = Date.parse(q.weeklyResetTime);
|
|
36203
|
+
if (isNaN(resetTs)) shouldWarm = true;
|
|
36204
|
+
else {
|
|
36205
|
+
const remainingMs = resetTs - now;
|
|
36206
|
+
if (now >= resetTs - 6e4 || remainingMs >= SIX_DAYS_MS) shouldWarm = true;
|
|
36178
36207
|
}
|
|
36179
36208
|
}
|
|
36180
|
-
} else {
|
|
36181
|
-
historyKey = `${identity}:${fam}:weekly:initial`;
|
|
36182
|
-
shouldWarm = options.force || !this.history.checkCooldown(historyKey, SIX_DAYS_MS, now);
|
|
36183
36209
|
}
|
|
36184
36210
|
const failureKey = `${historyKey}:failed`;
|
|
36185
36211
|
if (shouldWarm && !options.force && this.history.checkCooldown(failureKey, FAILURE_BACKOFF_MS, now)) shouldWarm = false;
|
|
36186
36212
|
if (shouldWarm) {
|
|
36187
|
-
const model = pickWarmupModelForFamily(fam, monitored);
|
|
36213
|
+
const model = pickWarmupModelForFamily(fam, monitored, account);
|
|
36188
36214
|
modelsToPing.push({
|
|
36189
36215
|
family: fam,
|
|
36190
36216
|
model,
|
|
@@ -36194,7 +36220,7 @@ var WarmupService = class {
|
|
|
36194
36220
|
}
|
|
36195
36221
|
}
|
|
36196
36222
|
if (modelsToPing.length === 0 && options.force) {
|
|
36197
|
-
const fallbackModel = pickWarmupModelForFamily("google", monitored);
|
|
36223
|
+
const fallbackModel = pickWarmupModelForFamily("google", monitored, account);
|
|
36198
36224
|
modelsToPing.push({
|
|
36199
36225
|
family: "google",
|
|
36200
36226
|
model: fallbackModel,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dsh-agy-link",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.8",
|
|
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",
|