oh-my-opencode 5.1.57 → 5.1.59

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 (83) hide show
  1. package/dist/cli/index.js +49 -45
  2. package/dist/cli-node/index.js +49 -45
  3. package/dist/index.js +364 -282
  4. package/dist/skills/browser/runtime/omowright/index.js +20 -19
  5. package/dist/skills/browser/runtime/omowright/manifest.json +3 -3
  6. package/dist/skills/eval-integrity/SKILL.md +107 -0
  7. package/dist/skills/ultimate-browsing/engine/executor.py +56 -5
  8. package/dist/skills/ultimate-browsing/engine/tests/test_executor_timeout.py +144 -0
  9. package/dist/skills/ulw-research/scripts/fidelity-values.mjs +5 -2
  10. package/dist/skills/ulw-research/scripts/fidelity-values.test.ts +26 -0
  11. package/dist/skills/ulw-research/scripts/html-foreign-object.mjs +61 -0
  12. package/dist/skills/ulw-research/scripts/html-lite.mjs +7 -3
  13. package/dist/skills/ulw-research/scripts/html-lite.test.ts +19 -0
  14. package/dist/tui.js +44 -40
  15. package/package.json +15 -15
  16. package/packages/omo-codex/plugin/.codex-plugin/plugin.json +1 -1
  17. package/packages/omo-codex/plugin/components/bootstrap/dist/cli.js +5 -1
  18. package/packages/omo-codex/plugin/components/bootstrap/hooks/hooks.json +1 -1
  19. package/packages/omo-codex/plugin/components/bootstrap/package.json +1 -1
  20. package/packages/omo-codex/plugin/components/comment-checker/hooks/hooks.json +1 -1
  21. package/packages/omo-codex/plugin/components/comment-checker/package.json +1 -1
  22. package/packages/omo-codex/plugin/components/git-bash/hooks/hooks.json +2 -2
  23. package/packages/omo-codex/plugin/components/git-bash/package.json +1 -1
  24. package/packages/omo-codex/plugin/components/lazycodex-executor-verify/hooks/hooks.json +1 -1
  25. package/packages/omo-codex/plugin/components/lazycodex-executor-verify/package.json +1 -1
  26. package/packages/omo-codex/plugin/components/lsp/dist/.omo-runtime-manifest.json +2 -2
  27. package/packages/omo-codex/plugin/components/lsp/hooks/hooks.json +2 -2
  28. package/packages/omo-codex/plugin/components/lsp/package.json +1 -1
  29. package/packages/omo-codex/plugin/components/rules/hooks/hooks.json +4 -4
  30. package/packages/omo-codex/plugin/components/rules/package.json +1 -1
  31. package/packages/omo-codex/plugin/components/teammode/hooks/hooks.json +1 -1
  32. package/packages/omo-codex/plugin/components/teammode/package.json +1 -1
  33. package/packages/omo-codex/plugin/components/telemetry/hooks/hooks.json +1 -1
  34. package/packages/omo-codex/plugin/components/telemetry/package.json +1 -1
  35. package/packages/omo-codex/plugin/components/ultrawork/hooks/hooks.json +1 -1
  36. package/packages/omo-codex/plugin/components/ultrawork/package.json +1 -1
  37. package/packages/omo-codex/plugin/components/ulw-execute-continuation/hooks/hooks.json +1 -1
  38. package/packages/omo-codex/plugin/components/ulw-execute-continuation/package.json +1 -1
  39. package/packages/omo-codex/plugin/components/ulw-loop/hooks/hooks.json +5 -5
  40. package/packages/omo-codex/plugin/components/ulw-loop/package.json +1 -1
  41. package/packages/omo-codex/plugin/hooks/post-compact-resetting-git-bash-mcp-reminder.json +1 -1
  42. package/packages/omo-codex/plugin/hooks/post-compact-resetting-lsp-diagnostics-cache.json +1 -1
  43. package/packages/omo-codex/plugin/hooks/post-compact-resetting-project-rule-cache.json +1 -1
  44. package/packages/omo-codex/plugin/hooks/post-tool-use-checking-comments.json +1 -1
  45. package/packages/omo-codex/plugin/hooks/post-tool-use-checking-lsp-diagnostics.json +1 -1
  46. package/packages/omo-codex/plugin/hooks/post-tool-use-checking-thread-title-hygiene.json +1 -1
  47. package/packages/omo-codex/plugin/hooks/post-tool-use-matching-project-rules.json +1 -1
  48. package/packages/omo-codex/plugin/hooks/post-tool-use-recording-spawn-admission.json +1 -1
  49. package/packages/omo-codex/plugin/hooks/pre-tool-use-enforcing-unlimited-goal-budget.json +1 -1
  50. package/packages/omo-codex/plugin/hooks/pre-tool-use-guarding-ulw-loop-spawns.json +1 -1
  51. package/packages/omo-codex/plugin/hooks/pre-tool-use-recommending-git-bash-mcp.json +1 -1
  52. package/packages/omo-codex/plugin/hooks/session-start-checking-auto-update.json +1 -1
  53. package/packages/omo-codex/plugin/hooks/session-start-checking-bootstrap-provisioning.json +1 -1
  54. package/packages/omo-codex/plugin/hooks/session-start-loading-project-rules.json +1 -1
  55. package/packages/omo-codex/plugin/hooks/session-start-recording-session-telemetry.json +1 -1
  56. package/packages/omo-codex/plugin/hooks/stop-checking-ulw-execute-continuation.json +1 -1
  57. package/packages/omo-codex/plugin/hooks/stop-checking-ulw-loop-resume.json +1 -1
  58. package/packages/omo-codex/plugin/hooks/subagent-stop-verifying-lazycodex-executor-evidence.json +1 -1
  59. package/packages/omo-codex/plugin/hooks/user-prompt-submit-checking-ultrawork-trigger.json +1 -1
  60. package/packages/omo-codex/plugin/hooks/user-prompt-submit-checking-ulw-loop-steering.json +1 -1
  61. package/packages/omo-codex/plugin/hooks/user-prompt-submit-loading-project-rules.json +1 -1
  62. package/packages/omo-codex/plugin/package-lock.json +12 -12
  63. package/packages/omo-codex/plugin/package.json +1 -1
  64. package/packages/omo-codex/plugin/skills/browser/runtime/omowright/index.js +20 -19
  65. package/packages/omo-codex/plugin/skills/browser/runtime/omowright/manifest.json +3 -3
  66. package/packages/omo-codex/plugin/skills/eval-integrity/SKILL.md +107 -0
  67. package/packages/omo-codex/plugin/skills/eval-integrity/agents/openai.yaml +2 -0
  68. package/packages/omo-codex/plugin/skills/ultimate-browsing/engine/executor.py +56 -5
  69. package/packages/omo-codex/plugin/skills/ulw-research/scripts/fidelity-values.mjs +5 -2
  70. package/packages/omo-codex/plugin/skills/ulw-research/scripts/html-foreign-object.mjs +61 -0
  71. package/packages/omo-codex/plugin/skills/ulw-research/scripts/html-lite.mjs +7 -3
  72. package/packages/omo-codex/plugin/test/sync-skills-test-support.mjs +1 -0
  73. package/packages/omo-codex/scripts/install-dist/install-local.mjs +7 -3
  74. package/packages/shared-skills/skills/browser/runtime/omowright/index.js +20 -19
  75. package/packages/shared-skills/skills/browser/runtime/omowright/manifest.json +3 -3
  76. package/packages/shared-skills/skills/eval-integrity/SKILL.md +107 -0
  77. package/packages/shared-skills/skills/ultimate-browsing/engine/executor.py +56 -5
  78. package/packages/shared-skills/skills/ultimate-browsing/engine/tests/test_executor_timeout.py +144 -0
  79. package/packages/shared-skills/skills/ulw-research/scripts/fidelity-values.mjs +5 -2
  80. package/packages/shared-skills/skills/ulw-research/scripts/fidelity-values.test.ts +26 -0
  81. package/packages/shared-skills/skills/ulw-research/scripts/html-foreign-object.mjs +61 -0
  82. package/packages/shared-skills/skills/ulw-research/scripts/html-lite.mjs +7 -3
  83. package/packages/shared-skills/skills/ulw-research/scripts/html-lite.test.ts +19 -0
