cli-jaw 2.17.46 → 2.17.47

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 (169) hide show
  1. package/README.md +4 -0
  2. package/dist/bin/commands/browser-web-ai.js +29 -10
  3. package/dist/bin/commands/browser-web-ai.js.map +1 -1
  4. package/dist/server.js +2 -2
  5. package/dist/server.js.map +1 -1
  6. package/dist/src/agent/claude-runtime-run.js +2 -1
  7. package/dist/src/agent/claude-runtime-run.js.map +1 -1
  8. package/dist/src/agent/lifecycle-handler.js +15 -4
  9. package/dist/src/agent/lifecycle-handler.js.map +1 -1
  10. package/dist/src/agent/pi-runtime.js +103 -86
  11. package/dist/src/agent/pi-runtime.js.map +1 -1
  12. package/dist/src/agent/spawn/exit-settle.js +74 -0
  13. package/dist/src/agent/spawn/exit-settle.js.map +1 -0
  14. package/dist/src/agent/spawn/kill-reason.js +38 -0
  15. package/dist/src/agent/spawn/kill-reason.js.map +1 -0
  16. package/dist/src/agent/spawn/queue.js +8 -0
  17. package/dist/src/agent/spawn/queue.js.map +1 -1
  18. package/dist/src/agent/spawn/steer-event.js +33 -0
  19. package/dist/src/agent/spawn/steer-event.js.map +1 -0
  20. package/dist/src/agent/spawn.js +157 -173
  21. package/dist/src/agent/spawn.js.map +1 -1
  22. package/dist/src/agent/watchdog.js +9 -4
  23. package/dist/src/agent/watchdog.js.map +1 -1
  24. package/dist/src/browser/adaptive-fetch/browser-escalation.js +18 -1
  25. package/dist/src/browser/adaptive-fetch/browser-escalation.js.map +1 -1
  26. package/dist/src/browser/adaptive-fetch/browser-flow.js +36 -9
  27. package/dist/src/browser/adaptive-fetch/browser-flow.js.map +1 -1
  28. package/dist/src/browser/adaptive-fetch/browser-session.js +10 -1
  29. package/dist/src/browser/adaptive-fetch/browser-session.js.map +1 -1
  30. package/dist/src/browser/adaptive-fetch/camoufox-session.js +16 -1
  31. package/dist/src/browser/adaptive-fetch/camoufox-session.js.map +1 -1
  32. package/dist/src/browser/adaptive-fetch/defuddle-provenance.js +49 -0
  33. package/dist/src/browser/adaptive-fetch/defuddle-provenance.js.map +1 -0
  34. package/dist/src/browser/adaptive-fetch/endpoint-resolvers.js +61 -31
  35. package/dist/src/browser/adaptive-fetch/endpoint-resolvers.js.map +1 -1
  36. package/dist/src/browser/adaptive-fetch/fetcher.js +12 -1
  37. package/dist/src/browser/adaptive-fetch/fetcher.js.map +1 -1
  38. package/dist/src/browser/adaptive-fetch/live-smoke-manifest.js +12 -18
  39. package/dist/src/browser/adaptive-fetch/live-smoke-manifest.js.map +1 -1
  40. package/dist/src/browser/adaptive-fetch/public-endpoint-normalizers.js +85 -1
  41. package/dist/src/browser/adaptive-fetch/public-endpoint-normalizers.js.map +1 -1
  42. package/dist/src/browser/adaptive-fetch/safety.js +5 -3
  43. package/dist/src/browser/adaptive-fetch/safety.js.map +1 -1
  44. package/dist/src/browser/adaptive-fetch/scheduler.js +34 -5
  45. package/dist/src/browser/adaptive-fetch/scheduler.js.map +1 -1
  46. package/dist/src/browser/adaptive-fetch/tls-fetch.js +54 -33
  47. package/dist/src/browser/adaptive-fetch/tls-fetch.js.map +1 -1
  48. package/dist/src/browser/adaptive-fetch/vendor/README.md +33 -1
  49. package/dist/src/browser/adaptive-fetch/ytdlp-reader.js +54 -9
  50. package/dist/src/browser/adaptive-fetch/ytdlp-reader.js.map +1 -1
  51. package/dist/src/browser/web-ai/capability-observation-presets.js +12 -10
  52. package/dist/src/browser/web-ai/capability-observation-presets.js.map +1 -1
  53. package/dist/src/browser/web-ai/chatgpt-model.js +80 -7
  54. package/dist/src/browser/web-ai/chatgpt-model.js.map +1 -1
  55. package/dist/src/browser/web-ai/gemini-model.js +18 -0
  56. package/dist/src/browser/web-ai/gemini-model.js.map +1 -1
  57. package/dist/src/browser/web-ai/grok-model.js +64 -15
  58. package/dist/src/browser/web-ai/grok-model.js.map +1 -1
  59. package/dist/src/code-mode/providers/codex-app.js +83 -0
  60. package/dist/src/code-mode/providers/codex-app.js.map +1 -1
  61. package/dist/src/core/config.js +77 -73
  62. package/dist/src/core/config.js.map +1 -1
  63. package/dist/src/core/db.js +227 -151
  64. package/dist/src/core/db.js.map +1 -1
  65. package/dist/src/core/settings-merge.js +78 -102
  66. package/dist/src/core/settings-merge.js.map +1 -1
  67. package/dist/src/discord/bot.js +37 -54
  68. package/dist/src/discord/bot.js.map +1 -1
  69. package/dist/src/discord/discord-file.js +29 -3
  70. package/dist/src/discord/discord-file.js.map +1 -1
  71. package/dist/src/discord/send-only-client.js +56 -8
  72. package/dist/src/discord/send-only-client.js.map +1 -1
  73. package/dist/src/manager/routes/telegram-hub.js +8 -1
  74. package/dist/src/manager/routes/telegram-hub.js.map +1 -1
  75. package/dist/src/manager/telegram-hub/hub-bot.js +7 -1
  76. package/dist/src/manager/telegram-hub/hub-bot.js.map +1 -1
  77. package/dist/src/messaging/delivery-outcome.js +30 -0
  78. package/dist/src/messaging/delivery-outcome.js.map +1 -1
  79. package/dist/src/messaging/file-receipt.js +49 -0
  80. package/dist/src/messaging/file-receipt.js.map +1 -0
  81. package/dist/src/messaging/native-body.js +31 -0
  82. package/dist/src/messaging/native-body.js.map +1 -0
  83. package/dist/src/messaging/queue-notice-record.js +48 -0
  84. package/dist/src/messaging/queue-notice-record.js.map +1 -0
  85. package/dist/src/messaging/send.js +13 -2
  86. package/dist/src/messaging/send.js.map +1 -1
  87. package/dist/src/messaging/target-reply-guard.js +66 -0
  88. package/dist/src/messaging/target-reply-guard.js.map +1 -0
  89. package/dist/src/orchestrator/collect.js +18 -3
  90. package/dist/src/orchestrator/collect.js.map +1 -1
  91. package/dist/src/orchestrator/gateway.js +3 -1
  92. package/dist/src/orchestrator/gateway.js.map +1 -1
  93. package/dist/src/orchestrator/pipeline.js +7 -1
  94. package/dist/src/orchestrator/pipeline.js.map +1 -1
  95. package/dist/src/orchestrator/session-lanes.js +2 -2
  96. package/dist/src/orchestrator/session-lanes.js.map +1 -1
  97. package/dist/src/prompt/builder.js +2 -2
  98. package/dist/src/prompt/builder.js.map +1 -1
  99. package/dist/src/routes/i18n.js +9 -4
  100. package/dist/src/routes/i18n.js.map +1 -1
  101. package/dist/src/routes/instance.js +8 -4
  102. package/dist/src/routes/instance.js.map +1 -1
  103. package/dist/src/routes/jaw-memory.js +5 -5
  104. package/dist/src/routes/jaw-memory.js.map +1 -1
  105. package/dist/src/routes/link-preview.js +5 -1
  106. package/dist/src/routes/link-preview.js.map +1 -1
  107. package/dist/src/routes/memory.js +9 -7
  108. package/dist/src/routes/memory.js.map +1 -1
  109. package/dist/src/routes/messaging.js +21 -10
  110. package/dist/src/routes/messaging.js.map +1 -1
  111. package/dist/src/routes/orchestrate.js +127 -118
  112. package/dist/src/routes/orchestrate.js.map +1 -1
  113. package/dist/src/routes/settings.js +7 -7
  114. package/dist/src/routes/settings.js.map +1 -1
  115. package/dist/src/routes/system.js +9 -4
  116. package/dist/src/routes/system.js.map +1 -1
  117. package/dist/src/slack/bot.js +199 -132
  118. package/dist/src/slack/bot.js.map +1 -1
  119. package/dist/src/slack/events.js +31 -8
  120. package/dist/src/slack/events.js.map +1 -1
  121. package/dist/src/slack/ingress.js +3 -1
  122. package/dist/src/slack/ingress.js.map +1 -1
  123. package/dist/src/slack/progress-activity.js +24 -3
  124. package/dist/src/slack/progress-activity.js.map +1 -1
  125. package/dist/src/slack/progress-lifecycle.js +29 -0
  126. package/dist/src/slack/progress-lifecycle.js.map +1 -1
  127. package/dist/src/slack/progress.js +1 -1
  128. package/dist/src/slack/progress.js.map +1 -1
  129. package/dist/src/slack/send-only-client.js +16 -3
  130. package/dist/src/slack/send-only-client.js.map +1 -1
  131. package/dist/src/slack/slack-file.js +5 -3
  132. package/dist/src/slack/slack-file.js.map +1 -1
  133. package/dist/src/slack/workflow.js +134 -0
  134. package/dist/src/slack/workflow.js.map +1 -0
  135. package/dist/src/telegram/bot.js +60 -55
  136. package/dist/src/telegram/bot.js.map +1 -1
  137. package/dist/src/telegram/rich-message.js +28 -20
  138. package/dist/src/telegram/rich-message.js.map +1 -1
  139. package/dist/src/telegram/telegram-file.js +45 -9
  140. package/dist/src/telegram/telegram-file.js.map +1 -1
  141. package/dist/src/trace/activity-journal.js +3 -6
  142. package/dist/src/trace/activity-journal.js.map +1 -1
  143. package/dist/src/trace/activity-retention.js +29 -0
  144. package/dist/src/trace/activity-retention.js.map +1 -1
  145. package/package.json +1 -1
  146. package/public/dist/.vite/manifest.json +20 -20
  147. package/public/dist/assets/{ChannelEnablementControl-DwUDKjX9.js → ChannelEnablementControl-egwTtO9-.js} +8 -8
  148. package/public/dist/assets/{ChannelSetupEntry-DH0AuNNX.js → ChannelSetupEntry-CCrUYd2-.js} +1 -1
  149. package/public/dist/assets/{ChannelsDiscord-7NmoTjR7.js → ChannelsDiscord-B6rJAsQG.js} +1 -1
  150. package/public/dist/assets/{ChannelsSlack-Ba0ax6iT.js → ChannelsSlack-CrSIw4Wd.js} +1 -1
  151. package/public/dist/assets/{ChannelsTelegram-DKA9atf2.js → ChannelsTelegram-DPrdLEnT.js} +1 -1
  152. package/public/dist/assets/CodeCanvas-D5jp8-t5.js +2 -0
  153. package/public/dist/assets/{manager-iX7KosWI.js → manager-CFwOAoe0.js} +2 -2
  154. package/public/dist/assets/{settings-embedding-DIqST-91.js → settings-embedding-DspkJ6sr.js} +1 -1
  155. package/public/dist/assets/{settings-KIPNUOIV.js → settings-qkC0NuQ7.js} +1 -1
  156. package/public/dist/manager/index.html +1 -1
  157. package/public/dist/settings/index.html +1 -1
  158. package/public/locales/en.json +9 -3
  159. package/public/locales/ja.json +9 -3
  160. package/public/locales/ko.json +9 -3
  161. package/public/locales/zh.json +9 -3
  162. package/public/manager/src/code/CodeWorkbench.tsx +11 -4
  163. package/public/manager/src/code/code-controller-draft-storage.ts +7 -3
  164. package/public/manager/src/code/code-controller-drafts.ts +9 -2
  165. package/public/manager/src/code/code-controller-runtime.ts +125 -12
  166. package/public/manager/src/code/code-controller-types.ts +2 -0
  167. package/public/manager/src/code/pending-user-item.ts +5 -0
  168. package/scripts/ci/windows-unit-manifest.txt +6 -0
  169. package/public/dist/assets/CodeCanvas-DWsx6sv5.js +0 -2
