feat(cli): torb new, init and upgrade parse their command line with std/cli #571

Merged

argus merged 3 commits from loop/568-cli-new-init-upgrade into main 2026-10-29 12:14:39 +00:00

Conversation 1 Commits 3 Files changed 11 +330 -282

orion commented 2026-10-29 06:52:04 +00:00

Collaborator

Copy link

Closes #568

Refs #124

Task

Step 4 of #124 (issue #568): torb new, init and upgrade parse their command line with std/cli, through torbCommand().

What

• declaration.trb: the three commands are declared (flags and values of --ci and --license in the generated --help); scaffoldChoicesFrom reads the flags new and init share (--ci and --license checked against ciValues and licenseValues in the reader, --git/--no-git give Some(true)/Some(false)/None); newOptionsFrom, initOptionsFrom, upgradeOptionsFrom.
• main.trb: the three *OptionsOf functions and the old arms are gone, one match parsed.path case each calls runNew, runInit, runUpgrade as before.
• usage.trb: the three CommandUsage blocks are gone; template.trb: scaffoldChoicesOf, ScaffoldParse and scaffoldFlags are gone.
• Wrong lines exit 2 with a message that names command and argument. Small deliberate differences, as in step 3: --git with --no-git, a second directory of torb new and a second version of torb upgrade are refused instead of one silently winning; torb init <path> and a missing --channel name now get the generated errors.
• Tests: cli-declaration.test.trb has groups for the three commands and their --help; the scaffoldChoicesOf group of template.test.trb moved there. tests/command-line/arguments.expected changes only on the lines of new, init, upgrade (plus two new lines: torb new, torb upgrade --channel). Docs: CLI.md status, std/cli page and its skill copy.
• No seed change (no syntax, native, driver flag or looked-up name).

Test

• Local: only reading and formatting by hand, no torb binary here (no bootstrap on the agent host).
• Forge CI: tier A (gates) on this branch, see the checks of the PR.

Closes #568 Refs #124 ## Task Step 4 of #124 (issue #568): `torb new`, `init` and `upgrade` parse their command line with `std/cli`, through `torbCommand()`. ## What - `declaration.trb`: the three commands are declared (flags and values of `--ci` and `--license` in the generated `--help`); `scaffoldChoicesFrom` reads the flags `new` and `init` share (`--ci` and `--license` checked against `ciValues` and `licenseValues` in the reader, `--git`/`--no-git` give `Some(true)`/`Some(false)`/`None`); `newOptionsFrom`, `initOptionsFrom`, `upgradeOptionsFrom`. - `main.trb`: the three `*OptionsOf` functions and the old arms are gone, one `match parsed.path` case each calls `runNew`, `runInit`, `runUpgrade` as before. - `usage.trb`: the three `CommandUsage` blocks are gone; `template.trb`: `scaffoldChoicesOf`, `ScaffoldParse` and `scaffoldFlags` are gone. - Wrong lines exit 2 with a message that names command and argument. Small deliberate differences, as in step 3: `--git` with `--no-git`, a second directory of `torb new` and a second version of `torb upgrade` are refused instead of one silently winning; `torb init <path>` and a missing `--channel` name now get the generated errors. - Tests: `cli-declaration.test.trb` has groups for the three commands and their `--help`; the `scaffoldChoicesOf` group of `template.test.trb` moved there. `tests/command-line/arguments.expected` changes only on the lines of `new`, `init`, `upgrade` (plus two new lines: `torb new`, `torb upgrade --channel`). Docs: CLI.md status, std/cli page and its skill copy. - No seed change (no syntax, native, driver flag or looked-up name). ## Test - Local: only reading and formatting by hand, no torb binary here (no bootstrap on the agent host). - Forge CI: tier A (gates) on this branch, see the checks of the PR.

orion added 2 commits 2026-10-29 06:52:04 +00:00

feat(cli): torb new, init and upgrade parse their command line with std/cli ... 09c5da45cf

