Skip to content

refactor(cli): consolidate internal command tree layout#502

Merged
skevetter merged 16 commits into
mainfrom
tedious-jellyfish
Jun 6, 2026
Merged

refactor(cli): consolidate internal command tree layout#502
skevetter merged 16 commits into
mainfrom
tedious-jellyfish

Conversation

@skevetter

Copy link
Copy Markdown
Contributor

Summary

  • Move cmd/agent/ and cmd/helper/ under cmd/internal/ so the source layout mirrors the hidden internal command tree.
  • Hoist the agent container/workspace subcommands into agentcontainer/agentworkspace packages, and group the helper http/json/strings/ssh/provider/image/workspace-info commands into focused sub-packages before dissolving the loose files into the cmdinternal package.
  • Remove the hidden helper parent command, promoting its 16 subcommands to direct children of internal (e.g. internal helper ssh-server -> internal ssh-server), and update all Go, provider.yaml, desktop, and docs call sites.
  • Attach the agentPreRunE hook per-command so daemon-local/logs-daemon/run-user-commands keep inheriting the root command's PersistentPreRunE; preserve git-ssh-signature-helper as a genuine distinct command.

skevetter added 15 commits June 6, 2026 07:46
Remove the hidden `helper` parent command, promoting its 16 subcommands
to direct children of `internal` (e.g. `internal helper ssh-server` ->
`internal ssh-server`). Collapse the helper* sub-packages into the
cmdinternal package, dropping the vestigial `helper` naming from files
and import aliases now that the parent is gone.

The agentPreRunE hook is attached per-command rather than on the
`internal` parent so daemon-local/logs-daemon/run-user-commands keep
inheriting the root command's PersistentPreRunE.

git-ssh-signature-helper is preserved as a genuine distinct command.
@netlify

netlify Bot commented Jun 6, 2026

Copy link
Copy Markdown

Deploy Preview for devsydev canceled.

Name Link
🔨 Latest commit 2b99adc
🔍 Latest deploy log https://app.netlify.com/projects/devsydev/deploys/6a243907ec2dbb0008cf87ea

@coderabbitai

coderabbitai Bot commented Jun 6, 2026

Copy link
Copy Markdown

Warning

Review limit reached

@skevetter, we couldn't start this review because you've reached your PR review rate limit.

More reviews will be available in 43 minutes and 16 seconds. Learn how PR review limits work.

Your organization has run out of usage credits. Purchase more in the billing tab.

⌛ How to resolve this issue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans include higher PR review limits than trial, open-source, and free plans. In all cases, reviews become available again over time. During sustained high-volume PR review activity, CodeRabbit may temporarily slow when the next review becomes available.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 4d6ced76-2cbe-4b4d-b0e6-a6709e954f61

📥 Commits

Reviewing files that changed from the base of the PR and between f2f5e15 and 2b99adc.

📒 Files selected for processing (87)
  • cmd/agent/agent.go
  • cmd/agent/git_ssh_signature_helper.go
  • cmd/helper/helper.go
  • cmd/internal/agent.go
  • cmd/internal/agent_daemon.go
  • cmd/internal/agent_docker_credentials.go
  • cmd/internal/agentcontainer/codeserver_async.go
  • cmd/internal/agentcontainer/container.go
  • cmd/internal/agentcontainer/credentials_server.go
  • cmd/internal/agentcontainer/daemon.go
  • cmd/internal/agentcontainer/deferred_hooks.go
  • cmd/internal/agentcontainer/deferred_hooks_windows.go
  • cmd/internal/agentcontainer/openvscode_async.go
  • cmd/internal/agentcontainer/post_attach.go
  • cmd/internal/agentcontainer/post_attach_windows.go
  • cmd/internal/agentcontainer/setup.go
  • cmd/internal/agentcontainer/setup_devsy_platform_access.go
  • cmd/internal/agentcontainer/setup_internal_test.go
  • cmd/internal/agentcontainer/setup_windows.go
  • cmd/internal/agentcontainer/ssh_server.go
  • cmd/internal/agentcontainer/vscode_async.go
  • cmd/internal/agentworkspace/build.go
  • cmd/internal/agentworkspace/clean.go
  • cmd/internal/agentworkspace/clean_test.go
  • cmd/internal/agentworkspace/delete.go
  • cmd/internal/agentworkspace/delete_test.go
  • cmd/internal/agentworkspace/docker_darwin_test.go
  • cmd/internal/agentworkspace/install_dotfiles.go
  • cmd/internal/agentworkspace/logs.go
  • cmd/internal/agentworkspace/logs_daemon.go
  • cmd/internal/agentworkspace/setup_gpg.go
  • cmd/internal/agentworkspace/status.go
  • cmd/internal/agentworkspace/stop.go
  • cmd/internal/agentworkspace/up.go
  • cmd/internal/agentworkspace/update_config.go
  • cmd/internal/agentworkspace/workspace.go
  • cmd/internal/browser_tunnel.go
  • cmd/internal/browser_tunnel_test.go
  • cmd/internal/check_provider_update.go
  • cmd/internal/container_tunnel.go
  • cmd/internal/fleet_server.go
  • cmd/internal/get.go
  • cmd/internal/get_image.go
  • cmd/internal/get_image_platforms.go
  • cmd/internal/get_provider_name.go
  • cmd/internal/get_workspace_config.go
  • cmd/internal/get_workspace_name.go
  • cmd/internal/get_workspace_uid.go
  • cmd/internal/git_credentials.go
  • cmd/internal/git_ssh_signature.go
  • cmd/internal/git_ssh_signature_test.go
  • cmd/internal/http.go
  • cmd/internal/internal.go
  • cmd/internal/json.go
  • cmd/internal/request.go
  • cmd/internal/setup_docker_credentials.go
  • cmd/internal/sh.go
  • cmd/internal/ssh_client.go
  • cmd/internal/ssh_git_clone.go
  • cmd/internal/ssh_server.go
  • cmd/internal/strings.go
  • cmd/machine/ssh.go
  • cmd/pro/check_update.go
  • cmd/pro/daemon/netcheck.go
  • cmd/pro/daemon/status.go
  • cmd/pro/health.go
  • cmd/pro/provider/provider.go
  • cmd/workspace/logs.go
  • cmd/workspace/ssh.go
  • cmd/workspace/up/agent.go
  • desktop/src/main/ipc.ts
  • docs/uml/up_sequence.puml
  • e2e/tests/machineprovider/testdata/machineprovider/provider.yaml
  • e2e/tests/machineprovider/testdata/machineprovider2/provider.yaml
  • e2e/tests/machineprovider/testdata/machineprovider3/provider.yaml
  • e2e/tests/tunnel/testdata/tunnel/provider.yaml
  • pkg/agent/agent.go
  • pkg/agent/workspace.go
  • pkg/devcontainer/setup.go
  • pkg/ide/fleet/fleet.go
  • pkg/ide/opener/browser_tunnel.go
  • pkg/ide/opener/browser_tunnel_test.go
  • pkg/shell/shell.go
  • pkg/tunnel/container.go
  • providers/docker/provider.yaml
  • providers/kubernetes/provider.yaml
  • providers/podman/provider.yaml

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Refactoring the annotation reference (agent -> cmdinternal) made the line
new to goconst's diff-scoped check, which flags the third "true" literal
in the cmd/pro package. Match the existing //nolint:goconst convention
already used in check_update.go.
@skevetter skevetter marked this pull request as ready for review June 6, 2026 15:39
@skevetter skevetter merged commit e390fe3 into main Jun 6, 2026
59 checks passed
@skevetter skevetter deleted the tedious-jellyfish branch June 6, 2026 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant