dsh-llm-acp 0.2.0 → 0.2.1

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/README.md CHANGED
@@ -125,7 +125,7 @@ KPI 下方是**估算条**:CLI 没回报 token 的轮次按「字符数 ÷ 4
125
125
 
126
126
  ## 上架到 DSH 插件市场(维护者)
127
127
 
128
- 本插件的市场索引在 [docs/market-index.json](docs/market-index.json),已经用 DSH 自带的 `parseMarketIndex` 验证过(format 1)。索引里的安装来源是 npm registry:`dsh-llm-acp@0.2.0`,所以用户装好后会收到「更新可用」提示,点更新就是 `pnpm add dsh-llm-acp@新版本`,不需要 Git 凭据。
128
+ 本插件的市场索引在 [docs/market-index.json](docs/market-index.json),已经用 DSH 自带的 `parseMarketIndex` 验证过(format 1)。索引里的安装来源是 npm registry:`dsh-llm-acp@0.2.1`,所以用户装好后会收到「更新可用」提示,点更新就是 `pnpm add dsh-llm-acp@新版本`,不需要 Git 凭据。
129
129
 
130
130
  发布步骤:
131
131
 
@@ -136,7 +136,7 @@ KPI 下方是**估算条**:CLI 没回报 token 的轮次按「字符数 ÷ 4
136
136
  - 更新 `publishTimestamp`(Unix **秒**);
137
137
  - 保持 `engines.dsh` 与实际兼容范围一致;
138
138
  - 用验证器跑一遍 `parseMarketIndex(JSON.parse(...), indexUrl)`。
139
- 4. 用户把这个索引 URL 加到插件市场的索引列表(设置 → 插件市场,或调用 `pluginMarket.setIndexes`),就能在 Discover 里看到本插件。
139
+ 4. 用户启用实验性插件市场后,把这个索引 URL 加到「设置 → 插件 → 实验性插件 → 自定义插件索引」,就能在「发现」标签页里看到本插件。用户侧的完整步骤见下文「安装 · 四、从 DSH 插件市场安装」。
140
140
 
141
141
  详情页面:插件页读 `locale/en.json` / `locale/zh.json` 里的 `meta.detail`([DETAIL.md](docs/DETAIL.md)、[DETAIL.zh.md](docs/DETAIL.zh.md)),图片是同目录的 [preview.svg](docs/preview.svg)。没有启用 `meta.detail` 时会回退到本 README。图标是 [icon.svg](icon.svg)。
142
142
 
@@ -144,7 +144,7 @@ KPI 下方是**估算条**:CLI 没回报 token 的轮次按「字符数 ÷ 4
144
144
 
145
145
  ## 安装(给别人用)
146
146
 
147
- 三种方式,按对方的场景选。**共同前提**:至少要装一个 ACP CLI(`kiro-cli acp`、`codebuddy --acp`、`opencode acp`、`pi-acp`、`@agentclientprotocol/claude-agent-acp`……),本插件自己不提供模型。
147
+ 四种方式,按对方的场景选;普通用户推荐第四种「从 DSH 插件市场安装」。**共同前提**:至少要装一个 ACP CLI(`kiro-cli acp`、`codebuddy --acp`、`opencode acp`、`pi-acp`、`@agentclientprotocol/claude-agent-acp`……),本插件自己不提供模型。
148
148
 
149
149
  ### 一、从本地目录装(最快,适合自己两台机器之间搬)
150
150
 
@@ -188,7 +188,25 @@ tgz 里**不含 `node_modules`**,`@agentclientprotocol/sdk` 和 `zod` 是插
188
188
  3. `npm publish` 发布。
189
189
  4. 按上文「上架到 DSH 插件市场」更新索引里的 `versions` 和 `publishTimestamp`。
190
190
 
