Skip to content

chore: merge master into develop#2288

Merged
aeppling merged 20 commits into
developfrom
chore/merge-master-into-develop
Jun 5, 2026
Merged

chore: merge master into develop#2288
aeppling merged 20 commits into
developfrom
chore/merge-master-into-develop

Conversation

@aeppling

@aeppling aeppling commented Jun 5, 2026

Copy link
Copy Markdown
Contributor

Merges master into develop to resolve the conflict in release PR #2083.

Why this is needed: the security hardening was cherry-picked from master onto develop (PR #2286). The cherry-picks have the same content as master's originals but different SHAs, so when release-please tried develop -> master in #2083, git saw both branches modifying the same lines.

Resolution: kept develop's version on every conflict (develop is a content superset, containing master's CVE fix commits plus Copilot CLI adaptation and added tests). The bot will regenerate #2083 cleanly after this merges.

aeppling and others added 20 commits May 22, 2026 17:57
…--components--rtk

chore(master): release 0.41.0
…--components--rtk

chore(master): release 0.42.0
patch(openclaw): no execSync to avoid async dangerous cmds
…--components--rtk

chore(master): release 0.42.1
- Decompose compound commands for permission checks (newline, background &, subshell `( )`) in addition to &&, ||, ;, | so hidden segments are checked.
- `contains_unattestable_construct`: flag command/process substitution and file-target redirects (fd-dup `2>&1` and /dev/null exempt) — RTK can't decompose these, so they are never auto-allowed.
- Route every host hook (Claude, VS Code, Gemini, Cursor, Copilot CLI) through a single decision flow. Precedence: Deny → (defer if unattestable) → Allow → Ask → Default. Auto-allow only on a positive Allow; otherwise defer to the host's own engine.
- Gemini: ask_user instead of hardcoded allow. Cursor: empty `{}` delegation, since permission:"ask" is not enforced on its sandboxed shell.
fix(permissions): never auto-allow not evaluable cmds, defer to hosts
…--components--rtk

chore(master): release 0.42.2
@CLAassistant

Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ aeppling
❌ rtk-release-bot[bot]
You have signed the CLA already but the status is still pending? Let us recheck it.

@aeppling aeppling merged commit 98108bf into develop Jun 5, 2026
11 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants