@lifeaitools/clauth 1.5.80 → 1.5.81

package/cli/commands/serve.js

@@ -3687,37 +3687,43 @@ function createServer(initPassword, whitelist, port, tunnelHostnameInit = null,
       return ok(res, { status: tunnelStatus });
     }
 
-    // POST /launch-ccandme — spawn CCandMe (WezTerm 4-pane: Claude + Codex + Me)
+    // POST /launch-ccandme — open a new CCandMe WezTerm window without killing existing sessions
     if (method === "POST" && reqPath === "/launch-ccandme") {
       if (lockedGuard(res)) return;
       try {
         const { spawn } = await import("child_process");
-        const ccandmeBin = path.resolve(process.env.APPDATA || "", "../Local/node_modules/.bin/ccandme.cmd");
-        const fallbacks = [
-          ccandmeBin,
-          "C:/Dev/CCandMe/bin/ccandme.mjs",
-        ];
-        // Find the first ccandme binary that exists
-        const { existsSync } = await import("fs");
-        let cmd = null;
-        let args = [];
-        for (const f of fallbacks) {
-          if (existsSync(f)) {
-            if (f.endsWith(".mjs")) { cmd = process.execPath; args = [f, "start"]; }
-            else { cmd = f; args = ["start"]; }
-            break;
-          }
+        const { existsSync, readFileSync, writeFileSync } = await import("fs");
+
+        // Locate WezTerm
+        const wezCandidates = [
+          "C:/Program Files/WezTerm/wezterm.exe",
+          "C:/Program Files (x86)/WezTerm/wezterm.exe",
+          process.env.WEZTERM_EXE,
+        ].filter(Boolean);
+        const wezExe = wezCandidates.find(existsSync) || "wezterm";
+
+        // Render the lua config from the CCandMe template (skip the kill-existing step)
+        const CCANDME_DIR = "C:/Dev/CCandMe";
+        const WORK_DIR = "C:/Dev/regen-root";
+        const templatePath = path.join(CCANDME_DIR, "templates", "wezterm.lua");
+        const luaOutPath  = path.join(CCANDME_DIR, ".ccandme-wezterm.lua");
+
+        if (existsSync(templatePath)) {
+          const lua = readFileSync(templatePath, "utf8")
+            .replaceAll("__SUPERVISOR_DIR__", CCANDME_DIR.replace(/\//g, "\\\\"))
+            .replaceAll("__WORK_DIR__",       WORK_DIR.replace(/\//g, "\\\\"))
+            .replaceAll("__WORKSPACE__",      "ccandme")
+            .replaceAll("__CLAUDE_CMD__",     "claude")
+            .replaceAll("__CODEX_CMD__",      "codex")
+            .replaceAll("__PACKAGE_ROOT__",   CCANDME_DIR.replace(/\//g, "\\\\"));
+          writeFileSync(luaOutPath, lua, "utf8");
         }
-        // Last resort: try the global npm bin
-        if (!cmd) {
-          cmd = process.platform === "win32" ? "cmd.exe" : "ccandme";
-          args = process.platform === "win32" ? ["/c", "ccandme", "start"] : ["start"];
-        }
-        const child = spawn(cmd, args, {
+
+        // Launch WezTerm with the CCandMe config — no kill of existing sessions
+        const luaArg = existsSync(luaOutPath) ? luaOutPath : path.join(CCANDME_DIR, ".ccandme-wezterm.lua");
+        const child = spawn(wezExe, ["--config-file", luaArg, "start"], {
           detached: true,
           stdio: "ignore",
-          windowsHide: false,
-          shell: process.platform === "win32" && cmd === "cmd.exe" ? false : true,
         });
         child.unref();
         return ok(res, { ok: true, message: "CCandMe launched" });

package/package.json

@@ -1,61 +1,61 @@
-{
-  "name": "@lifeaitools/clauth",
-  "version": "1.5.80",
-  "description": "Hardware-bound credential vault for the LIFEAI infrastructure stack",
-  "type": "module",
-  "bin": {
-    "clauth": "./cli/index.js"
-  },
-  "scripts": {
-    "build": "bash scripts/build.sh",
-    "postinstall": "node scripts/postinstall.js",
-    "worker:start": "node cli/index.js serve",
-    "worker:stop": "curl -s http://127.0.0.1:52437/shutdown 2>nul || taskkill /F /IM cloudflared.exe 2>nul & exit 0",
-    "worker:restart": "npm run worker:stop && timeout /t 3 /nobreak >nul && npm run worker:start"
-  },
-  "dependencies": {
-    "chalk": "^5.3.0",
-    "commander": "^12.1.0",
-    "conf": "^13.0.0",
-    "inquirer": "^10.1.0",
-    "node-fetch": "^3.3.2",
-    "ora": "^8.1.0",
-    "@vscode/ripgrep": "^1.15.9",
-    "fast-glob": "^3.3.2"
-  },
-  "engines": {
-    "node": ">=18.0.0"
-  },
-  "keywords": [
-    "lifeai",
-    "credentials",
-    "vault",
-    "cli",
-    "prt"
-  ],
-  "author": "Dave Ladouceur <dave@life.ai>",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/LIFEAI/clauth.git"
-  },
-  "devDependencies": {
-    "javascript-obfuscator": "^5.3.0"
-  },
-  "files": [
-    "cli/",
-    "scripts/bin/",
-    "scripts/bootstrap.cjs",
-    "scripts/build.sh",
-    "scripts/postinstall.js",
-    "supabase/",
-    ".clauth-skill/",
-    "install.sh",
-    "install.ps1",
-    "README.md"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "homepage": "https://github.com/LIFEAI/clauth"
-}
+{
+  "name": "@lifeaitools/clauth",
+  "version": "1.5.81",
+  "description": "Hardware-bound credential vault for the LIFEAI infrastructure stack",
+  "type": "module",
+  "bin": {
+    "clauth": "./cli/index.js"
+  },
+  "scripts": {
+    "build": "bash scripts/build.sh",
+    "postinstall": "node scripts/postinstall.js",
+    "worker:start": "node cli/index.js serve",
+    "worker:stop": "curl -s http://127.0.0.1:52437/shutdown 2>nul || taskkill /F /IM cloudflared.exe 2>nul & exit 0",
+    "worker:restart": "npm run worker:stop && timeout /t 3 /nobreak >nul && npm run worker:start"
+  },
+  "dependencies": {
+    "chalk": "^5.3.0",
+    "commander": "^12.1.0",
+    "conf": "^13.0.0",
+    "inquirer": "^10.1.0",
+    "node-fetch": "^3.3.2",
+    "ora": "^8.1.0",
+    "@vscode/ripgrep": "^1.15.9",
+    "fast-glob": "^3.3.2"
+  },
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "keywords": [
+    "lifeai",
+    "credentials",
+    "vault",
+    "cli",
+    "prt"
+  ],
+  "author": "Dave Ladouceur <dave@life.ai>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/LIFEAI/clauth.git"
+  },
+  "devDependencies": {
+    "javascript-obfuscator": "^5.3.0"
+  },
+  "files": [
+    "cli/",
+    "scripts/bin/",
+    "scripts/bootstrap.cjs",
+    "scripts/build.sh",
+    "scripts/postinstall.js",
+    "supabase/",
+    ".clauth-skill/",
+    "install.sh",
+    "install.ps1",
+    "README.md"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "homepage": "https://github.com/LIFEAI/clauth"
+}