@@ -1 +1 @@
1
- {"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../../../src/browser/adaptive-fetch/scheduler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../../../src/browser/adaptive-fetch/scheduler.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import { execFile } from 'node:child_process';
2
2
  import { promisify } from 'node:util';
3
- import { validateFetchUrl } from './safety.js';
3
+ import { assertPublicResolvedHost, DEFAULT_REDIRECT_LIMIT, validateFetchUrl } from './safety.js';
4
4
  const execFileAsync = promisify(execFile);
5
5
  const PROFILES = ['chrome131', 'safari18_0', 'firefox133'];
6
6
  let cachedBinary;
@@ -26,43 +26,64 @@ function selectProfile(url) {
26
26
  return PROFILES[Math.abs(hash) % PROFILES.length] ?? PROFILES[0];
27
27
  }
28
28
  export async function tlsFetch(rawUrl, options) {
29
- const binary = await detectCurlImpersonate();
29
+ // #693: the overall deadline may already have fired before this fallback is
30
+ // reached; do not spawn curl-impersonate at all in that case.
31
+ if (options?.signal?.aborted)
32
+ return null;
33
+ const execFileFn = options?.execFileImpl
34
+ || ((binary, args, opts) => execFileAsync(binary, args, opts));
35
+ const binary = options?.execFileImpl ? 'curl-impersonate-chrome' : await detectCurlImpersonate();
30
36
  if (!binary)
31
37
  return null;
32
- const safeUrl = validateFetchUrl(rawUrl);
33
- const profile = selectProfile(safeUrl.href);
38
+ let current = validateFetchUrl(rawUrl).href;
34
39
  const timeout = Math.ceil((options?.timeoutMs || 15_000) / 1000);
40
+ const redirectLimit = Number(options?.redirectLimit ?? DEFAULT_REDIRECT_LIMIT);
35
41
  try {
36
- const args = [
37
- '--impersonate', profile,
38
- '--max-time', String(timeout),
39
- '--max-filesize', String(options?.maxBytes || 5_000_000),
40
- '-L', '-s',
41
- '-i',
42
- ];
43
- if (options?.proxy)
44
- args.push('--proxy', options.proxy);
45
- args.push(safeUrl.href);
46
- const { stdout } = await execFileAsync(binary, args, { timeout: (timeout + 5) * 1000, maxBuffer: 10_000_000 });
47
- const sep = stdout.indexOf('\r\n\r\n');
48
- const headerText = sep > 0 ? stdout.slice(0, sep) : '';
49
- const body = sep > 0 ? stdout.slice(sep + 4) : stdout;
50
- const statusMatch = headerText.match(/HTTP\/\S+\s+(\d+)/);
51
- const status = statusMatch ? Number(statusMatch[1]) : 200;
52
- const headers = {};
53
- for (const line of headerText.split('\r\n').slice(1)) {
54
- const idx = line.indexOf(':');
55
- if (idx > 0)
56
- headers[line.slice(0, idx).toLowerCase().trim()] = line.slice(idx + 1).trim();
57
- }
58
- const finalUrl = extractFinalUrl(headerText) || safeUrl.href;
59
- try {
60
- validateFetchUrl(finalUrl, { allowPrivateNetwork: false });
42
+ // curl used to follow the whole chain itself with -L, which meant the
43
+ // private hop was already fetched by the time the final URL was
44
+ // checked, and only the FIRST response's Location was ever inspected.
45
+ // Each hop is now issued separately and cleared before it is issued.
46
+ for (let redirects = 0; redirects <= redirectLimit; redirects += 1) {
47
+ // #693: a redirect chain must not keep issuing hops past the deadline.
48
+ if (options?.signal?.aborted)
49
+ return null;
50
+ await assertPublicResolvedHost(current, options?.resolveHost, { sensitiveQuery: 'allow' });
51
+ const profile = selectProfile(current);
52
+ const args = [
53
+ '--impersonate', profile,
54
+ '--max-time', String(timeout),
55
+ '--max-filesize', String(options?.maxBytes || 5_000_000),
56
+ '-s',
57
+ '-i',
58
+ ];
59
+ if (options?.proxy)
60
+ args.push('--proxy', options.proxy);
61
+ args.push(current);
62
+ const { stdout } = await execFileFn(binary, args, {
63
+ timeout: (timeout + 5) * 1000,
64
+ maxBuffer: 10_000_000,
65
+ // #693: kill curl-impersonate when the overall deadline fires.
66
+ ...(options?.signal ? { signal: options.signal } : {}),
67
+ });
68
+ const sep = stdout.indexOf('\r\n\r\n');
69
+ const headerText = sep > 0 ? stdout.slice(0, sep) : '';
70
+ const body = sep > 0 ? stdout.slice(sep + 4) : stdout;
71
+ const statusMatch = headerText.match(/HTTP\/\S+\s+(\d+)/);
72
+ const status = statusMatch ? Number(statusMatch[1]) : 200;
73
+ const headers = {};
74
+ for (const line of headerText.split('\r\n').slice(1)) {
75
+ const idx = line.indexOf(':');
76
+ if (idx > 0)
77
+ headers[line.slice(0, idx).toLowerCase().trim()] = line.slice(idx + 1).trim();
78
+ }
79
+ const location = extractFinalUrl(headerText);
80
+ if (status >= 300 && status < 400 && location) {
81
+ current = validateFetchUrl(new URL(location, current).href, { allowPrivateNetwork: false }).href;
82
+ continue;
83
+ }
84
+ return { ok: status >= 200 && status < 400, status, headers, body, profile };
61
85
  }
62
- catch {
63
- return null;
64
- }
65
- return { ok: status >= 200 && status < 400, status, headers, body, profile };
86
+ return null;
66
87
  }
67
88
  catch {
68
89
  return null;
@@ -1 +1 @@
1
- {"version":3,"file":"tls-fetch.js","sourceRoot":"","sources":["../../../../src/browser/adaptive-fetch/tls-fetch.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tls-fetch.js","sourceRoot":"","sources":["../../../../src/browser/adaptive-fetch/tls-fetch.ts"],"names":[],"mappings":"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"}
@@ -23,4 +23,36 @@ Uses the **full** entry (`dist/index.full.js`, ~700KB minified): the
23
23
  markdown serializer lives only in the full build — the lite `dist/index.js`
24
24
  silently ignores `markdown: true` and returns cleaned HTML (verified
25
25
  2026-06-10 against v0.18.1). After rebuilding, update the version in this
26
- file and rerun `npm run test:unit`.
26
+ file and rerun `npm test` (there is no `test:unit` script).
27
+
28
+ ### Pinned provenance
29
+
30
+ | | |
31
+ | --- | --- |
32
+ | Upstream | kepano/defuddle v0.18.1, released 2026-04-22, MIT |
33
+ | Entry | `dist/index.full.js` (the package's `exports["./full"]`) |
34
+ | Bundle bytes | 699043 |
35
+ | Bundle sha256 | `581bdb074e62570834c284031499e3d80ccca966915ab493b3e662e088770dab` |
36
+ | npm tarball integrity | `sha512-AvFPFOsoDjt5xUOA1QxzafSSzJ5dqEIC63yO72tHYtSjj1DYY/XM0XTPUCsHkm5A2f1X9ulBvoSVFJrd4s2ckA==` |
37
+
38
+ These values also live in `../defuddle-provenance.ts` and are enforced by
39
+ `tests/unit/browser-adaptive-fetch-defuddle-integrity.test.ts`. Editing the
40
+ numbers in this file alone changes nothing: the test compares the real bytes
41
+ against the module, and the module against this table.
42
+
43
+ The bundle itself contains no Defuddle version string. It does contain
44
+ `version:"0.13.01"`, which belongs to Temml — bundled inside it — and is not a
45
+ Defuddle version.
46
+
47
+ ### Upgrading is a hash PR, not a README edit
48
+
49
+ 1. Rebuild from the **full** entry with the command above.
50
+ 2. Recompute the byte length and sha256, and put both in
51
+ `../defuddle-provenance.ts` along with the new version, release date and
52
+ npm tarball integrity.
53
+ 3. Update the table above to the same values.
54
+ 4. Read the upstream advisories for the version you are leaving and the one you
55
+ are taking. GHSA-5mq8-78gm-pjmq (CVE-2026-30830, XSS in the schema-text
56
+ fallback) affects `<= 0.7.0` only, so the pin above is outside its range.
57
+ 5. The integrity test fails until steps 1-3 agree with each other. That failure
58
+ is the point of the gate.
@@ -1,6 +1,6 @@
1
1
  import { execFile } from 'node:child_process';
2
2
  import { promisify } from 'node:util';
3
- import { validateFetchUrl } from './safety.js';
3
+ import { assertPublicResolvedHost, DEFAULT_REDIRECT_LIMIT, validateFetchUrl } from './safety.js';
4
4
  const execFileAsync = promisify(execFile);
5
5
  let cachedBinary;
6
6
  async function detectYtdlp() {
@@ -18,16 +18,39 @@ async function detectYtdlp() {
18
18
  return null;
19
19
  }
20
20
  export async function ytdlpMetadata(url, options) {
21
- const binary = await detectYtdlp();
21
+ // #693: the overall deadline may already have fired; yt-dlp must not be
22
+ // spawned at all in that case. This sits ahead of the URL guard because an
23
+ // expired deadline makes the call moot either way; the guard is unchanged.
24
+ if (options?.signal?.aborted)
25
+ return null;
26
+ // The binary follows its own redirects and fetches related resources, so
27
+ // the only place we can still refuse is before it is handed the URL.
28
+ // This runs ahead of binary detection so the refusal does not depend on
29
+ // yt-dlp being installed.
30
+ try {
31
+ validateFetchUrl(url, { allowPrivateNetwork: false });
32
+ await assertPublicResolvedHost(url, options?.resolveHost, { sensitiveQuery: 'allow' });
33
+ }
34
+ catch {
35
+ return null;
36
+ }
37
+ const execFileFn = options?.execFileImpl
38
+ || ((binary, args, opts) => execFileAsync(binary, args, opts));
39
+ const binary = options?.execFileImpl ? 'yt-dlp' : await detectYtdlp();
22
40
  if (!binary)
23
41
  return null;
24
42
  const timeout = Math.ceil((options?.timeoutMs || 30_000) / 1000);
25
43
  try {
26
- const { stdout } = await execFileAsync(binary, [
44
+ const { stdout } = await execFileFn(binary, [
27
45
  '--dump-json', '--no-download', '--no-warnings',
28
46
  '--socket-timeout', String(timeout),
29
47
  url,
30
- ], { timeout: (timeout + 10) * 1000, maxBuffer: 10_000_000 });
48
+ ], {
49
+ timeout: (timeout + 10) * 1000,
50
+ maxBuffer: 10_000_000,
51
+ // #693: kill yt-dlp when the overall deadline fires.
52
+ ...(options?.signal ? { signal: options.signal } : {}),
53
+ });
31
54
  return JSON.parse(stdout);
32
55
  }
33
56
  catch {
@@ -35,6 +58,10 @@ export async function ytdlpMetadata(url, options) {
35
58
  }
36
59
  }
37
60
  export async function ytdlpSubtitles(url, lang = 'en', options) {
61
+ // #693: same bail as ytdlpMetadata; the caption fetch is a second network
62
+ // round trip that used to run past an expired deadline.
63
+ if (options?.signal?.aborted)
64
+ return null;
38
65
  const meta = await ytdlpMetadata(url, options);
39
66
  if (!meta)
40
67
  return null;
@@ -45,12 +72,30 @@ export async function ytdlpSubtitles(url, lang = 'en', options) {
45
72
  if (!vttEntry?.url)
46
73
  return null;
47
74
  try {
48
- validateFetchUrl(vttEntry.url);
49
75
  const fetchFn = options?.fetchImpl || fetch;
50
- const response = await fetchFn(vttEntry.url, { signal: AbortSignal.timeout(15_000) });
51
- if (!response.ok)
52
- return null;
53
- return extractSubtitleText(await response.text());
76
+ // The caption CDN redirects, and fetch follows by default, so a hop
77
+ // into a private address used to be reached without any check.
78
+ let current = validateFetchUrl(vttEntry.url, { allowPrivateNetwork: false }).href;
79
+ for (let redirects = 0; redirects <= DEFAULT_REDIRECT_LIMIT; redirects += 1) {
80
+ await assertPublicResolvedHost(current, options?.resolveHost, { sensitiveQuery: 'allow' });
81
+ const response = await fetchFn(current, {
82
+ redirect: 'manual',
83
+ // #693: the caption fetch had only its own 15s budget, which
84
+ // could outlive a much shorter overall deadline.
85
+ signal: options?.signal
86
+ ? AbortSignal.any([options.signal, AbortSignal.timeout(15_000)])
87
+ : AbortSignal.timeout(15_000),
88
+ });
89
+ const location = response.headers.get('location');
90
+ if (response.status >= 300 && response.status < 400 && location) {
91
+ current = validateFetchUrl(new URL(location, current).href, { allowPrivateNetwork: false }).href;
92
+ continue;
93
+ }
94
+ if (!response.ok)
95
+ return null;
96
+ return extractSubtitleText(await response.text());
97
+ }
98
+ return null;
54
99
  }
55
100
  catch {
56
101
  return null;
@@ -1 +1 @@
1
- {"version":3,"file":"ytdlp-reader.js","sourceRoot":"","sources":["../../../../src/browser/adaptive-fetch/ytdlp-reader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ytdlp-reader.js","sourceRoot":"","sources":["../../../../src/browser/adaptive-fetch/ytdlp-reader.ts"],"names":[],"mappings":"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"}
@@ -1,18 +1,15 @@
1
+ import { chatGptModelSelectorTestIds } from './chatgpt-model.js';
1
2
  export const CHATGPT_MODEL_SELECTOR_OBSERVATION = {
2
3
  status: 'implemented',
3
4
  source: 'live-frontend',
4
5
  selectorCandidates: [
5
6
  '[data-testid="model-switcher-dropdown-button"]',
6
7
  'button.__composer-pill[aria-haspopup="menu"]',
7
- '[data-testid="model-switcher-gpt-5-3"]',
8
- '[data-testid="model-switcher-gpt-5-5-thinking"]',
9
- '[data-testid="model-switcher-gpt-5-5-pro"]',
10
- '[data-testid="model-switcher-gpt-5-5-thinking-thinking-effort"]',
11
- '[data-testid="model-switcher-gpt-5-5-pro-thinking-effort"]',
12
- '[data-testid="model-switcher-gpt-5-6-thinking"]',
13
- '[data-testid="model-switcher-gpt-5-6-pro"]',
14
- '[data-testid="model-switcher-gpt-5-6-thinking-thinking-effort"]',
15
- '[data-testid="model-switcher-gpt-5-6-pro-thinking-effort"]',
8
+ // Derived from the runtime tables rather than appended by hand once per
9
+ // generation. The hand-maintained list had already fallen behind: it was
10
+ // missing the gpt-5-6 base id and the gpt-5-5 instant id that
11
+ // CHATGPT_MODEL_OPTIONS has been driving.
12
+ ...chatGptModelSelectorTestIds().map(testId => `[data-testid="${testId}"]`),
16
13
  ],
17
14
  textCandidates: ['Latest', 'Instant', 'Fast', 'Thinking', 'Thinking • Heavy', 'Pro', 'Heavy', 'Effort', 'Configure...'],
18
15
  activationPath: ['open model switcher or composer model pill', 'select menuitemradio or model-switcher effort menuitem', 'verify aria-checked=true or active pill text'],
@@ -23,6 +20,7 @@ export const CHATGPT_MODEL_SELECTOR_OBSERVATION = {
23
20
  'Model label text must be filtered from response capture.',
24
21
  '2026-04-30 headed UI moved the visible model opener to the composer pill; top data-testid opener may be absent.',
25
22
  'Thinking/Pro effort controls are runtime selectors; Pro can appear as a Heavy composer pill in the headed UI.',
23
+ '2026-09-11 live signed-in chatgpt.com: NO element with a data-testid starting "model-switcher" exists at all (the filtered query returned []), and model-switcher-dropdown-button was absent. The composer pill opened a radix menu whose rows are role=menuitemradio with data-testid null: "Latest" (aria-checked=true), "GPT-5.6 Sol", "GPT-5.5", plus a role=menuitem aria-label="Power" reasoning-effort slider reading "Extra High". The testIds table below is therefore fallback-only on this account and the visible-label path carries the selection.',
26
24
  ],
27
25
  };
28
26
  export const CHATGPT_ATTACHMENT_OBSERVATION = {
@@ -73,7 +71,11 @@ export const GEMINI_MODEL_PICKER_OBSERVATION = {
73
71
  activationPath: ['click Open mode picker', 'choose Flash-Lite|Flash|Pro menuitem', 'verify picker label'],
74
72
  activeStateSignals: ['mode picker button text equals selected mode'],
75
73
  mutationRisk: 'medium',
76
- notes: ['Observed separately from Deep Think in headed 30_browser on 2026-04-29.', 'Deep Think remains a Tools menu capability.'],
74
+ notes: [
75
+ 'Observed separately from Deep Think in headed 30_browser on 2026-04-29.',
76
+ 'Deep Think remains a Tools menu capability.',
77
+ '2026-09-11 live signed-in gemini.google.com: bard-mode-menu-button still resolves, but aria-label="Open mode picker" does not — the ko-KR opener reads "모드 선택 도구 열기, 현재 Flash 모드 사용 중". Mode rows are now gem-menu-item with OPAQUE HASH ids: bard-mode-option-fbb127bbb056c959 ("3.6 Flash"), bard-mode-option-5bf011840784117a ("3.6 사고 모델"), bard-mode-option-9d8ca3786ebdfbea ("3.1 Pro"). The semantic bard-mode-option-fast|thinking|pro ids no longer exist, so label matching under the [data-test-id^="bard-mode-option-"] prefix is the live path. No Flash-Lite row was present, and which choice "3.6 사고 모델" maps to was NOT established — do not guess it.',
78
+ ],
77
79
  };
78
80
  export const GEMINI_IMAGE_GENERATION_OBSERVATION = {
79
81
  status: 'schema-ready',
@@ -1 +1 @@
1
- {"version":3,"file":"capability-observation-presets.js","sourceRoot":"","sources":["../../../../src/browser/web-ai/capability-observation-presets.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"capability-observation-presets.js","sourceRoot":"","sources":["../../../../src/browser/web-ai/capability-observation-presets.ts"],"names":[],"mappings":"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"}
@@ -86,19 +86,84 @@ const CHATGPT_SIMPLIFIED_INTELLIGENCE_OPTIONS = {
86
86
  },
87
87
  },
88
88
  };
89
- const MODEL_ALIASES = {
89
+ /**
90
+ * Human-facing aliases that are not tied to any model generation. Seeded first
91
+ * so a derived slug can never take one of these names.
92
+ */
93
+ const MODEL_ALIAS_SEEDS = {
90
94
  instant: 'instant',
91
95
  fast: 'instant',
92
- 'gpt-5-3': 'instant',
93
- 'gpt-5.3': 'instant',
94
96
  thinking: 'thinking',
95
97
  think: 'thinking',
96
- 'gpt-5-5-thinking': 'thinking',
97
- 'gpt-5.5-thinking': 'thinking',
98
98
  pro: 'pro',
99
- 'gpt-5-5-pro': 'pro',
100
- 'gpt-5.5-pro': 'pro',
101
99
  };
100
+ /** 'model-switcher-gpt-5-6-thinking-thinking-effort' -> 'gpt-5-6-thinking'. */
101
+ function modelSlugFromTestId(testId) {
102
+ return testId.replace(/^model-switcher-/, '').replace(/-thinking-effort$/, '');
103
+ }
104
+ /**
105
+ * 'gpt-5-6-thinking' -> 'gpt-5.6-thinking'. Only the version prefix is
106
+ * rewritten: collapsing the whole slug would drop the thinking/pro suffix and
107
+ * silently merge three distinct choices into one key.
108
+ */
109
+ function dottedModelSlug(slug) {
110
+ return slug.replace(/^gpt-(\d+)-(\d+)/, 'gpt-$1.$2');
111
+ }
112
+ /**
113
+ * Every model slug the DOM table knows about, newest generation first.
114
+ *
115
+ * CHATGPT_MODEL_OPTIONS is the one place a new generation gets added, so the
116
+ * accepted --model spellings are derived from it rather than written out a
117
+ * second time. They used to be two hand-maintained tables, and they drifted:
118
+ * the table above already listed gpt-5-6 while the alias list stopped at
119
+ * gpt-5-5-thinking, so a released client that could drive gpt-5-6 still
120
+ * rejected 'gpt-5.6' as an unsupported model.
121
+ */
122
+ export function chatGptModelTestIdSlugs() {
123
+ const slugs = [];
124
+ for (const { testIds } of Object.values(CHATGPT_MODEL_OPTIONS)) {
125
+ for (const testId of testIds) {
126
+ const slug = modelSlugFromTestId(testId);
127
+ if (slug && !slugs.includes(slug))
128
+ slugs.push(slug);
129
+ }
130
+ }
131
+ return slugs;
132
+ }
133
+ /** Every model-switcher test-id the runtime will try, including effort triggers. */
134
+ export function chatGptModelSelectorTestIds() {
135
+ const ids = [];
136
+ for (const { testIds } of Object.values(CHATGPT_MODEL_OPTIONS)) {
137
+ for (const testId of testIds)
138
+ if (!ids.includes(testId))
139
+ ids.push(testId);
140
+ }
141
+ for (const { triggerTestIds } of Object.values(CHATGPT_MODEL_EFFORT_OPTIONS)) {
142
+ for (const testId of triggerTestIds)
143
+ if (!ids.includes(testId))
144
+ ids.push(testId);
145
+ }
146
+ return ids;
147
+ }
148
+ function deriveModelAliases() {
149
+ const aliases = { ...MODEL_ALIAS_SEEDS };
150
+ for (const [choice, { testIds }] of Object.entries(CHATGPT_MODEL_OPTIONS)) {
151
+ for (const testId of testIds) {
152
+ const slug = modelSlugFromTestId(testId);
153
+ if (!slug)
154
+ continue;
155
+ for (const key of [slug, dottedModelSlug(slug)]) {
156
+ // Exact keys, never prefix matching: 'gpt-5-5' and
157
+ // 'gpt-5-5-thinking' are different choices and must stay apart.
158
+ if (!(key in aliases))
159
+ aliases[key] = choice;
160
+ }
161
+ }
162
+ }
163
+ return aliases;
164
+ }
165
+ const MODEL_ALIASES = deriveModelAliases();
166
+ export const CHATGPT_MODEL_ALIAS_KEYS = Object.freeze(Object.keys(MODEL_ALIASES));
102
167
  const EFFORT_ALIASES = {
103
168
  light: 'light',
104
169
  low: 'light',
@@ -770,6 +835,14 @@ export function modelChoiceFromText(text) {
770
835
  return 'thinking';
771
836
  if (/\b(Pro|Heavy)\b/i.test(text))
772
837
  return 'pro';
838
+ // Observed live on 2026-09-11: the menu rows read 'Latest', 'GPT-5.6 Sol'
839
+ // and 'GPT-5.5' with no data-testid at all, and both fell through to null,
840
+ // which left the label fallback unable to identify the base tier. Every
841
+ // qualifier is matched above, so reaching here means an unqualified row.
842
+ if (/^\s*Latest\b/i.test(text))
843
+ return 'instant';
844
+ if (/^\s*(?:ChatGPT\s+)?GPT[-\s]?\d/i.test(text))
845
+ return 'instant';
773
846
  return null;
774
847
  }
775
848
  async function findOptionByExactLabels(page, labels) {