Fix apply --check remedy dropping scope flags (#1219)

[Mikola Lysenko (mikolalysenko)]

LLM Description written by Claude Code:claude-opus-5-5

Fixes #1219

Summary

When apply --check finds drift, its human report now ends with a remedy that uses the check's own scope:

Run `socket-patch apply --global-prefix '/opt/site packages'` to regenerate them.
Run `socket-patch apply --cwd app` to regenerate them.

Before, the line was always Run \socket-patch apply` to regenerate them.. Run as printed after a -g, --global-prefixor--cwd` check, it acted on a different tree, exited 0 and left the drift in place.

Root cause

apply.rs printed a constant remedy and never looked at args.common. This is the same class of bug as #464, which #777 fixed only for the report-only scan hint.

Change

• ui::scope_args(common) renders the flags that choose the tree: --cwd, --manifest-path, -g / --global-prefix and --ecosystems, each only when it differs from its default. ui::shell_word quotes each value when needed. It is Fix report-only scan -g hint dropping -g (#464) #777's quoting helper, moved out of scan/render.rs so both hints share it.
• ui::global_scope_arg is the global-only part. The report-only scan hint now uses it, and its output is unchanged.
• apply --check prints check_remedy(&args.common).
• In CLI_CONTRACT.md, the apply --check row now documents the remedy and its scope.
• --json output is unchanged.

Tests (per issue)

• apply --check drift report tells you to run socket-patch apply without the -g / --global-prefix / --cwd it was given, so following it patches nothing and exits 0 #1219, --cwd lane: tests/apply/check_verifies_installed_tree.rs::check_remedy_keeps_cwd_and_heals_the_checked_tree runs the check from the parent dir with --cwd, parses the printed remedy, runs it verbatim and asserts that the file is patched and the next check exits 0.
• apply --check drift report tells you to run socket-patch apply without the -g / --global-prefix / --cwd it was given, so following it patches nothing and exits 0 #1219, --global-prefix lane: check_remedy_keeps_global_prefix_and_heals_the_checked_tree does the same with a prefix that contains a space, so the quoting is exercised.
• Unit test: commands::apply::tests::check_remedy_repeats_the_check_scope checks the default, --cwd, -g, a quoted --global-prefix, and --cwd + --manifest-path + --ecosystems.

Red before the fix: both integration tests fail with left: ["apply"] against right: ["apply", "--cwd", ".tmp…"] / ["apply", "--global-prefix", "…/global lib/node_modules"]. Green after.

Commands run

• cargo test -p socket-patch-cli --lib --test apply --test cli_apply_silent --test covgap_commands_scan_mod --test remedy_commands_parse: all passed (remedy_commands_parse caught the first version's apply{} literal; fixed in the second commit)
• cargo clippy --workspace --all-features -- -D warnings: clean
• cargo fmt --all -- --check: clean for the changed files (core/src/patch/redirect/upstream/mod.rs has a main-wide fmt diff that this PR does not touch)

🤖 Generated with Claude Code

---

Generated by Claude Code

---

Note

Low Risk
User-facing CLI hint text only; apply/check logic and JSON output are unchanged aside from the stderr remedy line.

Overview
Fixes #1219: when apply --check reports drift, the closing remedy no longer suggests a bare socket-patch apply. It now repeats the check’s tree scope (--cwd, --manifest-path, -g / --global-prefix, --ecosystems), shell-quoted where needed, so pasting the line heals the same tree that was audited.

Shared UI helpers implement that: shell_word moves from scan rendering into ui::text, with new global_scope_arg and scope_args on GlobalArgs. Report-only scan hints use global_scope_arg (behavior unchanged). CLI_CONTRACT.md documents the scoped remedy. Unit and integration tests assert remedy text and that running it verbatim fixes drift under --cwd and spaced --global-prefix.

^{Reviewed by Cursor Bugbot for commit 8a76154. Configure here.}

[Mikola Lysenko (mikolalysenko)]

BugBot review

[cursor]

Stale Bugbot comment from a previous run.

[Mikola Lysenko (mikolalysenko)]

bugbot run

---

Generated by Claude Code

[cursor]

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

^{Reviewed by Cursor Bugbot for commit 8a76154. Configure here.}