@shareai-lab/kode 1.0.92 → 1.0.93

package/cli.js

@@ -3,16 +3,10 @@
 const { spawn } = require('child_process');
 const path = require('path');
 
-// Prefer Bun for dev; otherwise use Node + tsx (ESM --import)
+// Prefer packaged Bun runtime to execute TS/TSX directly (simple + cross-platform)
 const args = process.argv.slice(2);
 const cliPath = path.join(__dirname, 'src', 'entrypoints', 'cli.tsx');
 
-// Resolve tsx from this package directory (avoid CWD-based resolution on Windows/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
 try {
   const req = "${enginesNode}"
@@ -28,73 +22,24 @@ try {
   }
 } catch {}
 
-// Try Bun first
-try {
-  const { execSync } = require('child_process');
-  execSync('bun --version', { stdio: 'ignore' });
-  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', () => runWithNode());
-} catch { runWithNode(); }
-
-function runWithNode() {
-  const baseArgs = ['--no-warnings=ExperimentalWarning', '--enable-source-maps']
-
-  const tryWithImport = () => {
-    let importArg = 'tsx'
-    try {
-      if (tsxImportPath) {
-        const { pathToFileURL } = require('node:url')
-        importArg = pathToFileURL(tsxImportPath).href
-      }
-    } catch {}
-    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', () => failWithTsxHint())
-    child.on('exit', code => {
-      if (code && code !== 0) return failWithTsxHint()
-      process.exit(code || 0)
-    })
-  }
-
-  const tryWithTsxBinary = () => {
-    if (!tsxCliPath) return failWithTsxHint()
-    const child = spawn(process.execPath, [tsxCliPath, cliPath, ...args], {
-      stdio: 'inherit',
-      env: { ...process.env, YOGA_WASM_PATH: path.join(__dirname, 'yoga.wasm') },
-    })
-    child.on('error', () => failWithTsxHint())
-    child.on('exit', code => {
-      if (code && code !== 0) return failWithTsxHint()
-      process.exit(code || 0)
-    })
-  }
-
-  function failWithTsxHint() {
-    console.error('')
-    console.error('Failed to launch with Node + tsx.')
-    console.error('Try reinstalling: npm i -g @shareai-lab/kode (ensures bundled tsx).')
-    console.error('Or install Bun and run: bun run kode')
-    process.exit(1)
-  }
-
-  // Windows prefers tsx CLI due to top-level await in CJS transforms
-  if (process.platform === 'win32') {
-    tryWithTsxBinary()
-  } else {
-    // Non-Windows: try import-based first, then fallback
-    let attempted = false
-    const child = spawn(process.execPath, [...baseArgs, '--eval', ''], { stdio: 'ignore' })
-    child.on('error', () => {})
-    child.on('exit', () => {
-      if (attempted) return
-      attempted = true
-      tryWithImport()
-    })
-  }
+// Find packaged Bun binary or fall back to system Bun
+function findBunPath() {
+  const binName = process.platform === 'win32' ? 'bun.cmd' : 'bun'
+  const localBin = path.join(__dirname, 'node_modules', '.bin', binName)
+  try { require('fs').accessSync(localBin); return localBin } catch {}
+  return binName
 }
+
+const bunPath = findBunPath()
+const child = spawn(bunPath, [cliPath, ...args], {
+  stdio: 'inherit',
+  env: { ...process.env, YOGA_WASM_PATH: path.join(__dirname, 'yoga.wasm') },
+})
+child.on('error', err => {
+  console.error('')
+  console.error('Failed to start Kode using Bun runtime.')
+  console.error('Please install Bun or ensure it is accessible:')
+  console.error('  npm install -g bun')
+  process.exit(1)
+})
+child.on('exit', code => process.exit(code || 0))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shareai-lab/kode",
-  "version": "1.0.92",
+  "version": "1.0.93",
   "bin": {
     "kode": "cli.js",
     "kwa": "cli.js",
@@ -46,6 +46,7 @@
     "@img/sharp-win32-x64": "^0.33.5"
   },
   "dependencies": {
+    "bun": "^1.1.34",
     "@anthropic-ai/bedrock-sdk": "^0.12.6",
     "@anthropic-ai/sdk": "^0.39.0",
     "@anthropic-ai/vertex-sdk": "^0.7.0",