episoda 0.2.10 → 0.2.12

package/dist/index.js

@@ -2068,11 +2068,11 @@ var require_auth = __commonJS({
     exports2.validateToken = validateToken;
     var fs5 = __importStar(require("fs"));
     var path7 = __importStar(require("path"));
-    var os3 = __importStar(require("os"));
+    var os2 = __importStar(require("os"));
     var child_process_1 = require("child_process");
     var DEFAULT_CONFIG_FILE = "config.json";
     function getConfigDir4() {
-      return process.env.EPISODA_CONFIG_DIR || path7.join(os3.homedir(), ".episoda");
+      return process.env.EPISODA_CONFIG_DIR || path7.join(os2.homedir(), ".episoda");
     }
     function getConfigPath3(configPath) {
       if (configPath) {
@@ -2541,7 +2541,7 @@ async function startDaemon() {
   if (!fs2.existsSync(configDir)) {
     fs2.mkdirSync(configDir, { recursive: true });
   }
-  const daemonScript = path2.join(__dirname, "daemon-process.js");
+  const daemonScript = path2.join(__dirname, "daemon", "daemon-process.js");
   if (!fs2.existsSync(daemonScript)) {
     throw new Error(`Daemon script not found: ${daemonScript}. Make sure CLI is built.`);
   }
@@ -2923,26 +2923,36 @@ Received ${signal}, shutting down...`);
 }
 
 // src/commands/auth.ts
-var os2 = __toESM(require("os"));
+var os = __toESM(require("os"));
 var fs4 = __toESM(require("fs"));
 var path6 = __toESM(require("path"));
 var import_child_process4 = require("child_process");
 var import_core5 = __toESM(require_dist());
 
 // src/daemon/machine-id.ts
-var os = __toESM(require("os"));
 var fs3 = __toESM(require("fs"));
 var path5 = __toESM(require("path"));
 var crypto2 = __toESM(require("crypto"));
 var import_child_process3 = require("child_process");
 var import_core4 = __toESM(require_dist());
+function isValidUUID(str) {
+  const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+  return uuidRegex.test(str);
+}
 async function getMachineId() {
   const machineIdPath = path5.join((0, import_core4.getConfigDir)(), "machine-id");
   try {
     if (fs3.existsSync(machineIdPath)) {
-      const machineId2 = fs3.readFileSync(machineIdPath, "utf-8").trim();
-      if (machineId2) {
-        return machineId2;
+      const existingId = fs3.readFileSync(machineIdPath, "utf-8").trim();
+      if (existingId) {
+        if (isValidUUID(existingId)) {
+          return existingId;
+        }
+        console.log("[MachineId] Migrating legacy machine ID to UUID format...");
+        const newUUID = generateMachineId();
+        fs3.writeFileSync(machineIdPath, newUUID, "utf-8");
+        console.log(`[MachineId] Migrated: ${existingId} \u2192 ${newUUID}`);
+        return newUUID;
       }
     }
   } catch (error) {
@@ -3001,10 +3011,21 @@ function getHardwareUUID() {
   return crypto2.randomUUID();
 }
 function generateMachineId() {
-  const hostname2 = os.hostname();
   const hwUUID = getHardwareUUID();
-  const shortId = hwUUID.replace(/-/g, "").slice(0, 8).toLowerCase();
-  return `${hostname2}-${shortId}`;
+  if (isValidUUID(hwUUID)) {
+    return hwUUID.toLowerCase();
+  }
+  const hash = crypto2.createHash("sha256").update(hwUUID).digest("hex");
+  const uuid = [
+    hash.slice(0, 8),
+    hash.slice(8, 12),
+    "4" + hash.slice(13, 16),
+    // Version 4
+    (parseInt(hash.slice(16, 17), 16) & 3 | 8).toString(16) + hash.slice(17, 20),
+    // Variant
+    hash.slice(20, 32)
+  ].join("-");
+  return uuid.toLowerCase();
 }
 
 // src/git-helpers/git-credential-helper.ts
@@ -3330,8 +3351,9 @@ async function authCommand(options = {}) {
   const apiUrl = options.apiUrl || process.env.EPISODA_API_URL || "https://episoda.dev";
   status.info("Initializing Episoda CLI...");
   status.info("");
+  const machineId = await getMachineId();
   status.info("Step 1/3: Requesting authorization code...");
-  const deviceAuth = await initiateDeviceFlow(apiUrl);
+  const deviceAuth = await initiateDeviceFlow(apiUrl, machineId);
   status.success(`\u2713 Authorization code received: ${deviceAuth.user_code}`);
   status.info("");
   status.info("Step 2/3: Opening browser for authorization...");
@@ -3347,7 +3369,6 @@ async function authCommand(options = {}) {
   status.success("\u2713 Authorization successful!");
   status.info("");
   status.info("Step 3/3: Exchanging authorization for access token...");
-  const machineId = await getMachineId();
   const tokenResponse = await exchangeDeviceCode(apiUrl, deviceAuth.device_code, machineId);
   status.success("\u2713 Access token received");
   status.info(`  Project: ${tokenResponse.project_uid}`);
@@ -3381,13 +3402,16 @@ async function authCommand(options = {}) {
   status.info("  \u2022 Git operations will use Episoda auth automatically");
   status.info("");
 }
-async function initiateDeviceFlow(apiUrl) {
+async function initiateDeviceFlow(apiUrl, machineId) {
   const response = await fetch(`${apiUrl}/api/oauth/code`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json"
     },
-    body: JSON.stringify({})
+    body: JSON.stringify({
+      machine_id: machineId
+      // EP812: For cookie-based device pairing
+    })
   });
   if (!response.ok) {
     const error = await response.json();
@@ -3488,7 +3512,7 @@ async function exchangeDeviceCode(apiUrl, deviceCode, machineId) {
   return tokenResponse;
 }
 function openBrowser(url) {
-  const platform2 = os2.platform();
+  const platform2 = os.platform();
   let command;
   let args;
   switch (platform2) {
@@ -3516,7 +3540,7 @@ function openBrowser(url) {
 }
 async function installGitCredentialHelper(apiUrl) {
   try {
-    const homeDir = os2.homedir();
+    const homeDir = os.homedir();
     const episodaBinDir = path6.join(homeDir, ".episoda", "bin");
     const helperPath = path6.join(episodaBinDir, "git-credential-episoda");
     fs4.mkdirSync(episodaBinDir, { recursive: true });
@@ -3548,11 +3572,11 @@ async function installGitCredentialHelper(apiUrl) {
   }
 }
 function updateShellProfile(binDir) {
-  const platform2 = os2.platform();
+  const platform2 = os.platform();
   if (platform2 === "win32") {
     return;
   }
-  const homeDir = os2.homedir();
+  const homeDir = os.homedir();
   const profiles = [
     path6.join(homeDir, ".bashrc"),
     path6.join(homeDir, ".zshrc"),