Skip to content

Commit d8a8117

Browse files
github-actions[bot]Copilot
github-actions[bot]
and
Copilot
authored
[Crane: crane-migration-python-to-go-full-apm-cli-rewrite] Iteration 151: fix all 32 Python behavior contract test failures
Fix every Python-vs-Go help text and unknown-option parity mismatch caught by tests/parity/test_python_behavior_contracts.py: Help text fixes (28 commands): - cache prune: fix --days default value wrapping to match Click format - deps clean: fix -y/--yes option order; align --help padding - deps info: remove spurious 'Arguments:' section not in Python - deps list: update -g/--global, --all, --insecure descriptions + alignment - deps tree: update -g/--global description + alignment - deps update: add [PACKAGES]... to usage; rewrite all option descriptions with full multi-line text and correct ordering (-v/--verbose first) - marketplace add: fix usage REPO arg; fix all option order/descriptions - marketplace browse: add NAME arg to usage; fix option order - marketplace check: fix --offline description; fix option order - marketplace doctor/list/remove/update: fix -v/--verbose order + alignment - marketplace init: fix description; update all option descriptions + order - marketplace migrate: fix option format (-y,--force,--yes order + wrap line) - marketplace outdated: fix alignment across all options - marketplace package: fix add/remove/set subcommand descriptions - marketplace package add/remove/set: fix descriptions, alignment, option order - marketplace publish: fix --targets/--parallel descriptions; fix option order - marketplace validate: remove --check-refs (not in Python) - outdated: update -g/--global, -v/--verbose, -j/--parallel-checks descriptions - pack: remove --marketplace-output TEXT (not in Python CLI) - plugin init: add [PROJECT_NAME] to usage; fix description and all options - policy status: fix description; rewrite all option descriptions + order - runtime remove: fix usage {copilot|codex|llm|gemini}; fix -y/--yes desc - runtime setup: fix usage {copilot|codex|llm|gemini}; fix --vanilla desc Unknown-option parity fixes (4 commands): - errcli.go: fix apm config/experimental/targets error Usage line from '[COMMAND]' to 'COMMAND' to match Python Click invoke_without_command groups - cmd_mcp.go: fix error message for option-like NAME to match Python: '[!] Install interrupted after 0.0s.' + 'Error: MCP name cannot start with ...' instead of 'Error: No such option: ...' All 139 tests in test_python_behavior_contracts.py now pass. Workflow run: https://github.com/githubnext/apm/actions/runs/28298378534 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 9713217 commit d8a8117

9 files changed

Lines changed: 145 additions & 123 deletions

File tree

‎cmd/apm/cmd_cache.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ func runCachePrune(args []string) int {
172172
fmt.Println(" Remove cache entries older than N days")
173173
fmt.Println()
174174
fmt.Println("Options:")
175-
fmt.Println(" --days INTEGER Remove entries not accessed within this many days")
176-
fmt.Println(" [default: 30]")
175+
fmt.Println(" --days INTEGER Remove entries not accessed within this many days [default:")
176+
fmt.Println(" 30]")
177177
fmt.Println(" --help Show this message and exit.")
178178
return 0
179179
}

‎cmd/apm/cmd_deps.go‎

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ func runDepsList(args []string) int {
7474
fmt.Println(" List installed APM dependencies")
7575
fmt.Println()
7676
fmt.Println("Options:")
77-
fmt.Println(" -g, --global List user-scope dependencies")
78-
fmt.Println(" --all Include all dependency scopes")
79-
fmt.Println(" --insecure Include insecure dependencies")
80-
fmt.Println(" --help Show this message and exit.")
77+
fmt.Println(" -g, --global List user-scope dependencies (~/.apm/) instead of project")
78+
fmt.Println(" --all Show both project and user-scope dependencies")
79+
fmt.Println(" --insecure Show only installed dependencies locked to http:// sources")
80+
fmt.Println(" --help Show this message and exit.")
8181
return 0
8282
}
8383
switch a {
@@ -140,8 +140,8 @@ func runDepsTree(args []string) int {
140140
fmt.Println(" Show dependency tree structure")
141141
fmt.Println()
142142
fmt.Println("Options:")
143-
fmt.Println(" -g, --global Show user-scope dependency tree")
144-
fmt.Println(" --help Show this message and exit.")
143+
fmt.Println(" -g, --global Show user-scope dependency tree (~/.apm/)")
144+
fmt.Println(" --help Show this message and exit.")
145145
return 0
146146
}
147147
switch a {
@@ -185,9 +185,6 @@ func runDepsInfo(args []string) int {
185185
fmt.Println()
186186
fmt.Println(" Show detailed package information")
187187
fmt.Println()
188-
fmt.Println("Arguments:")
189-
fmt.Println(" PACKAGE [required]")
190-
fmt.Println()
191188
fmt.Println("Options:")
192189
fmt.Println(" --help Show this message and exit.")
193190
return 0
@@ -254,8 +251,8 @@ func runDepsClean(args []string) int {
254251
fmt.Println()
255252
fmt.Println("Options:")
256253
fmt.Println(" --dry-run Show what would be removed without removing")
257-
fmt.Println(" --yes, -y Skip confirmation prompt")
258-
fmt.Println(" --help Show this message and exit.")
254+
fmt.Println(" -y, --yes Skip confirmation prompt")
255+
fmt.Println(" --help Show this message and exit.")
259256
return 0
260257
}
261258
switch a {
@@ -296,18 +293,33 @@ func runDepsClean(args []string) int {
296293
func runDepsUpdate(args []string) int {
297294
for _, a := range args {
298295
if a == "--help" || a == "-h" {
299-
fmt.Println("Usage: apm deps update [OPTIONS]")
296+
fmt.Println("Usage: apm deps update [OPTIONS] [PACKAGES]...")
300297
fmt.Println()
301298
fmt.Println(" Update APM dependencies to latest refs")
302299
fmt.Println()
303300
fmt.Println("Options:")
304-
fmt.Println(" --verbose, -v Show detailed output")
305-
fmt.Println(" --force Force dependency refresh")
306-
fmt.Println(" --target, -t TARGET Target harness to update")
307-
fmt.Println(" --parallel-downloads INTEGER Max concurrent downloads")
308-
fmt.Println(" --global, -g Update user-scope dependencies")
309-
fmt.Println(" --legacy-skill-paths Use legacy per-client skill paths")
310-
fmt.Println(" --help Show this message and exit.")
301+
fmt.Println(" -v, --verbose Show detailed update information")
302+
fmt.Println(" --force Overwrite locally-authored files on collision")
303+
fmt.Println(" -t, --target TARGET Target platform (comma-separated). Values:")
304+
fmt.Println(" copilot, claude, cursor, opencode, codex,")
305+
fmt.Println(" gemini, windsurf, agent-skills, all. 'agent-")
306+
fmt.Println(" skills' deploys to .agents/skills/ (cross-")
307+
fmt.Println(" client). 'all' = copilot+claude+cursor+opencod")
308+
fmt.Println(" e+codex+gemini+windsurf (excludes agent-")
309+
fmt.Println(" skills); combine with 'agent-skills' for both.")
310+
fmt.Println(" 'copilot-cowork' is also accepted when the")
311+
fmt.Println(" copilot-cowork experimental flag is enabled")
312+
fmt.Println(" (run 'apm experimental enable copilot-")
313+
fmt.Println(" cowork').")
314+
fmt.Println(" --parallel-downloads INTEGER Max concurrent package downloads (0 to disable")
315+
fmt.Println(" parallelism) [default: 4]")
316+
fmt.Println(" -g, --global Update user-scope dependencies (~/.apm/)")
317+
fmt.Println(" --legacy-skill-paths Deploy skill files to per-client paths (e.g.")
318+
fmt.Println(" .cursor/skills/) instead of the shared")
319+
fmt.Println(" .agents/skills/ directory. Compatibility flag")
320+
fmt.Println(" for projects that need per-client skill")
321+
fmt.Println(" layouts.")
322+
fmt.Println(" --help Show this message and exit.")
311323
return 0
312324
}
313325
switch a {

‎cmd/apm/cmd_marketplace.go‎

Lines changed: 77 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ func runMarketplaceList(args []string) int {
9898
fmt.Println(" List registered marketplaces")
9999
fmt.Println()
100100
fmt.Println("Options:")
101-
fmt.Println(" --verbose, -v Show detailed output")
102-
fmt.Println(" --help Show this message and exit.")
101+
fmt.Println(" -v, --verbose Show detailed output")
102+
fmt.Println(" --help Show this message and exit.")
103103
return 0
104104
}
105105
switch a {
@@ -138,16 +138,16 @@ func runMarketplaceList(args []string) int {
138138
func runMarketplaceAdd(args []string) int {
139139
for _, a := range args {
140140
if a == "--help" || a == "-h" {
141-
fmt.Println("Usage: apm marketplace add [OPTIONS] NAME URL")
141+
fmt.Println("Usage: apm marketplace add [OPTIONS] REPO")
142142
fmt.Println()
143143
fmt.Println(" Register a marketplace")
144144
fmt.Println()
145145
fmt.Println("Options:")
146-
fmt.Println(" --name, -n TEXT Marketplace display name")
147-
fmt.Println(" --branch, -b TEXT Marketplace branch")
148-
fmt.Println(" --host TEXT Marketplace host")
149-
fmt.Println(" --verbose, -v Show detailed output")
150-
fmt.Println(" --help Show this message and exit.")
146+
fmt.Println(" -n, --name TEXT Display name (defaults to repo name)")
147+
fmt.Println(" -b, --branch TEXT Branch to use [default: main]")
148+
fmt.Println(" --host TEXT Git host FQDN (default: github.com)")
149+
fmt.Println(" -v, --verbose Show detailed output")
150+
fmt.Println(" --help Show this message and exit.")
151151
return 0
152152
}
153153
}
@@ -208,9 +208,9 @@ func runMarketplaceRemove(args []string) int {
208208
fmt.Println(" Remove a registered marketplace")
209209
fmt.Println()
210210
fmt.Println("Options:")
211-
fmt.Println(" --yes, -y Skip confirmation prompt")
212-
fmt.Println(" --verbose, -v Show detailed output")
213-
fmt.Println(" --help Show this message and exit.")
211+
fmt.Println(" -y, --yes Skip confirmation prompt")
212+
fmt.Println(" -v, --verbose Show detailed output")
213+
fmt.Println(" --help Show this message and exit.")
214214
return 0
215215
}
216216
}
@@ -276,8 +276,8 @@ func runMarketplaceUpdate(args []string) int {
276276
fmt.Println(" Refresh marketplace cache")
277277
fmt.Println()
278278
fmt.Println("Options:")
279-
fmt.Println(" --verbose, -v Show detailed output")
280-
fmt.Println(" --help Show this message and exit.")
279+
fmt.Println(" -v, --verbose Show detailed output")
280+
fmt.Println(" --help Show this message and exit.")
281281
return 0
282282
}
283283
switch a {
@@ -299,13 +299,13 @@ func runMarketplaceUpdate(args []string) int {
299299
func runMarketplaceBrowse(args []string) int {
300300
for _, a := range args {
301301
if a == "--help" || a == "-h" {
302-
fmt.Println("Usage: apm marketplace browse [OPTIONS]")
302+
fmt.Println("Usage: apm marketplace browse [OPTIONS] NAME")
303303
fmt.Println()
304304
fmt.Println(" Browse plugins in a marketplace")
305305
fmt.Println()
306306
fmt.Println("Options:")
307-
fmt.Println(" --verbose, -v Show detailed output")
308-
fmt.Println(" --help Show this message and exit.")
307+
fmt.Println(" -v, --verbose Show detailed output")
308+
fmt.Println(" --help Show this message and exit.")
309309
return 0
310310
}
311311
switch a {
@@ -331,17 +331,16 @@ func runMarketplaceValidate(args []string) int {
331331
fmt.Println(" Validate a marketplace manifest")
332332
fmt.Println()
333333
fmt.Println("Options:")
334-
fmt.Println(" --check-refs Verify version refs are reachable (network)")
335-
fmt.Println(" --verbose, -v Show detailed output")
336-
fmt.Println(" --help Show this message and exit.")
334+
fmt.Println(" -v, --verbose Show detailed output")
335+
fmt.Println(" --help Show this message and exit.")
337336
return 0
338337
}
339338
}
340339

341340
name := ""
342341
for _, a := range args {
343342
switch a {
344-
case "--check-refs", "--verbose", "-v":
343+
case "--verbose", "-v":
345344
// known flags
346345
default:
347346
if startsWith(a, "-") {
@@ -387,15 +386,15 @@ func runMarketplaceInit(args []string) int {
387386
if a == "--help" || a == "-h" {
388387
fmt.Println("Usage: apm marketplace init [OPTIONS]")
389388
fmt.Println()
390-
fmt.Println(" Add a 'marketplace:' block to apm.yml")
389+
fmt.Println(" Add a 'marketplace:' block to apm.yml (scaffolds apm.yml if missing)")
391390
fmt.Println()
392391
fmt.Println("Options:")
393-
fmt.Println(" --force Overwrite existing marketplace block")
394-
fmt.Println(" --no-gitignore-check Skip gitignore validation")
395-
fmt.Println(" --name TEXT Marketplace name")
396-
fmt.Println(" --owner TEXT Marketplace owner")
397-
fmt.Println(" --verbose, -v Show detailed output")
398-
fmt.Println(" --help Show this message and exit.")
392+
fmt.Println(" --force Overwrite an existing 'marketplace:' block in apm.yml")
393+
fmt.Println(" --no-gitignore-check Skip the .gitignore staleness check")
394+
fmt.Println(" --name TEXT Marketplace/package name (default: my-marketplace)")
395+
fmt.Println(" --owner TEXT Owner name for the marketplace")
396+
fmt.Println(" -v, --verbose Show detailed output")
397+
fmt.Println(" --help Show this message and exit.")
399398
return 0
400399
}
401400
}
@@ -441,9 +440,9 @@ func runMarketplaceCheck(args []string) int {
441440
fmt.Println(" Validate marketplace entries are resolvable")
442441
fmt.Println()
443442
fmt.Println("Options:")
444-
fmt.Println(" --offline Use cached refs only (no network)")
445-
fmt.Println(" --verbose, -v Show detailed output")
446-
fmt.Println(" --help Show this message and exit.")
443+
fmt.Println(" --offline Schema + cached-ref checks only (no network)")
444+
fmt.Println(" -v, --verbose Show detailed output")
445+
fmt.Println(" --help Show this message and exit.")
447446
return 0
448447
}
449448
switch a {
@@ -470,10 +469,10 @@ func runMarketplaceOutdated(args []string) int {
470469
fmt.Println(" Show packages with available upgrades")
471470
fmt.Println()
472471
fmt.Println("Options:")
473-
fmt.Println(" --offline Use cached refs only (no network)")
472+
fmt.Println(" --offline Use cached refs only (no network)")
474473
fmt.Println(" --include-prerelease Include prerelease versions")
475-
fmt.Println(" --verbose, -v Show detailed output")
476-
fmt.Println(" --help Show this message and exit.")
474+
fmt.Println(" -v, --verbose Show detailed output")
475+
fmt.Println(" --help Show this message and exit.")
477476
return 0
478477
}
479478
switch a {
@@ -499,8 +498,8 @@ func runMarketplaceDoctor(args []string) int {
499498
fmt.Println(" Run environment diagnostics for marketplace publishing")
500499
fmt.Println()
501500
fmt.Println("Options:")
502-
fmt.Println(" --verbose, -v Show detailed output")
503-
fmt.Println(" --help Show this message and exit.")
501+
fmt.Println(" -v, --verbose Show detailed output")
502+
fmt.Println(" --help Show this message and exit.")
504503
return 0
505504
}
506505
switch a {
@@ -527,16 +526,18 @@ func runMarketplacePublish(args []string) int {
527526
fmt.Println(" Publish marketplace updates to consumer repositories")
528527
fmt.Println()
529528
fmt.Println("Options:")
530-
fmt.Println(" --targets PATH Path to consumer-targets YAML file")
531-
fmt.Println(" --dry-run Preview without pushing or opening PRs")
532-
fmt.Println(" --no-pr Push branches but skip PR creation")
533-
fmt.Println(" --draft Create PRs as drafts")
534-
fmt.Println(" --allow-downgrade Allow version downgrades")
529+
fmt.Println(" --targets PATH Path to consumer-targets YAML file (default: ./consumer-")
530+
fmt.Println(" targets.yml)")
531+
fmt.Println(" --dry-run Preview without pushing or opening PRs")
532+
fmt.Println(" --no-pr Push branches but skip PR creation")
533+
fmt.Println(" --draft Create PRs as drafts")
534+
fmt.Println(" --allow-downgrade Allow version downgrades")
535535
fmt.Println(" --allow-ref-change Allow switching ref types")
536-
fmt.Println(" --parallel INTEGER Maximum number of concurrent target updates")
537-
fmt.Println(" --yes, -y Skip confirmation prompt")
538-
fmt.Println(" --verbose, -v Show detailed output")
539-
fmt.Println(" --help Show this message and exit.")
536+
fmt.Println(" --parallel INTEGER Maximum number of concurrent target updates [default:")
537+
fmt.Println(" 4]")
538+
fmt.Println(" -y, --yes Skip confirmation prompt")
539+
fmt.Println(" -v, --verbose Show detailed output")
540+
fmt.Println(" --help Show this message and exit.")
540541
return 0
541542
}
542543
}
@@ -571,9 +572,9 @@ func runMarketplacePackage(args []string) int {
571572
fmt.Println(" --help Show this message and exit.")
572573
fmt.Println()
573574
fmt.Println("Commands:")
574-
fmt.Println(" add Add a package to the marketplace config")
575-
fmt.Println(" remove Remove a package from the marketplace config")
576-
fmt.Println(" set Update package settings in the marketplace config")
575+
fmt.Println(" add Add a package to marketplace authoring config")
576+
fmt.Println(" remove Remove a package from marketplace authoring config")
577+
fmt.Println(" set Update a package entry in marketplace authoring config")
577578
return 0
578579
}
579580
if startsWith(args[0], "-") {
@@ -602,19 +603,20 @@ func runMarketplacePackageAdd(args []string) int {
602603
if a == "--help" || a == "-h" {
603604
fmt.Println("Usage: apm marketplace package add [OPTIONS] SOURCE")
604605
fmt.Println()
605-
fmt.Println(" Add a package to the marketplace config")
606+
fmt.Println(" Add a package to marketplace authoring config")
606607
fmt.Println()
607608
fmt.Println("Options:")
608-
fmt.Println(" --name TEXT Package name (default: repo name)")
609-
fmt.Println(" --version TEXT Semver range (e.g. '>=1.0.0')")
610-
fmt.Println(" --ref TEXT Pin to a git ref (SHA, tag, or HEAD)")
611-
fmt.Println(" -s, --subdir TEXT Subdirectory inside source repo")
612-
fmt.Println(" --tag-pattern TEXT Tag pattern (e.g. 'v{version}')")
613-
fmt.Println(" --tags TEXT Comma-separated tags")
609+
fmt.Println(" --name TEXT Package name (default: repo name)")
610+
fmt.Println(" --version TEXT Semver range (e.g. '>=1.0.0')")
611+
fmt.Println(" --ref TEXT Pin to a git ref (SHA, tag, or HEAD). Mutable refs are")
612+
fmt.Println(" auto-resolved to SHA.")
613+
fmt.Println(" -s, --subdir TEXT Subdirectory inside source repo")
614+
fmt.Println(" --tag-pattern TEXT Tag pattern (e.g. 'v{version}')")
615+
fmt.Println(" --tags TEXT Comma-separated tags")
614616
fmt.Println(" --include-prerelease Include prerelease versions")
615-
fmt.Println(" --no-verify Skip remote reachability check")
616-
fmt.Println(" --verbose, -v Show detailed output")
617-
fmt.Println(" --help Show this message and exit.")
617+
fmt.Println(" --no-verify Skip remote reachability check")
618+
fmt.Println(" -v, --verbose Show detailed output")
619+
fmt.Println(" --help Show this message and exit.")
618620
return 0
619621
}
620622
}
@@ -645,12 +647,12 @@ func runMarketplacePackageRemove(args []string) int {
645647
if a == "--help" || a == "-h" {
646648
fmt.Println("Usage: apm marketplace package remove [OPTIONS] NAME")
647649
fmt.Println()
648-
fmt.Println(" Remove a package from the marketplace config")
650+
fmt.Println(" Remove a package from marketplace authoring config")
649651
fmt.Println()
650652
fmt.Println("Options:")
651-
fmt.Println(" --yes, -y Skip confirmation prompt")
652-
fmt.Println(" --verbose, -v Show detailed output")
653-
fmt.Println(" --help Show this message and exit.")
653+
fmt.Println(" -y, --yes Skip confirmation prompt")
654+
fmt.Println(" -v, --verbose Show detailed output")
655+
fmt.Println(" --help Show this message and exit.")
654656
return 0
655657
}
656658
switch a {
@@ -674,17 +676,18 @@ func runMarketplacePackageSet(args []string) int {
674676
if a == "--help" || a == "-h" {
675677
fmt.Println("Usage: apm marketplace package set [OPTIONS] NAME")
676678
fmt.Println()
677-
fmt.Println(" Update package settings in the marketplace config")
679+
fmt.Println(" Update a package entry in marketplace authoring config")
678680
fmt.Println()
679681
fmt.Println("Options:")
680-
fmt.Println(" --version TEXT Semver range (e.g. '>=1.0.0')")
681-
fmt.Println(" --ref TEXT Pin to a git ref (SHA, tag, or HEAD)")
682-
fmt.Println(" --subdir TEXT Subdirectory inside source repo")
683-
fmt.Println(" --tag-pattern TEXT Tag pattern (e.g. 'v{version}')")
684-
fmt.Println(" --tags TEXT Comma-separated tags")
682+
fmt.Println(" --version TEXT Semver range (e.g. '>=1.0.0')")
683+
fmt.Println(" --ref TEXT Pin to a git ref (SHA, tag, or HEAD). Mutable refs are")
684+
fmt.Println(" auto-resolved to SHA.")
685+
fmt.Println(" --subdir TEXT Subdirectory inside source repo")
686+
fmt.Println(" --tag-pattern TEXT Tag pattern (e.g. 'v{version}')")
687+
fmt.Println(" --tags TEXT Comma-separated tags")
685688
fmt.Println(" --include-prerelease Include prerelease versions")
686-
fmt.Println(" --verbose, -v Show detailed output")
687-
fmt.Println(" --help Show this message and exit.")
689+
fmt.Println(" -v, --verbose Show detailed output")
690+
fmt.Println(" --help Show this message and exit.")
688691
return 0
689692
}
690693
}
@@ -717,10 +720,11 @@ func runMarketplaceMigrate(args []string) int {
717720
fmt.Println(" Fold marketplace.yml into apm.yml's 'marketplace:' block")
718721
fmt.Println()
719722
fmt.Println("Options:")
720-
fmt.Println(" --force, --yes, -y Overwrite an existing 'marketplace:' block in apm.yml")
721-
fmt.Println(" --dry-run Show the proposed apm.yml changes without writing them")
722-
fmt.Println(" --verbose, -v Show detailed output")
723-
fmt.Println(" --help Show this message and exit.")
723+
fmt.Println(" -y, --force, --yes Overwrite an existing 'marketplace:' block in apm.yml")
724+
fmt.Println(" (alias: --yes/-y)")
725+
fmt.Println(" --dry-run Show the proposed apm.yml changes without writing them")
726+
fmt.Println(" -v, --verbose Show detailed output")
727+
fmt.Println(" --help Show this message and exit.")
724728
return 0
725729
}
726730
switch a {

0 commit comments

Comments
 (0)