@shareai-lab/kode 1.1.14 → 1.1.16-dev.1

package/cli.js

@@ -1,100 +1,95 @@
 #!/usr/bin/env node
 
-const { spawn, execSync } = require('child_process');
+const { spawn } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
-/**
- * Windows Syntax Error Fix
- * 
- * This script is designed to work around common Windows CLI syntax issues:
- * 1. cmd.exe shell syntax limitations
- * 2. Path separator issues (\ vs /)
- * 3. spawn/exec command format differences
- * 
- * For most Windows users, the compiled dist/ files should work directly
- * without needing any additional tools like bun or tsx.
- */
-
-const isWindows = process.platform === 'win32';
+// Prefer dist (pure Node) if available, otherwise try bun, then node+tsx
 const args = process.argv.slice(2);
-
-// Windows-safe path construction
 const cliPath = path.join(__dirname, 'src', 'entrypoints', 'cli.tsx');
 const distEntrypoint = path.join(__dirname, 'dist', 'entrypoints', 'cli.js');
-const yogaWasmPath = path.join(__dirname, 'yoga.wasm');
-
-// Windows command execution with proper escaping
-function runWindowsSafe(command, cmdArgs = [], env = {}) {
-  // Use cmd.exe for Windows to handle shell syntax properly
-  const options = {
-    stdio: 'inherit',
-    windowsHide: true,
-    shell: true,
-    env: {
-      ...process.env,
-      ...env,
-      YOGA_WASM_PATH: yogaWasmPath
-    }
-  };
 
-  try {
-    if (isWindows) {
-      // Use spawn with absolute paths to avoid shell interpretation issues
-      return spawn(command, cmdArgs, options);
-    } else {
-      return spawn(command, cmdArgs, options);
-    }
-  } catch (error) {
-    // Fallback to exec for better error handling
-    const fullCommand = isWindows ? 
-      `"${command}" ${cmdArgs.map(arg => `"${arg}"`).join(' ')}` :
-      `${command} ${cmdArgs.join(' ')}`;
-    
-    return spawn('cmd', ['/c', fullCommand], options);
+// 1) Run compiled dist with Node if present (Windows-friendly, no bun/tsx needed)
+try {
+  if (fs.existsSync(distEntrypoint)) {
+    const child = spawn(process.execPath, [distEntrypoint, ...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', () => runWithBunOrTsx());
+    return;
   }
+} catch (_) {
+  // fallthrough to bun/tsx
 }
 
-// Primary execution: Use compiled dist files (recommended for Windows)
-function runWithNode() {
+// 2) Otherwise, try bun first, then fall back to node+tsx
+runWithBunOrTsx();
+
+function runWithBunOrTsx() {
+  // Try bun first
   try {
-    if (fs.existsSync(distEntrypoint)) {
-      // Use direct Node.js execution - most reliable for Windows
-      const child = runWindowsSafe(process.execPath, [distEntrypoint, ...args]);
-      
-      child.on('exit', code => process.exit(code || 0));
-      child.on('error', (err) => {
-        console.error('❌ Node.js execution failed:', err.message);
-        process.exit(1);
-      });
-      
-      return true;
-    } else {
-      console.error('❌ Compiled files not found. Run: npm install -g @shareai-lab/kode');
-      process.exit(1);
-    }
-  } catch (err) {
-    console.error('❌ Unexpected error:', err.message);
-    process.exit(1);
+    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', () => runWithNodeTsx());
+    return;
+  } catch {
+    // ignore and try tsx path
   }
-}
 
-// Simple error handler
-function handleWindowsError(error) {
-  console.error('\n❌ Windows CLI Error');
-  console.error('Error:', error.message);
-  console.error('\n💡 Solutions for Windows:');
-  console.error('1. Install latest Node.js from nodejs.org');
-  console.error('2. Use Git Bash (recommended) or Windows Terminal');
-  console.error('3. Reinstall: npm install -g @shareai-lab/kode');
-  console.error('4. Use WSL (Windows Subsystem for Linux)');
-  process.exit(1);
+  runWithNodeTsx();
 }
 
-// Main execution - always use compiled dist files for Windows
-if (isWindows) {
-  console.log('🪟 Windows detected - using optimized execution...');
-}
+function runWithNodeTsx() {
+  // Use local tsx installation; if missing, try PATH-resolved tsx
+  const binDir = path.join(__dirname, 'node_modules', '.bin')
+  const tsxPath = process.platform === 'win32'
+    ? path.join(binDir, 'tsx.cmd')
+    : path.join(binDir, 'tsx')
+
+  const runPathTsx = () => {
+    const child2 = spawn('tsx', [cliPath, ...args], {
+      stdio: 'inherit',
+      shell: process.platform === 'win32',
+      env: { 
+        ...process.env, 
+        YOGA_WASM_PATH: path.join(__dirname, 'yoga.wasm'),
+        TSX_TSCONFIG_PATH: process.platform === 'win32' ? 'noop' : undefined
+      },
+    })
+    child2.on('error', () => {
+      console.error('\nError: tsx is required but not found.')
+      console.error('Please install tsx globally: npm install -g tsx')
+      process.exit(1)
+    })
+    child2.on('exit', (code2) => process.exit(code2 || 0))
+  }
 
-// Always use the compiled version for better Windows compatibility
-runWithNode();
+  const child = spawn(tsxPath, [cliPath, ...args], {
+    stdio: 'inherit',
+    shell: process.platform === 'win32',
+    env: { 
+      ...process.env, 
+      YOGA_WASM_PATH: path.join(__dirname, 'yoga.wasm'),
+      TSX_TSCONFIG_PATH: process.platform === 'win32' ? 'noop' : undefined
+    },
+  })
+  
+  child.on('error', () => runPathTsx())
+  child.on('exit', (code) => {
+    if (code && code !== 0) return runPathTsx()
+    process.exit(code || 0)
+  })
+}

package/dist/entrypoints/cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env -S node --no-warnings=ExperimentalWarning --enable-source-maps
 import { fileURLToPath } from "node:url";
 import { dirname, join } from "node:path";
+import { existsSync } from "node:fs";
 import { initSentry } from "../services/sentry.js";
 import { PRODUCT_COMMAND, PRODUCT_NAME } from "../constants/product.js";
 initSentry();
@@ -21,7 +22,7 @@ import * as dontcare from "@anthropic-ai/sdk/shims/node";
 Object.keys(dontcare);
 import React from "react";
 import { ReadStream } from "tty";
-import { openSync, existsSync } from "fs";
+import { openSync } from "fs";
 import { addToHistory } from "../history.js";
 import { getContext, setContext, removeContext } from "../context.js";
 import { Command } from "@commander-js/extra-typings";
@@ -101,9 +102,9 @@ async function showSetupScreens(safeMode, print) {
   const config = getGlobalConfig();
   if (!config.theme || !config.hasCompletedOnboarding) {
     await clearTerminal();
-    const { render: render2 } = await import("ink");
+    const { render } = await import("ink");
     await new Promise((resolve) => {
-      render2(
+      render(
         /* @__PURE__ */ React.createElement(
           Onboarding,
           {
@@ -127,9 +128,12 @@ async function showSetupScreens(safeMode, print) {
           grantReadPermissionForOriginalDir();
           resolve();
         };
-        render(/* @__PURE__ */ React.createElement(TrustDialog, { onDone }), {
-          exitOnCtrlC: false
-        });
+        (async () => {
+          const { render } = await import("ink");
+          render(/* @__PURE__ */ React.createElement(TrustDialog, { onDone }), {
+            exitOnCtrlC: false
+          });
+        })();
       });
     }
     if (process.env.USER_TYPE === "ant") {
@@ -195,7 +199,11 @@ async function setup(cwd2, safeMode) {
   if (autoUpdaterStatus === "not_configured") {
     logEvent("tengu_setup_auto_updater_not_configured", {});
     await new Promise((resolve) => {
-      render(/* @__PURE__ */ React.createElement(Doctor, { onDone: () => resolve() }));
+      ;
+      (async () => {
+        const { render } = await import("ink");
+        render(/* @__PURE__ */ React.createElement(Doctor, { onDone: () => resolve() }));
+      })();
     });
   }
 }
@@ -321,9 +329,9 @@ ${commandList}`
           return { version: null, commands: null };
         })();
         {
-          const { render: render2 } = await import("ink");
+          const { render } = await import("ink");
           const { REPL } = await import("../screens/REPL.js");
-          render2(
+          render(
             /* @__PURE__ */ React.createElement(
               REPL,
               {
@@ -725,7 +733,7 @@ ${commandList}`
       const reactModule = await import("react");
       const inkjsui = await import("@inkjs/ui");
       const utilsTheme = await import("../utils/theme.js");
-      const { render: render2 } = ink;
+      const { render } = ink;
       const React2 = reactModule;
       const { MultiSelect } = inkjsui;
       const { Box, Text } = ink;
@@ -822,7 +830,7 @@ ${commandList}`
             ))
           ), /* @__PURE__ */ React2.createElement(Box, { marginTop: 0, marginLeft: 3 }, /* @__PURE__ */ React2.createElement(Text, { dimColor: true }, "Space to select \xB7 Enter to confirm \xB7 Esc to cancel")), isFinished && /* @__PURE__ */ React2.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React2.createElement(Text, { color: theme.success }, "Successfully imported", " ", importResults.filter((r) => r.success).length, " MCP server to local config.")));
         }
-        const { unmount } = render2(/* @__PURE__ */ React2.createElement(ClaudeDesktopImport, null));
+        const { unmount } = render(/* @__PURE__ */ React2.createElement(ClaudeDesktopImport, null));
         setTimeout(() => {
           unmount();
           resolve();
@@ -864,7 +872,11 @@ ${commandList}`
   program.command("doctor").description(`Check the health of your ${PRODUCT_NAME} auto-updater`).action(async () => {
     logEvent("tengu_doctor_command", {});
     await new Promise((resolve) => {
-      render(/* @__PURE__ */ React.createElement(Doctor, { onDone: () => resolve(), doctorMode: true }));
+      ;
+      (async () => {
+        const { render } = await import("ink");
+        render(/* @__PURE__ */ React.createElement(Doctor, { onDone: () => resolve(), doctorMode: true }));
+      })();
     });
     process.exit(0);
   });
@@ -899,11 +911,14 @@ ${commandList}`
     await setup(cwd2, false);
     logEvent("tengu_view_logs", { number: number?.toString() ?? "" });
     const context2 = {};
-    const { unmount } = render(
-      /* @__PURE__ */ React.createElement(LogList, { context: context2, type: "messages", logNumber: number }),
-      renderContextWithExitOnCtrlC
-    );
-    context2.unmount = unmount;
+    (async () => {
+      const { render } = await import("ink");
+      const { unmount } = render(
+        /* @__PURE__ */ React.createElement(LogList, { context: context2, type: "messages", logNumber: number }),
+        renderContextWithExitOnCtrlC
+      );
+      context2.unmount = unmount;
+    })();
   });
   program.command("resume").description(
     "Resume a previous conversation. Optionally provide a number (0, 1, 2, etc.) or file path to resume a specific conversation."
@@ -953,9 +968,9 @@ ${commandList}`
         const fork = getNextAvailableLogForkNumber(date, forkNumber ?? 1, 0);
         const isDefaultModel = await isDefaultSlowAndCapableModel();
         {
-          const { render: render2 } = await import("ink");
+          const { render } = await import("ink");
           const { REPL } = await import("../screens/REPL.js");
-          render2(
+          render(
             /* @__PURE__ */ React.createElement(
               REPL,
               {
@@ -981,20 +996,23 @@ ${commandList}`
       }
     } else {
       const context2 = {};
-      const { unmount } = render(
-        /* @__PURE__ */ React.createElement(
-          ResumeConversation,
-          {
-            context: context2,
-            commands: commands2,
-            logs,
-            tools,
-            verbose
-          }
-        ),
-        renderContextWithExitOnCtrlC
-      );
-      context2.unmount = unmount;
+      (async () => {
+        const { render } = await import("ink");
+        const { unmount } = render(
+          /* @__PURE__ */ React.createElement(
+            ResumeConversation,
+            {
+              context: context2,
+              commands: commands2,
+              logs,
+              tools,
+              verbose
+            }
+          ),
+          renderContextWithExitOnCtrlC
+        );
+        context2.unmount = unmount;
+      })();
     }
   });
   program.command("error").description(
@@ -1007,11 +1025,14 @@ ${commandList}`
     await setup(cwd2, false);
     logEvent("tengu_view_errors", { number: number?.toString() ?? "" });
     const context2 = {};
-    const { unmount } = render(
-      /* @__PURE__ */ React.createElement(LogList, { context: context2, type: "errors", logNumber: number }),
-      renderContextWithExitOnCtrlC
-    );
-    context2.unmount = unmount;
+    (async () => {
+      const { render } = await import("ink");
+      const { unmount } = render(
+        /* @__PURE__ */ React.createElement(LogList, { context: context2, type: "errors", logNumber: number }),
+        renderContextWithExitOnCtrlC
+      );
+      context2.unmount = unmount;
+    })();
   });
   const context = program.command("context").description(
     `Set static context (eg. ${PRODUCT_COMMAND} context add-file ./src/*.py)`