Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@src/lib/onboard.ts`:
- Around line 10028-10034: The new policy-channel merge (building
policyMessagingChannels from selectedMessagingChannels,
recordedMessagingChannels, and activeMessagingChannels) must be extracted from
onboard.ts into a small helper in src/lib/onboard (e.g.,
createPolicyMessagingChannels or mergePolicyMessagingChannels) and the top-level
onboard.ts should only call that helper with the three inputs and receive the
merged array; move the same extraction for the related block covering lines
~10054-10074 as well, ensure the helper validates
Array.isArray(activeMessagingChannels) and preserves Set de-duplication, and
update onboard.ts to import and call the helper so the entrypoint remains thin.
- Around line 10027-10034: The current merge that builds policyMessagingChannels
uses registry.getSandbox(sandboxName)?.messagingChannels
(activeMessagingChannels) without excluding channels listed in disabledChannels,
which can re-enable stopped channels like "slack"; update the logic that
constructs policyMessagingChannels to first read disabledChannels (e.g.,
registry.getSandbox(sandboxName)?.disabledChannels), ensure it's an array, and
filter out any channel names present in disabledChannels from
activeMessagingChannels (and from the combined set of
selectedMessagingChannels/recordedMessagingChannels) before creating the Set so
disabled channels are never included when deriving required policy presets.

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@src/lib/onboard.ts`:
- Around line 10060-10078: The fast resume path only verifies that the remaining
(pruned) presets are present in the sandbox via arePolicyPresetsApplied, but it
does not detect extra applied presets that were removed because their channels
are now disabled (e.g., Slack still applied). Update the resumePolicies
condition to also ensure there are no additional applied policy presets beyond
recordedPolicyPresetsForSupport: either replace
arePolicyPresetsApplied(sandboxName, recordedPolicyPresetsForSupport) with a
strict equality check (sandboxAppliedPresets ===
recordedPolicyPresetsForSupport) or add a complementary function (e.g.,
arePolicyPresetsExactMatch or hasNoExtraAppliedPolicyPresets) and use that
together with recordedPolicyPresetsNeedReconcile, referencing
recordedPolicyPresetsForSupport, recordedPolicyPresetsNeedReconcile,
arePolicyPresetsApplied and resumePolicies.

---

Nitpick comments:
In `@src/lib/actions/sandbox/rebuild.ts`:
- Around line 760-763: The change prunes restored presets using
pruneDisabledMessagingPolicyPresets (called into savedPresets with
rebuildDisabledChannels), so run the channels-stop-start-e2e workflow before
merging to validate stop/start persistence across destroy/recreate with cached
credentials; specifically, execute the channels-stop-start-e2e pipeline against
this branch, confirm that disabled channel resolution
(pruneDisabledMessagingPolicyPresets -> savedPresets) preserves stop/start state
after sandbox rebuild, and report any failing scenarios to adjust how
rebuildDisabledChannels is computed or applied during restore.

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Duplicate comments:
In `@src/lib/onboard.ts`:
- Around line 10052-10063: The fast-path resume incorrectly treats a pruned
recordedPolicyPresetsForSupport as valid even when it still contains presets
that target disabled messaging channels; update the
recordedPolicyPresetsNeedReconcile logic (used to compute resumePolicies) to
consider not only length mismatch but also whether any preset in
recordedPolicyPresetsForSupport touches activeSandbox?.disabledChannels (i.e.,
detect preset.channel intersections) so the resume path is blocked when
disabled-channel presets remain; also ensure the code that persists
recordedPolicyPresetsForSupport (the block around where you save them before
calling setupPoliciesWithSelection) is moved or gated so persistence happens
only after setupPoliciesWithSelection completes successfully. Reference symbols:
recordedPolicyPresetsForSupport, recordedPolicyPresetsNeedReconcile,
pruneDisabledMessagingPolicyPresets, mergeRequiredSetupPolicyPresets,
arePolicyPresetsApplied, setupPoliciesWithSelection,
activeSandbox?.disabledChannels.

---

