@pyrokine/mcp-chrome 3.0.1 → 3.1.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.
Files changed (150) hide show
  1. package/README.md +1060 -432
  2. package/README_zh.md +936 -349
  3. package/dist/cdp/client.d.ts +8 -3
  4. package/dist/cdp/client.d.ts.map +1 -1
  5. package/dist/cdp/client.js +260 -63
  6. package/dist/cdp/client.js.map +1 -1
  7. package/dist/cdp/launcher.d.ts +1 -1
  8. package/dist/cdp/launcher.d.ts.map +1 -1
  9. package/dist/cdp/launcher.js +33 -12
  10. package/dist/cdp/launcher.js.map +1 -1
  11. package/dist/core/auto-wait.d.ts.map +1 -1
  12. package/dist/core/auto-wait.js +88 -52
  13. package/dist/core/auto-wait.js.map +1 -1
  14. package/dist/core/browser-driver.d.ts +73 -15
  15. package/dist/core/browser-driver.d.ts.map +1 -1
  16. package/dist/core/browser-driver.js.map +1 -1
  17. package/dist/core/browser-event-schema.d.ts +287 -0
  18. package/dist/core/browser-event-schema.d.ts.map +1 -0
  19. package/dist/core/browser-event-schema.js +104 -0
  20. package/dist/core/browser-event-schema.js.map +1 -0
  21. package/dist/core/browser-events.d.ts +105 -0
  22. package/dist/core/browser-events.d.ts.map +1 -0
  23. package/dist/core/browser-events.js +1482 -0
  24. package/dist/core/browser-events.js.map +1 -0
  25. package/dist/core/challenge-page.d.ts +39 -0
  26. package/dist/core/challenge-page.d.ts.map +1 -0
  27. package/dist/core/challenge-page.js +231 -0
  28. package/dist/core/challenge-page.js.map +1 -0
  29. package/dist/core/dom-helpers.d.ts +28 -0
  30. package/dist/core/dom-helpers.d.ts.map +1 -0
  31. package/dist/core/dom-helpers.js +311 -0
  32. package/dist/core/dom-helpers.js.map +1 -0
  33. package/dist/core/error-sanitizer.d.ts.map +1 -1
  34. package/dist/core/error-sanitizer.js +2 -1
  35. package/dist/core/error-sanitizer.js.map +1 -1
  36. package/dist/core/errors.d.ts +4 -0
  37. package/dist/core/errors.d.ts.map +1 -1
  38. package/dist/core/errors.js +57 -9
  39. package/dist/core/errors.js.map +1 -1
  40. package/dist/core/file-upload.d.ts +22 -0
  41. package/dist/core/file-upload.d.ts.map +1 -0
  42. package/dist/core/file-upload.js +194 -0
  43. package/dist/core/file-upload.js.map +1 -0
  44. package/dist/core/locator.d.ts +11 -2
  45. package/dist/core/locator.d.ts.map +1 -1
  46. package/dist/core/locator.js +135 -206
  47. package/dist/core/locator.js.map +1 -1
  48. package/dist/core/os-mouse.d.ts +11 -0
  49. package/dist/core/os-mouse.d.ts.map +1 -1
  50. package/dist/core/os-mouse.js +104 -29
  51. package/dist/core/os-mouse.js.map +1 -1
  52. package/dist/core/retry.d.ts.map +1 -1
  53. package/dist/core/retry.js +4 -1
  54. package/dist/core/retry.js.map +1 -1
  55. package/dist/core/session.d.ts +62 -12
  56. package/dist/core/session.d.ts.map +1 -1
  57. package/dist/core/session.js +1174 -304
  58. package/dist/core/session.js.map +1 -1
  59. package/dist/core/types.d.ts +5 -1
  60. package/dist/core/types.d.ts.map +1 -1
  61. package/dist/core/types.js +16 -1
  62. package/dist/core/types.js.map +1 -1
  63. package/dist/core/unified-session.d.ts +48 -37
  64. package/dist/core/unified-session.d.ts.map +1 -1
  65. package/dist/core/unified-session.js +982 -294
  66. package/dist/core/unified-session.js.map +1 -1
  67. package/dist/core/utils.d.ts +8 -4
  68. package/dist/core/utils.d.ts.map +1 -1
  69. package/dist/core/utils.js +76 -18
  70. package/dist/core/utils.js.map +1 -1
  71. package/dist/extension/bridge.d.ts +48 -17
  72. package/dist/extension/bridge.d.ts.map +1 -1
  73. package/dist/extension/bridge.js +288 -46
  74. package/dist/extension/bridge.js.map +1 -1
  75. package/dist/extension/http-server.d.ts +8 -2
  76. package/dist/extension/http-server.d.ts.map +1 -1
  77. package/dist/extension/http-server.js +211 -49
  78. package/dist/extension/http-server.js.map +1 -1
  79. package/dist/index.js +15 -1
  80. package/dist/index.js.map +1 -1
  81. package/dist/tools/browse.d.ts.map +1 -1
  82. package/dist/tools/browse.js +56 -28
  83. package/dist/tools/browse.js.map +1 -1
  84. package/dist/tools/browser-event-output.d.ts +7 -0
  85. package/dist/tools/browser-event-output.d.ts.map +1 -0
  86. package/dist/tools/browser-event-output.js +19 -0
  87. package/dist/tools/browser-event-output.js.map +1 -0
  88. package/dist/tools/challenge.d.ts +18 -5
  89. package/dist/tools/challenge.d.ts.map +1 -1
  90. package/dist/tools/challenge.js +217 -200
  91. package/dist/tools/challenge.js.map +1 -1
  92. package/dist/tools/cookies.d.ts.map +1 -1
  93. package/dist/tools/cookies.js +34 -8
  94. package/dist/tools/cookies.js.map +1 -1
  95. package/dist/tools/diagnostics.d.ts.map +1 -1
  96. package/dist/tools/diagnostics.js +15 -0
  97. package/dist/tools/diagnostics.js.map +1 -1
  98. package/dist/tools/evaluate.d.ts +6 -5
  99. package/dist/tools/evaluate.d.ts.map +1 -1
  100. package/dist/tools/evaluate.js +94 -52
  101. package/dist/tools/evaluate.js.map +1 -1
  102. package/dist/tools/extract.d.ts.map +1 -1
  103. package/dist/tools/extract.js +293 -153
  104. package/dist/tools/extract.js.map +1 -1
  105. package/dist/tools/input.d.ts.map +1 -1
  106. package/dist/tools/input.js +747 -282
  107. package/dist/tools/input.js.map +1 -1
  108. package/dist/tools/logs.d.ts.map +1 -1
  109. package/dist/tools/logs.js +50 -11
  110. package/dist/tools/logs.js.map +1 -1
  111. package/dist/tools/manage.d.ts.map +1 -1
  112. package/dist/tools/manage.js +123 -18
  113. package/dist/tools/manage.js.map +1 -1
  114. package/dist/tools/network-sanitizer.d.ts +2 -0
  115. package/dist/tools/network-sanitizer.d.ts.map +1 -1
  116. package/dist/tools/network-sanitizer.js +53 -10
  117. package/dist/tools/network-sanitizer.js.map +1 -1
  118. package/dist/tools/page-context.d.ts +4 -3
  119. package/dist/tools/page-context.d.ts.map +1 -1
  120. package/dist/tools/page-context.js +57 -14
  121. package/dist/tools/page-context.js.map +1 -1
  122. package/dist/tools/png.d.ts.map +1 -1
  123. package/dist/tools/png.js +12 -3
  124. package/dist/tools/png.js.map +1 -1
  125. package/dist/tools/post-condition.d.ts +1 -1
  126. package/dist/tools/post-condition.d.ts.map +1 -1
  127. package/dist/tools/post-condition.js +163 -47
  128. package/dist/tools/post-condition.js.map +1 -1
  129. package/dist/tools/schema.d.ts +7 -4
  130. package/dist/tools/schema.d.ts.map +1 -1
  131. package/dist/tools/schema.js +32 -122
  132. package/dist/tools/schema.js.map +1 -1
  133. package/dist/tools/target-diagnostics.d.ts +3 -3
  134. package/dist/tools/target-diagnostics.d.ts.map +1 -1
  135. package/dist/tools/target-diagnostics.js +64 -34
  136. package/dist/tools/target-diagnostics.js.map +1 -1
  137. package/dist/tools/wait.d.ts.map +1 -1
  138. package/dist/tools/wait.js +94 -40
  139. package/dist/tools/wait.js.map +1 -1
  140. package/extension/dist/assets/{content.ts-qe6IB5DK.js → content.ts-C9QgtUYe.js} +1 -1
  141. package/extension/dist/assets/{content.ts-loader-DUWbDHRS.js → content.ts-loader-yqB_P8vu.js} +1 -1
  142. package/extension/dist/assets/index.ts-DBFNh8mZ.js +20275 -0
  143. package/extension/dist/assets/{page-scripts-D508WLkW.js → page-scripts-BjqQ0zXt.js} +258 -367
  144. package/extension/dist/assets/{popup.html-B-eVq48O.js → popup.html-DwwHo00N.js} +2 -2
  145. package/extension/dist/manifest.json +4 -4
  146. package/extension/dist/service-worker-loader.js +1 -1
  147. package/extension/dist/src/popup/popup.html +3 -3
  148. package/package.json +9 -7
  149. package/scripts/start-chrome.ps1 +9 -1
  150. package/extension/dist/assets/index.ts-D7_LCUoV.js +0 -9319
