@dsh-cc/tool-web-fetch 0.5.0 → 0.6.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
@@ -25,10 +25,11 @@ or produces no text fails the call as an `isError` tool result.
25
25
 
26
26
  ## Provider requirement
27
27
 
28
- CC deployments get a fetch executor from the cc-shell bundle, which mounts
29
- `@dsh-cc/web-fetch-http` (wrapping `HttpFetchProvider`, with a literal
30
- SSRF gate). This package itself does not register a provider; tests fake
31
- `ctx.web.fetch`.
28
+ CC deployments use the stock `@deepseek-ai/dsh-web-fetch-http` executor from
29
+ dsh-base (DNS-pinned, public-only per hop), with CC egress caps restated by
30
+ the cc-shell bundle. The tool upgrades `http:` URLs to `https:` before the
31
+ seam call (CC WebFetch parity); it never registers a provider itself — tests
32
+ fake `ctx.web.fetch`.
32
33
 
33
34
  ## Prompt guidance interplay
34
35
 
@@ -38,8 +39,8 @@ from the `web_search` system-prompt section. This package re-registers the
38
39
 
39
40
  ## Known limits
40
41
 
41
- - No host allowlist in this package: the literal SSRF gate (private/loopback/
42
- link-local literals blocked) lives in the `@dsh-cc/web-fetch-http`
43
- wrapper mounted from cc-shell. Residual risk: DNS rebinding — upstream
44
- webfetch-ssrf-allowlist (DNS-pin / per-hop re-validation) remains a follow-up.
42
+ - No host allowlist in this package: SSRF policy lives in the executor — the
43
+ stock provider resolves public-only addresses and pins them per hop, so the
44
+ DNS-rebinding window is closed upstream (rc.1). Anything stricter belongs
45
+ there, not here.
45
46
  - Tavily / Firecrawl are plugins/skills, not fetch backends for this tool.
package/README.zh.md CHANGED
@@ -21,9 +21,10 @@ CC 风格的 `web_fetch` 替代工具,带可选 `prompt` 参数。当 CC prese
21
21
 
22
22
  ## Provider 要求
23
23
 
24
- CC 部署通过 cc-shell bundle 获得 fetch 执行器:其挂载
25
- `@dsh-cc/web-fetch-http`(包装 `HttpFetchProvider`,带字面量 SSRF 门禁)。
26
- 本包自身不注册 provider。测试通过 fake `ctx.web.fetch` 进行。
24
+ CC 部署使用 dsh-base 自带的 stock `@deepseek-ai/dsh-web-fetch-http` 执行器
25
+ (DNS 钉定、逐跳仅公网),CC 出口上限由 cc-shell bundle 重述。本工具在调用
26
+ seam 之前把 `http:` URL 升级为 `https:`(CC WebFetch 对齐);自身不注册
27
+ provider,测试通过 fake `ctx.web.fetch` 进行。
27
28
 
28
29
  ## Prompt 指引的相互影响
29
30
 
@@ -33,7 +34,7 @@ CC 部署通过 cc-shell bundle 获得 fetch 执行器:其挂载
33
34
 
34
35
  ## 已知限制
35
36
 
36
- - 本包无 host allowlist:字面量 SSRF 门禁(阻止私有/回环/链路本地字面量)位于
37
- cc-shell 挂载的 `@dsh-cc/web-fetch-http` 包装器中。残余风险:DNS rebinding——
38
- 上游 webfetch-ssrf-allowlist(DNS-pin / 逐跳重校验)仍是后续事项。
37
+ - 本包无 host allowlist:SSRF 策略在执行器一侧——stock provider 解析并钉定
38
+ 仅公网地址、逐跳重校验,DNS rebinding 窗口已在上游(rc.1)关闭。更严格的
39
+ 限制应放在执行器,而不是本工具。
39
40
  - Tavily / Firecrawl 是插件/skill,不是本工具的 fetch 后端。
package/lib/index.d.ts CHANGED
@@ -24,5 +24,12 @@ export interface Config {
24
24
  }
25
25
  /** Runtime configuration schema. */
26
26
  export declare const Config: z<Config>;
27
+ /**
28
+ * CC WebFetch parity: an `http:` URL is upgraded to `https:` before the fetch.
29
+ * Total on purpose — parseFetchArgs rejects only blank strings, so a malformed
30
+ * model-supplied URL passes through unchanged for the web provider to reject
31
+ * as WEB_INVALID_URL (a thrown TypeError here would be an untyped tool error).
32
+ */
33
+ export declare function upgradeInsecureUrl(url: string): string;
27
34
  export declare function apply(ctx: Context, config?: Config): void;
28
35
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,CAAC,MAAM,0BAA0B,CAAA;AAQxC,eAAO,MAAM,IAAI,mBAAmB,CAAA;AACpC,eAAO,MAAM,MAAM,UAA0C,CAAA;AAE7D,mDAAmD;AACnD,MAAM,WAAW,MAAM;IACrB,qFAAqF;IACrF,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,kEAAkE;IAClE,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,oDAAoD;IACpD,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,6EAA6E;IAC7E,oBAAoB,CAAC,EAAE,MAAM,CAAA;CAC9B;AAED,oCAAoC;AACpC,eAAO,MAAM,MAAM,EAAE,CAAC,CAAC,MAAM,CAK3B,CAAA;AAgBF,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,MAAW,GAAG,IAAI,CAwJ7D"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,CAAC,MAAM,0BAA0B,CAAA;AAQxC,eAAO,MAAM,IAAI,mBAAmB,CAAA;AACpC,eAAO,MAAM,MAAM,UAA0C,CAAA;AAE7D,mDAAmD;AACnD,MAAM,WAAW,MAAM;IACrB,qFAAqF;IACrF,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,kEAAkE;IAClE,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,oDAAoD;IACpD,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,6EAA6E;IAC7E,oBAAoB,CAAC,EAAE,MAAM,CAAA;CAC9B;AAED,oCAAoC;AACpC,eAAO,MAAM,MAAM,EAAE,CAAC,CAAC,MAAM,CAK3B,CAAA;AAaF;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAQtD;AAKD,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,MAAW,GAAG,IAAI,CAyJ7D"}
package/lib/index.js CHANGED
@@ -28,6 +28,23 @@ const DEFAULTS = {
28
28
  maxSummaryTokens: 2048,
29
29
  maxSummaryInputChars: 32_000,
30
30
  };
31
+ /**
32
+ * CC WebFetch parity: an `http:` URL is upgraded to `https:` before the fetch.
33
+ * Total on purpose — parseFetchArgs rejects only blank strings, so a malformed
34
+ * model-supplied URL passes through unchanged for the web provider to reject
35
+ * as WEB_INVALID_URL (a thrown TypeError here would be an untyped tool error).
36
+ */
37
+ export function upgradeInsecureUrl(url) {
38
+ try {
39
+ const parsed = new URL(url);
40
+ if (parsed.protocol === 'http:')
41
+ parsed.protocol = 'https:';
42
+ return parsed.toString();
43
+ }
44
+ catch {
45
+ return url;
46
+ }
47
+ }
31
48
  /** Model-visible failure (maps to an isError tool result). */
32
49
  class WebFetchError extends Error {
33
50
  }
