@shareai-lab/kode 1.0.103 → 1.1.2

package/cli.js

@@ -1,112 +1,76 @@
 #!/usr/bin/env node
 
-const { spawn } = require('child_process');
+const { spawn, execSync } = require('child_process');
 const path = require('path');
 
-// Prefer Bun if available for speed; otherwise use Node/tsx in best order per platform
+// Prefer bun if available, otherwise use Node with local tsx CLI
 const args = process.argv.slice(2);
 const cliPath = path.join(__dirname, 'src', 'entrypoints', 'cli.tsx');
 
-// Resolve tsx from this package directory (stable across global installs)
-let tsxImportPath = null;
-let tsxCliPath = null;
-try { tsxImportPath = require.resolve('tsx', { paths: [__dirname] }); } catch {}
-try { tsxCliPath = require.resolve('tsx/cli', { paths: [__dirname] }); } catch {}
-
-// Enforce minimum Node version based on package.json engines.node
+// Auto-set UTF-8 code page on Windows cmd if not already UTF-8
 try {
-  const req = ">=20.18.1"
-  const m = req.match(/(\d+)\.(\d+)\.(\d+)/)
-  const [maj, min, pat] = process.versions.node.split('.').map(Number)
-  const [rMaj, rMin, rPat] = m ? m.slice(1).map(Number) : [20, 18, 1]
-  const tooOld = (maj < rMaj) || (maj === rMaj && (min < rMin || (min === rMin && pat < rPat)))
-  if (tooOld) {
-    console.error('Error: Node.js ' + req + ' is required. Please upgrade Node.')
-    process.exit(1)
+  if (process.platform === 'win32' && process.env.KODE_NO_AUTO_CHCP !== '1') {
+    const out = execSync('chcp', { encoding: 'utf8' });
+    if (!/65001/.test(out)) {
+      execSync('chcp 65001', { stdio: 'ignore' });
+    }
   }
 } catch {}
 
-// Find packaged Bun binary or fall back to system Bun
-function hasBun() {
-  try {
-    require('child_process').execSync('bun --version', { stdio: 'ignore' })
-    return true
-  } catch { return false }
+// Try bun first
+try {
+  execSync('bun --version', { stdio: 'ignore' });
+
+  // Bun is available
+  const child = spawn('bun', ['run', cliPath, ...args], {
+    stdio: 'inherit',
+    env: {
+      ...process.env,
+      YOGA_WASM_PATH: path.join(__dirname, 'yoga.wasm')
+    }
+  });
+
+  child.on('exit', (code) => process.exit(code || 0));
+  child.on('error', () => {
+    // Fallback to node if bun fails
+    runWithNode();
+  });
+} catch {
+  // Bun not available, use node
+  runWithNode();
 }
 
-function runWithBun() {
-  const bunCmd = 'bun'
-  let child
-  try {
-    child = spawn(bunCmd, ['run', cliPath, ...args], {
+function runWithNode() {
+  // Use local tsx installation (original PR behavior), with Windows-friendly resolution
+  const binDir = path.join(__dirname, 'node_modules', '.bin')
+  const tsxPath = process.platform === 'win32'
+    ? path.join(binDir, 'tsx.cmd')
+    : path.join(binDir, 'tsx')
+
+  const trySpawn = (cmd, useShell) => {
+    const child = spawn(cmd, [cliPath, ...args], {
       stdio: 'inherit',
-      shell: process.platform === 'win32',
+      shell: useShell || false,
       env: { ...process.env, YOGA_WASM_PATH: path.join(__dirname, 'yoga.wasm') },
     })
-  } catch {
-    return process.platform === 'win32' ? runWindowsNoBun() : runPosixNoBun()
+    child.on('error', (err) => {
+      // Final fallback: suggest install
+      if (err && err.code === 'ENOENT') {
+        console.error('\nError: tsx is required but not found.')
+        console.error('Please run: npm install')
+      } else {
+        console.error('Failed to start Kode:', err && err.message ? err.message : err)
+      }
+      process.exit(1)
+    })
+    child.on('exit', (code) => process.exit(code || 0))
   }
-  child.on('error', () => (process.platform === 'win32' ? runWindowsNoBun() : runPosixNoBun()))
-  child.on('exit', code => {
-    if (code && code !== 0) return process.platform === 'win32' ? runWindowsNoBun() : runPosixNoBun()
-    process.exit(code || 0)
-  })
-}
 
-function spawnTsxImport(onErrorFailOver) {
-  let importArg = 'tsx'
   try {
-    if (tsxImportPath) {
-      const { pathToFileURL } = require('node:url')
-      importArg = pathToFileURL(tsxImportPath).href
-    }
-  } catch {}
-  const baseArgs = ['--no-warnings=ExperimentalWarning', '--enable-source-maps']
-  const child = spawn(process.execPath, [...baseArgs, '--import', importArg, cliPath, ...args], {
-    stdio: 'inherit',
-    env: { ...process.env, YOGA_WASM_PATH: path.join(__dirname, 'yoga.wasm') },
-  })
-  child.on('error', () => onErrorFailOver ? onErrorFailOver() : fail())
-  child.on('exit', code => {
-    if (code && code !== 0) return onErrorFailOver ? onErrorFailOver() : fail()
-    process.exit(code || 0)
-  })
-}
-
-function spawnTsxCLI(onErrorFailOver) {
-  if (!tsxCliPath) return fail()
-  const child = spawn(process.execPath, [tsxCliPath, cliPath, ...args], {
-    stdio: 'inherit',
-    env: { ...process.env, YOGA_WASM_PATH: path.join(__dirname, 'yoga.wasm') },
-  })
-  child.on('error', () => onErrorFailOver ? onErrorFailOver() : fail())
-  child.on('exit', code => {
-    if (code && code !== 0) return onErrorFailOver ? onErrorFailOver() : fail()
-    process.exit(code || 0)
-  })
-}
-
-function runWindowsNoBun() {
-  // Best order on Windows: tsx CLI -> Node --import tsx
-  spawnTsxCLI(() => spawnTsxImport(() => fail()))
-}
-
-function runPosixNoBun() {
-  // Best order on non-Windows: Node --import tsx -> tsx CLI
-  spawnTsxImport(() => spawnTsxCLI(() => fail()))
-}
-
-function fail() {
-  console.error('')
-  console.error('Failed to start Kode.')
-  console.error('If you see top-level await/CJS errors on Windows, ensure tsx is available and up-to-date.')
-  process.exit(1)
-}
-
-if (hasBun()) {
-  runWithBun()
-} else if (process.platform === 'win32') {
-  runWindowsNoBun()
-} else {
-  runPosixNoBun()
+    // Prefer absolute path to local .bin
+    trySpawn(tsxPath, false)
+  } catch {
+    // If that fails (e.g., npm hoisted .bin), try PATH-resolved "tsx" (shell on Windows)
+    trySpawn('tsx', process.platform === 'win32')
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shareai-lab/kode",
-  "version": "1.0.103",
+  "version": "1.1.02",
   "bin": {
     "kode": "cli.js",
     "kwa": "cli.js",

package/src/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "module"
-}