Repository navigation
fix(sandbox): backport the scope probe PATH and bus-path fixes to release/0.8.0 - #15638
Conversation
Design Review (Fable 5) — ✅ PASSDesign-level review of Design-Verdict: PASS Verify the cherry-picks match what finally merged on main in #15636 — the PR was drafted before its second-round review there concluded. [DESIGN-REVIEWED] 67269be |
First Principles Review (Fable 5) — ✅ PASSPremise-level review of First-Principles-Verdict: PASS Verify the cherry-pick is byte-identical to #15636 as merged on main — a diverged backport is the only risk this diff carries. What this change shipsInventory (6 items) — 6 justifiedIntent: FIX — stop the cgroup-scope probe refresh from hanging the event loop on a PATH walk, and stop a percent-escaped D-Bus address from silently dropping the cgroup ceiling (backport of #15636).
Counts run: [FIRST-PRINCIPLES-REVIEWED] 53fc823 |
GPT 5.6 Review — ✅ no blocking findingsGPT 5.6 completed its review of This comment is updated in place on each push. Review detailsNo findings. False positive or not applicable? A repository writer can comment: |
Opus 5 Review — ✅ no blocking findingsReviewed Review details
FINDING — src/kiro_crew/sandbox.py:14320 — [OPUS-REVIEWED] 53fc823 Verdict parsed from the review's SHA-scoped output markers for commit False positive or not applicable? A repository writer can comment: |
UX Review (Fable 5) — ⏭️ skippedRevision |
Two defects the post-logout probe fix (#15622) introduced, from its review: - The probe now refreshes on a TTL, and every refresh resolved systemd-run with shutil.which on the event loop. A PATH entry on a stalled mount would hang the gateway's loop. The probe now uses platform_compat.trusted_system_bin, the same fixed-directory lookup cgroup_scope_argv already pins its wrapper with. - DBUS_SESSION_BUS_ADDRESS unix:path= values may percent-escape any byte. Probing the escaped spelling literally misses a live bus that lives outside XDG_RUNTIME_DIR and drops the cgroup ceiling. The value is now decoded before it is dialed. (cherry picked from commit e5a68df) (cherry picked from commit 623f2b4)
Second-round review of this PR: trusted_system_bin's miss diagnostic still calls shutil.which, so a host with no trusted systemd-run walked PATH on the event loop at the first probe refresh. The probe now uses platform_compat.trusted_system_bin_quiet, the same fixed-directory lookup without the diagnostic, and reports the miss in its reason. A D-Bus unix:path= value that decodes to an empty path or one holding a NUL cannot name a socket and made os.stat raise ValueError on the spawn path; such values are now skipped. (cherry picked from commit 5843231)
67269be to
53fc823
Compare
… release/0.8.0 (#15619) * fix(windows): backport the directory-junction hardening to release/0.8.0 (#15666) Backport of #14327, #14962, #15310 to release/0.8.0, cherry-picked in main's merge order. * fix(windows): anchor six directory-link fences to pinned descriptors (#14327) (cherry picked from commit 6b0a6d5) * fix(config): refuse a link or junction at the workspace dir name (#14962) (cherry picked from commit 4bb50ef) * fix(windows): make four is_symlink guards see a junction (#12379, #10492) (#15310) (cherry picked from commit 6d54165) * style(test): black-format the failed-start reap test and drop its history wording on release/0.8.0 (#15665) test/test_acp_runtime_failed_start_reap.py arrived with #15625 not black-formatted (fails scripts/check_black_formatting.py on the release tip), and the _gone docstring said "no longer runs", which scripts/check_comment_history.py flags as history narration. Black 26.3.1 (--target-version py310) reflow, and the docstring now reads "has stopped running", the wording the #15664 forward-port uses. Test file only. * fix(adaptive): keep a same-window gate step from eating idle recovery (#15595) Idle recovery (#15541) took its exec step only when nothing else had changed on the sample. A spawn-gate increase earned on the same sample set that shared flag, so the idle exec step due on it was skipped, and the gate step also restarted the one-increase-per-window clock: the exec cap then waited a further window for a step it had already been due. Judge the idle step on the exec track alone. Both tracks keep sharing one increase-per-window clock across samples, as the earn rules do. An increase's reason now names each track it moved: the exec note only when the exec cap moved, and every gate step as "spawn gate target X -> Y" (the policy's target; the daemon confirms or clamps it). A gate-only step used to read "clean window earned +1", and a gate step beside an exec step was not mentioned at all. (cherry picked from commit f23a39f) * fix(acp): treat only JSON whitespace as an empty mcp.json (#15673) #15627 read an empty or whitespace-only MCP settings file as absent, using bytes.strip() with no argument. That also strips \x0b and \x0c, which JSON does not allow, so a file holding only those bytes read as "no restrictions" instead of failing closed like any other malformed document. The emptiness check now strips only space, tab, CR and LF (RFC 8259); anything else goes to the parser and fails closed as before #15627. Refs #15616 (cherry picked from commit 157fd51) * fix(sandbox): backport the scope probe PATH and bus-path fixes to release/0.8.0 (#15638) * fix(sandbox): keep the scope probe refresh off PATH, decode bus paths Two defects the post-logout probe fix (#15622) introduced, from its review: - The probe now refreshes on a TTL, and every refresh resolved systemd-run with shutil.which on the event loop. A PATH entry on a stalled mount would hang the gateway's loop. The probe now uses platform_compat.trusted_system_bin, the same fixed-directory lookup cgroup_scope_argv already pins its wrapper with. - DBUS_SESSION_BUS_ADDRESS unix:path= values may percent-escape any byte. Probing the escaped spelling literally misses a live bus that lives outside XDG_RUNTIME_DIR and drops the cgroup ceiling. The value is now decoded before it is dialed. (cherry picked from commit e5a68df) (cherry picked from commit 623f2b4) * fix(sandbox): resolve the probe's systemd-run without any PATH walk Second-round review of this PR: trusted_system_bin's miss diagnostic still calls shutil.which, so a host with no trusted systemd-run walked PATH on the event loop at the first probe refresh. The probe now uses platform_compat.trusted_system_bin_quiet, the same fixed-directory lookup without the diagnostic, and reports the miss in its reason. A D-Bus unix:path= value that decodes to an empty path or one holding a NUL cannot name a socket and made os.stat raise ValueError on the spawn path; such values are now skipped. (cherry picked from commit 5843231) * fix(chat): restore the interrupted turn when Resume lands on a natively loaded session (#15643) (#15644) * fix(chat): restore the interrupted turn when Resume lands on a natively loaded session (#15643) kiro-cli appends a prompt to <sid>.jsonl only once the model has answered it. When the process serving a turn dies mid-answer (a gateway restart, a crash, a recycled runtime) that request is never written, so session/load brings the conversation back without it. A natively resumed session gets no Kiro Crew replay, so the Resume press on that turn sent a bare "finish the user's most recent request" with the request missing: the model answered the turn before it, or said there was nothing to continue. Reproduced against kiro-cli 2.26.1: after a completed turn and a second turn killed mid-stream, session/load restores only the first. The path is any native resume: a dashboard chat with agent.tool_search off, a dashboard chat linked to a channel, and the automatic connection-lost recovery on a respawned runtime. When the Resume message or the connection-lost recovery runs on a session that this turn natively resumed, _run_chat now prepends the interrupted turn from the slot's own transcript (the opener the turn-in-flight marker restores, plus the partial answer), bracketed [INTERRUPTED TURN] so the context scanner attributes it. A cold start that replays already carries the turn and is unchanged. A session whose only turn was interrupted was already covered: SessionMap.get prunes a sid whose log holds no turn. Backport of #15643 to release/0.8.0. Conflict: context.py still carries compress_thread_history here (removed on main by #14952); the new helper is placed after it. * fix(chat): open the interrupted-turn restore at the right row, and mint it after the scrub (#15643) A cron, app or synthesis delivery opens its turn as an inject row. The interrupted-turn walk only stopped at user, nudge and sub-agent rows, so for such a turn it reached the already-answered request before it and restored that as the user's most recent request. Openers now include the inject kinds dashboard.state.TURN_OPENING_INJECT_KINDS names (the dispatching kinds minus recovery and user_replay, which continue a turn). The session-busy recovery (_BUSY_RECOVER_MSG) also resets the session and session/loads the same native conversation, so it gets the restore too. The frame tells the model the request inside it is the one to carry on with, so its markers join _STRUCTURAL_MARKER_RES and the runner prepends it after the egress scrub, like the task checklist; the builder scrubs the restored payload itself. The turn-in-flight marker now copies a sub-agent completion opener too (_LOCAL_TURN_OPENER_ROLES / _LOCAL_TURN_PROMPT_ROLES): without it a crash before the flush loses that row, and the restore would walk past it to the previous, already-answered request. * fix(mcp): repair Windows command casing at every resolver, not only the rewriter On Windows `shutil.which` spells the extension it appends exactly as PATHEXT spells it, so a bare `demo-mcp` resolves to `demo-mcp.EXE` while the file on disk is `demo-mcp.exe`. A launcher that dispatches on its own argv[0] basename case-sensitively (a tool manager's multiplexer shim) refuses to run under that spelling and the MCP server never starts. The rewriter already restored the on-disk basename, but the agent-config resolver (`agent._resolve_command`) and the dashboard probe (`mcp_discovery`) consumed raw `which` output, and the resolver's result is PERSISTED as the spec's absolute `command`. An absolute command is accepted verbatim on every later pass, so the uppercase spelling written once looked operator-authored to the rewriter from then on and its repair never ran. Move the helper to `kiro_crew.env.resolved_command_casing`, beside the `mcp_search_path` the three resolvers already share, and apply it on both return paths of `_resolve_command` and in the probe. Repairing at the resolver also keeps the provenance record's `emitted` value repaired, so `command_is_ours` still recognises the entry and re-derivation stays on. Fixes #11627 (cherry picked from commit aa7c0bd, #15071; applied as its pre-#14919 revision 457210d plus the round-2 test and docstring delta, since release/0.8.0 predates the agent.py split)
Problem / Motivation
Backport of #15636 to
release/0.8.0(cherry-pick -x, clean).release/0.8.0already carries #15622 through #15624. Draft until #15636 merges on main.Goal: The cgroup-scope probe added in #15622 never stalls the gateway's event loop on a hung
PATHentry, and never drops the cgroup ceiling because a D-Bus bus address was percent-escaped.#15622 merged with two blocking findings from its GPT 5.6 review still open, both in code that PR added:
shutil.which("systemd-run")on the event loop. That is a walk of everyPATHentry, and one entry on a stalled network mount freezes the loop and the liveness heartbeat._user_bus_socket_pathsdialedDBUS_SESSION_BUS_ADDRESSunix:path=values literally. The D-Bus spec lets any byte be%XX-escaped, so an escaped address that names a bus outsideXDG_RUNTIME_DIRprobed as unreachable, and spawns ran without the fork-bomb/memory ceiling.Why it matters
(1) is a gateway-wide freeze that ends in a watchdog kill and a crash loop on hosts with automounted or network
PATHentries. (2) silently drops a security ceiling on hosts whose bus address is escaped.Not a goal
What changed (motivation → approach → change)
_compute_cgroup_scope_proberesolvessystemd-runthrough the newplatform_compat.trusted_system_bin_quiet, a handful ofstats over fixed system directories. This is the lookupcgroup_scope_argvalready uses to pin the wrapper it prepends, without its miss diagnostic, which itself walksPATHwithshutil.which; the review's second round found that walk.trusted_system_binnow delegates to it and keeps the diagnostic, so its behaviour is unchanged. The probe's answer also matches what the wrapper can actually use. Before, asystemd-runfound only onPATHmade the probe answer "available", and the wrapper then refused it._user_bus_socket_pathspercent-decodes eachunix:path=value (urllib.parse.unquote_to_bytes→os.fsdecode) before it is stat'ed and dialed. A value that decodes to an empty path or contains a NUL cannot name a socket and would makeos.statraiseValueErroron the spawn path, so it is skipped.Backwards compatibility
Compatible: on a host whose
systemd-runis in a trusted directory and whose bus address is unescaped, the probe's answer is unchanged. A host withsystemd-runonly onPATHalready got no ceiling from the wrapper. It now also gets a probe answer that says so, which also stops the bus locators from being forwarded to a spawn that is not wrapped.Tests
test/test_cgroup_scope_probe_liveness.py:test_a_percent_escaped_bus_address_is_decoded: the only live bus is reachable through an escapedunix:path=. Red without the decode.test_a_probe_refresh_never_walks_path:shutil.whichraises if called, and a TTL refresh must still answer(True, "ok"). Red withshutil.whichrestored.test_a_probe_miss_never_walks_path: no trustedsystemd-runandplatform_compat.shutil.whichraises; the probe must answer unavailable without walkingPATH. Red with the diagnosingtrusted_system_bin.test_a_bus_address_naming_no_socket_never_breaks_a_spawn(%00, an embedded%00, and an emptypath=): the probe and wrapper still work off theXDG_RUNTIME_DIRbus. Red without the NUL filter.All 17 tests in the file pass.
test_sandbox_argv,test_per_runtime_process_resources,test_sandbox_agent_slice_identityandtest_session_scope_reappass onrelease/0.8.0(285 intest_sandbox_argv+test_session_scope_reap).test_platform_compatand every test that referencestrusted_system_binpass (6296). The one failure,TestPeakRssIsThisProcesss, fails identically on unmodified main on this host. flake8, isort, mypy (src/kiro_crew, 0 issues), black, docs-lint and the comment-history gate are clean.docs/system-specs/common/platform-compat.mdgains a row for the quiet lookup.Manual verification
N/A — unit coverage sufficient: both changes are pure functions of the environment and the fixed system directories, and both tests exercise them through the real probe against a real listening socket.
Related Issues
Backport of #15636. Follow-up to #15622 / #15624 (its GPT 5.6 review findings F1 and F2). Refs #11473. Internal report: https://t.corp.amazon.com/187b5c6e-b5cb-4d1b-9c36-ccf8c598e4f4
Pattern harvest
Rule candidate: review-prompt
Pattern: a once-per-process lookup that becomes periodic (TTL or fingerprint refresh) inherits the event-loop budget of every call, so
PATHwalks and other unbounded filesystem lookups inside it must be swapped for fixed-directory resolution.Checklist
feat|fix|docs|style|refactor|perf|test|chore|ci|build|revert: ...)Contribution License Agreement