Use Claude Code, Codex, VSCode, Pi, and OpenCode (and 6 other harnesses) for free (1.3B+ free tokens) from your terminal, app, IDE, or phone, and now from the browser with native browser sessions (multi-harness + multi-model) like OpenClaw (voice supported + ToS friendly)
Python
Collapse doctor output in bug reports (#1911)
Ali Khokhar4f6e56bd726b
diff --git a/.github/workflows/validate-bug-report-version.yml b/.github/workflows/validate-bug-report-version.ymlindex 7d1c6641..97001ae0 100644--- a/.github/workflows/validate-bug-report-version.yml+++ b/.github/workflows/validate-bug-report-version.yml@@ -37,6 +37,8 @@ jobs:if (doctor.length) {if (doctor.length !== 1) return { valid: false };let text = doctor[0].replace(/^FCC doctor output\r?\n/, "").trim();+ const details = text.match(/^<details>\s*<summary>[^<>\r\n]*<\/summary>\s*([\s\S]*?)\s*<\/details>$/);+ if (details) text = details[1].trim();const fence = text.match(/^```(?:json)?\r?\n([\s\S]*)\r?\n```$/);if (fence) text = fence[1];let report;@@ -58,7 +60,25 @@ jobs:const reportedVersion = versionMatches.length === 1 ? versionMatches[0][1] : undefined;return { valid: reportedVersion !== undefined || fieldValue === "None", reportedVersion };};- const { reportedVersion, valid } = parseReport(issue.body || "");+ const collapseDoctorReport = (body) => {+ const sections = body.split(/(?=^### )/m);+ const index = sections.findIndex((section) => /^### FCC doctor output\r?\n/.test(section));+ if (index === -1 || !parseReport(body).valid) return body;+ const section = sections[index];+ const text = section.replace(/^### FCC doctor output\r?\n/, "").trim();+ if (text.startsWith("<details>")) return body;+ const newline = section.includes("\r\n") ? "\r\n" : "\n";+ const content = text.startsWith("```") ? text : `\`\`\`json${newline}${text}${newline}\`\`\``;+ const wrapped = ["<details>", "<summary>FCC doctor output</summary>", "", content, "", "</details>"].join(newline);+ const start = section.indexOf(text);+ sections[index] = section.slice(0, start) + wrapped + section.slice(start + text.length);+ return sections.join("");+ };+ const formattedBody = collapseDoctorReport(issue.body || "");+ if (formattedBody !== (issue.body || "")) {+ await github.rest.issues.update({ ...repo, issue_number, body: formattedBody });+ }+ const { reportedVersion, valid } = parseReport(formattedBody);const labelName = "needs-fcc-version";const invalidMarker = "<!-- fcc-version-validator -->";const outdatedMarker = "<!-- fcc-version-outdated -->";diff --git a/tests/contracts/test_issue_form_version_validation.py b/tests/contracts/test_issue_form_version_validation.pyindex d0160e8d..db494513 100644--- a/tests/contracts/test_issue_form_version_validation.py+++ b/tests/contracts/test_issue_form_version_validation.py@@ -76,6 +76,21 @@ def test_bug_forms_require_description_and_post_install_diagnostics() -> None:"body, valid, version",[('### FCC doctor output\n\n```json\n{"version":"1.2.3"}\n```', True, "1.2.3"),+ (+ '### FCC doctor output\n\n<details>\n<summary>FCC doctor output</summary>\n\n```json\n{"version":"1.2.3"}\n```\n\n</details>',+ True,+ "1.2.3",+ ),+ (+ '### FCC doctor output\r\n\r\n<details>\r\n<summary>Diagnostics</summary>\r\n\r\n```json\r\n{"version":"1.2.3"}\r\n```\r\n\r\n</details>',+ True,+ "1.2.3",+ ),+ (+ "### FCC doctor output\n\n<details>\n<summary>Diagnostics</summary>\n\n```json\n{invalid}\n```\n\n</details>",+ False,+ None,+ ),('### FCC doctor output\r\n\r\n```json\r\n{"version":"1.2.3"}\r\n```',True,@@ -101,6 +116,12 @@ def test_bug_forms_require_description_and_post_install_diagnostics() -> None:],)def test_report_parser_uses_the_correct_form_section(body, valid, version):+ result = _parse_report(body)+ assert result["valid"] is valid+ assert result.get("reportedVersion") == version+++def _parse_report(body):patterns = "\n".join(f"const {name} = {json.dumps(_workflow_pattern(name))};"for name in ("fieldPattern", "versionPattern")@@ -109,9 +130,71 @@ def test_report_parser_uses_the_correct_form_section(body, valid, version):script += (f"\nprocess.stdout.write(JSON.stringify(parseReport({json.dumps(body)})));")- result = _run_javascript(script)- assert result["valid"] is valid- assert result.get("reportedVersion") == version+ return _run_javascript(script)+++def test_plain_doctor_report_can_be_collapsed_without_changing_its_data(+ monkeypatch, capsys+):+ from free_claude_code.cli import doctor++ copied = []+ report = {"version": "1.2.3", "model_routing": {"model": "provider/```</details>"}}+ monkeypatch.setattr(doctor, "collect_report", lambda: report)+ monkeypatch.setattr(doctor, "copy_text", copied.append)+ doctor.main([])+ assert json.loads(capsys.readouterr().out) == report+ assert json.loads(copied[0]) == report+ body = "### FCC doctor output\n\n" + copied[0]+ collapsed = _collapse_report(body)+ assert collapsed.startswith("### FCC doctor output\n\n<details>\n")+ assert json.loads(collapsed.split("```json\n", 1)[1].rsplit("```", 1)[0]) == report+ assert _parse_report(collapsed) == {"valid": True, "reportedVersion": "1.2.3"}+++def _collapse_report(body):+ patterns = "\n".join(+ f"const {name} = {json.dumps(_workflow_pattern(name))};"+ for name in ("fieldPattern", "versionPattern")+ )+ script = (+ patterns+ + "\n"+ + _javascript_function("parseReport")+ + "\n"+ + _javascript_function("collapseDoctorReport")+ )+ script += f"\nprocess.stdout.write(JSON.stringify(collapseDoctorReport({json.dumps(body)})));"+ return _run_javascript(script)++[email protected]("newline", ["\n", "\r\n"])[email protected]("fenced", [False, True])+def test_collapsing_only_changes_doctor_section_and_is_idempotent(newline, fenced):+ report = '{"version":"1.2.3","model":"$&```</details>"}'+ content = f"```json\n{report}\n```" if fenced else report+ before = "### Describe the issue\n\nMy description and \n\n### FCC doctor output\n\n"+ after = "\n\n### Other details\n\nKeep this text exactly.\n"+ body = (before + content + after).replace("\n", newline)+ collapsed = _collapse_report(body)+ assert collapsed.startswith(before.replace("\n", newline) + "<details>")+ assert collapsed.endswith(after.replace("\n", newline))+ assert report in collapsed+ assert _collapse_report(collapsed) == collapsed+ assert _parse_report(collapsed) == {"valid": True, "reportedVersion": "1.2.3"}+++ "body",+ [+ "### Installation issue\n\nCannot install",+ "### FCC version\n\n1.2.3",+ "### FCC doctor output\n\n{invalid}",+ '### FCC doctor output\n\n{"version":"1.2.3"}\n\n### FCC doctor output\n\n{"version":"1.2.3"}',+ ],+)+def test_collapsing_leaves_other_or_invalid_reports_untouched(body):+ assert _collapse_report(body) == body@pytest.mark.parametrize(@@ -248,6 +331,11 @@ const github = {record("getIssue", args);return { data: liveIssue };},+ update: async (args) => {+ record("updateIssue", args);+ liveIssue.body = args.body;+ return { data: liveIssue };+ },getLabel: async (args) => record("getLabel", args),createLabel: async (args) => record("createLabel", args),addLabels: async (args) => {@@ -336,6 +424,7 @@ process.stdout.write(JSON.stringify({ calls, comments }));assert names.count("deleteComment") == 3assert names.count("getLatestRelease") == 4assert names.count("getIssue") == 6+ assert names.count("updateIssue") == (3 if form == "doctor" else 0)assert names.count("getLabel") == 1assert names.count("addLabels") == 1assert names.count("removeLabel") == 2@@ -354,7 +443,11 @@ process.stdout.write(JSON.stringify({ calls, comments }));)assert result["comments"] == []assert "cancel-in-progress: false" in workflow- assert "github.rest.issues.update({" not in workflow+ assert all(+ set(call["args"]) == {"owner", "repo", "issue_number", "body"}+ for call in calls+ if call["name"] == "updateIssue"+ )assert 'state: "closed"' not in workflow