Skip to content

Drive CLI codegen from a checked-in cli.json #5484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pietern merged 13 commits into from
Jun 11, 2026
Merged

Drive CLI codegen from a checked-in cli.json #5484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e500f48
Drive CLI codegen from a checked-in cli.json
pietern Jun 9, 2026
d5673ef
internal/cligen: test splitASCII name-splitting behavior
pietern Jun 9, 2026
e54bc98
internal/cligen: move splitASCII into split.go
pietern Jun 9, 2026
b47043d
internal/cligen: reword split.go header comment
pietern Jun 9, 2026
078472c
internal/cligen: cover the empty/underscore/$ guard branches
pietern Jun 9, 2026
33fe412
codegen: consume the IR-derived cli.json from genkit
pietern Jun 9, 2026
bddbd3c
bundle/internal/schema: drop dead mapIncorrectTypNames
pietern Jun 9, 2026
ea21ed6
Taskfile: minimize diff vs origin/main
pietern Jun 9, 2026
3956d20
internal/clijson: share the cli.json contract types across consumers
pietern Jun 11, 2026
fdfa173
Address review feedback on the cligen/clijson pipeline
pietern Jun 11, 2026
43b92f4
Merge remote-tracking branch 'origin/main' into cligen
pietern Jun 11, 2026
9abb5f0
NEXT_CHANGELOG: don't name the removed in-development enums
pietern Jun 11, 2026
b0bb1e2
Taskfile: restore the universe dirty-tree check in generate-clijson
pietern Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .agent/rules/auto-generated-files.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ Files matching this rule's glob pattern are most likely generated artifacts. Aut
- Everything, in one shot:
- `./task generate` — aggregator that runs all generators below
- OpenAPI SDK/CLI command stubs and related generated artifacts:
- `./task generate-genkit`
- Includes generated `cmd/account/**`, `cmd/workspace/**`, `.gitattributes`, `internal/genkit/tagging.py`.
- `./task generate-cligen` — regenerates `cmd/account/**`, `cmd/workspace/**` and `.gitattributes` from the checked-in `.codegen/cli.json`.
- `./task generate-clijson` — refreshes `.codegen/cli.json` from the OpenAPI spec via genkit (requires universe repo); also updates `internal/genkit/tagging.py`.
- Direct engine generated YAML:
- `./task generate-direct` (or `./task generate-direct-apitypes`, `./task generate-direct-resources`)
- Bundle schemas:
Expand Down
3 changes: 1 addition & 2 deletions .codegen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"mode": "cli_v0",
"api_changelog": true,
"mode": "cli_v1",
Comment thread
janniklasrose marked this conversation as resolved.

@simonfaltum simonfaltum Jun 9, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Following up on my Taskfile comment about sequencing with a concrete check: genkit on universe master as of 2026-06-09 still has no cli_v1 (codegen.go dispatches cli_v0 only, same in cmd/update and cmd/generate), so genkit update-sdk --dir against this repo fails with unknown mode until the producer merges. Day-to-day task generate is unaffected since cli.json is checked in. Worth noting the minimum universe version in the generate-cli-json comment once the producer lands.

"formatter": "go run golang.org/x/tools/cmd/goimports@latest -w $FILENAMES && go fmt ./...",
"version": {
"python/README.md": "version $VERSION or above",
Expand Down
1 change: 1 addition & 0 deletions .codegen/.gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cli.json linguist-generated=true
Loading
Loading