@@ -4,8 +4,10 @@
4
4
  * Target Zod Schema 和定位参数转换
5
5
  */
6
6
  import { z } from 'zod';
7
+ import type { SemanticTarget } from '../core/dom-helpers.js';
7
8
  import type { Target } from '../core/types.js';
8
9
  export declare const pageTargetIdSchema: z.ZodOptional<z.ZodString>;
10
+ export declare const frameZodSchema: z.ZodOptional<z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>, z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>]>>;
9
11
  export declare const pageConditionSchema: {
10
12
  expectedUrl: z.ZodOptional<z.ZodString>;
11
13
  expectedRevision: z.ZodOptional<z.ZodString>;
@@ -53,7 +55,7 @@ export declare const targetZodSchema: z.ZodPreprocess<z.ZodIntersection<z.ZodUni
53
55
  y: z.ZodNumber;
54
56
  }, z.core.$strip>]>, z.ZodObject<{
55
57
  nth: z.ZodOptional<z.ZodNumber>;
56
- }, z.core.$strip>>>;
58
+ }, z.core.$strip>>, unknown>;
57
59
  /**
58
60
  * 将 Target 对象解析为 find() 所需的查询参数
59
61
  *
@@ -62,9 +64,9 @@ export declare const targetZodSchema: z.ZodPreprocess<z.ZodIntersection<z.ZodUni
62
64
  *
63
65
  * exact 语义(默认 false):
64
66
  * - CSS 属性(placeholder/title/alt):false → *= 子串匹配,true → = 精确匹配
65
- * - text:false → Extension find 的 includes 子串匹配,true → xpath 精确匹配
66
- * - label:xpath 同时匹配 aria-label、<label for> 关联、<label> 内嵌控件
67
- * - role:无 name 时 CSS 匹配隐式+显式 role;有 name 时 xpath 匹配多来源可访问名称
67
+ * - text:false → Extension find 的 includes 子串匹配,true → DOM 精确匹配
68
+ * - label:按控件的标签和 aria-labelledby 引用计算名称
69
+ * - role:CSS 筛选候选,再按实际 role 和可访问名称过滤
68
70
  * - testId/css/xpath:exact 不影响
69
71
  * - role 值自动 lowercase(ARIA role 不区分大小写)
70
72
  */