@@ -1,9 +1,9 @@
1
1
  {
2
2
  "version": "0.0.1",
3
- "sourceDigest": "c9eaae75e948cc52d5b60bb654a5565869d68627046453d87d6f695a5b618045",
3
+ "sourceDigest": "27243299c68de06d4321588d998bd106e0554086d268dc448aa70571db719c1d",
4
4
  "files": {
5
- "index.js": "8b14c1775f397e36967a0d094c67e2a31f8ae1e92add172925548723ca339046",
5
+ "index.js": "3a2e4f2575bdfc15448f13768cd8113f8493bf04611c9fefb09b13430d6520de",
6
6
  "page-bundle.js": "bfd51e8383cf47200d57387bbbed258bce5a3a3d00c38fc108034d2888e23f0c"
7
7
  },
8
- "stagedAtUtc": "2026-11-01T20:36:05.138Z"
8
+ "stagedAtUtc": "2026-11-03T09:02:51.904Z"
9
9
  }
@@ -0,0 +1,107 @@
1
+ ---
2
+ name: eval-integrity
3
+ description: "Assess integrity of an eval, benchmark, metric, A/B test, holdout, LLM-judge, or user-study claim when the question is whether measurement, comparison, or evidence is independent and trustworthy."
4
+ ---
5
+
6
+ # Evaluation Integrity
7
+
8
+ Provide a read-only audit of whether an evaluation can support its stated claim. Do not alter code,
9
+ data, prompts, labels, or study operations. Begin with exactly one verdict line in the form
10
+ `**Verdict: PASS**`, `**Verdict: FAIL**`, or `**Verdict: INCONCLUSIVE**`. Emit no other verdict
11
+ line and do not restate the verdict later in the report. A favorable score is not itself evidence
12
+ of integrity.
13
+
14
+ ## Route correctly
15
+
16
+ - **NOT for code review:** route implementation, correctness, security, or maintainability review to
17
+ `review-work`.
18
+ - **NOT for data processing:** route cleaning, transforming, joining, modeling, or analyzing data to
19
+ `data-scientist`.
20
+ - Use this skill for the independence and validity of the measurement setup, not for producing a
21
+ result from it.
22
+
23
+ ## Audit method
24
+
25
+ ### 1. State the claim and map the evaluation
26
+
27
+ Write the claim in testable form: what comparison, metric, threshold, or causal statement is being
28
+ made; for which population; and under which decision rule. Map every role before judging it:
29
+
30
+ | Element | Record |
31
+ | --- | --- |
32
+ | Claim | The conclusion and decision it is meant to justify. |
33
+ | System under test | Exact model, version, configuration, prompt, policy, or treatment. |
34
+ | Dataset and split | Sources, collection dates, inclusion rules, train/dev/test or holdout assignment. |
35
+ | Designer | Who selected the task, data, prompts, treatments, metric, and stopping rule. |
36
+ | Evaluator or judge | Who or what assigns quality judgments, including model and prompt versions. |
37
+ | Scorer | The rule or system that turns outputs or judgments into the reported metric. |
38
+ | Subjects | Humans, records, tasks, or units exposed to treatment or observation. |
39
+
40
+ Trace shared ownership, shared data, shared prompts, shared labels, and shared selection decisions
41
+ across this map. Several models do **not** establish independence merely because there are several
42
+ of them; identify distinct training, tuning, prompt design, labels, data, and decision authority.
43
+
44
+ ### 2. Check the ground truth
45
+
46
+ Identify the independent ground truth that could confirm the claim without reusing the system's own
47
+ preferences, outputs, labels, or optimization target. Test whether it is:
48
+
49
+ - external to the system under test and its designer;
50
+ - collected or adjudicated without seeing the treatment identity when blinding is feasible;
51
+ - appropriate to the claim rather than a proxy selected because it favors one arm; and
52
+ - fixed before comparison, or accompanied by a disclosed multiplicity and selection procedure.
53
+
54
+ If no independent ground truth exists, do not substitute agreement among related systems. Mark the
55
+ claim **INCONCLUSIVE** unless the stated claim is explicitly limited to that related system's score.
56
+
57
+ ### 3. Probe independence failures
58
+
59
+ Check only risks relevant to the mapped design:
60
+
61
+ - **Contamination:** benchmark items, answers, or near duplicates reached training, prompt design,
62
+ retrieval, tuning, or post-hoc selection.
63
+ - **Invalid controls:** arms differ beyond the intended treatment, allocation is biased, exposure is
64
+ unequal, or the control cannot answer the causal comparison.
65
+ - **Circular judging:** the evaluated system, its designer, or a derived rubric defines its own
66
+ success without external confirmation.
67
+ - **Scorer-label coupling:** labels, thresholds, reward signals, or rubric choices are reused by the
68
+ scorer in a way that makes agreement self-fulfilling.
69
+ - **Evaluator-designer coupling:** the evaluator, judge prompt, or adjudication process is selected,
70
+ tuned, or influenced by the comparison designer without an independent safeguard.
71
+ - **Split or annotator dependence:** overlapping sources, duplicates, temporal leakage, shared
72
+ annotators, or correlated annotation policies invalidate assumed independence.
73
+ - **Hypothesis priming:** task framing, examples, pre-registration gaps, or interim results steer
74
+ evaluators or analysts toward the expected outcome.
75
+ - **Observer and demand effects:** subjects or observers infer the desired treatment or outcome, and
76
+ behavior or ratings change because of that knowledge.
77
+
78
+ For each concern, distinguish documented evidence from an assumption. Missing provenance for data,
79
+ splits, labels, prompts, evaluator selection, or scoring is **INCONCLUSIVE**, not evidence that the
80
+ design was independent.
81
+
82
+ ### 4. Reach the verdict
83
+
84
+ - **PASS:** evidence supports an independent, valid measurement path for the stated claim, with no
85
+ material unresolved dependency.
86
+ - **FAIL:** evidence shows a dependency or invalid design that materially invalidates or overstates
87
+ the stated claim.
88
+ - **INCONCLUSIVE:** provenance or evidence is missing, the ground truth is not independently
89
+ established, or remaining uncertainty prevents either result.
90
+
91
+ Do not convert uncertainty into PASS because a metric looks plausible, a result is statistically
92
+ significant, or multiple related evaluators agree.
93
+
94
+ ## Report
95
+
96
+ Report the verdict first. Then report only findings that fired; do not pad the report with risks
97
+ that were checked and did not fire. For each fired finding include:
98
+
99
+ 1. **Evidence:** the observed artifact, provenance record, or explicit absence of one.
100
+ 2. **Impact:** which claim or inference the issue weakens or invalidates.
101
+ 3. **Minimal independence fix:** the smallest separation, blind, held-out source, external
102
+ adjudication, or control change that would address it.
103
+ 4. **Missing evidence:** what must be supplied to resolve the finding, if applicable.
104
+ 5. **Residual risk:** what remains uncertain after the minimal fix.
105
+
106
+ Keep conclusions bounded to the evidence. This audit advises; it does not certify a system,
107
+ recompute results, or approve deployment.
@@ -21,6 +21,7 @@ from __future__ import annotations
21
21
  import json