191
- ### 装完之后(三种方式都一样)
191
+ ### 四、从 DSH 插件市场安装(图形界面,自动收到更新)
192
+
193
+ 不用敲命令,在 DSH 界面里点几下就能装好,以后有新版本会提示「更新可用」。插件市场目前是 DSH 的**实验性功能**,第一次用要先打开:
194
+
195
+ 1. **启用插件市场**:设置 → 插件 → 打开「实验性插件」,启用 **Experimental custom plugin indexes**(`@deepseek-ai/dsh-experimental-plugin-market-bundle`)。启用后「插件」页会多出 **发现** 标签页;没出现就重启一次 DSH。
196
+ 2. **添加索引源**:在「自定义插件索引」里添加下面这个 URL(只用加一次,每个 profile 各一份):
197
+
198
+ ```
199
+ https://raw.githubusercontent.com/yingcaihuang/dsh-llm-acp/main/docs/market-index.json
200
+ ```
201
+
202
+ 3. **安装**:切到「发现」标签页,选这个索引源,找到 **ACP CLI models**,点「安装」。确认框里的来源应该是 npm registry 的 `dsh-llm-acp@<版本>`,确认即可。
203
+ 4. **升级**:以后发了新版本,「已安装」里这个插件会显示「更新可用」,点「更新」就行。
204
+
205
+ > **已经用 `link:` 或 tgz 装过的,要先卸载再从市场装。** 同名插件只能有一份,市场版会替换本地版本;从本地目录装的版本不会自动升级。开发机上要即时改源码调试,就继续用 `link:`,不要从市场装。
206
+ >
207
+ > 从市场安装同样要求宿主版本在下文「版本门槛」的范围内,不满足时插件管理器会拦下。
208
+
209
+ ### 装完之后(四种方式都一样)
192
210
 
193
211
  插件装好后**一个 provider 都没有**(自带配置是 `providers: {}`)。打开「ACP 洞察」或右侧栏控制台,「本机 ACP CLI」卡片会自动扫描一次本机已装的 CLI,选一个点「配置并添加」即可,见下文「扫描本机 CLI,一键添加」。扫描结果不会自动接入,改配置前一定由用户确认。
194
212
 
@@ -36,8 +36,8 @@
36
36
  },