@@ -75,5 +77,6 @@ export declare function targetToFindParams(target: Target & {
75
77
  text?: string;
76
78
  xpath?: string;
77
79
  nth?: number;
80
+ semantic?: SemanticTarget;
78
81
  };
79
82
  //# sourceMappingURL=schema.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/tools/schema.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAG9C,eAAO,MAAM,kBAAkB,4BAA+B,CAAA;AAC9D,eAAO,MAAM,mBAAmB;IAC5B,WAAW;IACX,gBAAgB;CAKnB,CAAA;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,SAAS,CAKnG;AA+DD;;;;GAIG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAUN,CAAA;AA8FtB;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG;IACnE,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;CACf,CAgGA"}
1
+ {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/tools/schema.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAE9C,eAAO,MAAM,kBAAkB,4BAA+B,CAAA;AAE9D,eAAO,MAAM,cAAc,oJAAyE,CAAA;AACpG,eAAO,MAAM,mBAAmB;IAC5B,WAAW;IACX,gBAAgB;CAKnB,CAAA;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,SAAS,CAKnG;AA+DD;;;;GAIG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAUN,CAAA;AA8DtB;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG;IACnE,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,cAAc,CAAA;CAC5B,CAkCA"}
@@ -4,8 +4,9 @@
4
4
  * Target Zod Schema 和定位参数转换
5
5
  */
6
6
  import { z } from 'zod';
7
- import { escapeXPathString } from '../core/utils.js';
8
7
  export const pageTargetIdSchema = z.string().min(1).optional();
8
+ const frameStepSchema = z.union([z.string().min(1), z.number().int().nonnegative()]);
9
+ export const frameZodSchema = z.union([frameStepSchema, z.array(frameStepSchema).min(1)]).optional();
9
10
  export const pageConditionSchema = {
10
11
  expectedUrl: z.string().optional().describe('动作执行前要求页面 URL 与此值一致;不一致时不执行'),
11
12
  expectedRevision: z
@@ -132,10 +133,12 @@ const IMPLICIT_ROLE_SELECTORS = {
132
133
  ],
133
134
  checkbox: ['input[type="checkbox"]'],
134
135
  radio: ['input[type="radio"]'],
135
- combobox: ['select'],
136
+ combobox: ['select', 'input[list]'],
137
+ listbox: ['select'],
138
+ searchbox: ['input[type="search"]'],
136
139
  heading: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'],
137
- image: ['img[alt]'],
138
- img: ['img[alt]'],
140
+ image: ['img'],
141
+ img: ['img'],
139
142
  navigation: ['nav'],
140
143
  main: ['main'],
141
144
  banner: ['header'],
@@ -148,37 +151,6 @@ const IMPLICIT_ROLE_SELECTORS = {
148
151
  list: ['ul', 'ol', 'menu'],
149
152
  listitem: ['li'],
150
153
  };
151
- /**
152
- * 隐式 ARIA role → XPath self:: 条件映射
153
- *
154
- * 用于 role+name 组合定位:需要 xpath 表达多来源可访问名称过滤,
155
- * 与 IMPLICIT_ROLE_SELECTORS 内容对应,只是语法不同
156
- */
157
- const IMPLICIT_ROLE_XPATH = {
158
- button: 'self::button or self::input[@type="submit"] or self::input[@type="button"] or ' +
159
- 'self::input[@type="reset"] or self::summary',
160
- link: 'self::a[@href] or self::area[@href]',
161
- textbox: 'self::input[not(@type)] or self::input[@type="text"] or self::input[@type="email"] or ' +
162
- 'self::input[@type="url"] or self::input[@type="tel"] or self::input[@type="search"] or ' +
163
- 'self::input[@type="password"] or self::textarea or self::*[@contenteditable="true"]',
164
- checkbox: 'self::input[@type="checkbox"]',
165
- radio: 'self::input[@type="radio"]',
166
- combobox: 'self::select',
167
- heading: 'self::h1 or self::h2 or self::h3 or self::h4 or self::h5 or self::h6',
168
- image: 'self::img[@alt]',
169
- img: 'self::img[@alt]',
170
- navigation: 'self::nav',
171
- main: 'self::main',
172
- banner: 'self::header',
173
- contentinfo: 'self::footer',
174
- region: 'self::section[@aria-label or @aria-labelledby]',
175
- article: 'self::article',
176
- complementary: 'self::aside',
177
- form: 'self::form[@aria-label or @aria-labelledby]',
178
- table: 'self::table',
179
- list: 'self::ul or self::ol or self::menu',
180
- listitem: 'self::li',
181
- };
182
154
  /**
183
155
  * 将 Target 对象解析为 find() 所需的查询参数
184
156
  *
@@ -187,9 +159,9 @@ const IMPLICIT_ROLE_XPATH = {
187
159
  *
188
160
  * exact 语义(默认 false):
189
161
  * - CSS 属性(placeholder/title/alt):false → *= 子串匹配,true → = 精确匹配
190
- * - text:false → Extension find 的 includes 子串匹配,true → xpath 精确匹配
191
- * - label:xpath 同时匹配 aria-label、<label for> 关联、<label> 内嵌控件
192
- * - role:无 name 时 CSS 匹配隐式+显式 role;有 name 时 xpath 匹配多来源可访问名称
162
+ * - text:false → Extension find 的 includes 子串匹配,true → DOM 精确匹配
163
+ * - label:按控件的标签和 aria-labelledby 引用计算名称
164
+ * - role:CSS 筛选候选,再按实际 role 和可访问名称过滤
193
165
  * - testId/css/xpath:exact 不影响
194
166
  * - role 值自动 lowercase(ARIA role 不区分大小写)
195
167
  */
@@ -197,105 +169,43 @@ export function targetToFindParams(target) {
197
169
  let selector;
198
170
  let text;
199
171
  let xpath;
172
+ let semantic;
200
173
  if ('css' in target && target.css) {
201
174
  selector = target.css;
202
- // CSS + 文本组合定位:先 CSS 筛选,再按 text 过滤
203
- if ('text' in target && target.text) {
175
+ if ('text' in target) {
204
176
  text = target.text;
177
+ semantic = { exact: getExact(target) };
205
178
  }
206
179
  }
207
180
  else if ('xpath' in target && target.xpath) {
208
181
  xpath = target.xpath;
209
182
  }
210
- else if ('text' in target && target.text) {
211
- if (getExact(target)) {
212
- // 精确匹配:通过 xpath 匹配 textContent 完全相等的元素
213
- xpath = `//*[normalize-space(.)=${escapeXPathString(target.text)}]`;
214
- }
215
- else {
216
- text = target.text;
217
- }
183
+ else if ('text' in target) {
184
+ text = target.text;
185
+ semantic = { exact: getExact(target) };
218
186
  }
219
187
  else if ('role' in target && target.role) {
220
- const roleLower = target.role.toLowerCase();
221
- if ('name' in target && target.name) {
222
- // role + name:xpath 同时匹配隐式/显式 role 和多来源可访问名称
223
- const roleConditions = [`@role=${escapeXPathString(roleLower)}`];
224
- const implicitXPath = IMPLICIT_ROLE_XPATH[roleLower];
225
- if (implicitXPath) {
226
- roleConditions.push(implicitXPath);
227
- }
228
- const nameStr = escapeXPathString(target.name);
229
- const nameConditions = getExact(target)
230
- ? [
231
- `normalize-space(.)=${nameStr}`,
232
- `@aria-label=${nameStr}`,
233
- `@title=${nameStr}`,
234
- `@placeholder=${nameStr}`,
235
- `@alt=${nameStr}`,
236
- `@value=${nameStr}`,
237
- `@id=//label[normalize-space(.)=${nameStr}]/@for`,
238
- ]
239
- : [
240
- `contains(.,${nameStr})`,
241
- `contains(@aria-label,${nameStr})`,
242
- `contains(@title,${nameStr})`,
243
- `contains(@placeholder,${nameStr})`,
244
- `contains(@alt,${nameStr})`,
245
- `contains(@value,${nameStr})`,
246
- `@id=//label[contains(.,${nameStr})]/@for`,
247
- ];
248
- xpath = `//*[(${roleConditions.join(' or ')}) and (${nameConditions.join(' or ')})]`;
249
- }
250
- else {
251
- // role only:CSS 选择器匹配隐式标签 + 显式 role
252
- const escapedRole = escapeAttrValue(roleLower);
253
- const selectors = [`[role="${escapedRole}"]`];
254
- const implicit = IMPLICIT_ROLE_SELECTORS[roleLower];
255
- if (implicit) {
256
- selectors.push(...implicit);
257
- }
258
- selector = selectors.join(',');
259
- }
188
+ const role = target.role.toLowerCase();
189
+ const implicit = IMPLICIT_ROLE_SELECTORS[role] ?? [];
190
+ selector = ['[role="' + escapeAttrValue(role) + '"]', ...implicit].join(',');
191
+ semantic = { role, ...('name' in target ? { name: target.name } : {}), exact: getExact(target) };
260
192
  }
261
- else if ('label' in target && target.label) {
262
- // xpath 同时匹配 aria-label、<label for="id"> 关联、<label> 内嵌控件
263
- const xpathStr = escapeXPathString(target.label);
264
- const formControls = 'self::input or self::select or self::textarea';
265
- if (getExact(target)) {
266
- const labelMatch = `normalize-space(.)=${xpathStr}`;
267
- xpath =
268
- `//*[@aria-label=${xpathStr}]` +
269
- ` | //*[@id=//label[${labelMatch}]/@for]` +
270
- ` | //label[${labelMatch}]/descendant::*[${formControls}]` +
271
- ` | //label[${labelMatch}]/following-sibling::*[${formControls}][1]` +
272
- ` | //label[${labelMatch}]/parent::*/following-sibling::*[1]/descendant::*[${formControls}]`;
273
- }
274
- else {
275
- const labelMatch = `contains(.,${xpathStr})`;
276
- xpath =
277
- `//*[contains(@aria-label,${xpathStr})]` +
278
- ` | //*[@id=//label[${labelMatch}]/@for]` +
279
- ` | //label[${labelMatch}]/descendant::*[${formControls}]` +
280
- ` | //label[${labelMatch}]/following-sibling::*[${formControls}][1]` +
281
- ` | //label[${labelMatch}]/parent::*/following-sibling::*[1]/descendant::*[${formControls}]`;
282
- }
193
+ else if ('label' in target) {
194
+ selector = 'input,select,textarea,button,meter,output,progress,[aria-label],[aria-labelledby]';
195
+ semantic = { label: target.label, exact: getExact(target) };
283
196
  }
284
- else if ('placeholder' in target && target.placeholder) {
285
- const escaped = escapeAttrValue(target.placeholder);
286
- selector = getExact(target) ? `[placeholder="${escaped}"]` : `[placeholder*="${escaped}"]`;
197
+ else if ('placeholder' in target) {
198
+ selector = '[placeholder' + (getExact(target) ? '=' : '*=') + '"' + escapeAttrValue(target.placeholder) + '"]';
287
199
  }
288
- else if ('title' in target && target.title) {
289
- const escaped = escapeAttrValue(target.title);
290
- selector = getExact(target) ? `[title="${escaped}"]` : `[title*="${escaped}"]`;
200
+ else if ('title' in target) {
201
+ selector = '[title' + (getExact(target) ? '=' : '*=') + '"' + escapeAttrValue(target.title) + '"]';
291
202
  }
292
- else if ('alt' in target && target.alt) {
293
- const escaped = escapeAttrValue(target.alt);
294
- selector = getExact(target) ? `[alt="${escaped}"]` : `[alt*="${escaped}"]`;
203
+ else if ('alt' in target) {
204
+ selector = '[alt' + (getExact(target) ? '=' : '*=') + '"' + escapeAttrValue(target.alt) + '"]';
295
205
  }
296
- else if ('testId' in target && target.testId) {
297
- selector = `[data-testid="${escapeAttrValue(target.testId)}"]`;
206
+ else if ('testId' in target) {
207
+ selector = '[data-testid="' + escapeAttrValue(target.testId) + '"]';
298
208
  }
299
- return { selector, text, xpath, nth: target.nth };
209
+ return { selector, text, xpath, nth: target.nth, ...(semantic ? { semantic } : {}) };
300
210
  }
301
211
  //# sourceMappingURL=schema.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/tools/schema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/tools/schema.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
- import { getUnifiedSession } from '../core/index.js';
2
1
  import { ElementNotFoundError, TimeoutError } from '../core/errors.js';
2
+ import { getUnifiedSession } from '../core/index.js';
3
3
  import type { Target } from '../core/types.js';
4
4
  export interface TargetCandidate {
5
5
  tag?: string;
@@ -31,13 +31,13 @@ export declare function targetLookupTimeout(timeout: number): number;
31
31
  export declare function enrichTargetError(error: ElementNotFoundError | TimeoutError, unifiedSession: ReturnType<typeof getUnifiedSession>, target: Target, options: {
32
32
  timeout: number;
33
33
  deadline: number;
34
- frame?: string | number;
34
+ frame?: import('../core/browser-driver.js').FrameSelection;
35
35
  }): Promise<void>;
36
36
  export declare function buildTargetDiagnostics(unifiedSession: ReturnType<typeof getUnifiedSession>, target: Target, options: {
37
37
  nth: number;
38
38
  timeout?: number;
39
39
  deadline?: number;
40
- frame?: string | number;
40
+ frame?: import('../core/browser-driver.js').FrameSelection;
41
41
  matchCount: number | null;
42
42
  lastState: string;
43
43
  lastError?: unknown;
@@ -1 +1 @@
1
- {"version":3,"file":"target-diagnostics.d.ts","sourceRoot":"","sources":["../../src/tools/target-diagnostics.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAO9C,MAAM,WAAW,eAAe;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;IAC9D,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACzB;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAI7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAHrD,QAAQ,CAAC,IAAI,oBAAmB;IAChC,QAAQ,CAAC,UAAU,oMAA4D;IAE/E,YAAqB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAGpD;IAGD,MAAM,IAAI,MAAM,CAEf;CACJ;AAED,qBAAa,mBAAoB,SAAQ,KAAK;IAI9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAHrD,QAAQ,CAAC,IAAI,sBAAqB;IAClC,QAAQ,CAAC,UAAU,8HAAwC;IAE3D,YAAqB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAGpD;IAGD,MAAM,IAAI,MAAM,CAEf;CACJ;AAeD,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAMvG;AAkDD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAsB,iBAAiB,CACnC,KAAK,EAAE,oBAAoB,GAAG,YAAY,EAC1C,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpD,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACxE,OAAO,CAAC,IAAI,CAAC,CAef;AAED,wBAAsB,sBAAsB,CACxC,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpD,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IACL,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,eAAe,EAAE,CAAA;CACjC,GACF,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAuDlC"}
1
+ {"version":3,"file":"target-diagnostics.d.ts","sourceRoot":"","sources":["../../src/tools/target-diagnostics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACtE,OAAO,EAAc,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAU9C,MAAM,WAAW,eAAe;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;IAC9D,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACzB;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAI7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAHrD,QAAQ,CAAC,IAAI,oBAAmB;IAChC,QAAQ,CAAC,UAAU,oMAA4D;IAE/E,YAAqB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAGpD;IAGD,MAAM,IAAI,MAAM,CAEf;CACJ;AAED,qBAAa,mBAAoB,SAAQ,KAAK;IAI9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAHrD,QAAQ,CAAC,IAAI,sBAAqB;IAClC,QAAQ,CAAC,UAAU,8HAAwC;IAE3D,YAAqB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAGpD;IAGD,MAAM,IAAI,MAAM,CAEf;CACJ;AAeD,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAMvG;AAmFD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAsB,iBAAiB,CACnC,KAAK,EAAE,oBAAoB,GAAG,YAAY,EAC1C,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpD,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,2BAA2B,EAAE,cAAc,CAAA;CAAE,GAC3G,OAAO,CAAC,IAAI,CAAC,CAef;AAED,wBAAsB,sBAAsB,CACxC,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpD,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IACL,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,OAAO,2BAA2B,EAAE,cAAc,CAAA;IAC1D,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,eAAe,EAAE,CAAA;CACjC,GACF,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAyDlC"}
@@ -1,6 +1,8 @@
1
1
  import { sanitizeErrorMessage } from '../core/error-sanitizer.js';
2
2
  import { getSession } from '../core/index.js';
3
3
  import { withNavigationBudget } from '../core/utils.js';
4
+ import { sanitizePageUrls } from './network-sanitizer.js';
5
+ import { targetToFindParams } from './schema.js';
4
6
  const MAX_CANDIDATES = 10;
5
7
  const MAX_LOCATOR_TEXT = 500;
6
8
  const MAX_CANDIDATE_TEXT = 160;
@@ -49,37 +51,63 @@ export function summarizeTargetCandidates(candidates) {
49
51
  ...(candidate.rect ? { rect: candidate.rect } : {}),
50
52
  }));
51
53
  }
52
- async function collectPageCandidates(unifiedSession, timeout) {
54
+ async function collectPageCandidates(unifiedSession, timeout, target) {
53
55
  try {
54
- const script = `(() => {
55
- const active = document.activeElement;
56
- return {
57
- activeElement: active ? {
58
- tag: active.tagName.toLowerCase().slice(0, 40),
59
- id: active.id ? active.id.slice(0, ${MAX_CANDIDATE_TEXT}) : undefined,
60
- role: active.getAttribute('role')?.slice(0, 80) || undefined,
61
- inputType: active instanceof HTMLInputElement ? active.type.slice(0, 40) : undefined,
62
- contentEditable: Boolean(active.isContentEditable)
63
- } : null,
64
- candidates: Array.from(document.querySelectorAll(
65
- 'input, textarea, select, button, a, [role], [contenteditable="true"]'
66
- ))
67
- .slice(0, ${MAX_CANDIDATES})
68
- .map((el) => {
69
- const rect = el.getBoundingClientRect();
70
- return {
71
- tag: el.tagName.toLowerCase(),
72
- id: el.id || undefined,
73
- role: el.getAttribute('role') || undefined,
74
- label: (el.getAttribute('aria-label') || el.getAttribute('placeholder') || '').slice(0, 80),
75
- text: (el.textContent || '').replace(/\\s+/g, ' ').trim().slice(0, ${MAX_CANDIDATE_TEXT}),
76
- visible: rect.width > 0 && rect.height > 0,
77
- disabled: Boolean(el.disabled) || el.getAttribute('aria-disabled') === 'true',
78
- bounds: {x: rect.x, y: rect.y, width: rect.width, height: rect.height}
79
- };
80
- })
81
- };
82
- })()`;
56
+ const { selector, text, xpath, semantic } = targetToFindParams(target);
57
+ const query = JSON.stringify({ selector, text, xpath, semantic });
58
+ const script = '(() => {\n const matchCount = ' +
59
+ `${'x' in target ? 'null' : `globalThis.__mcpDomHelpers?.query(${query}).length ?? null`}` +
60
+ ';\n const active = ' +
61
+ 'document.activeElement;\n ' +
62
+ 'return {\n matchCount,\n ' +
63
+ ' activeElement: active ? {\n ' +
64
+ ' tag: ' +
65
+ 'active.tagName.toLowerCase().slice(0, 40),\n ' +
66
+ ' id: active.id ? ' +
67
+ 'active.id.slice(0, ' +
68
+ `${MAX_CANDIDATE_TEXT}` +
69
+ ') : undefined,\n role: ' +
70
+ "active.getAttribute('role')?.slice(0, 80) || " +
71
+ 'undefined,\n inputType: ' +
72
+ 'active instanceof HTMLInputElement ? ' +
73
+ 'active.type.slice(0, 40) : undefined,\n ' +
74
+ ' contentEditable: ' +
75
+ 'Boolean(active.isContentEditable)\n ' +
76
+ ' } : null,\n ' +
77
+ 'candidates: Array.from(document.querySelectorA' +
78
+ "ll(\n 'input, textarea, " +
79
+ 'select, button, a, [role], ' +
80
+ '[contenteditable="true"]\'\n ' +
81
+ '))\n .slice(0, ' +
82
+ `${MAX_CANDIDATES}` +
83
+ ')\n .map((el) => {\n ' +
84
+ ' const rect = ' +
85
+ 'el.getBoundingClientRect();\n ' +
86
+ ' return {\n ' +
87
+ ' tag: el.tagName.toLowerCase(),\n ' +
88
+ ' id: el.id || undefined,\n' +
89
+ ' role: ' +
90
+ "el.getAttribute('role') || undefined,\n " +
91
+ ' label: ' +
92
+ "(el.getAttribute('aria-label') || " +
93
+ "el.getAttribute('placeholder') || '')\n " +
94
+ ' .slice(0, 80),\n ' +
95
+ ' text: ' +
96
+ "(el.textContent || '').replace(/\\s+/g, ' " +
97
+ "').trim()\n " +
98
+ '.slice(0, ' +
99
+ `${MAX_CANDIDATE_TEXT}` +
100
+ '),\n visible: ' +
101
+ 'rect.width > 0 && rect.height > 0,\n ' +
102
+ ' disabled: ' +
103
+ 'Boolean(el.disabled) || ' +
104
+ "el.matches(':disabled') || " +
105
+ "el.getAttribute('aria-disabled') === 'true',\n " +
106
+ ' bounds: {x: ' +
107
+ 'rect.x, y: rect.y, width: rect.width, height: ' +
108
+ 'rect.height}\n };\n ' +
109
+ ' })\n };\n ' +
110
+ ' })()';
83
111
  const budget = Math.min(Math.max(timeout ?? MAX_DIAGNOSTIC_TIMEOUT_MS, 1), MAX_DIAGNOSTIC_TIMEOUT_MS);
84
112
  // 原生 CDP 路径不经过会自动重连的 evaluate 分发,避免作用域恢复后的迟到探测
85
113
  return unifiedSession.getMode() === 'cdp'
@@ -130,23 +158,25 @@ export async function buildTargetDiagnostics(unifiedSession, target, options) {
130
158
  candidates: knownCandidates,
131
159
  activeElement: null,
132
160
  };
133
- if (knownCandidates.length === 0 && remaining() > 0) {
161
+ if ((knownCandidates.length === 0 || options.matchCount === null) && remaining() > 0) {
134
162
  try {
135
- pageCandidates = await withNavigationBudget(() => collectPageCandidates(unifiedSession, remaining()), deadline);
163
+ pageCandidates = await withNavigationBudget(() => collectPageCandidates(unifiedSession, remaining(), target), deadline);
136
164
  }
137
165
  catch (error) {
138
166
  diagnosticError = sanitizeErrorMessage(error).slice(0, 500);
139
167
  }
140
168
  }
169
+ const pageUrl = sanitizePageUrls({ currentUrl: state?.url ?? null });
141
170
  return {
171
+ ...pageUrl,
142
172
  locator: boundedTarget(target),
143
173
  targetType: targetType(target),
144
174
  nth: options.nth,
145
- currentUrl: state?.url?.slice(0, 500) ?? null,
175
+ currentUrl: pageUrl.currentUrl?.slice(0, 500) ?? null,
146
176
  tabId,
147
177
  managed: state?.managed ?? null,
148
178
  frame: options.frame,
149
- matchCount: options.matchCount,
179
+ matchCount: options.matchCount ?? pageCandidates.matchCount ?? null,
150
180
  candidates: pageCandidates.candidates.slice(0, MAX_CANDIDATES),
151
181
  activeElement: pageCandidates.activeElement,
152
182
  lastLocatorState: options.lastState,
@@ -1 +1 @@
1
- {"version":3,"file":"target-diagnostics.js","sourceRoot":"","sources":["../../src/tools/target-diagnostics.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"target-diagnostics.js","sourceRoot":"","sources":["../../src/tools/target-diagnostics.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../src/tools/wait.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAA;AAonBxE;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CASxD"}
1
+ {"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../src/tools/wait.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAA;AA2tBxE;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CASxD"}