Consolidate 36 Jules PRs: pre-compile regex, harden log sanitization, add dry-run plan details by Copilot · Pull Request #175 · abhimehro/ctrld-sync

Copilot · 2026-02-08T23:46:01Z

Jules generated 36 overlapping PRs across three categories (Bolt/Sentinel/Palette) with heavy duplication. This PR cherry-picks the best change from each category, incorporates bot review feedback (Gemini Code Assist, Copilot reviewer, CodeQL), and consolidates into a single mergeable PR.

⚡ Performance: Pre-compile regex (from PR #173)

Moved PROFILE_ID_PATTERN, RULE_PATTERN, and two sanitization patterns to module-level compiled constants. Used in is_valid_rule, is_valid_profile_id_format, validate_profile_id, and sanitize_for_log.

PROFILE_ID_PATTERN = re.compile(r"^[a-zA-Z0-9_-]+$")
RULE_PATTERN = re.compile(r"^[a-zA-Z0-9.\-_:*\/]+$")
_BASIC_AUTH_PATTERN = re.compile(r"://[^/@]+@")
_SENSITIVE_PARAM_PATTERN = re.compile(
    r"([?&#])(token|key|secret|password|auth|access_token|api_key)=[^&#\s]*",
    flags=re.IGNORECASE,
)

🛡️ Security: Redact credentials from logs (from PR #172 + review feedback)

sanitize_for_log() now strips Basic Auth (://user:pass@host) and sensitive query params before logging. Handles # fragment separators per Gemini review. Uses [^&#\s]* to avoid consuming trailing punctuation per Copilot review.

🎨 UX: Dry-run plan details + fix duplicate function (from PR #174)

Added print_plan_details() showing per-folder rule counts during --dry-run
Removed duplicate render_progress_bar definition (first copy was dead code shadowed by second)

PRs superseded (close these)

Category	PRs to close
Bolt (regex)	#140, #143, #152, #155, #158, #161, #167, #173
Sentinel (security)	#142, #145, #148, #151, #154, #157, #160, #169, #172
Palette (UX)	#139, #141, #144, #147, #150, #153, #156, #159, #162, #165, #168, #171, #174

Keep open (independent features): #146, #149, #164 (parallel deletion), #163 (RTLO fix), #166 (.env perms), #170 (combined API calls).

💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

Copilot · 2026-02-08T23:46:04Z

@abhimehro Unfortunately, I hit an error while trying to use the custom Copilot setup steps configured for this repository and had to close this PR. The error I am seeing is:

no `copilot-setup-steps` job found in your `copilot-setup-steps.yml` workflow file. Please ensure you have a single job named `copilot-setup-steps`. For more details, see https://gh.io/copilot/actions-setup-steps

Once you or someone with the necessary access fixes the problem, please unassign and then reassign issue #0 to me and I'll retry. Thanks!

trunk-io · 2026-02-08T23:46:05Z

😎 Merged manually by @abhimehro - details.

…itization, add dry-run plan details Incorporates the best changes from 36 Jules PRs, addressing review feedback: Bolt (Performance) - from PR #173: - Pre-compile PROFILE_ID_PATTERN and RULE_PATTERN at module level - Use compiled patterns in is_valid_profile_id_format, validate_profile_id, and is_valid_rule - Supersedes PRs: #140, #143, #152, #155, #158, #161, #167, #170, #173 Sentinel (Security) - from PR #172 with review feedback: - Enhance sanitize_for_log to redact Basic Auth credentials in URLs - Redact sensitive query parameters (token, key, secret, password, etc.) - Handle fragment separators (#) per Gemini Code Assist review - Use [^&#\s]* pattern per Copilot reviewer suggestion - Update docstring per reviewer suggestion - Supersedes PRs: #142, #145, #148, #151, #154, #157, #160, #169, #172 Palette (UX) - from PR #174 with lint fixes: - Add print_plan_details function for dry-run visibility - Fix duplicate render_progress_bar definition bug - Supersedes PRs: #139, #141, #144, #147, #150, #153, #156, #159, #162, #165, #168, #171, #174 Also: #146, #149, #164 (parallel folder deletion) and #166 (auto-fix .env perms) are independent features not consolidated here. Co-authored-by: abhimehro <84992105+abhimehro@users.noreply.github.com>

main.py

…odule level Co-authored-by: abhimehro <84992105+abhimehro@users.noreply.github.com>

github-actions · 2026-02-09T00:14:39Z

👋 Development Partner is reviewing this PR. Will provide feedback shortly.

tests/test_plan_details.py

+    captured = capsys.readouterr()
+    output = captured.out
+
+    assert "Plan Details for test_profile:" in output


tests/test_plan_details.py

+    output = captured.out
+
+    assert "Plan Details for test_profile:" in output
+    assert "  - Folder A: 10 rules" in output


tests/test_plan_details.py

+
+    assert "Plan Details for test_profile:" in output
+    assert "  - Folder A: 10 rules" in output
+    assert "  - Folder B: 5 rules" in output


tests/test_plan_details.py

+    assert "  - Folder A: 10 rules" in output
+    assert "  - Folder B: 5 rules" in output
+    # Verify alphabetical ordering (A before B)
+    assert output.index("Folder A") < output.index("Folder B")


tests/test_plan_details.py

+    captured = capsys.readouterr()
+    output = captured.out
+
+    assert "Plan Details for test_profile:" in output


tests/test_plan_details.py

+    output = captured.out
+
+    assert "Plan Details for test_profile:" in output
+    assert "No folders to sync." in output


tests/test_plan_details.py

+    captured = capsys.readouterr()
+    output = captured.out
+
+    assert "📝 Plan Details for test_profile:" in output


tests/test_plan_details.py

+    output = captured.out
+
+    assert "📝 Plan Details for test_profile:" in output
+    assert "Folder A" in output


tests/test_plan_details.py

+
+    assert "📝 Plan Details for test_profile:" in output
+    assert "Folder A" in output
+    assert "10 rules" in output


main.py

        s = s.replace(TOKEN, "[REDACTED]")
+
+    # Redact Basic Auth in URLs (e.g. https://user:pass@host)
+    s = _BASIC_AUTH_PATTERN.sub("://[REDACTED]@", s)


main.py

+    s = _BASIC_AUTH_PATTERN.sub("://[REDACTED]@", s)
+
+    # Redact sensitive query parameters (handles ?, &, and # separators)
+    s = _SENSITIVE_PARAM_PATTERN.sub(r"\1\2=[REDACTED]", s)


main.py

        s = s.replace(TOKEN, "[REDACTED]")
+
+    # Redact Basic Auth in URLs (e.g. https://user:pass@host)
+    s = _BASIC_AUTH_PATTERN.sub("://[REDACTED]@", s)


main.py

+    s = _BASIC_AUTH_PATTERN.sub("://[REDACTED]@", s)
+
+    # Redact sensitive query parameters (handles ?, &, and # separators)
+    s = _SENSITIVE_PARAM_PATTERN.sub(r"\1\2=[REDACTED]", s)


tests/test_plan_details.py

+    captured = capsys.readouterr()
+    output = captured.out
+
+    assert "Plan Details for test_profile:" in output


tests/test_plan_details.py

+    output = captured.out
+
+    assert "Plan Details for test_profile:" in output
+    assert "  - Folder A: 10 rules" in output


tests/test_plan_details.py

+
+    assert "Plan Details for test_profile:" in output
+    assert "  - Folder A: 10 rules" in output
+    assert "  - Folder B: 5 rules" in output


tests/test_plan_details.py

+    assert "  - Folder A: 10 rules" in output
+    assert "  - Folder B: 5 rules" in output
+    # Verify alphabetical ordering (A before B)
+    assert output.index("Folder A") < output.index("Folder B")


tests/test_plan_details.py

+    captured = capsys.readouterr()
+    output = captured.out
+
+    assert "Plan Details for test_profile:" in output


tests/test_plan_details.py

+    output = captured.out
+
+    assert "Plan Details for test_profile:" in output
+    assert "No folders to sync." in output


tests/test_plan_details.py

+    captured = capsys.readouterr()
+    output = captured.out
+
+    assert "📝 Plan Details for test_profile:" in output


tests/test_plan_details.py

+    output = captured.out
+
+    assert "📝 Plan Details for test_profile:" in output
+    assert "Folder A" in output


tests/test_plan_details.py

+
+    assert "📝 Plan Details for test_profile:" in output
+    assert "Folder A" in output
+    assert "10 rules" in output


Copilot

Pull request overview

This PR consolidates prior overlapping changes into a single update that improves runtime efficiency and security of log output, and enhances --dry-run UX by showing a folder/rule breakdown.

Changes:

Pre-compiles hot-path validation regexes and log-sanitization regexes at module scope and switches call sites to reuse them.
Hardens sanitize_for_log() to redact Basic Auth credentials in URLs and sensitive query parameters (in addition to TOKEN), while continuing to escape control characters.
Adds print_plan_details() and calls it during --dry-run, plus adds/extends tests covering dry-run output and new sanitization behavior.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File	Description
main.py	Adds pre-compiled regex constants, strengthens `sanitize_for_log`, introduces `print_plan_details`, and wires it into dry-run flow.
tests/test_plan_details.py	New pytest tests validating dry-run plan detail output ordering and no-folder behavior.
tests/test_log_sanitization.py	Adds unittest coverage for Basic Auth and sensitive query parameter redaction in `sanitize_for_log`.

Initial plan

4256d94

Copilot AI assigned Copilot and abhimehro Feb 8, 2026

Copilot started work on behalf of abhimehro February 8, 2026 23:46 View session

github-advanced-security bot found potential problems Feb 8, 2026

View reviewed changes

main.py Dismissed Show dismissed Hide dismissed

main.py Dismissed Show dismissed Hide dismissed

Address code review: pre-compile log sanitization regex patterns at m…

0fcb4a8

…odule level Co-authored-by: abhimehro <84992105+abhimehro@users.noreply.github.com>

Copilot AI changed the title ~~[WIP] Review and prepare pull requests for merging~~ Consolidate 36 Jules PRs: pre-compile regex, harden log sanitization, add dry-run plan details Feb 8, 2026

Copilot AI requested a review from abhimehro February 8, 2026 23:55

Copilot finished work on behalf of abhimehro February 8, 2026 23:55

abhimehro marked this pull request as ready for review February 9, 2026 00:14

Copilot AI review requested due to automatic review settings February 9, 2026 00:14

github-actions bot added the python label Feb 9, 2026

github-advanced-security bot found potential problems Feb 9, 2026

View reviewed changes

Copilot started reviewing on behalf of abhimehro February 9, 2026 00:15 View session

github-advanced-security bot found potential problems Feb 9, 2026

View reviewed changes

Copilot AI reviewed Feb 9, 2026

View reviewed changes

abhimehro approved these changes Feb 9, 2026

View reviewed changes

abhimehro merged commit cf4c32b into main Feb 9, 2026
24 of 25 checks passed

abhimehro deleted the copilot/analyze-and-update-pull-requests branch February 9, 2026 00:25

Conversation

Copilot AI commented Feb 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚡ Performance: Pre-compile regex (from PR #173)

🛡️ Security: Redact credentials from logs (from PR #172 + review feedback)

🎨 UX: Dry-run plan details + fix duplicate function (from PR #174)

PRs superseded (close these)

Uh oh!

Copilot AI commented Feb 8, 2026

Uh oh!

trunk-io bot commented Feb 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Feb 9, 2026

Uh oh!

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check warning

Check warning

Check warning

Check warning

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Copilot AI commented Feb 8, 2026 •

edited

Loading

trunk-io bot commented Feb 8, 2026 •

edited

Loading