37
37
  "versions": [
38
38
  {
39
- "version": "0.2.0",
40
- "publishTimestamp": 1795010347,
39
+ "version": "0.2.1",
40
+ "publishTimestamp": 1795136127,
41
41
  "source": { "type": "npm" },
42
42
  "engines": { "dsh": ">=0.2.1 <0.3.0-0" }
43
43
  }
package/index.js CHANGED
@@ -75,6 +75,14 @@ export function apply(ctx, rawConfig) {
75
75
  return store.readImageRequest(ref, target, signal)
76
76
  }
77
77
 
78
+ const rawProviders = rawConfig?.providers && typeof rawConfig.providers === 'object' ? rawConfig.providers : {}
79
+ // Tell the host (and through it every open model picker) that a provider's advertised models
80
+ // changed, so a console switch, delete, or a CLI discovery result (failure ⇄ recovery, models
81
+ // added/removed) shows up at once instead of after the picker's cache expires. Same event
82
+ // DSH's own DeepSeek adapter emits.
83
+ const notifyModels = (id) => {
84
+ try { ctx.emit('llm/models-updated', id) } catch (e) { log.warn(e, { msg: 'llm-acp: models-updated emit failed' }) }
85
+ }
78
86
  const adapter = createAcpAdapter({
79
87
  // askUser (upstream 0.4.19): DSH's waitable approval service. Only 'allowed-once' lets the CLI go
80
88
  // ahead; no service / no live agent ⇒ 'unavailable' ⇒ refused exactly as before. callId is not
@@ -101,6 +109,7 @@ export function apply(ctx, rawConfig) {
101
109
  logger: log,
102
110
  prefs,
103
111
  onTurn: (rec) => usage.append(rec),
112
+ onModelsChanged: notifyModels,
104
113
  })
105
114
 
106
115
  const release = providers.size > 0 ? ctx.llm.registerAdapter([...providers.keys()], adapter) : () => {}
@@ -117,13 +126,6 @@ export function apply(ctx, rawConfig) {
117
126
  if (typeof editor?.edit !== 'function' || entry === undefined) throw new Error('当前 profile 不支持在界面里保存配置(没有 configEditor),请改 cordis.patch.yml')
118
127
  await editor.edit(entry, (current) => change(current))
119
128
  }
120
- const rawProviders = rawConfig?.providers && typeof rawConfig.providers === 'object' ? rawConfig.providers : {}
121
- // Tell the host (and through it every open model picker) that a provider's advertised models
122
- // changed, so a console switch or delete shows up at once instead of after the picker's cache
123
- // expires. Same event DSH's own DeepSeek adapter emits.
124
- const notifyModels = (id) => {
125
- try { ctx.emit('llm/models-updated', id) } catch (e) { log.warn(e, { msg: 'llm-acp: models-updated emit failed' }) }
126
- }
127
129
  registerDashboardRoutes(ctx, { adapter, providers, prefs, usage, stateFile, saveConfig, rawProviders, notifyModels })
128
130
  ctx.logger?.info?.(`llm-acp: registered ${[...providers.keys()].join(', ') || '(no provider)'}`)
129
131
  }
package/lib/adapter.js CHANGED
@@ -59,7 +59,7 @@ const RETRYABLE_PROMPT_CODES = new Set(['RATE_LIMIT', 'SERVER', 'TIMEOUT', 'TRAN
59
59
  * @param {string} [deps.stateFile] where CLI-native session ids are remembered (undefined ⇒ memory only)
60
60
  * @param {(ref: object, target: object, signal?: AbortSignal) => Promise<{data: Uint8Array, mediaType: string}>} [deps.readImage] host attachment bytes
61
61
  */
62
- export function createAcpAdapter({ Base, providers, resolveCwd, logger, stateFile, modelsFile, readImage, prefs, onTurn, userApproval }) {
62
+ export function createAcpAdapter({ Base, providers, resolveCwd, logger, stateFile, modelsFile, readImage, prefs, onTurn, userApproval, onModelsChanged }) {
63
63
  // Accept a plain host logger or a structured one; structured is what the tests assert on.
64
64
  // A structured logger is used as-is; anything else (the host's own logger, or a test stub with
65
65
  // only info/warn/error) gets wrapped so every line is sanitised and timed.
@@ -289,6 +289,10 @@ export function createAcpAdapter({ Base, providers, resolveCwd, logger, stateFil
289
289
  async listModels(provider) {
290
290
  if (providerOff(provider)) return []
291
291
  const list = await this.catalog(provider)
292
+ // A provider whose last discovery failed (CLI missing / logged out / broken) is hidden from
293
+ // the host picker entirely: an empty list drops its group from the catalog. The console
294
+ // still shows it via catalog() with the failure reason and backoff.
295
+ if (this.#models.get(provider)?.failed === true) return []
292
296
  // `rate` is console metadata; the host picker gets the plain entry.
293
297
  return list.filter((m) => !modelOff(provider, m.id)).map(({ rate, ...m }) => m)
294
298
  }
@@ -372,6 +376,17 @@ export function createAcpAdapter({ Base, providers, resolveCwd, logger, stateFil
372
376
  const finish = log.timed('discovery', { provider: p.id })
373
377
  const t0 = Date.now()
374
378
  const backoffOf = (f) => (f === undefined ? {} : { failures: f.count, backoffMs: backoffFor(p, f) })
379
+ const prevKey = () => {
380
+ const k = this.#models.get(p.id)
381
+ return k === undefined ? '' : `${k.failed === true ? 'F' : 'ok'}:${k.list.map((m) => m.id).join(',')}`
382
+ }
383
+ // Announce a changed advertised list (failure ⇄ recovery, models added/removed) so open
384
+ // model pickers reload; nothing is emitted while the list is unchanged.
385
+ const announce = (before) => {
386
+ if (prevKey() === before) return
387
+ try { onModelsChanged?.(p.id) } catch { /* the host notification is best effort */ }
388
+ }
389
+ const before = prevKey()
375
390
  const fail = (e) => {
376
391
  const prev = this.#models.get(p.id)
377
392
  const same = prev !== undefined && prev.fp === fp
@@ -389,12 +404,14 @@ export function createAcpAdapter({ Base, providers, resolveCwd, logger, stateFil
389
404
  this.#models.set(p.id, { fp, at: Date.now(), list, failed: false })
390
405
  this.#persist(p, fp, found)
391
406
  }
407
+ announce(before)
392
408
  finish({ ok: true, count: list.length, ...backoffOf(f) })
393
409
  this.#discovery.set(p.id, { at: Date.now(), ok: true, count: list.length, ms: Date.now() - t0, ...backoffOf(f) })
394
410
  },
395
411
  (e) => {
396
412
  if (!live()) return
397
413
  const f = fail(e)
414
+ announce(before)
398
415
  finish({ ok: false, code: e?.code, message: e?.message ?? String(e), ...backoffOf(f) })
399
416
  this.#discovery.set(p.id, { at: Date.now(), ok: false, ms: Date.now() - t0, code: e?.code, message: String(e?.message ?? e).slice(0, 300), ...backoffOf(f) })
400
417
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dsh-llm-acp",
3
- "version": "0.2.0",
3
+ "version": "0.2.1",
4
4
  "description": "Expose local ACP CLI agents (kiro-cli, codebuddy, …) as DeepSeek Harness LLM provider routes, with a usage console and one-click CLI setup",
5
5
  "license": "MIT",
6
6
  "type": "module",