Nitpick comments:
In `@src/lib/actions/sandbox/rebuild.ts`:
- Around line 760-763: This change affects how disabled channels gate preset
restoration in src/lib/actions/sandbox/rebuild.ts (see
pruneDisabledMessagingPolicyPresets, savedPresets, rebuildDisabledChannels), so
run the targeted lifecycle E2E suite named channels-stop-start-e2e against the
rebuild/onboard path to validate channels stop/start behavior; if the E2E fails,
trace failures back to pruneDisabledMessagingPolicyPresets or the
rebuildDisabledChannels resolution logic and update the code or tests to ensure
disabled-channel preservation/restore semantics match expected behavior before
merging.

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Outside diff comments:
In `@src/lib/onboard.ts`:
- Around line 10072-10110: The code discards synthesized cleanup presets from
mergeAppliedPolicyPresetsForDisabledMessagingCleanup whenever
recordedPolicyPresets is null, so setupPoliciesWithSelection may not receive
necessary selectedPresets to remove stale disabled-channel policies; change the
selectedPresets argument passed into setupPoliciesWithSelection to use
recordedPolicyPresetsForSupport (or at least check its length) instead of gating
on Array.isArray(recordedPolicyPresets), ensuring that when
recordedPolicyPresetsForSupport contains synthesized presets they are forwarded
to setupPoliciesWithSelection; update the ternary at the selectedPresets key (or
its surrounding logic) to pass recordedPolicyPresetsForSupport when non-empty so
disabled-channel cleanup presets are not dropped.
- Around line 10027-10124: Extract the policy-state reconciliation block
(starting at the recordedPolicyPresets/recordedMessagingChannels lines through
the computation of resumePolicies and prior to the resume handling) into a new
helper function (e.g., assemblePolicyState) in a new module under
src/lib/onboard/; the helper should accept the minimal inputs (sandboxName,
latestSession or recordedPolicyPresets/recordedMessagingChannels,
selectedMessagingChannels, registry.getSandbox result or sandboxName+registry,
policies, hermesToolGateways, webSearchSupported,
activeSandbox?.disabledChannels, webSearchConfig, provider, model, agent, etc.)
and return the computed values used afterward (at least
recordedPolicyPresetsForSupport, policyMessagingChannels,
appliedPolicyPresetsForSupport, disabledMessagingPolicyPresetApplied,
resumePolicies); use the existing helper functions referenced in the block
(mergePolicyMessagingChannels, pruneDisabledMessagingPolicyPresets,
policies.clampSetupPolicyPresetNames, hasDisabledMessagingPolicyPreset,
mergeAppliedPolicyPresetsForDisabledMessagingCleanup,
mergeRequiredSetupPolicyPresets, arePolicyPresetsApplied) inside the new
assemblePolicyState function and export it, then replace the large inline block
in src/lib/onboard.ts with a single call to assemblePolicyState and use its
returned values unchanged.

---

Nitpick comments:
In `@src/lib/onboard.ts`:
- Around line 10027-10124: Summary: This change touches resume logic and
disabled-channel/policy preset handling; run the relevant E2E suites before
merging. Action: execute the lifecycle E2E tests for this onboarding path —
channels-stop-start-e2e, rebuild-openclaw-e2e, and hermes-slack-e2e — and verify
no regressions around resume, disabled-channel cleanup, and Slack policy
preservation; focus validation on flows that exercise resume,
mergeRequiredSetupPolicyPresets, pruneDisabledMessagingPolicyPresets,
mergeAppliedPolicyPresetsForDisabledMessagingCleanup,
hasDisabledMessagingPolicyPreset, arePolicyPresetsApplied, and
setupPoliciesWithSelection; if failures occur, capture failures, reproduce
locally, and update the code or tests until all three suites pass.

In `@test/onboard-preset-diff.test.ts`:
- Around line 324-458: The tests flake because inherited DISCORD_* and
TELEGRAM_* env vars can activate messaging channels in the spawned helper;
modify the buildPreamble output to explicitly remove any process.env keys that
start with "DISCORD_" or "TELEGRAM_" before the helper logic runs. Concretely,
inside the buildPreamble-generated script (the preamble string emitted by
buildPreamble), add a short sanitization block that iterates
Object.keys(process.env) and deletes keys matching /^DISCORD_/ or /^TELEGRAM_/
(e.g., for (const k of Object.keys(process.env)) if (k.startsWith("DISCORD_") ||
k.startsWith("TELEGRAM_")) delete process.env[k]); place this at the very top of
the preamble so setupPoliciesWithSelection and any channel-detection logic sees
a hermetic env.

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Outside diff comments:
In `@src/lib/onboard.ts`:
- Around line 10024-10035: The smoke verifier is being called with the raw
configured set (activeMessagingChannels) which can include channels marked
disabled; instead pass the effective enabled set (policyMessagingChannels) into
verifyCompatibleEndpointSandboxSmoke so the verifier uses the same channel view
as the policy flow—update the call site that currently passes
Array.isArray(activeMessagingChannels) ? activeMessagingChannels : [] to instead
pass Array.isArray(policyMessagingChannels) ? policyMessagingChannels : []
(referencing activeSandbox, activeMessagingChannels, policyMessagingChannels and
verifyCompatibleEndpointSandboxSmoke to locate the change).

