dsh-bundle-antigravity-host 0.1.28 → 0.1.30

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.
@@ -9,7 +9,8 @@ export class PooledAcpAdapter extends LlmAdapter {
9
9
  poll;
10
10
  capacity;
11
11
  queueTimeoutMs;
12
- sessionAffinity;
12
+ readSessionAffinity;
13
+ get sessionAffinity() { return this.readSessionAffinity(); }
13
14
  preparation;
14
15
  preparationAbort;
15
16
  preparationWaiters = 0;
@@ -21,7 +22,8 @@ export class PooledAcpAdapter extends LlmAdapter {
21
22
  this.create = create;
22
23
  this.capacity = Math.max(1, Math.min(4, Math.floor(options.capacity ?? 2)));
23
24
  this.queueTimeoutMs = Math.max(1_000, options.queueTimeoutMs ?? 120_000);
24
- this.sessionAffinity = options.sessionAffinity ?? true;
25
+ const affinity = options.sessionAffinity ?? true;
26
+ this.readSessionAffinity = typeof affinity === 'function' ? affinity : () => affinity;
25
27
  this.addSlot();
26
28
  }
27
29
  get busy() { return this.slots.some(s => s.leased || s.worker.adapter.busy); }
@@ -1 +1 @@
1
- {"version":3,"file":"pooled-adapter.js","sourceRoot":"","sources":["../../src/pool/pooled-adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pooled-adapter.js","sourceRoot":"","sources":["../../src/pool/pooled-adapter.ts"],"names":[],"mappings":"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"}
@@ -38,4 +38,7 @@ export interface ProxiedFetchDeps {
38
38
  * 只有固定的 Google 域名,列表主要用来放行 loopback)。
39
39
  */
40
40
  export declare function matchesBypass(hostname: string, bypass: string): boolean;
41
+ /** Resolve routing at request boundaries; keep old agents until unload so an
42
+ * in-flight response is never destroyed by a settings save. */
43
+ export declare function createLiveProxiedFetch(readProxy: () => ResolvedProxy | undefined, deps?: ProxiedFetchDeps): ManagedFetch;
41
44
  export declare function createProxiedFetch(proxy: ResolvedProxy | undefined, deps?: ProxiedFetchDeps): ManagedFetch;
@@ -41,6 +41,32 @@ export function matchesBypass(hostname, bypass) {
41
41
  }
42
42
  return false;
43
43
  }
44
+ /** Resolve routing at request boundaries; keep old agents until unload so an
45
+ * in-flight response is never destroyed by a settings save. */
46
+ export function createLiveProxiedFetch(readProxy, deps = {}) {
47
+ const routes = new Map();
48
+ let closed = false;
49
+ const request = (input, init) => {
50
+ if (closed)
51
+ return Promise.reject(new ProxyConfigError('代理传输已关闭;请求未发送'));
52
+ const proxy = readProxy();
53
+ const key = JSON.stringify(proxy ?? null);
54
+ let route = routes.get(key);
55
+ if (!route) {
56
+ route = createProxiedFetch(proxy, deps);
57
+ routes.set(key, route);
58
+ }
59
+ return route(input, init);
60
+ };
61
+ return Object.assign(request, { close: async () => {
62
+ closed = true;
63
+ const results = await Promise.allSettled([...routes.values()].map(route => route.close()));
64
+ routes.clear();
65
+ const failed = results.find((result) => result.status === 'rejected');
66
+ if (failed)
67
+ throw failed.reason;
68
+ } });
69
+ }
44
70
  export function createProxiedFetch(proxy, deps = {}) {
45
71
  const fallback = deps.fallback ?? ((input, init) => globalThis.fetch(input, init));
46
72
  if (!proxy)
@@ -1 +1 @@
1
- {"version":3,"file":"proxied-fetch.js","sourceRoot":"","sources":["../../src/runtime/proxied-fetch.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AASjD,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,CAAA;AAS3C,KAAK,UAAU,iBAAiB;IAC9B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAmC,CAAA;QACzE,IAAI,OAAO,MAAM,CAAC,UAAU,KAAK,UAAU,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,UAAU;YAAE,OAAO,MAAoB,CAAA;QAC9G,OAAO,SAAS,CAAA;IAClB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC;AAED,yDAAyD;AACzD,SAAS,gBAAgB,CAAC,GAAW;IACnC,OAAO,0BAA0B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC7C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,QAAgB,EAAE,MAAc;IAC5D,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA;IAC3D,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACpC,IAAI,KAAK,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;QACpC,IAAI,CAAC,KAAK;YAAE,SAAQ;QACpB,IAAI,KAAK,KAAK,GAAG;YAAE,OAAO,IAAI,CAAA;QAC9B,uCAAuC;QACvC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,KAAK,GAAG,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAA;aACjF,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;QAC1E,IAAI,KAAK,KAAK,IAAI;YAAE,OAAO,IAAI,CAAA;QAC/B,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAAE,OAAO,IAAI,CAAA;QACxE,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAA;IAChE,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAgC,EAAE,OAAyB,EAAE;IAC9F,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;IAClF,IAAI,CAAC,KAAK;QAAE,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAiB,EAAE,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS,EAAE,CAAC,CAAA;IAC5H,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC;QAAE,MAAM,IAAI,gBAAgB,CAAC,wCAAwC,CAAC,CAAA;IACtG,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,IAAI,iBAAiB,CAAA;IACjD,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,IAAI,QAAoH,CAAA;IACxH,MAAM,OAAO,GAAG,GAAiC,EAAE;QACjD,QAAQ,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACzD,IAAI,CAAC,MAAM;gBAAE,MAAM,IAAI,gBAAgB,CAAC,iCAAiC,CAAC,CAAA;YAC1E,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBAC9B,IAAI,GAAG,CAAC,QAAQ,KAAK,UAAU;oBAAE,GAAG,CAAC,QAAQ,GAAG,SAAS,CAAA;gBACzD,4DAA4D;gBAC5D,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS;oBAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,MAAM,CAAC,UAAU,CAAC;4BAC5E,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC;yBACtG,CAAC,EAAE,CAAA;gBACJ,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ;oBACxC,CAAC,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;oBACtH,CAAC,CAAC,SAAS,CAAA;gBACb,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAA;gBACjB,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAA;gBACjB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAA;YACjG,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,IAAI,gBAAgB,CAAC,yBAAyB,CAAC,CAAA;YACvD,CAAC;QACH,CAAC,CAAC,CAAA;QACF,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;IACD,MAAM,OAAO,GAAiB,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAClD,IAAI,MAAM;YAAE,MAAM,IAAI,gBAAgB,CAAC,eAAe,CAAC,CAAA;QACvD,MAAM,GAAG,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAA;QAC7F,IAAI,QAAQ,GAAG,EAAE,CAAA;QACjB,IAAI,CAAC;YACH,QAAQ,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAA;QAClC,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,gBAAgB,CAAC,cAAc,CAAC,CAAA;QAC5C,CAAC;QACD,IAAI,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YAAE,OAAO,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;QACvE,MAAM,KAAK,GAAG,MAAM,OAAO,EAAE,CAAA;QAC7B,IAAI,MAAM;YAAE,MAAM,IAAI,gBAAgB,CAAC,eAAe,CAAC,CAAA;QACvD,MAAM,WAAW,GAAG,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC;YAC7C,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI;YAC9D,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9E,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1E,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM;SAC/E,CAAC,CAAC,CAAC,EAAE,CAAA;QACN,OAAO,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,GAAG,WAAW,EAAE,GAAI,IAA4C,EAAE,UAAU,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAA;IAC/H,CAAC,CAAA;IACD,IAAI,OAAkC,CAAA;IACtC,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;YAC1C,MAAM,GAAG,IAAI,CAAA;YACb,OAAO,KAAK,CAAC,KAAK,IAAI,EAAE;gBACtB,MAAM,IAAI,GAAG,CAAC,KAAK,IAAI,EAAE;oBACvB,MAAM,KAAK,GAAG,MAAM,QAAQ,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;oBACpD,IAAI,CAAC,KAAK;wBAAE,OAAM;oBAClB,0CAA0C;oBAC1C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;gBAC7E,CAAC,CAAC,EAAE,CAAA;gBACJ,IAAI,KAAgD,CAAA;gBACpD,IAAI,CAAC;oBACH,MAAM,OAAO,CAAC,IAAI,CAAC;wBACjB,IAAI;wBACJ,IAAI,OAAO,CAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;4BACtC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,gBAAgB,CAAC,UAAU,CAAC,CAAC,EAAE,sBAAsB,CAAC,CAAA;wBAC5F,CAAC,CAAC;qBACH,CAAC,CAAA;gBACJ,CAAC;wBAAS,CAAC;oBACT,IAAI,KAAK;wBAAE,YAAY,CAAC,KAAK,CAAC,CAAA;gBAChC,CAAC;YACH,CAAC,CAAC,EAAE,CAAA;YACJ,OAAO,OAAO,CAAA;QAChB,CAAC,EAAE,CAAC,CAAA;AACN,CAAC"}
1
+ {"version":3,"file":"proxied-fetch.js","sourceRoot":"","sources":["../../src/runtime/proxied-fetch.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AASjD,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,CAAA;AAS3C,KAAK,UAAU,iBAAiB;IAC9B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAmC,CAAA;QACzE,IAAI,OAAO,MAAM,CAAC,UAAU,KAAK,UAAU,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,UAAU;YAAE,OAAO,MAAoB,CAAA;QAC9G,OAAO,SAAS,CAAA;IAClB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC;AAED,yDAAyD;AACzD,SAAS,gBAAgB,CAAC,GAAW;IACnC,OAAO,0BAA0B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC7C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,QAAgB,EAAE,MAAc;IAC5D,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA;IAC3D,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACpC,IAAI,KAAK,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;QACpC,IAAI,CAAC,KAAK;YAAE,SAAQ;QACpB,IAAI,KAAK,KAAK,GAAG;YAAE,OAAO,IAAI,CAAA;QAC9B,uCAAuC;QACvC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,KAAK,GAAG,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAA;aACjF,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;QAC1E,IAAI,KAAK,KAAK,IAAI;YAAE,OAAO,IAAI,CAAA;QAC/B,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAAE,OAAO,IAAI,CAAA;QACxE,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAA;IAChE,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED;+DAC+D;AAC/D,MAAM,UAAU,sBAAsB,CAAC,SAA0C,EAAE,OAAyB,EAAE;IAC5G,MAAM,MAAM,GAAG,IAAI,GAAG,EAAwB,CAAA;IAC9C,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,MAAM,OAAO,GAAiB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC5C,IAAI,MAAM;YAAE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,gBAAgB,CAAC,eAAe,CAAC,CAAC,CAAA;QACxE,MAAM,KAAK,GAAG,SAAS,EAAE,CAAA;QACzB,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,IAAI,CAAC,CAAA;QACzC,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC3B,IAAI,CAAC,KAAK,EAAE,CAAC;YAAC,KAAK,GAAG,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QAAC,CAAC;QAC/E,OAAO,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IAC3B,CAAC,CAAA;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE;YAChD,MAAM,GAAG,IAAI,CAAA;YACb,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;YAC1F,MAAM,CAAC,KAAK,EAAE,CAAA;YACd,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAmC,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,UAAU,CAAC,CAAA;YACtG,IAAI,MAAM;gBAAE,MAAM,MAAM,CAAC,MAAM,CAAA;QACjC,CAAC,EAAE,CAAC,CAAA;AACN,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAgC,EAAE,OAAyB,EAAE;IAC9F,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;IAClF,IAAI,CAAC,KAAK;QAAE,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAiB,EAAE,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS,EAAE,CAAC,CAAA;IAC5H,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC;QAAE,MAAM,IAAI,gBAAgB,CAAC,wCAAwC,CAAC,CAAA;IACtG,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,IAAI,iBAAiB,CAAA;IACjD,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,IAAI,QAAoH,CAAA;IACxH,MAAM,OAAO,GAAG,GAAiC,EAAE;QACjD,QAAQ,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACzD,IAAI,CAAC,MAAM;gBAAE,MAAM,IAAI,gBAAgB,CAAC,iCAAiC,CAAC,CAAA;YAC1E,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBAC9B,IAAI,GAAG,CAAC,QAAQ,KAAK,UAAU;oBAAE,GAAG,CAAC,QAAQ,GAAG,SAAS,CAAA;gBACzD,4DAA4D;gBAC5D,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS;oBAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,MAAM,CAAC,UAAU,CAAC;4BAC5E,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC;yBACtG,CAAC,EAAE,CAAA;gBACJ,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ;oBACxC,CAAC,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;oBACtH,CAAC,CAAC,SAAS,CAAA;gBACb,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAA;gBACjB,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAA;gBACjB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAA;YACjG,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,IAAI,gBAAgB,CAAC,yBAAyB,CAAC,CAAA;YACvD,CAAC;QACH,CAAC,CAAC,CAAA;QACF,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;IACD,MAAM,OAAO,GAAiB,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAClD,IAAI,MAAM;YAAE,MAAM,IAAI,gBAAgB,CAAC,eAAe,CAAC,CAAA;QACvD,MAAM,GAAG,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAA;QAC7F,IAAI,QAAQ,GAAG,EAAE,CAAA;QACjB,IAAI,CAAC;YACH,QAAQ,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAA;QAClC,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,gBAAgB,CAAC,cAAc,CAAC,CAAA;QAC5C,CAAC;QACD,IAAI,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YAAE,OAAO,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;QACvE,MAAM,KAAK,GAAG,MAAM,OAAO,EAAE,CAAA;QAC7B,IAAI,MAAM;YAAE,MAAM,IAAI,gBAAgB,CAAC,eAAe,CAAC,CAAA;QACvD,MAAM,WAAW,GAAG,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC;YAC7C,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI;YAC9D,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9E,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1E,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM;SAC/E,CAAC,CAAC,CAAC,EAAE,CAAA;QACN,OAAO,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,GAAG,WAAW,EAAE,GAAI,IAA4C,EAAE,UAAU,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAA;IAC/H,CAAC,CAAA;IACD,IAAI,OAAkC,CAAA;IACtC,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;YAC1C,MAAM,GAAG,IAAI,CAAA;YACb,OAAO,KAAK,CAAC,KAAK,IAAI,EAAE;gBACtB,MAAM,IAAI,GAAG,CAAC,KAAK,IAAI,EAAE;oBACvB,MAAM,KAAK,GAAG,MAAM,QAAQ,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;oBACpD,IAAI,CAAC,KAAK;wBAAE,OAAM;oBAClB,0CAA0C;oBAC1C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;gBAC7E,CAAC,CAAC,EAAE,CAAA;gBACJ,IAAI,KAAgD,CAAA;gBACpD,IAAI,CAAC;oBACH,MAAM,OAAO,CAAC,IAAI,CAAC;wBACjB,IAAI;wBACJ,IAAI,OAAO,CAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;4BACtC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,gBAAgB,CAAC,UAAU,CAAC,CAAC,EAAE,sBAAsB,CAAC,CAAA;wBAC5F,CAAC,CAAC;qBACH,CAAC,CAAA;gBACJ,CAAC;wBAAS,CAAC;oBACT,IAAI,KAAK;wBAAE,YAAY,CAAC,KAAK,CAAC,CAAA;gBAChC,CAAC;YACH,CAAC,CAAC,EAAE,CAAA;YACJ,OAAO,OAAO,CAAA;QAChB,CAAC,EAAE,CAAC,CAAA;AACN,CAAC"}
@@ -3,6 +3,18 @@
3
3
  * schema 写法对准已安装 @deepseek-ai/schemastery 3.18.x 的实际导出。
4
4
  */
5
5
  import Schema from '@deepseek-ai/schemastery';
6
+ import type { Volatile } from '@deepseek-ai/cordis';
7
+ /** 单个模型目录条目上的用户设置;键是 DSH 模型选择器里的模型 ID。 */
8
+ export interface ModelOverride {
9
+ /** 是否出现在 DSH 模型选择器;省略等同启用。停用不删除目录条目,仍可被会话请求。 */
10
+ enabled?: boolean;
11
+ /** 该模型的默认思考档位;未在 DSH 思考强度菜单选择时使用,省略按官方默认(medium)。 */
12
+ effort?: 'low' | 'medium' | 'high';
13
+ /** 显示名覆盖;省略用官方目录名称。 */
14
+ name?: string;
15
+ /** 映射到官方模型 ID,原样写入 ACP 会话,优先于家族 + 档位路由。 */
16
+ target?: string;
17
+ }
6
18
  export interface AntigravityHostConfig {
7
19
  /** Maximum independent ACP workers, started on demand. */
8
20
  maxConcurrentSessions?: number;
@@ -34,10 +46,10 @@ export interface AntigravityHostConfig {
34
46
  /** 并发 MCP tools/call 的聚合窗口(毫秒),决定同一轮携带多少 tool-call block。 */
35
47
  bridgeParkSettleMs?: number;
36
48
  /**
37
- * 默认/自定义模型 id:在目录中优先显示,目录外 id 标为用户配置、未验证。
38
- * 旧会话的 server-default 路由仍映射到此值;留空不指定默认项。
49
+ * 按模型 ID 的目录设置:是否出现在 DSH 模型选择器、默认思考档位、显示名、
50
+ * 官方模型 ID 映射。只作用于目录中已存在的条目,不新增自造模型。
39
51
  */
40
- preferredModel?: string;
52
+ modelOverrides?: Record<string, ModelOverride>;
41
53
  /**
42
54
  * 官方进程出网代理(如 http://127.0.0.1:7890)。留空继承宿主代理,宿主未配置才直连;
43
55
  * 填入后同时注入大小写两套 *_PROXY 与 NO_PROXY。
@@ -70,11 +82,20 @@ export interface AntigravityHostConfig {
70
82
  /** 保留进程的最长空闲时间(毫秒),超时回收;0 表示不设上限。 */
71
83
  idleRecycleMs?: number;
72
84
  }
85
+ export declare const LIVE_SETTING_KEYS: readonly ["autoWarmup", "reuseSessions", "modelOverrides", "proxyUrl", "proxyBypass", "agyCliPath", "resumeSessions", "keepProcessAfterCancel", "cancelGraceMs", "idleRecycleMs"];
86
+ export type LiveSettingKey = typeof LIVE_SETTING_KEYS[number];
87
+ export type AntigravityPluginConfig = Omit<AntigravityHostConfig, LiveSettingKey> & {
88
+ [K in LiveSettingKey]?: AntigravityHostConfig[K] | Volatile<AntigravityHostConfig[K]>;
89
+ };
90
+ /** Keep references live; callers may spread this view to capture one operation. */
91
+ export declare function liveHostConfig(config: AntigravityPluginConfig): AntigravityHostConfig;
92
+ /** 官方思考档位;与 runtime/agy-cli.ts 的 AGY_REASONING_EFFORTS 一致。 */
93
+ export declare const MODEL_EFFORTS: readonly ["low", "medium", "high"];
73
94
  export declare const Config: Schema<Schemastery.ObjectS<NoInfer<{
74
95
  maxConcurrentSessions: Schema<number, number, "defined">;
75
96
  queueTimeoutMs: Schema<number, number, "defined">;
76
- agyCliPath: Schema<string, string, "plain">;
77
- autoWarmup: Schema<boolean, boolean, "defined">;
97
+ agyCliPath: Schema<string, string, "volatile">;
98
+ autoWarmup: Schema<boolean, boolean, "volatile-defined">;
78
99
  binaryPath: Schema<string, string, "plain">;
79
100
  autoDownload: Schema<boolean, boolean, "defined">;
80
101
  extraArgs: Schema<string[], string[], "defined">;
@@ -84,19 +105,19 @@ export declare const Config: Schema<Schemastery.ObjectS<NoInfer<{
84
105
  authTimeoutMs: Schema<number, number, "defined">;
85
106
  promptTimeoutMs: Schema<number, number, "defined">;
86
107
  bridgeParkSettleMs: Schema<number, number, "defined">;
87
- preferredModel: Schema<string, string, "plain">;
88
- proxyUrl: Schema<string, string, "plain">;
89
- proxyBypass: Schema<string, string, "plain">;
90
- reuseSessions: Schema<boolean, boolean, "defined">;
91
- resumeSessions: Schema<boolean, boolean, "defined">;
92
- keepProcessAfterCancel: Schema<boolean, boolean, "defined">;
93
- cancelGraceMs: Schema<number, number, "defined">;
94
- idleRecycleMs: Schema<number, number, "defined">;
108
+ modelOverrides: Schema<Record<string, ModelOverride>, Record<string, ModelOverride>, "volatile-defined">;
109
+ proxyUrl: Schema<string, string, "volatile">;
110
+ proxyBypass: Schema<string, string, "volatile">;
111
+ reuseSessions: Schema<boolean, boolean, "volatile-defined">;
112
+ resumeSessions: Schema<boolean, boolean, "volatile-defined">;
113
+ keepProcessAfterCancel: Schema<boolean, boolean, "volatile-defined">;
114
+ cancelGraceMs: Schema<number, number, "volatile-defined">;
115
+ idleRecycleMs: Schema<number, number, "volatile-defined">;
95
116
  }>>, Schemastery.ObjectT<NoInfer<{
96
117
  maxConcurrentSessions: Schema<number, number, "defined">;
97
118
  queueTimeoutMs: Schema<number, number, "defined">;
98
- agyCliPath: Schema<string, string, "plain">;
99
- autoWarmup: Schema<boolean, boolean, "defined">;
119
+ agyCliPath: Schema<string, string, "volatile">;
120
+ autoWarmup: Schema<boolean, boolean, "volatile-defined">;
100
121
  binaryPath: Schema<string, string, "plain">;
101
122
  autoDownload: Schema<boolean, boolean, "defined">;
102
123
  extraArgs: Schema<string[], string[], "defined">;
@@ -106,12 +127,12 @@ export declare const Config: Schema<Schemastery.ObjectS<NoInfer<{
106
127
  authTimeoutMs: Schema<number, number, "defined">;
107
128
  promptTimeoutMs: Schema<number, number, "defined">;
108
129
  bridgeParkSettleMs: Schema<number, number, "defined">;
109
- preferredModel: Schema<string, string, "plain">;
110
- proxyUrl: Schema<string, string, "plain">;
111
- proxyBypass: Schema<string, string, "plain">;
112
- reuseSessions: Schema<boolean, boolean, "defined">;
113
- resumeSessions: Schema<boolean, boolean, "defined">;
114
- keepProcessAfterCancel: Schema<boolean, boolean, "defined">;
115
- cancelGraceMs: Schema<number, number, "defined">;
116
- idleRecycleMs: Schema<number, number, "defined">;
130
+ modelOverrides: Schema<Record<string, ModelOverride>, Record<string, ModelOverride>, "volatile-defined">;
131
+ proxyUrl: Schema<string, string, "volatile">;
132
+ proxyBypass: Schema<string, string, "volatile">;
133
+ reuseSessions: Schema<boolean, boolean, "volatile-defined">;
134
+ resumeSessions: Schema<boolean, boolean, "volatile-defined">;
135
+ keepProcessAfterCancel: Schema<boolean, boolean, "volatile-defined">;
136
+ cancelGraceMs: Schema<number, number, "volatile-defined">;
137
+ idleRecycleMs: Schema<number, number, "volatile-defined">;
117
138
  }>>, "plain">;
package/dist/settings.js CHANGED
@@ -4,11 +4,50 @@
4
4
  */
5
5
  import Schema from '@deepseek-ai/schemastery';
6
6
  import { DEFAULT_ACP_SERVER_VERSION } from './runtime/binary.js';
7
+ // Only fields owned by the custom settings card are live. Ordinary launch/pool
8
+ // configuration remains ordinary, so editing it still follows the host lifecycle.
9
+ export const LIVE_SETTING_KEYS = ['autoWarmup', 'reuseSessions', 'modelOverrides', 'proxyUrl', 'proxyBypass', 'agyCliPath', 'resumeSessions', 'keepProcessAfterCancel', 'cancelGraceMs', 'idleRecycleMs'];
10
+ function readSetting(value) {
11
+ return typeof value === 'object' && value !== null && 'get' in value ? value.get() : value;
12
+ }
13
+ /** Keep references live; callers may spread this view to capture one operation. */
14
+ export function liveHostConfig(config) {
15
+ return {
16
+ ...config,
17
+ get autoWarmup() { return readSetting(config.autoWarmup); },
18
+ get reuseSessions() { return readSetting(config.reuseSessions); },
19
+ get modelOverrides() { return readSetting(config.modelOverrides); },
20
+ get proxyUrl() { return readSetting(config.proxyUrl); },
21
+ get proxyBypass() { return readSetting(config.proxyBypass); },
22
+ get agyCliPath() { return readSetting(config.agyCliPath); },
23
+ get resumeSessions() { return readSetting(config.resumeSessions); },
24
+ get keepProcessAfterCancel() { return readSetting(config.keepProcessAfterCancel); },
25
+ get cancelGraceMs() { return readSetting(config.cancelGraceMs); },
26
+ get idleRecycleMs() { return readSetting(config.idleRecycleMs); },
27
+ };
28
+ }
29
+ /** 官方思考档位;与 runtime/agy-cli.ts 的 AGY_REASONING_EFFORTS 一致。 */
30
+ export const MODEL_EFFORTS = ['low', 'medium', 'high'];
31
+ /**
32
+ * modelOverrides 的 schema。
33
+ *
34
+ * TS2742 规避:`Schema.dict` 的推断类型引用 schemastery 依赖的 cosmokit
35
+ * `Dict`;npm ci 在版本分叉时会把 cosmokit 嵌套进
36
+ * `@deepseek-ai/schemastery/node_modules`,导出类型无法命名该路径(本机
37
+ * 扁平提升才看不出来)。末尾的显式标注把 Config 的类型收敛到本包
38
+ * `ModelOverride`,只经过可移植路径。
39
+ */
40
+ const ModelOverrideSchema = Schema.object({
41
+ enabled: Schema.boolean().default(true).description('是否出现在 DSH 模型选择器'),
42
+ effort: Schema.union(MODEL_EFFORTS).description('默认思考档位:low / medium / high'),
43
+ name: Schema.string().description('显示名覆盖'),
44
+ target: Schema.string().description('映射到的官方模型 ID,优先于家族 + 档位路由'),
45
+ });
7
46
  export const Config = Schema.object({
8
47
  maxConcurrentSessions: Schema.natural().min(1).max(4).default(2).description('最大并发 ACP 连接数(1–4),按需启动;不同对话互不占用工具审批回合'),
9
48
  queueTimeoutMs: Schema.natural().min(1000).default(120000).description('等待空闲 ACP 连接的最长时间(毫秒),排队期间可取消'),
10
- agyCliPath: Schema.string().description('官方 agy CLI 路径;留空依次查 AGY_CLI_BIN、PATH 和默认安装目录'),
11
- autoWarmup: Schema.boolean().default(true).description('插件启用时预热并保留 ACP 连接,减少首次聊天启动等待;复用本机登录态,不发送模型消息'),
49
+ agyCliPath: Schema.string().volatile().description('官方 agy CLI 路径;留空依次查 AGY_CLI_BIN、PATH 和默认安装目录'),
50
+ autoWarmup: Schema.boolean().default(true).volatile().description('插件启用时预热并保留 ACP 连接,减少首次聊天启动等待;复用本机登录态,不发送模型消息'),
12
51
  binaryPath: Schema.string().description('官方 agy-acp-server 可执行文件路径;留空则按 AGY_ACP_BIN → 缓存 → 自动下载解析'),
13
52
  autoDownload: Schema.boolean().default(true).description('未找到本地二进制时自动从 dl.google.com 下载(仅 https + 官方域名 + 拒绝重定向)'),
14
53
  extraArgs: Schema.array(Schema.string()).default([]).description('传给 ACP server 的额外命令行参数'),
@@ -18,13 +57,13 @@ export const Config = Schema.object({
18
57
  authTimeoutMs: Schema.natural().default(300_000).description('authenticate(需人工在浏览器完成 OAuth 授权)的等待上限(毫秒)'),
19
58
  promptTimeoutMs: Schema.natural().default(1_800_000).description('单轮 session/prompt 的等待上限(毫秒)'),
20
59
  bridgeParkSettleMs: Schema.natural().default(50).description('并发 MCP tools/call 的聚合窗口(毫秒)'),
21
- preferredModel: Schema.string().description('默认/自定义模型 ID,优先列入目录;目录外 ID 未验证。兼容旧 server-default 路由,留空不指定默认项'),
22
- proxyUrl: Schema.string().description('官方进程出网代理,如 http://127.0.0.1:7890(缺 scheme 按 http 处理)。留空继承宿主代理,宿主也未配置时才直连'),
23
- proxyBypass: Schema.string().description('代理排除列表,逗号分隔,如 example.internal,*.internal;不支持 CIDR。localhost/127.0.0.1/::1 始终自动排除'),
24
- reuseSessions: Schema.boolean().default(true).description('复用同一个 ACP 会话,后续回合只发送新增消息;历史被压缩/回退或模型、工具目录变化时自动重建。关闭则每轮新会话并重放全部历史'),
25
- resumeSessions: Schema.boolean().default(false).description('重启后尝试用 session/load 恢复上次的 ACP 会话;依赖 agent 的 loadSession 能力,恢复失败会自动重建'),
26
- keepProcessAfterCancel: Schema.boolean().default(false).description('用户取消后保留官方进程:宽限内确认 agent 已停止就只丢弃会话,下一轮不必冷启动;默认关闭'),
27
- cancelGraceMs: Schema.natural().max(60_000).default(30_000).description('取消后等待 agent 确认停止的上限(毫秒);0 表示不等待、立即回收'),
28
- idleRecycleMs: Schema.natural().max(3_600_000).default(300_000).description('保留进程的最长空闲时间(毫秒),超时回收;0 表示不设上限。默认 5 分钟是本插件的资源回收策略,不代表上游缓存 TTL'),
60
+ modelOverrides: Schema.dict(ModelOverrideSchema).default({}).volatile().description('按模型 ID 的目录设置(是否显示、默认思考档位、显示名、官方模型 ID 映射);只作用于目录中已存在的模型'),
61
+ proxyUrl: Schema.string().volatile().description('官方进程出网代理,如 http://127.0.0.1:7890(缺 scheme 按 http 处理)。留空继承宿主代理,宿主也未配置时才直连'),
62
+ proxyBypass: Schema.string().volatile().description('代理排除列表,逗号分隔,如 example.internal,*.internal;不支持 CIDR。localhost/127.0.0.1/::1 始终自动排除'),
63
+ reuseSessions: Schema.boolean().default(true).volatile().description('复用同一个 ACP 会话,后续回合只发送新增消息;历史被压缩/回退或模型、工具目录变化时自动重建。关闭则每轮新会话并重放全部历史'),
64
+ resumeSessions: Schema.boolean().default(false).volatile().description('重启后尝试用 session/load 恢复上次的 ACP 会话;依赖 agent 的 loadSession 能力,恢复失败会自动重建'),
65
+ keepProcessAfterCancel: Schema.boolean().default(false).volatile().description('用户取消后保留官方进程:宽限内确认 agent 已停止就只丢弃会话,下一轮不必冷启动;默认关闭'),
66
+ cancelGraceMs: Schema.natural().max(60_000).default(30_000).volatile().description('取消后等待 agent 确认停止的上限(毫秒);0 表示不等待、立即回收'),
67
+ idleRecycleMs: Schema.natural().max(3_600_000).default(300_000).volatile().description('保留进程的最长空闲时间(毫秒),超时回收;0 表示不设上限。默认 5 分钟是本插件的资源回收策略,不代表上游缓存 TTL'),
29
68
  });
30
69
  //# sourceMappingURL=settings.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"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"}
package/docs/changelog.md CHANGED
@@ -4,6 +4,20 @@
4
4
 
5
5
  记录源码与发布内容,不将本地构建、npm 发布和本机升级混为同一状态。日期采用 Asia/Hong_Kong。更早历史见 [Git 提交记录](https://github.com/KouzakiUmi/dsh-antigravity-acp/commits/main/)。
6
6
 
7
+ ## 0.1.30 · 2026-10-27
8
+
9
+ - **移除「默认模型」**:设置页不再维护一个「新对话优先使用」的模型 ID。DSH 自带模型选择器负责选模,插件侧再存一份只会与它冲突;`preferredModel` 字段及旧 `server-default` 映射一并删除。
10
+ - **模型列表设置**:设置页按模型逐项设置——是否出现在 DSH 模型选择器、默认思考档位(低 / 中 / 高 / 跟随官方)、显示名覆盖、映射到官方模型 ID。改动合并成一份 `modelOverrides` 保存,清空的项自动移除,不留空壳配置。
11
+ - **生效路径**:停用只影响选择器,不删除目录条目;映射目标原样写入 ACP 会话,优先于家族 + 档位路由;默认档位在未选择思考强度时生效,官方未声明该档位时退回官方默认。保存后立即通知宿主刷新目录。
12
+ - **验证边界**:本地类型检查、38 个文件 / 639 项隔离测试与构建通过;覆盖逐模型设置的草稿合并、只提交改动项、目录变化与只读状态,以及映射与档位路由。真实 Desktop GUI 与官方账号未重新验收。
13
+
14
+ ## 0.1.29 · 2026-10-26
15
+
16
+ - **恢复设置编辑与保存**:将设置卡片的 10 个字段声明为宿主可编辑的即时配置,修复默认模型、代理、会话开关和计时字段被统一禁用的问题;配置文档缺失时显示原因和恢复提示,而非静默禁用。
17
+ - **配置实际生效**:默认模型更新通知宿主选择器;CLI 路径及插件请求代理随下一次操作读取,会话偏好在下一轮聊天、预热或目录发现时捕获,不替换正在输出或等待工具的回合配置。旧代理连接保留到卸载时统一清理,避免打断在途响应。
18
+ - **生效边界**:自动预热开关在下次启用插件时生效;已有 ACP 进程保留原启动环境,切换其代理仍需重新加载插件。普通启动与并发配置继续遵循宿主重载流程。
19
+ - **验证边界**:本地类型检查、37 个文件 / 625 项隔离测试与构建通过;覆盖真实 React renderer 的控件编辑、保存回读、只读和配置恢复,以及即时引用、偏好更新与代理生命周期。真实 Desktop GUI、官方账号及非 Windows 实机未重新验收;npm 发布不代表本机安装已更新。
20
+
7
21
  ## 0.1.28 · 2026-10-25
8
22
 
9
23
  - **功能可靠性**:手动预热 / 目录刷新可从一次暂时回收故障中恢复,持续失败仍拒绝复用旧进程;后续会话省略模型配置时保留已知目录,worker 间模型名称、输入模态与实测上下文元数据一致,默认思考档位不指向不存在的选项。
@@ -2,7 +2,7 @@
2
2
 
3
3
  [返回主页](../README.md) · [使用与排障](reference.md) · [开发与验证](development.md)
4
4
 
5
- 以下对应 **0.1.28**,以 [`src/settings.ts`](https://github.com/KouzakiUmi/dsh-antigravity-acp/blob/main/src/settings.ts) 的 Config 为准。字段均位于 `llm-antigravity-acp` 插件配置根级,不需要额外包装一层对象。设置页只展示常用项,其余可通过宿主提供的配置面编辑。
5
+ 以下对应 **0.1.30**,以 [`src/settings.ts`](https://github.com/KouzakiUmi/dsh-antigravity-acp/blob/main/src/settings.ts) 的 Config 为准。字段均位于 `llm-antigravity-acp` 插件配置根级,不需要额外包装一层对象。设置页只展示常用项,其余可通过宿主提供的配置面编辑。
6
6
 
7
7
  ## 配置清单
8
8
 
@@ -21,7 +21,7 @@
21
21
  | `authTimeoutMs` | `300000` | 交互式 `authenticate` 等待上限(毫秒),独立于普通请求超时。 |
22
22
  | `promptTimeoutMs` | `1800000` | 单个 `session/prompt` 上限(毫秒);工具 park 不表示上游 prompt 已结束。 |
23
23
  | `bridgeParkSettleMs` | `50` | 并发 MCP 工具调用聚合窗口(毫秒);不是工具执行超时。 |
24
- | `preferredModel` | 未设置 | 默认 / 自定义模型 ID,在目录中优先列出;目录外 ID 未验证。兼容旧 `server-default` 路由,不替换现有会话选择。 |
24
+ | `modelOverrides` | `{}` | 按模型 ID 的目录设置,键是 DSH 选择器里的模型 ID:`enabled`(默认 `true`)决定是否出现在选择器,`effort` 是该模型未选思考强度时的默认档位,`name` 覆盖显示名,`target` 把该 ID 映射到官方模型 ID。只作用于目录中已存在的条目,不新增自造模型。 |
25
25
  | `proxyUrl` | 未设置 | 显式出网代理;留空继承 Host 代理环境,Host 也未配置才直连。支持 HTTP、HTTPS、SOCKS5、SOCKS5H。 |
26
26
  | `proxyBypass` | 未设置 | 逗号分隔排除列表,支持域名匹配,不支持 CIDR;始终合并 localhost、127.0.0.1、::1。 |
27
27
  | `reuseSessions` | `true` | 复用同一个 ACP 会话:同一 DSH 对话的后续回合只发送**新增消息**,不再每轮 `session/new` 并重放全部历史。历史被压缩、回退或编辑,模型/思考强度变化,工具目录变化,或 MCP 桥被其他对话接管时自动重建。关闭后回到旧的「每轮新会话 + 全量重放」。 |
@@ -70,7 +70,11 @@ ACP 官方 agent 在同一会话内会保留上下文(2026-10-23 真机验证
70
70
 
71
71
  实测(2026-10-23,官方 1.4.0):同一会话空闲 60s、120s 后仍能复述上一轮暗号,响应耗时稳定(约 3s);`usage_update.used` 持续累计(3463 → 3628 → 3745)。官方会话空闲 TTL 未知;ACP 会话上下文、Gemini 显式缓存与模型前缀缓存不是同一个保证。默认 5 分钟仅是本插件在启动延迟与常驻资源之间选取的回收策略,可自行调整或设 0 禁用。
72
72
 
73
- 配置更新可能重载插件。非法代理当前会在插件装载期抛 `ProxyConfigError`,可能需要通过宿主通用配置面修复,不能假定本插件卡片还能显示。需要代理时先保存再连接;已有官方进程不会因为页面上的文本变化自动换出口。按部署方式重载 Host / 重启 Desktop,不把刷新网页当成 Host 已更新。
73
+ 设置页字段通过宿主的即时配置引用保存:模型显示开关、显示名与映射随保存更新选择器,会话与进程偏好在下一轮聊天、预热或目录发现时读取,不打断正在输出或等待工具的回合。自动预热开关在下次启用插件时读取。代理和 CLI 路径用于后续请求及新启动的官方进程;已有 ACP 进程保留原启动环境,切换其出口仍需重新加载插件。并发、二进制等普通配置继续遵循宿主的重载流程。
74
+
75
+ 工具回合尚未结束时保存偏好,其有效续轮以及不兼容续轮触发的 ACP prompt 重建仍沿用原回合快照;新值可能延至后续空闲新轮生效,不通过保存设置中断当前工具执行。
76
+
77
+ 需要代理时先保存再连接。非法代理在初次装载或后续使用时抛 `ProxyConfigError`;即时保存后使用失败可直接回到设置页修正,初次装载失败则需要通过宿主通用配置面修复。不要把刷新网页当成 Host 已更新。
74
78
 
75
79
  ## 环境变量
76
80
 
@@ -98,8 +102,10 @@ ACP 官方 agent 在同一会话内会保留上下文(2026-10-23 真机验证
98
102
 
99
103
  ## 设置页可以做什么
100
104
 
101
- 页面按连接、默认模型、常用偏好组织;网络 / CLI / 会话进程与生命周期诊断分别放入高级设置和连接诊断折叠区。可执行连接 / 取消、预热、目录刷新、默认模型、CLI 路径、代理、会话复用 / 重启恢复 / 取消保留开关、取消宽限与空闲计时。并发上限可通过宿主配置面调整。
105
+ 页面按连接、模型列表、常用偏好组织;网络 / CLI / 会话进程与生命周期诊断分别放入高级设置和连接诊断折叠区。可执行连接 / 取消、预热、目录刷新,逐模型设置显示开关、默认思考档位、显示名与官方 ID 映射,以及 CLI 路径、代理、会话复用 / 重启恢复 / 取消保留开关、取消宽限与空闲计时。并发上限可通过宿主配置面调整。
106
+
107
+ 模型列表对目录中的每个模型各占一行,改动合并成一份 `modelOverrides` 在保存时提交;清空显示名或映射等于移除该字段,不会留下空壳配置。已经保存但当前目录没有的 ID 仍列在末尾并标注「不在当前目录」,可继续修改或清除。
102
108
 
103
109
  套餐额度与 AI Credits 只在对话输入框旁的额度药丸及详情弹层展示;设置页不重复渲染,也不因此启动额度轮询。手动预热 / 目录刷新遇到暂时回收故障时会在本次操作内补试一次,持续失败仍拒绝复用旧进程。
104
110
 
105
- 不提供账户切换、模型删除 / 禁用或付费 Credits 开关。思考强度由 DSH 会话菜单选择,不在此维护第二份独立档位配置。只读 Profile 禁止修改;外部刷新不会覆盖未保存草稿,保存失败保留输入。
111
+ 不提供账户切换、删除目录条目或付费 Credits 开关:停用只是不列入选择器,已知模型的显示名、上下文容量与路由仍保留。思考强度由 DSH 会话菜单选择,不在此维护第二份独立档位配置。只读 Profile 禁止修改;外部刷新不会覆盖未保存草稿,保存失败保留输入。
@@ -58,18 +58,18 @@ npm pack
58
58
 
59
59
  ## 本次验证矩阵
60
60
 
61
- 0.1.28 本地检查日期:**2026-10-25**。
61
+ 0.1.30 本地检查日期:**2026-10-27**。
62
62
 
63
63
  | 验证项 | 状态与范围 |
64
64
  |---|---|
65
65
  | TypeScript | `npm run typecheck` 通过 |
66
- | 隔离回归 | `npm test`:36 个文件 / 617 项通过 |
66
+ | 隔离回归 | `npm test`:38 个文件 / 639 项通过 |
67
67
  | 构建 | `npm run build` 通过 |
68
68
  | 工具 / runtime | 假 ACP / MCP、乱序工具结果、池所有权、续轮变更、取消、写入阻塞和回收 |
69
69
  | 图片 | 附件引用校验、图片内容映射与跨 worker 能力;未调用真实视觉模型 |
70
- | 设置交互 | React 18 renderer 测试草稿、冲突、只读与连接状态;不是浏览器像素测试 |
71
- | 代理 | 合成依赖、失败不直连、本地 SOCKS 测试;不是 Google 网络可达性保证 |
72
- | 真实上游 / GUI | 本次未验收 0.1.28 安装后的 GUI、真实生成或图片识别 |
70
+ | 设置交互 | React 18 renderer 覆盖 9 个普通即时字段与逐模型 `modelOverrides` 的编辑、保存回读、草稿、冲突、只读与 namespace 恢复;不替代真实宿主设置服务或 GUI 验收 |
71
+ | 代理 | 合成依赖、动态变更与清空、不打断旧响应、卸载释放、失败不直连、本地 SOCKS 测试;不是 Google 网络可达性保证 |
72
+ | 真实上游 / GUI | 本次未验收 0.1.30 安装后的 GUI、真实生成或图片识别 |
73
73
  | 非 Windows | 有平台映射与契约测试,未实机验收 |
74
74
  | 生产依赖漏洞 | `check` 不包含漏洞审计;没有单独成功审计证据就不声明通过 |
75
75
 
@@ -85,6 +85,12 @@ node scripts/preview-ui.mjs
85
85
 
86
86
  ### 本次改动的补充验证
87
87
 
88
+ 2026-10-27 的模型列表改动通过类型检查、**38 个文件 / 639 项测试**与构建。即时字段与卡片字段一致,使用实际 volatile 引用提交验证后端读取新值;真实 React renderer 覆盖逐模型行的开关、档位、显示名与映射编辑,整份 `modelOverrides` 的合并提交、空值清除、目录外 ID 保留、外部更新冲突与只读禁用。适配器侧覆盖停用项不进选择器、显示名覆盖同时作用于目录与会话解析、默认档位设置、官方未声明档位时的回退,以及映射优先于家族 + 档位路由。
89
+
90
+ 上述设置测试没有实例化完整 DSH settings / Loader 服务,不能当作真实宿主端到端验收;动态会话粘性切换、工具等待期间保存偏好也未新增直接回归。当前工具回合中的不兼容续轮重建仍沿用该回合快照,偏好更新可能延至后续空闲新轮。真实 Desktop GUI、官方账号与非 Windows 实机仍未重新验收。
91
+
92
+ ### 0.1.28 验证记录
93
+
88
94
  2026-10-25 的源码工作副本执行 `npm run check`:TypeScript 检查、**36 个文件 / 617 项测试**与构建通过。新增覆盖手动预热的有界回收恢复、空模型配置保留目录、worker 元数据与档位合并、实际 worker 图片能力准备、额度信封与独立缓存竞态、Argon 共享额度、客户端失败保留快照,以及设置页分组与草稿行为。
89
95
 
90
96
  同时使用本机 Chrome 无头截图检查 `.local-preview/quota-ui.html` 的浅色 / 深色及 750px 窄屏静态预览;预览数字全部为虚构,不访问真实账户或 DSH 页面。未执行发布、Profile 安装、Host 重启或真实 Desktop GUI / 官方账号验收。
package/docs/reference.md CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  [返回主页](../README.md) · [配置](configuration.md) · [更新记录](changelog.md) · [开发与验证](development.md)
4
4
 
5
- 本文对应 `dsh-bundle-antigravity-host` **0.1.28**。安装或连接成功不等于真实模型生成、图片识别或所有平台已验收。
5
+ 本文对应 `dsh-bundle-antigravity-host` **0.1.30**。安装或连接成功不等于真实模型生成、图片识别或所有平台已验收。
6
6
 
7
7
  ## 安装与更新
8
8
 
@@ -59,8 +59,9 @@ dsh plugin --profile web add ./dsh-bundle-antigravity-host-0.1.24.tgz
59
59
  模型目录来自会话 `configOptions`、`config_option_update` 与官方 CLI 的只读 `agy models`。`initialize` 本身不是无需登录即可获取完整模型目录的接口。没有缓存时目录可以为空,应先显式连接或刷新。
60
60
 
61
61
  - 观测目录写入 `$DSH_HOME/cache/antigravity-acp/catalog.json`,只含模型信息,不含凭据;CLI 目录使用同目录的 `cli-models.json`。版本不符或损坏的缓存不作为有效目录。
62
- - `preferredModel` 可以从目录选择或手填。目录外 ID 标为用户配置、未验证;不会自动替换当前会话的选择。
63
- - 旧 `server-default` 路由仍兼容:映射到 `preferredModel`,留空沿用上游默认;不再新增占位选择项。
62
+ - 设置页的模型列表可逐项关闭某个模型在选择器中的显示、设置默认思考档位、覆盖显示名,或把该 ID 映射到官方模型 ID。停用不删除目录条目;映射目标原样写入 ACP 会话,由官方 agent 判定是否接受,未登记 ID 不会被静默改写成别的模型。
63
+ - 映射优先于家族 + 档位路由;没有映射时才按「显式选择 → 该模型默认档位 → 官方默认档位」决定最终模型。默认档位未被官方声明时退回官方默认,不指向不存在的选项。
64
+ - 旧 `server-default` 路由仍兼容:默认沿用上游模型,配置了映射时才写入映射目标;不再新增占位选择项。
64
65
  - 官方将思考档位编码进 ID 时,选择器折叠为模型家族;DSH 思考强度低 / 中 / 高路由至 `-low` / `-medium` / `-high`。缺档取最近档位,未指定通常使用 `medium`;显式钉住档位 ID 时尊重该 ID。`gpt-oss-120b` 家族不列入选择器。
65
66
  - 上下文容量不填猜测值。收到官方 `usage_update.size` 后才记录到模型上下文并缓存;首次观测前未知。
66
67
  - 模型、容量与图片能力在 worker 间同步;不因增加 worker 就虚构新模型权益。
@@ -117,7 +118,7 @@ ACP fs / terminal 与未知原生权限请求始终拒绝并记录,但不因
117
118
 
118
119
  ### 额度药丸与 AI Credits
119
120
 
120
- 只在选中 `antigravity-acp` 时显示。药丸位于模型选择器左侧,随模型匹配 Gemini、Claude/GPT、Gemini 4 Argon 额度组;未知型号与旧 `server-default` 不借用其它模型数字。
121
+ 只在选中 `antigravity-acp` 时显示。药丸位于模型选择器左侧,随模型匹配 Gemini、Claude/GPT、Gemini 4 Argon 额度组;未知型号与旧 `server-default` 不借用其它模型数字(模型改名的显示名不影响分组,分组按 ID 判断)。
121
122
 
122
123
  展开固定展示三个组;缺数据标为未提供,显示每窗剩余百分比、重置时间、当前模型、缓存状态与刷新。支持深浅主题、Escape 与外部点击关闭。
123
124
 
@@ -169,7 +170,7 @@ onefile 临时展开使用用户级根目录内独立的 `runtime/instance-*`,
169
170
 
170
171
  客户端先挂载贡献型 remote。`remote.settings` / `remote.llm` 是宿主已有服务,必须声明依赖;本包的 `remote.agyQuota` 需等挂载后出现,不能预先作为硬依赖阻止自身挂载。
171
172
 
172
- 设置草稿与远端快照分离,只提交已修改字段,支持清空。外部更新产生冲突时提示并可恢复远端值;保存失败保留草稿。加载、只读与保存期间禁用相应编辑,不提供账户切换、模型删除 / 禁用或付费开关。
173
+ 设置草稿与远端快照分离,只提交已修改字段,支持清空。模型列表整份 `modelOverrides` 作为一个字段参与脏值与冲突判断,规范化后比较,避免键序或写回默认值被误判为未保存修改。外部更新产生冲突时提示并可恢复远端值;保存失败保留草稿。加载、只读与保存期间禁用相应编辑,不提供账户切换、目录条目删除或付费开关。
173
174
 
174
175
  ## 已知限制与绕过
175
176
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dsh-bundle-antigravity-host",
3
- "version": "0.1.28",
3
+ "version": "0.1.30",
4
4
  "description": "DeepSeek Harness host bundle that talks to the official Antigravity ACP server over stdio (Agent Client Protocol v1).",
5
5
  "displayName": "Antigravity ACP",
6
6
  "keywords": [