Skip to content

feat(cli): add agent stop command, --all/-A for start and stop #1344

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
markturansky merged 2 commits into from
Apr 17, 2026
Merged

feat(cli): add agent stop command, --all/-A for start and stop #1344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08d4d0c
feat(cli): add agent stop command, --all/-A for start and stop
Apr 17, 2026
f4641cb
feat(cli): add --all/-A to delete command for bulk session cleanup
Apr 17, 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
219 changes: 199 additions & 20 deletions components/ambient-cli/cmd/acpctl/agent/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import (
"github.com/spf13/cobra"
)

var activePhases = map[string]bool{"Pending": true, "Creating": true, "Running": true}

var Cmd = &cobra.Command{
Use: "agent",
Short: "Manage project-scoped agents",
Expand All @@ -24,7 +26,8 @@ Subcommands:
create Create an agent in a project
update Update an agent's name, prompt, labels, or annotations
delete Delete an agent
start Start a new session for an agent
start Start a session for an agent (idempotent)
stop Stop the running session for an agent (idempotent)
start-preview Preview start context (dry run)`,
RunE: func(cmd *cobra.Command, args []string) error {
return cmd.Help()
Expand Down Expand Up @@ -61,6 +64,29 @@ func resolveAgent(ctx context.Context, client *sdkclient.Client, projectID, agen
return pa.ID, nil
}

func resolveAgentFull(ctx context.Context, client *sdkclient.Client, projectID, agentArg string) (*sdktypes.Agent, error) {
if agentArg == "" {
return nil, fmt.Errorf("agent name or ID is required")
}
pa, err := client.Agents().GetInProject(ctx, projectID, agentArg)
if err != nil {
pa, err = client.Agents().GetByProject(ctx, projectID, agentArg)
if err != nil {
return nil, fmt.Errorf("agent %q not found in project %q", agentArg, projectID)
}
}
return pa, nil
}

func allAgentsInProject(ctx context.Context, client *sdkclient.Client, projectID string) ([]sdktypes.Agent, error) {
opts := sdktypes.NewListOptions().Size(500).Build()
list, err := client.Agents().ListByProject(ctx, projectID, opts)
if err != nil {
return nil, fmt.Errorf("list agents: %w", err)
}
return list.Items, nil
}
Comment on lines +81 to +88
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot Apr 17, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟡 Minor

--all silently truncates at 500 agents.

If a project has more than 500 agents, excess agents are silently skipped. Consider warning when len(list.Items) == 500 or implementing pagination.

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@components/ambient-cli/cmd/acpctl/agent/cmd.go` around lines 81 - 88, The
current allAgentsInProject function uses sdktypes.NewListOptions().Size(500) and
calls client.Agents().ListByProject which will silently truncate results at 500;
update allAgentsInProject to either implement pagination by repeatedly calling
ListByProject with an offset/next-token until no more items (appending to a
slice) or, if you prefer a minimal change, detect when len(list.Items) == 500
and return a warning/error to the caller; reference functions/values:
allAgentsInProject, sdktypes.NewListOptions().Size,
client.Agents().ListByProject, and list.Items so you can add loop logic (or a
warning return) around the existing call.


var listArgs struct {
projectID string
outputFormat string
Expand Down Expand Up @@ -352,15 +378,22 @@ var agentStartArgs struct {
projectID string
prompt string
outputFormat string
all bool
}

var agentStartCmd = &cobra.Command{
Use: "start <name-or-id>",
Short: "Start a new session for an agent",
Args: cobra.ExactArgs(1),
Use: "start [name-or-id]",
Short: "Start a session for an agent (idempotent)",
Long: `Start a session for an agent. If the agent already has an active
session (Pending, Creating, or Running), returns it without creating a
new one. Use --all / -A to start all agents in the project.

This operation is idempotent — calling it multiple times is safe.`,
Args: cobra.MaximumNArgs(1),
Example: ` acpctl agent start api
acpctl agent start api --prompt "fix the bug"
acpctl agent start <id> --project-id <id>`,
acpctl agent start --all
acpctl agent start -A --prompt "run tests"`,
RunE: func(cmd *cobra.Command, args []string) error {
projectID, err := resolveProject(agentStartArgs.projectID)
if err != nil {
Expand All @@ -380,30 +413,67 @@ var agentStartCmd = &cobra.Command{
ctx, cancel := context.WithTimeout(context.Background(), cfg.GetRequestTimeout())
defer cancel()

if agentStartArgs.all {
if len(args) > 0 {
return fmt.Errorf("cannot specify agent name with --all")
}
return startAllAgents(ctx, cmd, client, projectID)
}

if len(args) == 0 {
return fmt.Errorf("agent name or ID is required (or use --all)")
}

agentID, err := resolveAgent(ctx, client, projectID, args[0])
if err != nil {
return err
}

resp, err := client.Agents().Start(ctx, projectID, agentID, agentStartArgs.prompt)
if err != nil {
return fmt.Errorf("start agent: %w", err)
}
return startSingleAgent(ctx, cmd, client, projectID, agentID, args[0])
},
}

if agentStartArgs.outputFormat == "json" {
printer := output.NewPrinter(output.FormatJSON, cmd.OutOrStdout())
if resp.Session != nil {
return printer.PrintJSON(resp.Session)
}
return printer.PrintJSON(resp)
}
func startSingleAgent(ctx context.Context, cmd *cobra.Command, client *sdkclient.Client, projectID, agentID, displayName string) error {
resp, err := client.Agents().Start(ctx, projectID, agentID, agentStartArgs.prompt)
if err != nil {
return fmt.Errorf("start agent: %w", err)
}

if agentStartArgs.outputFormat == "json" {
printer := output.NewPrinter(output.FormatJSON, cmd.OutOrStdout())
if resp.Session != nil {
fmt.Fprintf(cmd.OutOrStdout(), "session/%s started (phase: %s)\n", resp.Session.ID, resp.Session.Phase)
} else {
fmt.Fprintf(cmd.OutOrStdout(), "agent/%s started\n", args[0])
return printer.PrintJSON(resp.Session)
}
return printer.PrintJSON(resp)
}
if resp.Session != nil {
fmt.Fprintf(cmd.OutOrStdout(), "session/%s started (phase: %s)\n", resp.Session.ID, resp.Session.Phase)
} else {
fmt.Fprintf(cmd.OutOrStdout(), "agent/%s started\n", displayName)
}
return nil
}

func startAllAgents(ctx context.Context, cmd *cobra.Command, client *sdkclient.Client, projectID string) error {
agents, err := allAgentsInProject(ctx, client, projectID)
if err != nil {
return err
}
if len(agents) == 0 {
fmt.Fprintln(cmd.OutOrStdout(), "no agents in project")
return nil
},
}
var failed int
for _, a := range agents {
if err := startSingleAgent(ctx, cmd, client, projectID, a.ID, a.Name); err != nil {
fmt.Fprintf(cmd.ErrOrStderr(), "agent/%s: %v\n", a.Name, err)
failed++
}
}
if failed > 0 {
return fmt.Errorf("%d of %d agents failed to start", failed, len(agents))
}
return nil
}

var startPreviewArgs struct {
Expand Down Expand Up @@ -506,13 +576,118 @@ var sessionsCmd = &cobra.Command{
},
}

var agentStopArgs struct {
projectID string
all bool
}

var agentStopCmd = &cobra.Command{
Use: "stop [name-or-id]",
Short: "Stop the running session for an agent (idempotent)",
Long: `Stop the active session for an agent. If the agent has no active
session, prints a message and succeeds. Use --all / -A to stop all
agents in the project.

This operation is idempotent — calling it multiple times is safe.`,
Args: cobra.MaximumNArgs(1),
Example: ` acpctl agent stop api
acpctl agent stop --all
acpctl agent stop -A`,
RunE: func(cmd *cobra.Command, args []string) error {
projectID, err := resolveProject(agentStopArgs.projectID)
if err != nil {
return err
}

client, err := connection.NewClientFromConfig()
if err != nil {
return err
}

cfg, err := config.Load()
if err != nil {
return err
}

ctx, cancel := context.WithTimeout(context.Background(), cfg.GetRequestTimeout())
defer cancel()

if agentStopArgs.all {
if len(args) > 0 {
return fmt.Errorf("cannot specify agent name with --all")
}
return stopAllAgents(ctx, cmd, client, projectID)
}

if len(args) == 0 {
return fmt.Errorf("agent name or ID is required (or use --all)")
}

agent, err := resolveAgentFull(ctx, client, projectID, args[0])
if err != nil {
return err
}

return stopSingleAgent(ctx, cmd, client, agent)
},
}

func stopSingleAgent(ctx context.Context, cmd *cobra.Command, client *sdkclient.Client, agent *sdktypes.Agent) error {
if agent.CurrentSessionID == "" {
fmt.Fprintf(cmd.OutOrStdout(), "agent/%s has no active session\n", agent.Name)
return nil
}

sess, err := client.Sessions().Get(ctx, agent.CurrentSessionID)
if err != nil {
fmt.Fprintf(cmd.OutOrStdout(), "agent/%s session/%s not found — already cleaned up\n", agent.Name, agent.CurrentSessionID)
return nil
}
Comment on lines +641 to +645
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot Apr 17, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Error handling swallows non-404 failures.

Any error from Sessions().Get() is treated as "not found", including network timeouts, auth failures, or 5xx responses. The user sees "already cleaned up" when the session may still be running.

Consider checking for a 404-specific error type, or at least include the actual error in the message so users can distinguish transient failures from genuine cleanup.

Suggested fix 
 	sess, err := client.Sessions().Get(ctx, agent.CurrentSessionID)
 	if err != nil {
-		fmt.Fprintf(cmd.OutOrStdout(), "agent/%s session/%s not found — already cleaned up\n", agent.Name, agent.CurrentSessionID)
-		return nil
+		// TODO: check for sdkclient.ErrNotFound or similar if available
+		fmt.Fprintf(cmd.OutOrStdout(), "agent/%s session/%s not found or unavailable (%v)\n", agent.Name, agent.CurrentSessionID, err)
+		return nil // treat as idempotent success, but surface the error for debugging
 	}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
sess, err := client.Sessions().Get(ctx, agent.CurrentSessionID)
if err != nil {
fmt.Fprintf(cmd.OutOrStdout(), "agent/%s session/%s not found — already cleaned up\n", agent.Name, agent.CurrentSessionID)
return nil
}
sess, err := client.Sessions().Get(ctx, agent.CurrentSessionID)
if err != nil {
// TODO: check for sdkclient.ErrNotFound or similar if available
fmt.Fprintf(cmd.OutOrStdout(), "agent/%s session/%s not found or unavailable (%v)\n", agent.Name, agent.CurrentSessionID, err)
return nil // treat as idempotent success, but surface the error for debugging
}
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@components/ambient-cli/cmd/acpctl/agent/cmd.go` around lines 641 - 645, The
current error handling after client.Sessions().Get(ctx, agent.CurrentSessionID)
treats any error as "not found" and hides real failures; update the block around
Sessions().Get so that it distinguishes a 404/not-found error from other errors
(or at minimum include the actual err in the output). Specifically, modify the
error path that now prints via fmt.Fprintf(cmd.OutOrStdout(), "agent/%s
session/%s not found — already cleaned up\n", agent.Name,
agent.CurrentSessionID) to: detect the Sessions().Get 404/not-found response
(using the client error type or status/code check provided by your SDK) and only
print the "already cleaned up" message for that case, otherwise print a
descriptive error including err (and the agent.Name and agent.CurrentSessionID)
so network/auth/5xx failures are visible.


if !activePhases[sess.Phase] {
fmt.Fprintf(cmd.OutOrStdout(), "agent/%s session/%s already %s\n", agent.Name, sess.ID, sess.Phase)
return nil
}

stopped, err := client.Sessions().Stop(ctx, sess.ID)
if err != nil {
return fmt.Errorf("stop agent/%s session/%s: %w", agent.Name, sess.ID, err)
}

fmt.Fprintf(cmd.OutOrStdout(), "agent/%s session/%s stopped (phase: %s)\n", agent.Name, stopped.ID, stopped.Phase)
return nil
}

func stopAllAgents(ctx context.Context, cmd *cobra.Command, client *sdkclient.Client, projectID string) error {
agents, err := allAgentsInProject(ctx, client, projectID)
if err != nil {
return err
}
if len(agents) == 0 {
fmt.Fprintln(cmd.OutOrStdout(), "no agents in project")
return nil
}
var failed int
for i := range agents {
if err := stopSingleAgent(ctx, cmd, client, &agents[i]); err != nil {
fmt.Fprintf(cmd.ErrOrStderr(), "agent/%s: %v\n", agents[i].Name, err)
failed++
}
}
if failed > 0 {
return fmt.Errorf("%d of %d agents failed to stop", failed, len(agents))
}
return nil
}

func init() {
Cmd.AddCommand(listCmd)
Cmd.AddCommand(getCmd)
Cmd.AddCommand(createCmd)
Cmd.AddCommand(updateCmd)
Cmd.AddCommand(deleteCmd)
Cmd.AddCommand(agentStartCmd)
Cmd.AddCommand(agentStopCmd)
Cmd.AddCommand(startPreviewCmd)
Cmd.AddCommand(sessionsCmd)

Expand Down Expand Up @@ -542,6 +717,10 @@ func init() {
agentStartCmd.Flags().StringVar(&agentStartArgs.projectID, "project-id", "", "Project ID (defaults to configured project)")
agentStartCmd.Flags().StringVar(&agentStartArgs.prompt, "prompt", "", "Task prompt for this run")
agentStartCmd.Flags().StringVarP(&agentStartArgs.outputFormat, "output", "o", "", "Output format: json")
agentStartCmd.Flags().BoolVarP(&agentStartArgs.all, "all", "A", false, "Start all agents in the project")

agentStopCmd.Flags().StringVar(&agentStopArgs.projectID, "project-id", "", "Project ID (defaults to configured project)")
agentStopCmd.Flags().BoolVarP(&agentStopArgs.all, "all", "A", false, "Stop all agents in the project")

startPreviewCmd.Flags().StringVar(&startPreviewArgs.projectID, "project-id", "", "Project ID (defaults to configured project)")

Expand Down
Loading