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
@@ -7,6 +7,7 @@ const DEFAULTS = {
7
7
  absoluteMs: 600_000,
8
8
  absoluteHardCapMs: DEFAULT_WATCHDOG_ABSOLUTE_HARD_CAP_MS,
9
9
  checkIntervalMs: 2_000,
10
+ observeStdio: true,
10
11
  };
11
12
  export function attachWatchdog(child, _label, onStall, config) {
12
13
  const cfg = { ...DEFAULTS, ...config };
@@ -50,8 +51,10 @@ export function attachWatchdog(child, _label, onStall, config) {
50
51
  }
51
52
  const stdoutRef = child.stdout;
52
53
  const stderrRef = child.stderr;
53
- stdoutRef?.on('data', observe);
54
- stderrRef?.on('data', observe);
54
+ if (cfg.observeStdio) {
55
+ stdoutRef?.on('data', observe);
56
+ stderrRef?.on('data', observe);
57
+ }
55
58
  const timer = setInterval(() => {
56
59
  if (stopped)
57
60
  return;
@@ -90,8 +93,10 @@ export function attachWatchdog(child, _label, onStall, config) {
90
93
  stop() {
91
94
  stopped = true;
92
95
  clearInterval(timer);
93
- stdoutRef?.off('data', observe);
94
- stderrRef?.off('data', observe);
96
+ if (cfg.observeStdio) {
97
+ stdoutRef?.off('data', observe);
98
+ stderrRef?.off('data', observe);
99
+ }
95
100
  },
96
101
  };
97
102
  }
@@ -1 +1 @@
1
- {"version":3,"file":"watchdog.js","sourceRoot":"","sources":["../../../src/agent/watchdog.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"watchdog.js","sourceRoot":"","sources":["../../../src/agent/watchdog.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,7 @@ import { releaseFetchBrowserPage, getFetchBrowserPage } from './browser-runtime.
3
3
  import { classifyAccessBoundary, detectChallengeMarkers } from './challenge-detector.js';
4
4
  import { runDefuddleInPage } from './defuddle-extractor.js';
5
5
  import { extractMetadataFromHtml } from './metadata.js';
6
- import { validateFetchUrl } from './safety.js';
6
+ import { assertPublicResolvedHost, validateFetchUrl } from './safety.js';
7
7
  import { normalizeWhitespace } from './transforms.js';
8
8
  import { classifyBoundarySignals } from './validators.js';
9
9
  export async function collectBrowserCandidate(url, options = {}) {
@@ -16,6 +16,23 @@ export async function collectBrowserCandidate(url, options = {}) {
16
16
  await releaseFetchBrowserPage(pageRef);
17
17
  return { source: 'browser', label: 'browser-render', ok: false, status: 0, finalUrl: url, text: '', title: '', evidence: ['deadline-aborted'], warnings: ['deadline-aborted'] };
18
18
  }
19
+ // page.goto follows redirects inside the browser, so the post-navigation
20
+ // check further down cannot un-send the request. Clearing the entry URL
21
+ // here closes the DNS-rebinding case; an intermediate hop the browser
22
+ // followed on its own stays out of reach and is a recorded residual risk.
23
+ if (options.allowPrivateNetwork !== true) {
24
+ try {
25
+ await assertPublicResolvedHost(url, options.resolveHost, { sensitiveQuery: 'allow' });
26
+ }
27
+ catch (error) {
28
+ await releaseFetchBrowserPage(pageRef);
29
+ return {
30
+ source: 'browser', label: 'browser-render', ok: false, status: 0, finalUrl: url,
31
+ text: '', title: '', evidence: ['entry-url-private'],
32
+ warnings: [error.message || 'entry-url-private'],
33
+ };
34
+ }
35
+ }
19
36
  // P0-6: close the page if the overall deadline fires so a hung page.goto rejects.
20
37
  const onDeadlineAbort = () => { try {
21
38
  page.close?.();
@@ -1 +1 @@
1
- {"version":3,"file":"browser-escalation.js","sourceRoot":"","sources":["../../../../src/browser/adaptive-fetch/browser-escalation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"browser-escalation.js","sourceRoot":"","sources":["../../../../src/browser/adaptive-fetch/browser-escalation.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { validateFetchUrl } from './safety.js';
1
+ import { assertPublicResolvedHost, validateFetchUrl } from './safety.js';
2
2
  import { collectBrowserCandidate, collectBrowserMetadataCandidate, collectBrowserStructuredResultCandidates, collectDefuddleCandidate, collectNetworkJsonCandidates, } from './browser-escalation.js';
3
3
  import { BrowserRequiredError } from './browser-runtime.js';
4
4
  import { fetchViaCamoufox } from './camoufox-session.js';
@@ -12,8 +12,29 @@ export async function tryBrowserEscalation(url, options, deps, trace, challengeI
12
12
  if (signal?.aborted)
13
13
  return null; // P0-6: overall deadline already fired
14
14
  const allCandidates = [];
15
- const camoufoxResult = await fetchViaCamoufox(url, { timeoutMs: options.timeoutMs, ...(signal ? { signal } : {}) });
16
- if (camoufoxResult?.ok && camoufoxResult.html && isSafeFinalUrl(camoufoxResult.url || url, options)) {
15
+ const resolveHost = deps['resolveHost'];
16
+ const camoufoxResult = await fetchViaCamoufox(url, {
17
+ timeoutMs: options.timeoutMs,
18
+ allowPrivateNetwork: options.allowPrivateNetwork,
19
+ ...(resolveHost ? { resolveHost } : {}),
20
+ ...(signal ? { signal } : {}),
21
+ });
22
+ // A missing final URL is no longer treated as "the original target": the
23
+ // whole point of the guard is that the post-navigation URL decides, so an
24
+ // absent one means the result cannot be cleared and is dropped.
25
+ const camoufoxFinalUrl = camoufoxResult?.url || '';
26
+ const camoufoxFinalUrlSafe = camoufoxFinalUrl
27
+ ? await isSafeFinalUrl(camoufoxFinalUrl, options, resolveHost)
28
+ : false;
29
+ if (camoufoxResult?.ok && camoufoxResult.html && !camoufoxFinalUrlSafe) {
30
+ appendAttempt(trace, {
31
+ source: 'camoufox',
32
+ verdict: 'blocked',
33
+ url: camoufoxFinalUrl || url,
34
+ reason: camoufoxFinalUrl ? 'camoufox-final-url-private' : 'camoufox-final-url-missing',
35
+ });
36
+ }
37
+ if (camoufoxResult?.ok && camoufoxResult.html && camoufoxFinalUrlSafe) {
17
38
  const structured = extractStructuredContent(camoufoxResult.html);
18
39
  const evidence = ['camoufox-stealth'];
19
40
  if (structured.tables.length)
@@ -22,16 +43,16 @@ export async function tryBrowserEscalation(url, options, deps, trace, challengeI
22
43
  evidence.push(`structured:${structured.jsonLd.length}-jsonld`);
23
44
  appendAttempt(trace, { source: 'camoufox', verdict: 'ok', url, reason: 'camoufox-stealth' });
24
45
  const camoufoxCandidate = fromBrowserResult({
25
- ok: true, status: 200, finalUrl: camoufoxResult.url || url,
46
+ ok: true, status: 200, finalUrl: camoufoxFinalUrl,
26
47
  contentType: 'text/html', text: camoufoxResult.html,
27
48
  title: camoufoxResult.title, headers: {}, evidence, warnings: [],
28
49
  structured, label: 'camoufox-stealth',
29
50
  });
30
51
  const scored = scoreReaderCandidate(camoufoxCandidate);
31
- appendScoredAttempt(trace, 'camoufox', camoufoxCandidate, { finalUrl: camoufoxResult.url || url, status: 200, label: 'camoufox-stealth' });
52
+ appendScoredAttempt(trace, 'camoufox', camoufoxCandidate, { finalUrl: camoufoxFinalUrl, status: 200, label: 'camoufox-stealth' });
32
53
  allCandidates.push(camoufoxCandidate);
33
54
  if (scored.verdict === 'strong_ok') {
34
- return buildBrowserFlowResult(url, camoufoxResult, structured, evidence, allCandidates);
55
+ return buildBrowserFlowResult(camoufoxFinalUrl, camoufoxResult, structured, evidence, allCandidates);
35
56
  }
36
57
  }
37
58
  else if (camoufoxResult === null) {
@@ -45,6 +66,7 @@ export async function tryBrowserEscalation(url, options, deps, trace, challengeI
45
66
  selector: options.selector,
46
67
  allowPrivateNetwork: options.allowPrivateNetwork,
47
68
  challengeInfo,
69
+ ...(resolveHost ? { resolveHost } : {}),
48
70
  ...(signal ? { signal } : {}),
49
71
  });
50
72
  appendScoredAttempt(trace, 'browser', fromBrowserResult(result), result);
@@ -78,9 +100,9 @@ export async function tryBrowserEscalation(url, options, deps, trace, challengeI
78
100
  throw error;
79
101
  }
80
102
  }
81
- function buildBrowserFlowResult(url, camoufoxResult, structured, evidence, _candidates) {
103
+ function buildBrowserFlowResult(finalUrl, camoufoxResult, structured, evidence, _candidates) {
82
104
  return {
83
- ok: true, status: 200, finalUrl: camoufoxResult.url || url,
105
+ ok: true, status: 200, finalUrl,
84
106
  contentType: 'text/html', text: camoufoxResult.html,
85
107
  title: camoufoxResult.title, headers: {}, evidence, warnings: [], structured,
86
108
  };
@@ -95,9 +117,14 @@ function buildCandidateOnlyResult(url, candidates) {
95
117
  title: best.title, headers: {}, evidence: best.evidence, warnings: best.warnings,
96
118
  };
97
119
  }
98
- function isSafeFinalUrl(finalUrl, options) {
120
+ async function isSafeFinalUrl(finalUrl, options, resolveHost) {
99
121
  try {
100
122
  validateFetchUrl(finalUrl, { allowPrivateNetwork: options.allowPrivateNetwork });
123
+ // A literal check alone would still accept a public-looking name that
124
+ // resolves to loopback or cloud metadata, which is the rebinding case.
125
+ if (options.allowPrivateNetwork !== true) {
126
+ await assertPublicResolvedHost(finalUrl, resolveHost, { sensitiveQuery: 'allow' });
127
+ }
101
128
  return true;
102
129
  }
103
130
  catch {
@@ -1 +1 @@
1
- {"version":3,"file":"browser-flow.js","sourceRoot":"","sources":["../../../../src/browser/adaptive-fetch/browser-flow.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"browser-flow.js","sourceRoot":"","sources":["../../../../src/browser/adaptive-fetch/browser-flow.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGzE,OAAO,EACH,uBAAuB,EACvB,+BAA+B,EAC/B,wCAAwC,EACxC,wBAAwB,EACxB,4BAA4B,GAC/B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACnG,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACtC,GAAW,EACX,OAA6B,EAC7B,IAA6B,EAC7B,KAAmB,EACnB,aAAmC,EACnC,MAAoB;IAEpB,IAAI,OAAO,CAAC,WAAW,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IACjD,IAAI,MAAM,EAAE,OAAO;QAAE,OAAO,IAAI,CAAC,CAAC,uCAAuC;IAEzE,MAAM,aAAa,GAAsB,EAAE,CAAC;IAE5C,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAA4B,CAAC;IACnE,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE;QAC/C,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;QAChD,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAChC,CAAC,CAAC;IACH,yEAAyE;IACzE,0EAA0E;IAC1E,gEAAgE;IAChE,MAAM,gBAAgB,GAAG,cAAc,EAAE,GAAG,IAAI,EAAE,CAAC;IACnD,MAAM,oBAAoB,GAAG,gBAAgB;QACzC,CAAC,CAAC,MAAM,cAAc,CAAC,gBAAgB,EAAE,OAAO,EAAE,WAAW,CAAC;QAC9D,CAAC,CAAC,KAAK,CAAC;IACZ,IAAI,cAAc,EAAE,EAAE,IAAI,cAAc,CAAC,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACrE,aAAa,CAAC,KAAK,EAAE;YACjB,MAAM,EAAE,UAAU;YAClB,OAAO,EAAE,SAAS;YAClB,GAAG,EAAE,gBAAgB,IAAI,GAAG;YAC5B,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,4BAA4B;SACzF,CAAC,CAAC;IACP,CAAC;IACD,IAAI,cAAc,EAAE,EAAE,IAAI,cAAc,CAAC,IAAI,IAAI,oBAAoB,EAAE,CAAC;QACpE,MAAM,UAAU,GAAG,wBAAwB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACjE,MAAM,QAAQ,GAAG,CAAC,kBAAkB,CAAC,CAAC;QACtC,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM;YAAE,QAAQ,CAAC,IAAI,CAAC,cAAc,UAAU,CAAC,MAAM,CAAC,MAAM,SAAS,CAAC,CAAC;QAC7F,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM;YAAE,QAAQ,CAAC,IAAI,CAAC,cAAc,UAAU,CAAC,MAAM,CAAC,MAAM,SAAS,CAAC,CAAC;QAC7F,aAAa,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC;QAE7F,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;YACxC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,gBAAgB;YACjD,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,cAAc,CAAC,IAAI;YACnD,KAAK,EAAE,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;YAChE,UAAU,EAAE,KAAK,EAAE,kBAAkB;SACxC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;QACvD,mBAAmB,CAAC,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC;QAClI,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAEtC,IAAI,MAAM,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;YACjC,OAAO,sBAAsB,CAAC,gBAAgB,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;QACzG,CAAC;IACL,CAAC;SAAM,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;QACjC,aAAa,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC,CAAC;IACzG,CAAC;IAED,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,GAAG,EAAE;YAC9C,WAAW,EAAE,IAAI;YACjB,cAAc,EAAE,OAAO,CAAC,cAAkD;YAC1E,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;YAChD,aAAa;YACb,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAChC,CAAC,CAAC;QACH,mBAAmB,CAAC,KAAK,EAAE,SAAS,EAAE,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;QACzE,MAAM,iBAAiB,GAAG,+BAA+B,CAAC,MAAM,CAAC,CAAC;QAClE,IAAI,iBAAiB;YAAE,mBAAmB,CAAC,KAAK,EAAE,UAAU,EAAE,kBAAkB,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC,CAAC;QACxH,KAAK,MAAM,mBAAmB,IAAI,wCAAwC,CAAC,MAAM,CAAC,EAAE,CAAC;YACjF,mBAAmB,CAAC,KAAK,EAAE,SAAS,EAAE,iBAAiB,CAAC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC,CAAC;QACvG,CAAC;QACD,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAC;QAC3D,IAAI,iBAAiB;YAAE,mBAAmB,CAAC,KAAK,EAAE,SAAS,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC,CAAC;QACtH,KAAK,MAAM,gBAAgB,IAAI,4BAA4B,CAAC,MAAM,CAAC,EAAE,CAAC;YAClE,mBAAmB,CAAC,KAAK,EAAE,aAAa,EAAE,oBAAoB,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,CAAC;QACxG,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACtB,IAAI,KAAK,YAAY,oBAAoB,IAAK,KAAiC,EAAE,CAAC,MAAM,CAAC,KAAK,kBAAkB,EAAE,CAAC;YAC/G,aAAa,CAAC,KAAK,EAAE;gBACjB,MAAM,EAAE,SAAS;gBACjB,OAAO,EAAE,kBAAkB;gBAC3B,GAAG;gBACH,MAAM,EAAG,KAAe,CAAC,OAAO;aACnC,CAAC,CAAC;YACH,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3B,OAAO,wBAAwB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;YACxD,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,KAAK,CAAC;IAChB,CAAC;AACL,CAAC;AAED,SAAS,sBAAsB,CAC3B,QAAgB,EAChB,cAA4D,EAC5D,UAAoD,EACpD,QAAkB,EAClB,WAA8B;IAE9B,OAAO;QACH,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ;QAC/B,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,cAAc,CAAC,IAAI;QACnD,KAAK,EAAE,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU;KAC/E,CAAC;AACN,CAAC;AAED,SAAS,wBAAwB,CAAC,GAAW,EAAE,UAA6B;IACxE,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC3B,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC3G,OAAO;QACH,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACzD,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI;QAC9C,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ;KACnF,CAAC;AACN,CAAC;AAED,KAAK,UAAU,cAAc,CACzB,QAAgB,EAChB,OAA6B,EAC7B,WAAyB;IAEzB,IAAI,CAAC;QACD,gBAAgB,CAAC,QAAQ,EAAE,EAAE,mBAAmB,EAAE,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;QACjF,sEAAsE;QACtE,uEAAuE;QACvE,IAAI,OAAO,CAAC,mBAAmB,KAAK,IAAI,EAAE,CAAC;YACvC,MAAM,wBAAwB,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CAAC;QACvF,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAC;IACjB,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CACxB,KAAmB,EACnB,MAAc,EACd,SAA+C,EAC/C,GAA4B;IAE5B,MAAM,MAAM,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAC/C,aAAa,CAAC,KAAK,EAAE;QACjB,MAAM;QACN,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,GAAG,EAAE,GAAG,CAAC,UAAU,CAAW;QAC9B,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAW;QAC/B,MAAM,EAAE,SAAS,MAAM,CAAC,KAAK,EAAE;QAC/B,KAAK,EAAE,GAAG,CAAC,OAAO,CAAW;KAChC,CAAC,CAAC;AACP,CAAC"}
@@ -1,6 +1,6 @@
1
1
  // Mirrored from agbrowse adaptive-fetch v2; keep runtime behavior aligned while cli-jaw mirror remains experimental.
2
2
  import { getFetchBrowserPage, closeFetchBrowserPage } from './browser-runtime.js';
3
- import { validateFetchUrl } from './safety.js';
3
+ import { assertPublicResolvedHost, validateFetchUrl } from './safety.js';
4
4
  export function isUserSessionAvailable(options = {}) {
5
5
  const deps = (options?.browserDeps || {});
6
6
  return typeof deps['getPage'] === 'function';
@@ -17,6 +17,12 @@ export function shouldTryUserSession(candidates, options) {
17
17
  return false;
18
18
  }
19
19
  export async function navigateInUserSession(url, options) {
20
+ // The existing-session navigation carries the user's real cookies, so a
21
+ // rebound entry URL would send them to a private address and only the body
22
+ // would be discarded afterwards. Clear the entry before the page is taken.
23
+ if (options.allowPrivateNetwork !== true) {
24
+ await assertPublicResolvedHost(url, options.resolveHost, { sensitiveQuery: 'allow' });
25
+ }
20
26
  const pageRef = await getFetchBrowserPage({
21
27
  ...(options.browserDeps != null ? { browserDeps: options.browserDeps } : {}),
22
28
  browserSession: 'existing',
@@ -45,6 +51,9 @@ export async function navigateInUserSession(url, options) {
45
51
  const warnings = [];
46
52
  try {
47
53
  validateFetchUrl(finalUrl, options.allowPrivateNetwork != null ? { allowPrivateNetwork: options.allowPrivateNetwork } : {});
54
+ if (options.allowPrivateNetwork !== true) {
55
+ await assertPublicResolvedHost(finalUrl, options.resolveHost, { sensitiveQuery: 'allow' });
56
+ }
48
57
  }
49
58
  catch {
50
59
  warnings.push('user-session-redirected-to-private-url');
@@ -1 +1 @@
1
- {"version":3,"file":"browser-session.js","sourceRoot":"","sources":["../../../../src/browser/adaptive-fetch/browser-session.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"browser-session.js","sourceRoot":"","sources":["../../../../src/browser/adaptive-fetch/browser-session.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { execFile } from 'node:child_process';
2
2
  import { promisify } from 'node:util';
3
+ import { assertPublicResolvedHost, validateFetchUrl } from './safety.js';
3
4
  const execFileAsync = promisify(execFile);
4
5
  let cachedPython;
5
6
  let cachedAvailable;
@@ -41,6 +42,17 @@ export async function fetchViaCamoufox(url, options) {
41
42
  // P0-6: bail before spawning if the overall deadline already fired.
42
43
  if (options?.signal?.aborted)
43
44
  return null;
45
+ // Nothing downstream can un-send a navigation, so the entry URL is cleared
46
+ // before the browser is spawned rather than after it has already loaded.
47
+ try {
48
+ validateFetchUrl(url, { allowPrivateNetwork: options?.allowPrivateNetwork === true });
49
+ if (options?.allowPrivateNetwork !== true) {
50
+ await assertPublicResolvedHost(url, options?.resolveHost, { sensitiveQuery: 'allow' });
51
+ }
52
+ }
53
+ catch {
54
+ return null;
55
+ }
44
56
  const available = await detectCamoufox();
45
57
  if (!available)
46
58
  return null;
@@ -56,7 +68,10 @@ export async function fetchViaCamoufox(url, options) {
56
68
  ' page.goto(url, timeout=timeout)',
57
69
  ' title = page.title()',
58
70
  ' html = page.content()',
59
- ' print(json.dumps({"ok": True, "title": title, "html": html, "url": url}))',
71
+ // page.url is the post-navigation URL. Reporting the INPUT url here is
72
+ // what let a redirect to a private host pass the caller's final-URL
73
+ // check while its HTML was already in hand.
74
+ ' print(json.dumps({"ok": True, "title": title, "html": html, "url": page.url, "requestedUrl": url}))',
60
75
  ].join('\n');
61
76
  try {
62
77
  const { stdout } = await execFileAsync(python, ['-c', script], {
@@ -1 +1 @@
1
- {"version":3,"file":"camoufox-session.js","sourceRoot":"","sources":["../../../../src/browser/adaptive-fetch/camoufox-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAE1C,IAAI,YAAuC,CAAC;AAC5C,IAAI,eAAoC,CAAC;AAEzC,KAAK,UAAU,YAAY;IACvB,IAAI,YAAY,KAAK,SAAS;QAAE,OAAO,YAAY,CAAC;IACpD,KAAK,MAAM,IAAI,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC;YACD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;YAC5D,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC9B,YAAY,GAAG,IAAI,CAAC;gBACpB,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC;IAC/B,CAAC;IACD,YAAY,GAAG,IAAI,CAAC;IACpB,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,cAAc;IACzB,IAAI,eAAe,KAAK,SAAS;QAAE,OAAO,eAAe,CAAC;IAC1D,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;IACpC,IAAI,CAAC,MAAM,EAAE,CAAC;QAAC,eAAe,GAAG,KAAK,CAAC;QAAC,OAAO,KAAK,CAAC;IAAC,CAAC;IACvD,IAAI,CAAC;QACD,MAAM,aAAa,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,qDAAqD,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAChH,eAAe,GAAG,IAAI,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACL,eAAe,GAAG,KAAK,CAAC;QACxB,OAAO,KAAK,CAAC;IACjB,CAAC;AACL,CAAC;AASD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAClC,GAAW,EACX,OAAsD;IAEtD,oEAAoE;IACpE,IAAI,OAAO,EAAE,MAAM,EAAE,OAAO;QAAE,OAAO,IAAI,CAAC;IAC1C,MAAM,SAAS,GAAG,MAAM,cAAc,EAAE,CAAC;IACzC,IAAI,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAE5B,MAAM,MAAM,GAAG,YAAa,CAAC;IAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,SAAS,IAAI,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG;QACX,kBAAkB;QAClB,wCAAwC;QACxC,SAAS,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;QAC9B,aAAa,OAAO,GAAG,IAAI,EAAE;QAC7B,0CAA0C;QAC1C,+BAA+B;QAC/B,qCAAqC;QACrC,0BAA0B;QAC1B,2BAA2B;QAC3B,+EAA+E;KAClF,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,IAAI,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;YAC3D,OAAO,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC,GAAG,IAAI;YAC9B,SAAS,EAAE,UAAU;YACrB,oEAAoE;YACpE,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzD,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,CAAC;QACnE,OAAO,MAAwB,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,IAAI,CAAC;IAChB,CAAC;AACL,CAAC;AAED,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC"}
1
+ {"version":3,"file":"camoufox-session.js","sourceRoot":"","sources":["../../../../src/browser/adaptive-fetch/camoufox-session.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,49 @@
1
+ /**
2
+ * #695: the vendored Defuddle bundle carries no version string of its own, so
3
+ * this module is the only handle on what those 699KB actually are. The bundle
4
+ * does contain a `version:"0.13.01"` — that belongs to Temml, which is bundled
5
+ * inside it, and using it as a Defuddle version would be wrong.
6
+ *
7
+ * Replacing the bundle means changing these values in the same commit, because
8
+ * browser-adaptive-fetch-defuddle-integrity.test.ts refuses to pass otherwise.
9
+ * That is what turns an upgrade into a hash PR rather than an edit to a number
10
+ * in vendor/README.md.
11
+ *
12
+ * Checked against the npm registry and the GitHub release on 2026-09-11.
13
+ */
14
+ export const DEFUDDLE_VENDOR = {
15
+ /** Upstream release the bundle was built from. */
16
+ version: '0.18.1',
17
+ /** Upstream tags this release without a "v" prefix. */
18
+ releaseTag: '0.18.1',
19
+ /** Publish date of that release, for anyone reading an advisory later. */
20
+ releasedAt: '2026-04-22',
21
+ /**
22
+ * npm tarball integrity for defuddle@0.18.1. Recorded provenance, not
23
+ * something the test re-fetches; CI does not run npm pack.
24
+ */
25
+ tarballIntegrity: 'sha512-AvFPFOsoDjt5xUOA1QxzafSSzJ5dqEIC63yO72tHYtSjj1DYY/XM0XTPUCsHkm5A2f1X9ulBvoSVFJrd4s2ckA==',
26
+ /**
27
+ * The entry the bundle must be built from. exports["."] is the lite build,
28
+ * which silently ignores `markdown: true` and returns cleaned HTML.
29
+ */
30
+ entry: 'dist/index.full.js',
31
+ /** Byte length of vendor/defuddle.iife.min.js. */
32
+ bytes: 699043,
33
+ /** sha256 of vendor/defuddle.iife.min.js. */
34
+ sha256: '581bdb074e62570834c284031499e3d80ccca966915ab493b3e662e088770dab',
35
+ };
36
+ /**
37
+ * Names the full entry contributes and the lite entry does not. These are
38
+ * module export names and library property names, which esbuild preserves; a
39
+ * minified local identifier would change on every rebuild and is useless as a
40
+ * marker.
41
+ */
42
+ export const FULL_ENTRY_MARKERS = [
43
+ 'toMarkdown',
44
+ 'createMarkdownContent',
45
+ 'turndown',
46
+ 'fencedCodeBlock',
47
+ 'blankReplacement',
48
+ ];
49
+ //# sourceMappingURL=defuddle-provenance.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"defuddle-provenance.js","sourceRoot":"","sources":["../../../../src/browser/adaptive-fetch/defuddle-provenance.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;IAC3B,kDAAkD;IAClD,OAAO,EAAE,QAAQ;IACjB,uDAAuD;IACvD,UAAU,EAAE,QAAQ;IACpB,0EAA0E;IAC1E,UAAU,EAAE,YAAY;IACxB;;;OAGG;IACH,gBAAgB,EAAE,iGAAiG;IACnH;;;OAGG;IACH,KAAK,EAAE,oBAAoB;IAC3B,kDAAkD;IAClD,KAAK,EAAE,MAAM;IACb,6CAA6C;IAC7C,MAAM,EAAE,kEAAkE;CACpE,CAAC;AAEX;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAC9B,YAAY;IACZ,uBAAuB;IACvB,UAAU;IACV,iBAAiB;IACjB,kBAAkB;CACZ,CAAC"}
@@ -1,4 +1,5 @@
1
1
  // Mirrored from agbrowse adaptive-fetch v2; keep runtime behavior aligned while cli-jaw mirror remains experimental.
2
+ import net from 'node:net';
2
3
  export function resolvePublicEndpointCandidates(rawUrl) {
3
4
  const url = rawUrl instanceof URL ? rawUrl : new URL(String(rawUrl));
4
5
  return [
@@ -22,11 +23,23 @@ export function resolvePublicEndpointCandidates(rawUrl) {
22
23
  ...naverBlogCandidates(url),
23
24
  ...naverNewsCandidates(url),
24
25
  ...naverFinanceCandidates(url),
25
- ...mediumCandidates(url),
26
- ...substackCandidates(url),
27
- ...linkedinCandidates(url),
28
26
  ];
29
27
  }
28
+ /**
29
+ * #694: labels whose candidate already is the content rather than a structured
30
+ * API response — raw file bytes, or a cleaner rendition of the same page. They
31
+ * are meant to flow through the ordinary text and extraction path, so having no
32
+ * normalizer is the design for them rather than a gap in coverage.
33
+ */
34
+ export const DIRECT_CONTENT_LABELS = [
35
+ // The raw file itself; there is nothing to structure.
36
+ 'github-raw',
37
+ // Naver's mobile hosts render the same article with far less chrome.
38
+ 'naver-blog-mobile',
39
+ 'naver-news-mobile',
40
+ ];
41
+ /** #694: the one label handed to the yt-dlp reader rather than to a fetch. */
42
+ export const YTDLP_LABELS = ['youtube-ytdlp'];
30
43
  function githubCandidates(url) {
31
44
  if (url.hostname !== 'github.com')
32
45
  return [];
@@ -157,6 +170,18 @@ function blueskyCandidates(url) {
157
170
  }];
158
171
  }
159
172
  function mastodonCandidates(url) {
173
+ // The candidate reuses the hostname the caller already supplied and the
174
+ // scheduler fetches that same host directly anyway, so this resolver does
175
+ // not widen SSRF reach -- the per-hop DNS guard in the fetch lane is what
176
+ // contains it. A known-instance allowlist was considered and rejected: it
177
+ // would block most of the fediverse while still admitting any hostname that
178
+ // happens to end in an allowed suffix. What is worth refusing here is a
179
+ // shape no real instance has, so an IP literal or a single-label host does
180
+ // not get an API candidate synthesised for it.
181
+ if (net.isIP(url.hostname) !== 0)
182
+ return [];
183
+ if (!url.hostname.includes('.'))
184
+ return [];
160
185
  const parts = url.pathname.split('/').filter(Boolean);
161
186
  const statusMatch = parts.length >= 2 && parts[0].startsWith('@') && /^\d+$/.test(parts[1]);
162
187
  if (statusMatch) {
@@ -341,39 +366,44 @@ function naverFinanceCandidates(url) {
341
366
  const code = url.searchParams.get('code');
342
367
  if (!code || !/^[A-Z0-9]{4,12}$/i.test(code))
343
368
  return [];
369
+ // #694: the window used to be frozen at a fixed pair of calendar dates, so
370
+ // every session past the hardcoded end would have been silently cut off.
371
+ // The endpoint is the Korean exchange, so the window is computed on the
372
+ // Seoul calendar, and the end runs a day ahead so no offset can truncate
373
+ // the newest session. Korea has no DST, so a fixed +9h shift is exact.
374
+ const now = Date.now();
375
+ const start = seoulTwoYearsBack(now);
376
+ const end = seoulYyyymmdd(now + 24 * 60 * 60 * 1000);
344
377
  return [{
345
378
  label: 'naver-finance-json',
346
- url: `https://api.finance.naver.com/siseJson.naver?symbol=${encodeURIComponent(code)}&requestType=1&startTime=20240101&endTime=20261231&timeframe=day`,
379
+ url: `https://api.finance.naver.com/siseJson.naver?symbol=${encodeURIComponent(code)}&requestType=1&startTime=${start}&endTime=${end}&timeframe=day`,
347
380
  source: 'public_endpoint',
348
381
  }];
349
382
  }
350
- function mediumCandidates(url) {
351
- if (!/(^|\.)medium\.com$/i.test(url.hostname))
352
- return [];
353
- return [{
354
- label: 'medium-oembed',
355
- url: `https://medium.com/oembed?url=${encodeURIComponent(url.href)}`,
356
- source: 'public_endpoint',
357
- }];
383
+ const SEOUL_OFFSET_MS = 9 * 60 * 60 * 1000;
384
+ /** YYYYMMDD on the Seoul calendar. */
385
+ function seoulYyyymmdd(epochMs) {
386
+ const shifted = new Date(epochMs + SEOUL_OFFSET_MS);
387
+ const month = String(shifted.getUTCMonth() + 1).padStart(2, '0');
388
+ const day = String(shifted.getUTCDate()).padStart(2, '0');
389
+ return `${shifted.getUTCFullYear()}${month}${day}`;
358
390
  }
359
- function substackCandidates(url) {
360
- if (!/(^|\.)substack\.com$/i.test(url.hostname))
361
- return [];
362
- return [{
363
- label: 'substack-oembed',
364
- url: `https://substack.com/oembed?url=${encodeURIComponent(url.href)}`,
365
- source: 'public_endpoint',
366
- }];
367
- }
368
- function linkedinCandidates(url) {
369
- if (!/(^|\.)linkedin\.com$/i.test(url.hostname))
370
- return [];
371
- if (!url.pathname.startsWith('/posts/') && !url.pathname.startsWith('/pulse/'))
372
- return [];
373
- return [{
374
- label: 'linkedin-oembed',
375
- url: `https://www.linkedin.com/oembed?url=${encodeURIComponent(url.href)}&format=json`,
376
- source: 'public_endpoint',
377
- }];
391
+ /**
392
+ * Two Seoul years back. Subtracting from the year field directly would emit a
393
+ * 29 February in a year that has none; routing through Date.UTC rolls that to
394
+ * 1 March instead of producing a date that never existed.
395
+ */
396
+ function seoulTwoYearsBack(epochMs) {
397
+ const shifted = new Date(epochMs + SEOUL_OFFSET_MS);
398
+ const rolled = Date.UTC(shifted.getUTCFullYear() - 2, shifted.getUTCMonth(), shifted.getUTCDate());
399
+ return seoulYyyymmdd(rolled - SEOUL_OFFSET_MS);
378
400
  }
401
+ // #694: medium / substack / linkedin oEmbed candidates were removed. None of
402
+ // the three endpoints answers: checked live on 2026-09-11, medium.com/oembed
403
+ // returns 403 from Cloudflare even with browser headers, and both
404
+ // substack.com/oembed and the publication-host variant, and
405
+ // linkedin.com/oembed, return 404. They also had no normalizer, so a candidate
406
+ // that did answer would have fallen through to raw text anyway. Synthesising a
407
+ // URL that is always refused only costs a request and a misleading "supported"
408
+ // entry in the manifest.
379
409
  //# sourceMappingURL=endpoint-resolvers.js.map