kentutai-app 1.1.4 → 1.1.6

package/cli/cli.js

@@ -52,16 +52,7 @@ Options:
 
 const appDir = path.join(__dirname, "app");
 const standaloneServer = path.join(appDir, "server.js");
-const mainAppDir = path.resolve(__dirname, "..");
-const mainServerPath = path.join(mainAppDir, ".next", "standalone", "server.js");
-
 const useStandalone = fs.existsSync(standaloneServer);
-const useMainApp = !useStandalone && fs.existsSync(mainServerPath);
-
-if (!useStandalone && !useMainApp) {
-  console.log("\n  First run detected. Starting development server...\n");
-  console.log("  For production, run: npm run build\n");
-}
 
 function openBrowser(url) {
   const cmd = process.platform === "darwin" ? "open"
@@ -97,31 +88,18 @@ function startServer() {
   const displayHost = host === DEFAULT_HOST ? "localhost" : host;
   const url = `http://${displayHost}:${port}/dashboard`;
 
-  let server;
-
-  if (useStandalone) {
-    server = spawn(process.execPath, ["--max-old-space-size=4096", standaloneServer], {
-      cwd: appDir,
-      stdio: showLog ? "inherit" : "ignore",
-      env: { ...process.env, PORT: String(port), HOSTNAME: host }
-    });
-  } else if (useMainApp) {
-    server = spawn(process.execPath, ["--max-old-space-size=4096", mainServerPath], {
-      cwd: path.join(mainAppDir, ".next", "standalone"),
-      stdio: showLog ? "inherit" : "ignore",
-      env: { ...process.env, PORT: String(port), HOSTNAME: host }
-    });
-  } else {
-    const isWin = process.platform === "win32";
-    const npmCmd = isWin ? "npm.cmd" : "npm";
-    server = spawn(npmCmd, ["run", "dev", "--", "--port", String(port)], {
-      cwd: mainAppDir,
-      stdio: showLog ? "inherit" : "ignore",
-      shell: isWin,
-      env: { ...process.env, PORT: String(port) }
-    });
+  if (!useStandalone) {
+    console.error("\n  Error: Standalone build not found.");
+    console.error("  Please run 'npm run build:cli' first.\n");
+    process.exit(1);
   }
 
+  const server = spawn(process.execPath, ["--max-old-space-size=4096", standaloneServer], {
+    cwd: appDir,
+    stdio: showLog ? "inherit" : "ignore",
+    env: { ...process.env, PORT: String(port), HOSTNAME: host }
+  });
+
   server.on("error", (err) => {
     console.error("Failed to start server:", err.message);
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "kentutai-app",
-    "version": "1.1.4",
+    "version": "1.1.6",
     "description": "KentutAI web dashboard",
     "private": false,
     "bin": {
@@ -8,7 +8,12 @@
     },
     "files": [
         "bin.js",
-        "cli/",
+        "cli/cli.js",
+        "cli/src/",
+        "cli/hooks/",
+        "cli/package.json",
+        "cli/README.md",
+        "cli/LICENSE",
         "public/",
         "README.md",
         "LICENSE",

package/cli/scripts/build-cli.js

@@ -1,265 +0,0 @@
-#!/usr/bin/env node
-
-const fs = require("fs");
-const path = require("path");
-const { execSync } = require("child_process");
-
-const cliDir = path.resolve(__dirname, "..");
-const appDir = path.resolve(cliDir, "..");
-const rootDir = path.resolve(appDir, "..");
-const cliAppDir = path.join(cliDir, "app");
-const buildHomeDir = path.join(cliDir, ".build-home");
-const buildDistDirName = ".next-cli-build";
-const buildDistDir = path.join(appDir, buildDistDirName);
-
-// Exclude patterns for files/folders we don't want to copy
-const EXCLUDE_PATTERNS = [
-  "@img",           // Sharp image processing (not needed with unoptimized images)
-  "sharp",          // Sharp core lib (not needed with unoptimized images)
-  "detect-libc",    // Sharp dependency
-  "logs",           // Runtime logs
-  ".env",           // Environment files
-  ".env.local",
-  ".env.*.local",
-  "*.log",          // Log files
-  "tmp",            // Temp files
-  ".DS_Store",      // macOS files
-];
-
-function shouldExclude(name) {
-  return EXCLUDE_PATTERNS.some(pattern => {
-    if (pattern.includes("*")) {
-      const regex = new RegExp("^" + pattern.replace(/[.+?^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*") + "$");
-      return regex.test(name);
-    }
-    return name === pattern;
-  });
-}
-
-function copyRecursive(src, dest) {
-  if (!fs.existsSync(src)) {
-    console.warn(`Warning: Source ${src} does not exist`);
-    return;
-  }
-  
-  if (!fs.existsSync(dest)) {
-    fs.mkdirSync(dest, { recursive: true });
-  }
-
-  const entries = fs.readdirSync(src, { withFileTypes: true });
-  for (const entry of entries) {
-    if (shouldExclude(entry.name)) {
-      continue;
-    }
-
-    const srcPath = path.join(src, entry.name);
-    const destPath = path.join(dest, entry.name);
-
-    // Skip broken symlinks (common in workspace setups)
-    try {
-      fs.accessSync(srcPath);
-    } catch {
-      continue;
-    }
-
-    if (entry.isDirectory()) {
-      copyRecursive(srcPath, destPath);
-    } else if (entry.isSymbolicLink()) {
-      // Resolve and copy target (avoid linking outside bundle)
-      try {
-        const real = fs.realpathSync(srcPath);
-        if (fs.statSync(real).isDirectory()) {
-          copyRecursive(real, destPath);
-        } else {
-          fs.copyFileSync(real, destPath);
-        }
-      } catch {}
-    } else {
-      try {
-        fs.copyFileSync(srcPath, destPath);
-      } catch {}
-    }
-  }
-}
-
-console.log("📦 Building KentutAI CLI package with Next.js...\n");
-
-fs.mkdirSync(buildHomeDir, { recursive: true });
-fs.mkdirSync(path.join(buildHomeDir, "AppData", "Roaming"), { recursive: true });
-fs.mkdirSync(path.join(buildHomeDir, "AppData", "Local"), { recursive: true });
-
-// Step 0: Sync version from app/cli/package.json to app/package.json
-console.log("0️⃣  Syncing version to app/package.json...");
-const cliPkg = JSON.parse(fs.readFileSync(path.join(cliDir, "package.json"), "utf8"));
-const appPkgPath = path.join(appDir, "package.json");
-const appPkg = JSON.parse(fs.readFileSync(appPkgPath, "utf8"));
-if (appPkg.version !== cliPkg.version) {
-  appPkg.version = cliPkg.version;
-  fs.writeFileSync(appPkgPath, JSON.stringify(appPkg, null, 2) + "\n");
-  console.log(`✅ Version synced: ${cliPkg.version}\n`);
-} else {
-  console.log(`✅ Version already synced: ${cliPkg.version}\n`);
-}
-
-// Step 1: Build app with Next.js (workspace tracing root → traced node_modules in standalone).
-console.log("1️⃣  Building Next.js app...");
-try {
-  execSync("npm run build", {
-    stdio: "inherit",
-    cwd: appDir,
-    env: {
-      ...process.env,
-      HOME: buildHomeDir,
-      USERPROFILE: buildHomeDir,
-      APPDATA: path.join(buildHomeDir, "AppData", "Roaming"),
-      LOCALAPPDATA: path.join(buildHomeDir, "AppData", "Local"),
-      NEXT_DIST_DIR: buildDistDirName,
-      NEXT_TRACING_ROOT_MODE: "workspace",
-    }
-  });
-  console.log("✅ Next.js build completed\n");
-} catch (error) {
-  console.error("❌ Next.js build failed");
-  process.exit(1);
-}
-
-// Step 2: Clean old app/cli/app if exists
-console.log("2️⃣  Cleaning old app/cli/app...");
-if (fs.existsSync(cliAppDir)) {
-  fs.rmSync(cliAppDir, { recursive: true, force: true });
-}
-console.log("✅ Cleaned\n");
-
-// Step 3: Copy Next.js standalone build to app/cli/app.
-// Newer Next.js standalone output writes server.js/package.json plus .next/, src/, and
-// node_modules/ directly under .next/standalone. Older builds may still use a nested app/.
-console.log("3️⃣  Copying Next.js standalone build to app/cli/app...");
-const standaloneRoot = path.join(appDir, ".next", "standalone");
-const standaloneRootResolved = path.join(buildDistDir, "standalone");
-const standaloneRootToUse = fs.existsSync(standaloneRootResolved) ? standaloneRootResolved : standaloneRoot;
-const standaloneApp = fs.existsSync(path.join(standaloneRootToUse, "server.js"))
-  ? standaloneRootToUse
-  : path.join(standaloneRootToUse, "app");
-if (!fs.existsSync(standaloneApp)) {
-  console.error("❌ Next.js standalone build not found under .next/standalone");
-  console.error("Expected either .next/standalone/server.js or .next/standalone/app/");
-  process.exit(1);
-}
-copyRecursive(standaloneApp, cliAppDir);
-
-// Older nested-app layout stores traced node_modules at standalone root.
-const standaloneNodeModules = path.join(standaloneRootToUse, "node_modules");
-if (standaloneApp !== standaloneRootToUse && fs.existsSync(standaloneNodeModules)) {
-  copyRecursive(standaloneNodeModules, path.join(cliAppDir, "node_modules"));
-}
-console.log("✅ Copied standalone build\n");
-
-// Step 3b: Ensure sql.js (pure JS fallback) bundled in app/cli/app/node_modules.
-  // Strip better-sqlite3 (native) — it lives in ~/.kentutai/runtime to avoid
-// Windows EBUSY during global CLI updates. node:sqlite (Node ≥22.5) is also
-// available as a no-install middle tier.
-console.log("3️⃣ b Configuring SQLite drivers...");
-function ensureModuleInBundle(pkg) {
-  const dest = path.join(cliAppDir, "node_modules", pkg);
-  if (fs.existsSync(dest)) {
-    console.log(`✅ ${pkg} already bundled`);
-    return;
-  }
-  const candidates = [
-    path.join(appDir, "node_modules", pkg),
-    path.join(rootDir, "node_modules", pkg),
-  ];
-  const src = candidates.find((p) => fs.existsSync(p));
-  if (!src) {
-    console.warn(`⚠️  ${pkg} not found locally — bundle will rely on node:sqlite or runtime install`);
-    return;
-  }
-  fs.mkdirSync(path.dirname(dest), { recursive: true });
-  copyRecursive(src, dest);
-  console.log(`✅ Bundled ${pkg}`);
-}
-ensureModuleInBundle("sql.js");
-const betterDir = path.join(cliAppDir, "node_modules", "better-sqlite3");
-if (fs.existsSync(betterDir)) {
-  fs.rmSync(betterDir, { recursive: true, force: true });
-  console.log("✅ Stripped better-sqlite3 (lives in ~/.kentutai/runtime)");
-}
-console.log("");
-
-// Step 4: Copy static files
-console.log("4️⃣  Copying static files...");
-const staticSrc = path.join(appDir, ".next", "static");
-const staticSrcResolved = path.join(buildDistDir, "static");
-const staticDest = path.join(cliAppDir, buildDistDirName, "static");
-if (fs.existsSync(staticSrcResolved) || fs.existsSync(staticSrc)) {
-  copyRecursive(fs.existsSync(staticSrcResolved) ? staticSrcResolved : staticSrc, staticDest);
-  console.log("✅ Copied static files\n");
-} else {
-  console.log("⏭️  No static files found\n");
-}
-
-// Step 5: Copy public folder if exists
-console.log("5️⃣  Copying public folder...");
-const publicSrc = path.join(appDir, "public");
-const publicDest = path.join(cliAppDir, "public");
-if (fs.existsSync(publicSrc)) {
-  copyRecursive(publicSrc, publicDest);
-  console.log("✅ Copied public folder\n");
-} else {
-  console.log("⏭️  No public folder found\n");
-}
-
-// Step 6: Copy vendor-chunks (required for production)
-console.log("6️⃣  Copying vendor-chunks...");
-const vendorChunksSrc = path.join(appDir, ".next", "server", "vendor-chunks");
-const vendorChunksSrcResolved = path.join(buildDistDir, "server", "vendor-chunks");
-const vendorChunksDest = path.join(cliAppDir, buildDistDirName, "server", "vendor-chunks");
-if (fs.existsSync(vendorChunksSrcResolved) || fs.existsSync(vendorChunksSrc)) {
-  copyRecursive(fs.existsSync(vendorChunksSrcResolved) ? vendorChunksSrcResolved : vendorChunksSrc, vendorChunksDest);
-  console.log("✅ Copied vendor-chunks\n");
-} else {
-  console.log("⏭️  No vendor-chunks found\n");
-}
-
-// Step 7: Copy MITM server files (not bundled by Next.js standalone)
-console.log("7️⃣  Copying MITM server files...");
-const mitmSrc = path.join(appDir, "src", "mitm");
-const mitmDest = path.join(cliAppDir, "src", "mitm");
-if (fs.existsSync(mitmSrc)) {
-  copyRecursive(mitmSrc, mitmDest);
-  console.log("✅ Copied MITM files\n");
-} else {
-  console.log("⏭️  No MITM files found\n");
-}
-
-// Step 7b: Copy standalone updater (headless Node process for install progress)
-console.log("7️⃣ b Copying updater files...");
-const updaterSrc = path.join(appDir, "src", "lib", "updater");
-const updaterDest = path.join(cliAppDir, "src", "lib", "updater");
-if (fs.existsSync(updaterSrc)) {
-  copyRecursive(updaterSrc, updaterDest);
-  console.log("✅ Copied updater files\n");
-} else {
-  console.log("⏭️  No updater files found\n");
-}
-
-// Step 8: Build MITM server (config driven - see app/cli/scripts/buildMitm.js)
-console.log("8️⃣  Building MITM server...");
-try {
-  execSync("node scripts/buildMitm.js", { stdio: "inherit", cwd: cliDir });
-  console.log("✅ MITM server build completed\n");
-} catch (error) {
-  console.error("❌ MITM build failed");
-  process.exit(1);
-}
-
-console.log("✨ CLI package build completed!");
-console.log(`📁 Output: ${cliAppDir}`);
-
-try {
-  const { execSync: exec } = require("child_process");
-  const size = exec(`du -sh "${cliAppDir}"`, { encoding: "utf8" }).trim();
-  console.log(`📊 Package size: ${size.split("\t")[0]}`);
-} catch (e) {
-  // Silent fail on size check
-}

package/cli/scripts/buildMitm.js

@@ -1,70 +0,0 @@
-const esbuild = require("esbuild");
-const fs = require("fs");
-const path = require("path");
-
-// ── Build config ─────────────────────────────────────────
-const BUILD_CONFIG = {
-  bundle: true,
-  minify: true,
-  cleanPlainFiles: true,
-};
-// ─────────────────────────────────────────────────────────
-
-const cliDir = path.resolve(__dirname, "..");
-const appDir = path.resolve(cliDir, "..");
-const cliMitmDir = path.join(cliDir, "app", "src", "mitm");
-// Bundle everything — no externals. This keeps MITM runtime self-contained so
-// it can be copied to DATA_DIR/runtime/ and spawned from there (escapes
-// node_modules file locks that block `npm i -g kentutai@latest` on Windows).
-const EXTERNALS = [];
-const ENTRIES = ["server.js"];
-
-async function buildEntry(entry) {
-  const mitmSrc = path.join(appDir, "src", "mitm");
-  const output = path.join(cliMitmDir, entry);
-
-  const buildPlugin = {
-    name: "build-plugin",
-    setup(build) {
-      // Stub .git file scanned by esbuild
-      build.onResolve({ filter: /\.git/ }, args => ({ path: args.path, namespace: "git-stub" }));
-      build.onLoad({ filter: /.*/, namespace: "git-stub" }, () => ({ contents: "module.exports={}", loader: "js" }));
-    },
-  };
-
-  const steps = [];
-
-  if (BUILD_CONFIG.bundle) {
-    await esbuild.build({
-      entryPoints: [path.join(mitmSrc, entry)],
-      bundle: true,
-      minify: BUILD_CONFIG.minify,
-      platform: "node",
-      target: "node18",
-      external: EXTERNALS,
-      plugins: [buildPlugin],
-      outfile: output,
-    });
-    steps.push("bundled");
-    if (BUILD_CONFIG.minify) steps.push("minified");
-  }
-
-  console.log(`✅ ${steps.join(" + ")} → ${output}`);
-}
-
-async function run() {
-  const flags = Object.entries(BUILD_CONFIG).filter(([, v]) => v).map(([k]) => k).join(", ");
-  console.log(`⚙️  Config: ${flags}`);
-
-  for (const entry of ENTRIES) await buildEntry(entry);
-
-  if (BUILD_CONFIG.cleanPlainFiles) {
-    const keep = new Set(ENTRIES);
-    for (const name of fs.readdirSync(cliMitmDir)) {
-      if (!keep.has(name)) fs.rmSync(path.join(cliMitmDir, name), { recursive: true, force: true });
-    }
-    console.log("✅ Removed plain MITM files from CLI bundle");
-  }
-}
-
-run().catch((e) => { console.error(e); process.exit(1); });