fix(cloud): properly handle dev delegation

core/src/cloud/api.ts

@@ -586,6 +586,7 @@ export class CloudApi {
     localServerPort,
     environment,
     namespace,
+    isDevCommand,
   }: {
     parentSessionId: string | undefined
     sessionId: string
@@ -594,6 +595,7 @@ export class CloudApi {
     localServerPort?: number
     environment: string
     namespace: string
+    isDevCommand: boolean
   }): Promise<CloudSession | undefined> {
     let session = this.registeredSessions.get(sessionId)
 
@@ -610,6 +612,7 @@ export class CloudApi {
         projectUid: projectId,
         environment,
         namespace,
+        isDevCommand,
       }
       this.log.debug(`Registering session with ${this.distroName} for ${projectId} in ${environment}/${namespace}.`)
       const res: CloudSessionResponse = await this.post("sessions", {

core/src/commands/base.ts

@@ -55,6 +55,7 @@ import { GraphResultMapWithoutTask, GraphResultWithoutTask, GraphResults } from
 import { splitFirst } from "../util/string"
 import { ActionMode } from "../actions/types"
 import { AnalyticsHandler } from "../analytics/analytics"
+import { getCmdOptionForDev } from "./helpers"
 
 export interface CommandConstructor {
   new (parent?: CommandGroup): Command
@@ -258,17 +259,18 @@ export abstract class Command<A extends Parameters = {}, O extends Parameters =
    *
    * @returns The result from the command action
    */
-  async run({
-    garden: parentGarden,
-    args,
-    opts,
-    cli,
-    commandLine,
-    sessionId,
-    parentCommand,
-    parentSessionId,
-    overrideLogLevel,
-  }: RunCommandParams<A, O>): Promise<CommandResult<R>> {
+  async run(params: RunCommandParams<A, O>): Promise<CommandResult<R>> {
+    const {
+      garden: parentGarden,
+      args,
+      opts,
+      cli,
+      commandLine,
+      sessionId,
+      parentCommand,
+      parentSessionId,
+      overrideLogLevel,
+    } = params
     const commandStartTime = new Date()
     const server = this.server
 
@@ -284,6 +286,17 @@ export abstract class Command<A extends Parameters = {}, O extends Parameters =
 
     let cloudSession: CloudSession | undefined
 
+    // It's not ideal that we have to update the command info here after init, but we don't know whether we're
+    // going into a subcommand in the `GardenCli` class where the `commandInfo` object is first created.
+    if (!["dev", "serve"].includes(this.name) && this.maybePersistent(params) && !params.parentCommand) {
+      // Then this command will be starting a `dev` command and then running itself from there, so we update
+      // the `commandInfo` accordingly.
+      // Example: `garden deploy --sync`.
+      const outerName = this.name
+      garden.commandInfo.name = "dev"
+      garden.commandInfo.opts.cmd = getCmdOptionForDev(outerName, params)
+    }
+
     if (garden.cloudApi && garden.projectId && this.streamEvents) {
       cloudSession = await garden.cloudApi.registerSession({
         parentSessionId: parentSessionId || undefined,
@@ -293,6 +306,7 @@ export abstract class Command<A extends Parameters = {}, O extends Parameters =
         localServerPort: server?.port,
         environment: garden.environmentName,
         namespace: garden.namespace,
+        isDevCommand: garden.commandInfo.name === "dev"
       })
     }
 

core/src/commands/deploy.ts

@@ -21,7 +21,7 @@ import {
   emptyActionResults,
 } from "./base"
 import { printEmoji, printHeader } from "../logger/util"
-import { watchParameter, watchRemovedWarning } from "./helpers"
+import { getCmdOptionForDev, watchParameter, watchRemovedWarning } from "./helpers"
 import { DeployTask } from "../tasks/deploy"
 import { naturalList } from "../util/string"
 import { StringsParameter, BooleanParameter } from "../cli/params"
@@ -178,8 +178,7 @@ export class DeployCommand extends Command<Args, Opts> {
     const monitor = this.maybePersistent(params)
     if (monitor && !params.parentCommand) {
       // Then we're not in the dev command yet, so we call that instead with the appropriate initial command.
-      // TODO: Abstract this delegation process into a helper if we write more commands that do this sort of thing.
-      params.opts.cmd = ["deploy " + params.args.$all!.join(" ")]
+      params.opts.cmd = getCmdOptionForDev("deploy", params)
       const devCmd = new DevCommand()
       devCmd.printHeader(params)
       await devCmd.prepare(params)

core/src/commands/helpers.ts

@@ -19,11 +19,16 @@ import { ActionKind } from "../actions/types"
 import isGlob from "is-glob"
 import { ParameterError } from "../exceptions"
 import { naturalList } from "../util/string"
+import { CommandParams } from "./base"
 
 export function makeGetTestOrTaskLog(actions: (TestAction | RunAction)[]) {
   return actions.map((t) => prettyPrintTestOrTask(t)).join("\n")
 }
 
+export function getCmdOptionForDev(commandName: string, params: CommandParams) {
+  return [commandName + " " + params.args.$all?.join(" ")]
+}
+
 export function prettyPrintWorkflow(workflow: WorkflowConfig): string {
   let out = `${chalk.cyan.bold(workflow.name)}`
 

core/src/commands/serve.ts

@@ -166,6 +166,7 @@ export class ServeCommand<
             localServerPort: this.server.port,
             environment: defaultGarden.environmentName,
             namespace: defaultGarden.namespace,
+            isDevCommand: false,
           })
         }
       }

core/src/commands/up.ts

@@ -13,6 +13,7 @@ import { deployArgs, DeployCommand, deployOpts } from "./deploy"
 import { serveOpts } from "./serve"
 import { DevCommand } from "./dev"
 import type { LoggerType } from "../logger/logger"
+import { getCmdOptionForDev } from "./helpers"
 
 const upArgs = {
   ...deployArgs,
@@ -51,7 +52,7 @@ export class UpCommand extends Command<UpArgs, UpOpts> {
       cmd = new DeployCommand()
       params.opts.logs = true
     } else {
-      params.opts.cmd = ["deploy --logs " + params.args.$all!.join(" ")]
+      params.opts.cmd = getCmdOptionForDev("deploy --logs", params)
     }
 
     cmd.printHeader(params)