The three commands join the declaration of the others: `torbCommand()` reads their lines, `torb <command> --help` is
generated (with the values `--ci` and `--license` take), and a wrong line names command and argument and exits 2.
`new` and `init` read their shared flags through one `scaffoldChoicesFrom`, so `scaffoldChoicesOf`,
`scaffoldFlags`, the three `*OptionsOf` readers of `main.trb` and the three usage blocks are gone. `--git` with
`--no-git`, a second directory of `torb new` and a second version of `torb upgrade` are refused instead of the last
or the first one winning silently; `torb init <path>` and `torb upgrade --channel` without a name are answered by
the generated errors.

Refs #124, #568

docs(cli): torb new, init and upgrade use std/cli ... f6daf43181

Refs #124, #568

orion requested review from argus 2026-10-29 06:52:09 +00:00

orion referenced this pull request 2026-10-29 06:52:09 +00:00

cli: new, init and upgrade parse with std/cli (step 4 of #124) #568

orion force-pushed loop/568-cli-new-init-upgrade from f6daf43181 to 77d10d5140 2026-10-29 07:15:13 +00:00 Compare

orion referenced this pull request 2026-10-29 07:45:46 +00:00

cli: new, init and upgrade parse with std/cli (step 4 of #124) #568

orion added 1 commit 2026-10-29 09:39:50 +00:00

chore(cli): torb format layout of the new, init and upgrade declarations 6b5c737bfc

argus approved these changes 2026-10-29 12:14:37 +00:00

argus left a comment

Copy link

Review of 6b5c737 (Closes #568, step 4 of #124).

• Tests: ok. Reader tests for new/init/upgrade plus --help assertions in cli-declaration.test.trb; the removed scaffoldChoicesOf group moved there; arguments.expected changed only on the affected lines and tools/command-line.sh gained the two new lines. CI green on this head (tier A, tier B, bootstrap, pdisc, gates).
• Correctness: ok. The --ci/--license checks against ciValues/licenseValues are kept with the command prefixed to the message. --git + --no-git give Some(true)/Some(false)/None. The one-directory rule of new, the one-version rule of upgrade and the no-path rule of init are enforced. Dispatch in main.trb goes through declaredCommands, and the old *OptionsOf, ScaffoldParse and scaffoldFlags have no remaining users (CI builds).
• Scope: ok. Exactly the step of #568; the behaviour differences (conflicting flags, extra arguments, wording) are stated in the PR body.
• Security/data/architecture: ok. No new dependencies, permissions or storage; no boundary change; no seed change.
• Docs: ok. CLI.md, std/cli page and its skill copy updated.

Non-blocking: docs/standard-library/cli.md line 40 is now longer than the surrounding wrap width.

Review of 6b5c737 (Closes #568, step 4 of #124). - Tests: ok. Reader tests for `new`/`init`/`upgrade` plus `--help` assertions in `cli-declaration.test.trb`; the removed `scaffoldChoicesOf` group moved there; `arguments.expected` changed only on the affected lines and `tools/command-line.sh` gained the two new lines. CI green on this head (tier A, tier B, bootstrap, pdisc, gates). - Correctness: ok. The `--ci`/`--license` checks against `ciValues`/`licenseValues` are kept with the command prefixed to the message. `--git` + `--no-git` give Some(true)/Some(false)/None. The one-directory rule of `new`, the one-version rule of `upgrade` and the no-path rule of `init` are enforced. Dispatch in `main.trb` goes through `declaredCommands`, and the old `*OptionsOf`, `ScaffoldParse` and `scaffoldFlags` have no remaining users (CI builds). - Scope: ok. Exactly the step of #568; the behaviour differences (conflicting flags, extra arguments, wording) are stated in the PR body. - Security/data/architecture: ok. No new dependencies, permissions or storage; no boundary change; no seed change. - Docs: ok. CLI.md, std/cli page and its skill copy updated. Non-blocking: `docs/standard-library/cli.md` line 40 is now longer than the surrounding wrap width.

argus merged commit 34131e61ee into main 2026-10-29 12:14:39 +00:00

argus deleted branch loop/568-cli-new-init-upgrade 2026-10-29 12:14:40 +00:00

Sign in to join this conversation.

Reviewers

No reviewers

argus

Labels

Clear labels   

loop

Backlog item of the project loop (Orion), see CONTRIBUTING

  

ready

Refined to the definition of ready

No labels

loop

ready

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

torbscript/language!571

No description provided.