---

Nitpick comments:
In `@test/rebuild-policy-presets.test.ts`:
- Around line 181-188: Add a short clarifying comment inside the test "preserves
non-required channel presets for later start and rebuild" explaining why
"telegram" is expected to be preserved (e.g., that
pruneDisabledMessagingPolicyPresets only prunes presets that map to
known/required channels, and "telegram" in this case is considered non-required
so it should remain), and rename or expand the test name to clarify what "later
start" means (for example "preserves non-required channel presets for later
start/rebuild when channel mapping is absent"); update references in the test to
pruneDisabledMessagingPolicyPresets, manifest.policyPresets and savedPresets to
make the intent explicit.

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@src/lib/onboard/policy-selection.ts`:
- Around line 192-198: The current truthy checks (e.g., if
(options.recordedPolicyPresets)) skip empty-array selections and thus drop
required presets on resume; change these guards to explicitly check for
undefined/null (for example: if (options.recordedPolicyPresets !== undefined &&
options.recordedPolicyPresets !== null) or use
Array.isArray(options.recordedPolicyPresets)) so an empty [] is treated as valid
input and still calls mergeRequiredSetupPolicyPresets with the same payload
(include selectablePolicyPresets.map(...) etc.); apply the same explicit-check
fix to the other occurrence around lines 264-272 to ensure resume/replay always
merges required messaging presets when channels are enabled.

In `@test/onboard-preset-diff.test.ts`:
- Around line 324-458: The tests are flaky because the spawned test script
inherits host env vars that can enable messaging channels; update the runScript
helper to sanitize the environment before spawning the child: copy process.env,
remove any keys starting with "DISCORD_" or "TELEGRAM_" (and any other
messaging-related prefixes you see causing leakage), and pass that cleaned env
into the child process spawn/exec call (the runScript function is the unique
symbol to change). Ensure the rest of runScript behavior (stdout/stderr capture,
exit status) remains unchanged.

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Outside diff comments:
In `@src/lib/onboard.ts`:
- Around line 9608-9651: When finishing the "policies" step (both the
resumePolicies branch that uses recordedPolicyPresetsForSupport and the
interactive branch that yields setupAppliedPolicyPresets), persist the final
preset list back into the sandbox registry so
initialSandboxPolicy.appliedPresets / previousEntry?.policies reflect the
user-chosen presets and aren’t stale on recreate/rebuild; place this persistence
immediately after the recordStepComplete("policies", ...) calls and update the
sandbox registry entry (the same registry that stores
initialSandboxPolicy.appliedPresets / previousEntry?.policies) with the applied
presets (use recordedPolicyPresetsForSupport in the resume branch and
setupAppliedPolicyPresets in the interactive branch).

---

Nitpick comments:
In `@src/lib/actions/sandbox/rebuild.ts`:
- Around line 395-410: This change touches disabled channel resolution in the
sandbox rebuild flow (see src/lib/actions/sandbox/rebuild.ts around the rebuild
logic that calls captureSandboxListWithGatewayRecovery and handles
isLive/detectOpenShellStateRpcResultIssue), so before merging run the
channels-stop-start-e2e test suite on this branch to validate disabled/enabled
channel behavior across rebuilds; checkout this branch, run the
channels-stop-start-e2e E2E job (or the repo’s CI job that executes that suite),
verify the lifecycle passes (stop, rebuild, start) and that disabled channels
remain correctly resolved, and fix any failures uncovered in the rebuild logic
(particularly around captureSandboxListWithGatewayRecovery,
detectOpenShellStateRpcResultIssue, printOpenShellStateRpcIssue, and
printSandboxListFailureWithRecoveryContext) before merging.

In `@src/lib/onboard.ts`:
- Around line 9572-9651: Changes to resume-time policy reconciliation in
src/lib/onboard.ts (around functions mergePolicyMessagingChannels,
verifyCompatibleEndpointSandboxSmoke, preparePolicyPresetResumeSelection, and
setupPoliciesWithSelection) require running the relevant end-to-end tests before
merging; run the channels-stop-start-e2e suite and at least one full onboarding
E2E (cloud-e2e or a full onboard flow) to validate resume/reconcile behavior,
confirm policy presets are applied/skipped as expected, and fix any failures
discovered by updating the reconciliation logic or test fixtures accordingly.