GeezerVisonThe World Wide Web, restored to 800 pixels of glory. | |||||||||||||||||||||||
| Home|About|Gaming cabinet|Archives|How it works|Starter sites | |||||||||||||||||||||||
GeezerVison is showing github.com — Remove scan --apply/--vendor, get --no-apply and the download/gc aliases (#966) by mikolalysenko · Pull Request #1031 · SocketDev/socket-patch Conversation
|
| Removed | Use instead |
|---|---|
scan --apply |
scan --mode agent |
scan --vendor |
scan --mode vendored |
get --no-apply |
get --save-only (SOCKET_SAVE_ONLY is unchanged) |
socket-patch download |
socket-patch get |
socket-patch gc |
socket-patch repair |
Unchanged: --sync (shorthand for --mode agent --prune; --mode hosted|vendored --sync is still exit 2), --save-only, SOCKET_SAVE_ONLY, repair, and --vex with its --vex-* options (Q2 on #966 is still open, so this PR is "Part of", not "Closes").
scan/mod.rs: hidden apply/vendor fields deleted from ScanArgs; resolve_mode_flags now only rejects --sync next to a non-agent --mode, maps --sync to agent, and defaults to hosted (global-target check unchanged).get.rs: alias = "no-apply" removed. lib.rs: download and gc aliases removed.scan/{hosted,vendor_flow,discovery}.rs and apply.rs now use the --mode spelling.CLI_CONTRACT.md: alias columns cleared, boolean scan spellings and the --no-apply/gc paragraphs removed, all references moved to --mode, exit-code 2 row updated, alias rows of the bump table rewritten generically.docs/migrating-to-v5.md: five rows added to "Retired spellings", plus a note that removed spellings exit 2 and --sync stays.docs/usage.md and READMEs already used only the new spellings. CHANGELOG.md is untouched.--mode vendored/--mode agent/--save-only; ScanArgs literals updated; boolean conflict tests became --mode hosted|vendored --sync tests; alias tests now assert the spellings are rejected.cli_parse_main.rs checks all five removed spellings in the parser and through the binary (exit 2).scan_vendor_e2e call sites that passed --mode vendored twice (harmless with --vendor, rejected by clap now).cargo test -p socket-patch-cli --lib --bins plus every non-docker --test target. All pass except failures from the local machine: e2e_vendor_cargo_build (2 tests, the x86 rustup 1.41.1 toolchain can't run here) and mode_migration_npm::berry_vendored_then_hosted_takeover_leaves_pure_hosted, which exercises code this branch doesn't change (not yet confirmed against main).cli_parse_get, cli_parse_main, cli_parse_scan, help_text_hygiene, in_process_vendor_bun_takeover, scan_vendor_e2e, all pass; all test targets compile. cargo clippy --all-targets adds no warnings on changed lines.--sync with a non-agent --mode.scan --vendor; two comments still called the spellings "deprecated"/"legacy". All updated.package.json uses socket-patch download; docs/patches.md uses get --no-apply and gc) and socket-cli (integration tests run patch download --dry-run).🤖 Generated with Claude Code
Note
Medium Risk
Breaking CLI change: scripts using scan --apply, --vendor, get --no-apply, download, or gc will fail at parse time (exit 2) until updated.
Overview
v5 CLI cleanup: Removes legacy spellings with no deprecation period. scan --apply and scan --vendor are gone from ScanArgs; mode is only --mode plus --sync (agent + prune). get drops the hidden --no-apply alias (use --save-only). Subcommand aliases download and gc are removed (use get and repair).
Behavior: resolve_mode_flags no longer folds boolean mode flags; it only maps bare --sync to agent mode and rejects --sync combined with a non-agent --mode. Removed spellings are ordinary clap usage errors (exit 2).
Docs & tests: CLI_CONTRACT.md and related docs are updated to --mode agent / --mode vendored throughout; tests and comments follow the same naming.
Reviewed by Cursor Bugbot for commit 717a7d9. Configure here.
Generated by Claude Code
Sorry, something went wrong.
There was an error while loading. Please reload this page.
v5 drops these legacy spellings outright, with no warning release: - scan --apply (use --mode agent) and scan --vendor (use --mode vendored). resolve_mode_flags loses its cross-mode boolean arms; the only conflict left is --sync with a --mode other than agent. - get --no-apply (use --save-only; SOCKET_SAVE_ONLY is unchanged). - the `download` alias for get and the `gc` alias for repair. Each removed spelling is now an ordinary clap usage error (exit 2). --sync stays as the shorthand for --mode agent --prune. Comments that named the old flags now name the --mode spelling. Part of #966. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Tests now pass --mode agent / --mode vendored instead of --apply / --vendor, --save-only instead of --no-apply, and set ScanArgs.mode instead of the deleted apply/vendor fields. The boolean conflict tests become --mode X --sync conflict tests, the alias tests now assert that the old spellings fail to parse, and cli_parse_main gains a table test that checks every removed spelling is a usage error, in the parser and through the binary (exit 2). Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
CLI_CONTRACT.md no longer promises scan --apply/--vendor, get --no-apply or the download/gc aliases; it uses the --mode spelling throughout and notes the removal. migrating-to-v5.md lists each removed spelling with its replacement. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
The exit-2 row of the contract still described scan's cross-mode conflict as a --mode next to another mode's boolean spelling; only --sync with a non-agent --mode is left. Four test labels and comments still read "scan --vendor", and two comments still called the removed spellings deprecated or legacy. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Resolve vendor_flow.rs: keep main's gem takeover preview refusals in the scan --mode vendored dry-run arm, with the PR's comment wording (no reference to the removed `--apply` spelling). Co-Authored-By: Claude <[email protected]>
|
bugbot run Generated by Claude Code |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
Resolves the CLI_CONTRACT.md get/remove rows: keep this branch's get row without the removed --no-apply alias and take main's remove row. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
Stale Bugbot comment from a previous run.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
[agent] CI status: green on cfd141e (546 pass, 6 skipped). The PR had a merge conflict with main in CLI_CONTRACT.md (get/remove rows). I resolved it by keeping this branch's get row without the removed Generated by Claude Code |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
|
[agent] Merged main, CI green; ready for review. Generated by Claude Code |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
…ove-legacy-spellings Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01LD4qUfZKhg2qgt3x9vGeFf
|
bugbot run Generated by Claude Code |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
Stale Bugbot comment from a previous run.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
Resolve two CLI_CONTRACT.md conflicts by keeping main's new text (the atomic vendored-to-hosted takeover wording from #1039 and the gem_lock_unsupported warning from #768) while re-applying this PR's migration away from the removed spellings: `scan --apply` becomes `scan --mode agent`, and `--apply`/`--vendor` in the lockfile supplement become agent mode / vendored mode. Co-Authored-By: Claude <[email protected]>
The branch was updated in parallel with a merge of an older main (3b4ac84). This merge reconciles it with the merge of main at 823810a; the resulting tree is unchanged from that merge. Co-Authored-By: Claude <[email protected]>
|
bugbot run Generated by Claude Code |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
Stale Bugbot comment from a previous run.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
…ove-legacy-spellings # Conflicts: # docs/migrating-to-v5.md
|
bugbot run Generated by Claude Code |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
Stale Bugbot comment from a previous run.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
Burn-down agent: labeled Ready for review at head
Generated by Claude Code |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
…ove-legacy-spellings # Conflicts: # crates/socket-patch-cli/CLI_CONTRACT.md
|
Burn-down agent: main moved (#1030/#1085/#1095 landed) and this went CONFLICTING in Generated by Claude Code |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
Resolve conflicts with #1027 (--json usage errors print coded errors): keep this branch's --sync-only cross-mode wording (the legacy mode booleans are removed here) and add main's note that --json usage errors now print the coded error on stdout, in scan/mod.rs and CLI_CONTRACT.md. Co-Authored-By: Claude <[email protected]>
|
bugbot run Generated by Claude Code |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
✅ 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 717a7d9. Configure here.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
[burn-down agent] Ready for review at
Ready for a human approval. Generated by Claude Code |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
[final reviewer] Enqueued (auto-merge on, squash) at head Generated by Claude Code |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
Resolve conflicts with #1031 (scan --apply/--vendor, get --no-apply and download/gc alias removal): - docs/migrating-to-v5.md: keep both removal tables' rows (#1031's spellings plus --download-mode/SOCKET_DOWNLOAD_MODE) and the blobs-only archive note. - CLI_CONTRACT.md: keep the --download-mode removal paragraph, take main's --mode agent/vendored wording, drop diff-strategy text; repair events row renamed to `repair` with the file-only Downloaded details. - tests/cli_parse_repair.rs: keep the --download-mode rejection test, drop the gc alias tests main removed; header covers both removals. Fix merge fallout: drop the uuid argument from a new schema.rs test's apply_package_patch call (the PR removed that parameter), and remove an unused FileEdit import in vlt_heal.rs tests left by #1141. Co-Authored-By: Claude <[email protected]>
There was an error while loading. Please reload this page.
Successfully merging this pull request may close these issues.
There was an error while loading. Please reload this page.