fix last merge commit (raw copy from upstream)

cli/instance.ts

@@ -203,7 +203,7 @@ export async function pickInstance(
       name: opts.instance,
       remote: opts.baseUrl,
       token: opts.token,
-      prefix: opts.instance,
+      prefix: opts.prefix ?? opts.instance,
     };
   }
   if (opts.baseUrl && opts.token) {
@@ -218,7 +218,7 @@ export async function pickInstance(
       name: "custom",
       remote: opts.baseUrl,
       token: opts.token,
-      prefix: "custom",
+      prefix: opts.prefix ?? "custom",
     };
   }
   if (!allowNew && instances.length < 1) {
@@ -705,6 +705,11 @@ const command = new Command()
     "--instance <instance:string>",
     "Name of the instance to pull from, override the active instance"
   )
+  .option(
+    "--prefix <prefix:string>",
+    "Prefix of the local workspaces to pull, used to create the folders when using --include-workspaces"
+  )
+
   .action(instancePull as any)
   .command("push")
   .description(
@@ -721,7 +726,10 @@ const command = new Command()
     "--instance <instance:string>",
     "Name of the instance to push to, override the active instance"
   )
-  .option("--prefix <prefix:string>", "Prefix of the local workspaces to push")
+  .option(
+    "--prefix <prefix:string>",
+    "Prefix of the local workspaces folders to push"
+  )
   .action(instancePush as any)
   .command("whoami")
   .description("Display information about the currently logged-in user")