22
22
  import os
23
23
  import shutil
24
+ import signal
24
25
  import subprocess
25
26
  import tempfile
26
27
  import time
@@ -32,6 +33,10 @@ from .result_schema import Attempt
32
33
 
33
34
 
34
35
  TEMPLATES_DIR = os.path.join(os.path.dirname(__file__), "templates")
36
+ # Chrome removes its per-launch state (the macOS code-sign clone, the temp
37
+ # profile) only on a clean quit, so a timed-out template's process group gets
38
+ # SIGTERM and this long to let `ctx.close()` run before SIGKILL (omo#12067).
39
+ TERM_GRACE_S = 5
35
40
 
36
41
 
37
42
  def _node_available() -> bool:
@@ -70,19 +75,65 @@ def _run_node_template(template: str, args: dict, timeout: int = 90) -> tuple[in
70
75
  if not os.path.isfile(path):
71
76
  return 127, "", f"template not found: {path}"
72
77
  try:
73
- proc = subprocess.run(
78
+ proc = subprocess.Popen(
74
79
  ["node", path],
75
- input=json.dumps(args),
80
+ stdin=subprocess.PIPE,
81
+ stdout=subprocess.PIPE,
82
+ stderr=subprocess.PIPE,
76
83
  cwd=TEMPLATES_DIR,
77
- capture_output=True,
78
84
  text=True,
79
- timeout=timeout,
85
+ start_new_session=True,
80
86
  )
81
- return proc.returncode, proc.stdout, proc.stderr
87
+ except Exception as e:
88
+ return 1, "", f"{type(e).__name__}:{e}"
89
+ try:
90
+ stdout, stderr = proc.communicate(input=json.dumps(args), timeout=timeout)
91
+ return proc.returncode, stdout, stderr
82
92
  except subprocess.TimeoutExpired:
93
+ _terminate_template_group(proc)
83
94
  return 124, "", f"timeout after {timeout}s"
84
95
  except Exception as e:
96
+ _terminate_template_group(proc)
85
97
  return 1, "", f"{type(e).__name__}:{e}"
98
+ except BaseException:
99
+ # Cancellation (KeyboardInterrupt, SystemExit): start_new_session keeps a
100
+ # terminal Ctrl-C from reaching the template's group, so quit it here.
101
+ _terminate_template_group(proc)
102
+ raise
103
+
104
+
105
+ def _signal_group(pgid: int, sig: int) -> bool:
106
+ try:
107
+ os.killpg(pgid, sig)
108
+ except ProcessLookupError:
109
+ return False
110
+ return True
111
+
112
+
113
+ def _terminate_template_group(proc: subprocess.Popen[str]) -> None:
114
+ """SIGTERM the template's whole group (node and the Chrome it launched), wait up to TERM_GRACE_S, then SIGKILL."""
115
+ if os.name == "nt":
116
+ proc.terminate()
117
+ try:
118
+ proc.wait(timeout=TERM_GRACE_S)
119
+ except subprocess.TimeoutExpired:
120
+ proc.kill()
121
+ else:
122
+ pgid = proc.pid
123
+ if _signal_group(pgid, signal.SIGTERM):
124
+ deadline = time.monotonic() + TERM_GRACE_S
125
+ while time.monotonic() < deadline:
126
+ proc.poll()
127
+ if not _signal_group(pgid, 0):
128
+ break
129
+ time.sleep(0.05)
130
+ else:
131
+ _signal_group(pgid, signal.SIGKILL)
132
+ try:
133
+ proc.communicate(timeout=TERM_GRACE_S)
134
+ except subprocess.TimeoutExpired:
135
+ proc.kill()
136
+ proc.communicate()
86
137
 
87
138
 
88
139
  class _FakeResp:
@@ -0,0 +1,144 @@
1
+ """A timed-out template must give its browser a graceful quit before any SIGKILL.
2
+
3
+ Chrome removes its per-launch state (the macOS code-sign clone, a temp profile)
4
+ only on a clean exit, so killing the node template alone, or killing anything
5
+ without a SIGTERM grace window first, leaks it (omo#12067). A fake template and a
6
+ fake "browser" grandchild stand in for Playwright and Chrome.
7
+ """
8
+ from __future__ import annotations
9
+
10
+ import os
11
+ import shutil
12
+ import subprocess
13
+ import sys
14
+ import tempfile
15
+ import textwrap
16
+ import time
17
+ import unittest
18
+ from pathlib import Path
19
+ from unittest import mock
20
+
21
+ sys.path.insert(0, str(Path(__file__).resolve().parents[2]))
22
+
23
+ from engine import executor # noqa: E402
24
+
25
+ FAKE_TEMPLATE = textwrap.dedent(
26
+ """
27
+ const { spawn } = require('node:child_process');
28
+ const fs = require('node:fs');
29
+ const log = process.env.EXECUTOR_TEST_LOG;
30
+ const record = (line) => fs.appendFileSync(log, `${line} ${Date.now()}\\n`);
31
+ const browser = spawn(process.execPath, ['-e', `
32
+ const fs = require('node:fs');
33
+ process.on('SIGTERM', () => { fs.appendFileSync(${JSON.stringify(log)}, 'BROWSER_TERM ' + Date.now() + '\\\\n'); process.exit(0); });
34
+ fs.appendFileSync(${JSON.stringify(log)}, 'BROWSER_READY ' + Date.now() + '\\\\n');
35
+ setInterval(() => {}, 60000);
36
+ `], { stdio: 'ignore' });
37
+ record(`PIDS ${process.pid}:${browser.pid}`);
38
+ process.on('SIGTERM', () => {
39
+ record('TEMPLATE_TERM');
40
+ if (process.env.EXECUTOR_TEST_TEMPLATE_ON_TERM === 'exit') process.exit(0);
41
+ });
42
+ setInterval(() => {}, 60000);
43
+ """
44
+ )
45
+
46
+
47
+ def _alive(pid: int) -> bool:
48
+ try:
49
+ os.kill(pid, 0)
50
+ except ProcessLookupError:
51
+ return False
52
+ return True
53
+
54
+
55
+ @unittest.skipIf(os.name == "nt" or shutil.which("node") is None, "POSIX process groups and node required")
56
+ class TimedOutTemplateTermination(unittest.TestCase):
57
+ def _run(self, on_term: str, communicate=None) -> tuple[int, str, dict[str, list[int]], float]:
58
+ tmp = Path(tempfile.mkdtemp(prefix="ultimate-browsing-executor-test-"))
59
+ self.addCleanup(shutil.rmtree, tmp, True)
60
+ (tmp / "fake_template.js").write_text(FAKE_TEMPLATE, encoding="utf-8")
61
+ log = tmp / "events.log"
62
+ env = {"EXECUTOR_TEST_LOG": str(log), "EXECUTOR_TEST_TEMPLATE_ON_TERM": on_term}
63
+ try:
64
+ with mock.patch.object(executor, "TEMPLATES_DIR", str(tmp)), mock.patch.dict(os.environ, env):
65
+ if communicate is None:
66
+ code, _out, err = executor._run_node_template("fake_template.js", {}, timeout=1)
67
+ else:
68
+ with mock.patch.object(executor.subprocess.Popen, "communicate", communicate(log)):
69
+ code, _out, err = executor._run_node_template("fake_template.js", {}, timeout=30)
70
+ finally:
71
+ events = self._read_events(log)
72
+ returned_at = time.time() * 1000
73
+ return code, err, events, returned_at
74
+
75
+ def _read_events(self, log: Path) -> dict[str, list[int]]:
76
+ events: dict[str, list[int]] = {}
77
+ if not log.exists():
78
+ return events
79
+ for line in log.read_text(encoding="utf-8").splitlines():
80
+ name, *rest = line.split(" ")
81
+ events.setdefault(name, []).append(int(rest[-1]))
82
+ if name == "PIDS":
83
+ template_pid, browser_pid = rest[0].split(":")
84
+ events["template_pid"] = [int(template_pid)]
85
+ events["browser_pid"] = [int(browser_pid)]
86
+ for pid in (int(template_pid), int(browser_pid)):
87
+ self.addCleanup(lambda p=pid: _alive(p) and os.kill(p, 9))
88
+ self.last_events = events
89
+ return events
90
+
91
+ def _assert_gone(self, pid: int) -> None:
92
+ deadline = time.time() + 2
93
+ while _alive(pid) and time.time() < deadline:
94
+ time.sleep(0.05)
95
+ self.assertFalse(_alive(pid), f"pid {pid} outlived the timed-out template")
96
+
97
+ def test_timeout_terms_the_whole_group_and_waits_before_kill(self) -> None:
98
+ code, err, events, returned_at = self._run(on_term="ignore")
99
+ self.assertEqual(code, 124, err)
100
+ self.assertIn("BROWSER_TERM", events, "the browser grandchild never got SIGTERM")
101
+ self.assertIn("TEMPLATE_TERM", events, "the template never got SIGTERM")
102
+ grace_ms = returned_at - events["TEMPLATE_TERM"][0]
103
+ self.assertGreaterEqual(grace_ms, executor.TERM_GRACE_S * 1000 - 500, "SIGKILL came without a grace window")
104
+ self._assert_gone(events["template_pid"][0])
105
+ self._assert_gone(events["browser_pid"][0])
106
+
107
+ def test_template_that_quits_on_term_is_not_held_for_the_grace(self) -> None:
108
+ code, err, events, returned_at = self._run(on_term="exit")
109
+ self.assertEqual(code, 124, err)
110
+ self.assertIn("TEMPLATE_TERM", events)
111
+ self.assertLess(returned_at - events["TEMPLATE_TERM"][0], 3000)
112
+ self._assert_gone(events["browser_pid"][0])
113
+
114
+ def test_cancelled_run_tears_the_group_down_and_reraises(self) -> None:
115
+ # A KeyboardInterrupt (or any BaseException) during communicate() must still
116
+ # quit node and its browser: start_new_session means a terminal Ctrl-C no
117
+ # longer reaches the template's group, so nobody else will.
118
+ original = subprocess.Popen.communicate
119
+
120
+ def interrupting(log: Path):
121
+ calls = {"n": 0}
122
+
123
+ def communicate(proc, *args, **kwargs):
124
+ calls["n"] += 1
125
+ if calls["n"] > 1:
126
+ return original(proc, *args, **kwargs)
127
+ deadline = time.time() + 10
128
+ while time.time() < deadline and not (log.exists() and "BROWSER_READY" in log.read_text(encoding="utf-8")):
129
+ time.sleep(0.02)
130
+ raise KeyboardInterrupt
131
+
132
+ return communicate
133
+
134
+ with self.assertRaises(KeyboardInterrupt):
135
+ self._run(on_term="exit", communicate=interrupting)
136
+ events = self.last_events
137
+ self.assertIn("browser_pid", events, "the fake template never started")
138
+ self.assertIn("BROWSER_TERM", events, "the browser never got SIGTERM after the run was cancelled")
139
+ self._assert_gone(events["template_pid"][0])
140
+ self._assert_gone(events["browser_pid"][0])
141
+
142
+
143
+ if __name__ == "__main__":
144
+ unittest.main()
@@ -82,13 +82,16 @@ export function exportRows(ledger) {
82
82
 
83
83
  const walk = (node) => node.children.filter((child) => child.tag !== "#text").flatMap((child) => [child, ...walk(child)])
84
84
 
85
- /** SVG text nodes of a chart: data labels, or ticks with their declared grid. */
85
+ /** SVG text nodes of a chart: data labels, or ticks with their declared grid; foreignObject HTML counts as unticked labels. */
86
86
  function svgLabels(raw) {
87
- return walk(parseHtml(raw)).filter((node) => node.tag === "text").map((node) => {
87
+ const nodes = walk(parseHtml(raw))
88
+ const texts = nodes.filter((node) => node.tag === "text").map((node) => {
88
89
  let tick = null
89
90
  for (let cur = node.parent; cur && !tick; cur = cur.parent) if (cur.tag === "g" && /(?:^|\s)ticks(?:\s|$)/.test(cur.attrs.class ?? "")) tick = cur.attrs
90
91
  return { text: proseText(node), tick }
91
92
  })
93
+ const foreign = nodes.filter((node) => node.tag === "foreignobject").map((node) => ({ text: proseText(node), tick: null }))
94
+ return [...texts, ...foreign]
92
95
  }
93
96
 
94
97
  function onGrid(value, tick) {
@@ -212,6 +212,32 @@ describe("verification claims are structural (data-claim-kind)", () => {
212
212
  })
213
213
  })
214
214
 
215
+ describe("foreignObject (omo #11570)", () => {
216
+ const chartFO = (inner: string) =>
217
+ `<figure data-chart-source="assets/share.csv"><svg viewBox="0 0 200 100"><foreignObject><div xmlns="http://www.w3.org/1999/xhtml">${inner}</div></foreignObject></svg><figcaption>Share by segment [S4].</figcaption></figure>`
218
+ const valueFact = (id: string, text: string, value: string) => `<data class="fact" data-fact="${id}" value="${value}">${text}</data>`
219
+
220
+ const CASES: [string, string, string[]][] = [
221
+ ["fact element unit change", chartFO(`<p>Span ${fact("F1", "110.6 mm", "mm")} long [S4].</p>`), ["unit_mismatch", "chart_value_untraceable"]],
222
+ ["fact element digit change", chartFO(`<p>Units ${fact("F2", "1,273")} sold [S4].</p>`), ["value_mismatch", "chart_value_untraceable"]],
223
+ ["fact element digit plus value attribute", chartFO(`<p>Units ${valueFact("F2", "1,273", "1,273")} sold [S4].</p>`), ["value_mismatch", "chart_value_untraceable"]],
224
+ ["bare numeral sentence", chartFO(`<p>Growth 1234567 m [S4].</p>`), ["chart_value_untraceable"]],
225
+ ["numeral-free control", chartFO(`<p>Share by segment, no numbers here [S4].</p>`), []],
226
+ ["clean fact at a plot value", chartFO(`<p>Share ${fact("F5", "12%", "%")} total [S4].</p>`), []],
227
+ ]
228
+ for (const [name, body, want] of CASES) {
229
+ test(`#given ${name} inside foreignObject #when checked #then ${want.length ? want.join(" + ") : "clean"}`, () => {
230
+ expect(codes(run(body))).toEqual(want)
231
+ })
232
+ }
233
+
234
+ test("#given the same fact mutations in prose #when checked #then the same fact codes", () => {
235
+ expect(codes(run(`<p>Span ${fact("F1", "110.6 mm", "mm")} long [S4].</p>`))).toEqual(["unit_mismatch"])
236
+ expect(codes(run(`<p>Units ${valueFact("F2", "1,273", "1,273")} sold [S4].</p>`))).toEqual(["value_mismatch"])
237
+ expect(codes(run("<p>Growth 1234567 m [S4].</p>"))).toEqual(["untraceable_number"])
238
+ })
239
+ })
240
+
215
241
  describe("charts", () => {
216
242
  const SRC = 'data-chart-source="assets/share.csv"'
217
243
 
@@ -0,0 +1,61 @@
1
+ // html-foreign-object.mjs - the <foreignObject> carve-out for the html-lite tokenizer.
2
+ //
3
+ // An <svg> element is raw drawing markup, except <foreignObject>, which by definition holds
4
+ // HTML. The tokenizer keeps the svg's inner source in `raw` and additionally parses each
5
+ // foreignObject subtree into real children of the svg node, so the fidelity checks read chart
6
+ // HTML exactly like prose while the rest of the svg stays raw. Plain Node ESM, no dependencies.
7
+
8
+ import { makeNode, readTag } from "./html-lite.mjs"
9
+
10
+ /** Newlines in text before offset `to`. */
11
+ function newlinesBefore(text, to) {
12
+ let count = 0
13
+ for (let at = text.indexOf("\n"); at !== -1 && at < to; at = text.indexOf("\n", at + 1)) count++
14
+ return count
15
+ }
16
+
17
+ /** Shift a parsed subtree's line numbers by `delta` (fragment lines are relative to the fragment). */
18
+ function shiftLines(node, delta) {
19
+ node.line += delta
20
+ for (const child of node.children) shiftLines(child, delta)
21
+ }
22
+
23
+ const isLetter = (ch) => (ch >= "a" && ch <= "z") || (ch >= "A" && ch <= "Z")
24
+
25
+ /**
26
+ * Parse an svg node's <foreignObject> subtrees into real children; the rest of the svg stays raw.
27
+ * @param {object} node an <svg> LiteNode whose `raw` holds its inner source
28
+ * @param {number} rawStartLine document line of the first raw character
29
+ * @param {(source: string) => object} parseHtml the tokenizer, passed in so this module never imports it back
30
+ */
31
+ export function attachForeignObjects(node, rawStartLine, parseHtml) {
32
+ const raw = node.raw ?? ""
33
+ for (let lt = raw.indexOf("<"); lt !== -1; lt = raw.indexOf("<", lt + 1)) {
34
+ if (raw[lt + 1] === "/" || !isLetter(raw[lt + 1] ?? "")) continue
35
+ const open = readTag(raw, lt + 1)
36
+ if (open.name !== "foreignobject" || open.selfClosing) continue
37
+ let depth = 0
38
+ let innerEnd = raw.length
39
+ let resume = raw.length
40
+ for (let at = raw.indexOf("<", open.end); at !== -1; at = raw.indexOf("<", at + 1)) {
41
+ const closing = raw[at + 1] === "/"
42
+ if (!closing && !isLetter(raw[at + 1] ?? "")) continue
43
+ if (readTag(raw, at + (closing ? 2 : 1)).name !== "foreignobject") continue
44
+ if (closing) {
45
+ if (depth === 0) { innerEnd = at; const gt = raw.indexOf(">", at); resume = gt === -1 ? raw.length : gt + 1; break }
46
+ depth--
47
+ } else depth++
48
+ }
49
+ // Tags are lowercased by readTag, so the attached node is "foreignobject" like any parsed tag.
50
+ const fo = makeNode("foreignobject", open.attrs, node, rawStartLine + newlinesBefore(raw, lt))
51
+ const frag = parseHtml(raw.slice(open.end, innerEnd))
52
+ const body = frag.children.find((child) => child.tag === "body") ?? frag
53
+ for (const child of body.children) {
54
+ child.parent = fo
55
+ shiftLines(child, rawStartLine + newlinesBefore(raw, open.end) - 1)
56
+ fo.children.push(child)
57
+ }
58
+ node.children.push(fo)
59
+ lt = resume - 1
60
+ }
61
+ }
@@ -3,10 +3,13 @@
3
3
  // Single forward scan with indexOf (no whole-document regex, no backtracking). Produces a
4
4
  // LiteNode tree: { tag, attrs, children, parent, line, text, raw }. Text nodes carry
5
5
  // tag "#text"; <style>/<script>/<svg> keep their inner source in `raw` and have no parsed
6
- // children. The "#document" root also carries `ids` (id -> occurrence count) so
7
- // selectorPath can tell whether an id is unique. Plain Node ESM, no dependencies.
6
+ // children, except an <svg> node also gains its <foreignObject> subtrees as parsed children
7
+ // (see html-foreign-object.mjs; the rest of the svg stays raw). The "#document"
8
+ // root also carries `ids` (id -> occurrence count) so selectorPath can tell whether an id
9
+ // is unique. Plain Node ESM, no dependencies.
8
10
 
9
11
  import { decodeEntities } from "./entities.mjs"
12
+ import { attachForeignObjects } from "./html-foreign-object.mjs"
10
13
 
11
14
  export { decodeEntities }
12
15
 
@@ -25,7 +28,7 @@ const SAFE_ID = /^[A-Za-z_][\w-]*$/
25
28
  export const PROSE_TAGS = new Set(["p", "li", ...HEADINGS, "td", "th", "figcaption", "blockquote", "dd", "dt"])
26
29
  export const PROSE_BREAKS = new Set([...P_CLOSERS, ...PROSE_TAGS, "br", "tr"])
27
30
 
28
- function makeNode(tag, attrs, parent, line) {
31
+ export function makeNode(tag, attrs, parent, line) {
29
32
  return { tag, attrs, children: [], parent, line, text: "", raw: null }
30
33
  }
31
34
 
@@ -181,6 +184,7 @@ export function parseHtml(source) {
181
184
  if (!tag.selfClosing) {
182
185
  const [innerEnd, resume] = findRawClose(src, tag.end, tag.name)
183
186
  node.raw = src.slice(tag.end, innerEnd)
187
+ if (tag.name === "svg") attachForeignObjects(node, lineAt(starts, tag.end), parseHtml)
184
188
  at = textStart = resume
185
189
  }
186
190
  } else if (!VOID_TAGS.has(tag.name)) {
@@ -129,6 +129,25 @@ describe("parseHtml", () => {
129
129
  expect(childTags(svg.parent as LiteNode)).toEqual(["script", "svg", "p"])
130
130
  })
131
131
 
132
+ test("#given an svg with drawing markup and a foreignObject #when parsed #then raw is kept and only the foreignObject subtree is parsed", () => {
133
+ // given
134
+ const source =
135
+ "<body><svg viewBox=\"0 0 200 100\"><path d=\"M0 0\"/><text>12%</text><foreignObject>\n<div>chart 110.6 mm</div>\n</foreignObject></svg></body>"
136
+ // when
137
+ const doc = parseHtml(source)
138
+ // then
139
+ const svg = byTag(doc, "svg")[0] as LiteNode
140
+ expect(svg.raw).toBe("<path d=\"M0 0\"/><text>12%</text><foreignObject>\n<div>chart 110.6 mm</div>\n</foreignObject>")
141
+ expect(childTags(svg)).toEqual(["foreignobject"])
142
+ const fo = byTag(doc, "foreignobject")[0] as LiteNode
143
+ expect(fo.line).toBe(1)
144
+ const div = byTag(doc, "div")[0] as LiteNode
145
+ expect(div.line).toBe(2)
146
+ expect(proseText(div)).toBe("chart 110.6 mm")
147
+ expect(byTag(doc, "text")).toHaveLength(0)
148
+ expect(byTag(doc, "path")).toHaveLength(0)
149
+ })
150
+
132
151
  test("#given an unclosed fragment without body #when parsed #then the tree still has body > div > p", () => {
133
152
  // given
134
153
  const source = "<div><p>unclosed"