fix: custom garden commands in dev mode (WIP)

core/src/cli/command-line.ts

@@ -38,6 +38,7 @@ import {
 import type { GlobalOptions, ParameterValues } from "./params"
 import { bindActiveContext, withSessionContext } from "../util/tracing/context"
 import { wrapActiveSpan } from "../util/tracing/spans"
+import { GardenCli } from "./cli"
 
 const defaultMessageDuration = 3000
 const commandLinePrefix = chalk.yellow("🌼  > ")
@@ -133,13 +134,16 @@ export class CommandLine extends TypedEventEmitter<CommandLineEvents> {
   private readonly log: Log
   private readonly globalOpts: Partial<ParameterValues<GlobalOptions>>
 
+  private cli: GardenCli
+
   constructor({
     cwd,
     manager,
     log,
     globalOpts,
     serveCommand,
     extraCommands,
+    cli,
     history = [],
   }: {
     cwd: string
@@ -148,6 +152,7 @@ export class CommandLine extends TypedEventEmitter<CommandLineEvents> {
     globalOpts: Partial<ParameterValues<GlobalOptions>>
     serveCommand: ServeCommand
     extraCommands: Command[]
+    cli: GardenCli
     history?: string[]
   }) {
     super()
@@ -160,6 +165,7 @@ export class CommandLine extends TypedEventEmitter<CommandLineEvents> {
     this.globalOpts = globalOpts
     this.extraCommands = extraCommands
     this.serveCommand = serveCommand
+    this.cli = cli
 
     this.enabled = false
     this.currentCommand = ""
@@ -339,7 +345,10 @@ export class CommandLine extends TypedEventEmitter<CommandLineEvents> {
     })
 
     // Execute
-    this.setKeyHandler("return", bindActiveContext(() => this.handleReturn()))
+    this.setKeyHandler(
+      "return",
+      bindActiveContext(() => this.handleReturn())
+    )
 
     // Autocomplete
     this.setKeyHandler("tab", () => {
@@ -671,6 +680,7 @@ ${chalk.white.underline("Keys:")}
       opts,
       commandLine: this,
       parentCommand: this.serveCommand,
+      cli: this.cli,
     }
 
     const name = command.getFullName()
@@ -730,15 +740,17 @@ ${chalk.white.underline("Keys:")}
               return
             }
 
-            garden = await wrapActiveSpan("getGardenForRequest", () => this.manager.getGardenForRequest({
-              command,
-              projectConfig,
-              globalConfigStore: this.globalConfigStore,
-              log: this.log,
-              args,
-              opts,
-              sessionId,
-            }))
+            garden = await wrapActiveSpan("getGardenForRequest", () =>
+              this.manager.getGardenForRequest({
+                command,
+                projectConfig,
+                globalConfigStore: this.globalConfigStore,
+                log: this.log,
+                args,
+                opts,
+                sessionId,
+              })
+            )
           } catch (error) {
             this.flashError(getCmdFailMsg(name))
             this.log.error({ error })

core/src/commands/dev.tsx

@@ -12,7 +12,7 @@ import React, { FC, useState } from "react"
 import { Box, render, Text, useInput, useStdout } from "ink"
 import { serveArgs, ServeCommand, serveOpts } from "./serve"
 import { LoggerType } from "../logger/logger"
-import { ParameterError } from "../exceptions"
+import { InternalError, ParameterError } from "../exceptions"
 import { InkTerminalWriter } from "../logger/writers/ink-terminal-writer"
 import { CommandLine } from "../cli/command-line"
 import chalk from "chalk"
@@ -93,12 +93,15 @@ Use ${chalk.bold("up/down")} arrow keys to scroll through your command history.
     if (terminalWriter.type === "ink") {
       inkWriter = terminalWriter as InkTerminalWriter
     } else {
-      throw new ParameterError({ message: `This command can only be used with the ink logger type`, detail: {
-        writerTypes: {
-          terminalWriter: terminalWriter.type,
-          fileWriters: logger.getWriters().file.map((w) => w.type),
+      throw new ParameterError({
+        message: `This command can only be used with the ink logger type`,
+        detail: {
+          writerTypes: {
+            terminalWriter: terminalWriter.type,
+            fileWriters: logger.getWriters().file.map((w) => w.type),
+          },
         },
-      }})
+      })
     }
 
     const commandLine = await this.initCommandHandler(params)
@@ -123,9 +126,11 @@ Use ${chalk.bold("up/down")} arrow keys to scroll through your command history.
         },
       })
 
-      useInput(bindActiveContext((input, key) => {
-        commandLine.handleInput(input, key)
-      }))
+      useInput(
+        bindActiveContext((input, key) => {
+          commandLine.handleInput(input, key)
+        })
+      )
 
       const width = stdout ? stdout.columns - 2 : 50
 
@@ -190,7 +195,10 @@ Use ${chalk.bold("up/down")} arrow keys to scroll through your command history.
 
   private async initCommandHandler(params: ActionParams) {
     const _this = this
-    const { garden, log, opts } = params
+    const { garden, log, opts, cli } = params
+    if (!cli) {
+      throw new InternalError({ message: `Missing cli argument in dev command.`, detail: {} })
+    }
 
     // override the session for this manager to ensure we inherit from
     // the initial garden dummy instance
@@ -205,6 +213,7 @@ Use ${chalk.bold("up/down")} arrow keys to scroll through your command history.
       globalOpts: pick(opts, Object.keys(globalOptions)),
       history: await garden.localConfigStore.get("devCommandHistory"),
       serveCommand: this,
+      cli,
     })
     this.commandLine = cl