kasy-cli 1.31.5 → 1.31.6

package/lib/commands/reset.js

@@ -7,9 +7,7 @@ const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
 const { printCompactHeader } = require('../utils/brand');
 const { readBundleId, readPackageName } = require('../utils/mobile-identity');
 const { spawnFlutterWithSpinner } = require('../utils/flutter-run');
-const { augmentedEnv } = require('../utils/env-tools');
-
-const isWindows = process.platform === 'win32';
+const { spawnSyncFlutter } = require('../utils/env-tools');
 
 function runCmd(cmd, args) {
   const res = spawnSync(cmd, args, { encoding: 'utf8' });
@@ -21,11 +19,9 @@ function runCmd(cmd, args) {
 }
 
 async function listFlutterDevices(projectDir) {
-  const res = spawnSync('flutter', ['devices', '--machine'], {
+  const res = spawnSyncFlutter(['devices', '--machine'], {
     cwd: projectDir,
     encoding: 'utf8',
-    env: augmentedEnv(),
-    shell: isWindows,
   });
   if (res.status !== 0) return [];
   try {

package/lib/commands/run.js

@@ -1,25 +1,20 @@
 const path = require('node:path');
-const { spawnSync } = require('node:child_process');
 const fs = require('fs-extra');
 const kleur = require('kleur');
 const ui = require('../utils/ui');
 const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
 const { printCompactHeader, paintLime } = require('../utils/brand');
 const { spawnFlutterWithSpinner } = require('../utils/flutter-run');
-const { augmentedEnv } = require('../utils/env-tools');
-
-const isWindows = process.platform === 'win32';
+const { spawnSyncFlutter } = require('../utils/env-tools');
 
 function listFlutterDevices(projectDir) {
-  // Same as `kasy run`'s launcher: expose a freshly-installed Flutter SDK via
-  // augmentedEnv() (the terminal's PATH may not have it yet), and use a shell on
-  // Windows so the flutter.bat is found. Without this, a machine that just ran
-  // `kasy new` reports "Flutter not found" here even though Flutter is installed.
-  const res = spawnSync('flutter', ['devices', '--machine'], {
+  // Shared flutter spawner: exposes a freshly-installed SDK on PATH (the terminal
+  // may not have it yet right after `kasy new`) and handles the Windows flutter.bat
+  // without tripping Node's shell+args deprecation warning. Without it, a machine
+  // that just ran `kasy new` reports "Flutter not found" here.
+  const res = spawnSyncFlutter(['devices', '--machine'], {
     cwd: projectDir,
     encoding: 'utf8',
-    env: augmentedEnv(),
-    shell: isWindows,
   });
   if (res.status !== 0) return [];
   try {

package/lib/utils/env-tools.js

@@ -19,6 +19,7 @@
 const os = require('node:os');
 const path = require('node:path');
 const fs = require('node:fs');
+const { spawn, spawnSync } = require('node:child_process');
 
 const isWindows = process.platform === 'win32';
 const PATH_SEP = isWindows ? ';' : ':';
@@ -179,6 +180,27 @@ function augmentedEnv(extraDirs = []) {
   return env;
 }
 
+/**
+ * Spawn `flutter <args>` cross-platform, with the (possibly freshly-installed)
+ * SDK exposed on PATH via augmentedEnv().
+ *
+ * On Windows `flutter` is a .bat, which Node's spawn() refuses to run without a
+ * shell. But passing an ARGS ARRAY *together with* shell:true triggers Node's
+ * DEP0190 deprecation warning — and that warning, emitted asynchronously while a
+ * Clack prompt is on screen, corrupts its redraw (the device picker shows up
+ * duplicated). So on Windows we build ONE command STRING and pass shell:true with
+ * no args array (no array + shell ⇒ no warning); on Unix we pass the plain args.
+ */
+function flutterSpawn(spawnFn, args, options = {}) {
+  const base = { env: augmentedEnv(), ...options };
+  if (!isWindows) return spawnFn('flutter', args, base);
+  const quoted = args.map((a) => (/\s/.test(a) ? `"${a}"` : a));
+  return spawnFn(['flutter', ...quoted].join(' '), { ...base, shell: true });
+}
+
+const spawnFlutter = (args, options) => flutterSpawn(spawn, args, options);
+const spawnSyncFlutter = (args, options) => flutterSpawn(spawnSync, args, options);
+
 module.exports = {
   isWindows,
   homeDir,
@@ -186,4 +208,6 @@ module.exports = {
   pubCacheBin,
   keytoolBin,
   augmentedEnv,
+  spawnFlutter,
+  spawnSyncFlutter,
 };

package/lib/utils/flutter-run.js

@@ -28,29 +28,9 @@
 
 const path = require('node:path');
 const fs = require('node:fs');
-const { spawn } = require('node:child_process');
 const kleur = require('kleur');
 const ui = require('./ui');
-const { augmentedEnv } = require('./env-tools');
-
-const isWindows = process.platform === 'win32';
-
-// `flutter` runs from an SDK that may have been installed by `kasy new` in this
-// same session — and Windows only refreshes PATH for NEW terminals, so the
-// current one doesn't see it yet. augmentedEnv() exposes %LOCALAPPDATA%\flutter\bin
-// (and the pub-cache bin) so `kasy run` finds flutter exactly like `kasy new` did.
-// On Windows `flutter` is a .bat, which Node's spawn() refuses to run without a
-// shell — hence shell:true there. With shell:true the args become a command line,
-// so any arg with a space must be quoted (our flutter args normally have none,
-// but a dart-define value could).
-function flutterSpawnOptions(extra = {}) {
-  return { env: augmentedEnv(), shell: isWindows, ...extra };
-}
-
-function safeArgs(args) {
-  if (!isWindows) return args;
-  return args.map((a) => (/\s/.test(a) ? `"${a}"` : a));
-}
+const { spawnFlutter } = require('./env-tools');
 
 // Markers that tell us the initial build is done and the app is running.
 const FLUTTER_READY_RE = /Flutter run key commands\.|is listening on|VM Service|Dart VM service|To hot reload|Hot restart/i;
@@ -160,10 +140,10 @@ function spawnFlutterWithSpinner(args, projectDir, t, options = {}) {
  */
 function spawnRaw(args, projectDir, t, log, onReady) {
   return new Promise((resolve, reject) => {
-    const proc = spawn('flutter', safeArgs(args), flutterSpawnOptions({
+    const proc = spawnFlutter(args, {
       cwd: projectDir,
       stdio: ['inherit', 'pipe', 'pipe'],
-    }));
+    });
 
     let readyFired = false;
     const fireReady = () => {
@@ -212,10 +192,10 @@ function spawnRaw(args, projectDir, t, log, onReady) {
  */
 function spawnWithSpinner(args, projectDir, t, log, onReady) {
   return new Promise((resolve, reject) => {
-    const proc = spawn('flutter', safeArgs(args), flutterSpawnOptions({
+    const proc = spawnFlutter(args, {
       cwd: projectDir,
       stdio: ['pipe', 'pipe', 'pipe'],
-    }));
+    });
 
     const spinner = ui.spinner();
     const startTime = Date.now();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kasy-cli",
-  "version": "1.31.5",
+  "version": "1.31.6",
   "description": "CLI for scaffolding production-ready Flutter SaaS apps with Firebase, Supabase, or API REST backends.",
   "bin": {
     "kasy": "./bin/kasy.js"