@@ -102,9 +119,10 @@ export function apply(ctx, config = {}) {
102
119
  presentResult: presentFetchResult,
103
120
  async execute(args, exec) {
104
121
  const input = parseFetchArgs({ url: args.url });
122
+ const url = upgradeInsecureUrl(input.url);
105
123
  const prompt = typeof args.prompt === 'string' ? args.prompt.trim() : '';
106
124
  if (prompt.length === 0) {
107
- const result = await ctx.web.fetch({ url: input.url }, exec.signal);
125
+ const result = await ctx.web.fetch({ url }, exec.signal);
108
126
  return {
109
127
  url: result.url,
110
128
  statusCode: result.statusCode,
@@ -123,7 +141,7 @@ export function apply(ctx, config = {}) {
123
141
  if (filled === undefined) {
124
142
  throw new WebFetchError('web_fetch: prompt requires a configured haiku model alias');
125
143
  }
126
- const result = await ctx.web.fetch({ url: input.url }, exec.signal);
144
+ const result = await ctx.web.fetch({ url }, exec.signal);
127
145
  const converted = formatFetchOutput(result, resolved.maxSummaryInputChars);
128
146
  // One-shot summarize on the cheap lane. `purpose` is omitted on
129
147
  // purpose: the harness GenerateOptions purpose union is closed
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,CAAC,MAAM,0BAA0B,CAAA;AACxC,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAExE,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,cAAc,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AACvI,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAG1C,MAAM,CAAC,MAAM,IAAI,GAAG,gBAAgB,CAAA;AACpC,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,CAAC,CAAA;AAc7D,oCAAoC;AACpC,MAAM,CAAC,MAAM,MAAM,GAAc,CAAC,CAAC,MAAM,CAAC;IACxC,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE;IAC1B,mBAAmB,EAAE,CAAC,CAAC,MAAM,EAAE;IAC/B,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE;IAC5B,oBAAoB,EAAE,CAAC,CAAC,MAAM,EAAE;CACjC,CAAC,CAAA;AAKF,6CAA6C;AAC7C,MAAM,QAAQ,GAAmB;IAC/B,cAAc,EAAE,MAAM;IACtB,mBAAmB,EAAE,OAAO;IAC5B,gBAAgB,EAAE,IAAI;IACtB,oBAAoB,EAAE,MAAM;CAC7B,CAAA;AAED,8DAA8D;AAC9D,MAAM,aAAc,SAAQ,KAAK;CAAG;AAEpC,MAAM,UAAU,KAAK,CAAC,GAAY,EAAE,SAAiB,EAAE;IACrD,MAAM,QAAQ,GAAmB;QAC/B,GAAG,QAAQ;QACX,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CACvC;KAC7B,CAAA;IAED,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC;QACvB,IAAI,EAAE,gBAAgB;QACtB,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,mHAAmH;cACrH,0HAA0H;cAC1H,sHAAsH;cACtH,yHAAyH;cACzH,qDAAqD;KAC1D,CAAC,CAAA;IAEF,6EAA6E;IAC7E,6EAA6E;IAC7E,yEAAyE;IACzE,kDAAkD;IAClD,MAAM,IAAI,GAAG,UAAU,CAAC;QACtB,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,6EAA6E;cACtF,4GAA4G;cAC5G,iFAAiF;QACrF,UAAU,EAAE;YACV,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,2BAA2B,EAAE;YACjF,MAAM,EAAE;gBACN,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,iGAAiG;aAC/G;SACF;QACD,MAAM,EAAE;YACN,MAAM,EAAE;gBACN,IAAI,EAAE,QAAQ;gBACd,oBAAoB,EAAE,KAAK;gBAC3B,UAAU,EAAE;oBACV,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;oBACvC,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC/C,IAAI,EAAE;wBACJ,QAAQ,EAAE,IAAI;wBACd,KAAK,EAAE;4BACL;gCACE,IAAI,EAAE,QAAQ;gCACd,oBAAoB,EAAE,KAAK;gCAC3B,UAAU,EAAE;oCACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE;oCACvD,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;iCAC5C;6BACF;4BACD;gCACE,IAAI,EAAE,QAAQ;gCACd,oBAAoB,EAAE,KAAK;gCAC3B,UAAU,EAAE;oCACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE;oCACvD,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;iCAC5C;6BACF;yBACF;qBACF;oBACD,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;iBAC/C;aACF;YACD,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,CAAC,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC1G,gBAAgB,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC;SAC5F;QACD,SAAS,EAAE,QAAQ,CAAC,cAAc;QAClC,mDAAmD;QACnD,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI;QAC7B,WAAW,EAAE,gBAAgB;QAC7B,aAAa,EAAE,kBAAkB;QACjC,KAAK,CAAC,OAAO,CAAC,IAAsC,EAAE,IAAoB;YAMxE,MAAM,KAAK,GAAG,cAAc,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;YAC/C,MAAM,MAAM,GAAG,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;YAExE,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxB,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;gBACnE,OAAO;oBACL,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,UAAU,EAAE,MAAM,CAAC,UAAU;oBAC7B,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAuB,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE;oBACjF,SAAS,EAAE,MAAM,CAAC,SAAS;iBAC5B,CAAA;YACH,CAAC;YAED,sEAAsE;YACtE,6DAA6D;YAC7D,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,eAAe,CAEzB,CAAA;YACb,qEAAqE;YACrE,mEAAmE;YACnE,oEAAoE;YACpE,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,EAAE,EAAE,MAEvC,CAAA;YACb,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAA;YAC/D,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,MAAM,IAAI,aAAa,CAAC,2DAA2D,CAAC,CAAA;YACtF,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;YACnE,MAAM,SAAS,GAAG,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAA;YAE1E,gEAAgE;YAChE,+DAA+D;YAC/D,sEAAsE;YACtE,MAAM,OAAO,GAAG;gBACd,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,SAAS,EAAE,QAAQ,CAAC,gBAAgB;gBACpC,MAAM,EAAE,gIAAgI;gBACxI,QAAQ,EAAE,CAAC,iBAAiB,CAAC;wBAC3B,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,MAAM,kBAAkB,SAAS,EAAE,EAAE,CAAC;wBAClF,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE;qBACzC,CAAC,CAAC;gBACH,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB,CAAA;YACD,MAAM,SAAS,GAAG,IAAI,cAAc,EAAE,CAAA;YACtC,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAA+B,EAAE,CAAC;gBAChF,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YACvB,CAAC;YACD,sEAAsE;YACtE,6BAA6B;YAC7B,IAAI,SAAS,CAAC,MAAM,EAAE,IAAI,KAAK,YAAY,EAAE,CAAC;gBAC5C,MAAM,IAAI,aAAa,CAAC,wDAAwD,CAAC,CAAA;YACnF,CAAC;YACD,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC,EAAE,CAAC;gBACjE,MAAM,IAAI,aAAa,CAAC,wDAAwD,CAAC,CAAA;YACnF,CAAC;YACD,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,EAAE;iBAC5B,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC;iBACtC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;iBACxB,IAAI,CAAC,GAAG,CAAC;iBACT,IAAI,EAAE,CAAA;YACT,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;gBAAE,MAAM,IAAI,aAAa,CAAC,2CAA2C,CAAC,CAAA;YAC3F,OAAO;gBACL,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;gBACrC,SAAS,EAAE,MAAM,CAAC,SAAS;aAC5B,CAAA;QACH,CAAC;KACF,CAAC,CAAA;IACF,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,IAA2D,CAAC,CAAA;AACjF,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@dsh-cc/tool-web-fetch",
3
3
  "description": "CC-style web_fetch replacement with an optional prompt: summarizes the fetched page on the cheap lane (haiku alias) when configured; passing a prompt without haiku fails before fetching",
4
- "version": "0.5.0",
4
+ "version": "0.6.1",
5
5
  "repository": {
6
6
  "type": "git",
7
7
  "url": "git+https://github.com/dsh-cc/dsh-cc.git",
@@ -25,15 +25,15 @@
25
25
  ],
26
26
  "license": "Apache-2.0",
27
27
  "peerDependencies": {
28
- "@deepseek-ai/cordis": ">=0.1.1-rc.2",
29
- "@deepseek-ai/dsh-invariants": ">=0.1.1-rc.2",
30
- "@deepseek-ai/dsh-llm": ">=0.1.1-rc.2",
31
- "@deepseek-ai/dsh-system-prompt": ">=0.1.1-rc.2",
32
- "@deepseek-ai/dsh-tool-web": ">=0.1.1-rc.2",
33
- "@deepseek-ai/dsh-web": ">=0.1.1-rc.2",
28
+ "@deepseek-ai/cordis": ">=0.1.2-rc.1",
29
+ "@deepseek-ai/dsh-invariants": ">=0.1.2-rc.1",
30
+ "@deepseek-ai/dsh-llm": ">=0.1.2-rc.1",
31
+ "@deepseek-ai/dsh-system-prompt": ">=0.1.2-rc.1",
32
+ "@deepseek-ai/dsh-tool-web": ">=0.1.2-rc.1",
33
+ "@deepseek-ai/dsh-web": ">=0.1.2-rc.1",
34
34
  "@deepseek-ai/schemastery": "^3.18.1",
35
- "@dsh-cc/model-aliases": "^0.5.0",
36
- "@dsh-cc/tools": "^0.5.0"
35
+ "@dsh-cc/model-aliases": "^0.6.1",
36
+ "@dsh-cc/tools": "^0.6.1"
37
37
  },
38
38
  "devDependencies": {
39
39
  "@deepseek-ai/cordis": "link:../../../../deepseek-harness/vendor/cordis",
@@ -43,8 +43,8 @@
43
43
  "@deepseek-ai/dsh-tool-web": "link:../../../../deepseek-harness/packages/web/tool-web",
44
44
  "@deepseek-ai/dsh-web": "link:../../../../deepseek-harness/packages/web/web",
45
45
  "@deepseek-ai/schemastery": "link:../../../../deepseek-harness/vendor/schemastery",
46
- "@dsh-cc/model-aliases": "^0.5.0",
47
- "@dsh-cc/tools": "^0.5.0"
46
+ "@dsh-cc/model-aliases": "^0.6.1",
47
+ "@dsh-cc/tools": "^0.6.1"
48
48
  },
49
49
  "publishConfig": {
50
50
  "access": "public"