episoda 0.2.11 → 0.2.13

package/dist/daemon/daemon-process.js

@@ -1646,9 +1646,19 @@ var require_version = __commonJS({
     exports2.VERSION = void 0;
     var fs_1 = require("fs");
     var path_1 = require("path");
-    var packageJsonPath = (0, path_1.join)(__dirname, "..", "package.json");
-    var packageJson2 = JSON.parse((0, fs_1.readFileSync)(packageJsonPath, "utf-8"));
-    exports2.VERSION = packageJson2.version;
+    var FALLBACK_VERSION = "0.1.11";
+    function getVersion() {
+      try {
+        const packageJsonPath = (0, path_1.join)(__dirname, "..", "package.json");
+        if ((0, fs_1.existsSync)(packageJsonPath)) {
+          const packageJson2 = JSON.parse((0, fs_1.readFileSync)(packageJsonPath, "utf-8"));
+          return packageJson2.version;
+        }
+      } catch {
+      }
+      return FALLBACK_VERSION;
+    }
+    exports2.VERSION = getVersion();
   }
 });
 
@@ -2068,11 +2078,11 @@ var require_auth = __commonJS({
     exports2.validateToken = validateToken;
     var fs6 = __importStar(require("fs"));
     var path7 = __importStar(require("path"));
-    var os4 = __importStar(require("os"));
+    var os2 = __importStar(require("os"));
     var child_process_1 = require("child_process");
     var DEFAULT_CONFIG_FILE = "config.json";
     function getConfigDir5() {
-      return process.env.EPISODA_CONFIG_DIR || path7.join(os4.homedir(), ".episoda");
+      return process.env.EPISODA_CONFIG_DIR || path7.join(os2.homedir(), ".episoda");
     }
     function getConfigPath(configPath) {
       if (configPath) {
@@ -2228,7 +2238,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "episoda",
-      version: "0.2.10",
+      version: "0.2.12",
       description: "CLI tool for Episoda local development workflow orchestration",
       main: "dist/index.js",
       types: "dist/index.d.ts",
@@ -2283,19 +2293,29 @@ var require_package = __commonJS({
 });
 
 // src/daemon/machine-id.ts
-var os = __toESM(require("os"));
 var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
 var crypto = __toESM(require("crypto"));
 var import_child_process = require("child_process");
 var import_core = __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 = path.join((0, import_core.getConfigDir)(), "machine-id");
   try {
     if (fs.existsSync(machineIdPath)) {
-      const machineId2 = fs.readFileSync(machineIdPath, "utf-8").trim();
-      if (machineId2) {
-        return machineId2;
+      const existingId = fs.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();
+        fs.writeFileSync(machineIdPath, newUUID, "utf-8");
+        console.log(`[MachineId] Migrated: ${existingId} \u2192 ${newUUID}`);
+        return newUUID;
       }
     }
   } catch (error) {
@@ -2354,10 +2374,21 @@ function getHardwareUUID() {
   return crypto.randomUUID();
 }
 function generateMachineId() {
-  const hostname4 = os.hostname();
   const hwUUID = getHardwareUUID();
-  const shortId = hwUUID.replace(/-/g, "").slice(0, 8).toLowerCase();
-  return `${hostname4}-${shortId}`;
+  if (isValidUUID(hwUUID)) {
+    return hwUUID.toLowerCase();
+  }
+  const hash = crypto.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/daemon/project-tracker.ts
@@ -2615,97 +2646,6 @@ function performBackgroundUpdate() {
   }
 }
 
-// src/daemon/identity-server.ts
-var http = __toESM(require("http"));
-var os2 = __toESM(require("os"));
-var IDENTITY_SERVER_PORT = 3002;
-var IdentityServer = class {
-  constructor(machineId) {
-    this.server = null;
-    this.isConnected = false;
-    this.machineId = machineId;
-  }
-  /**
-   * Update connection status
-   * Called when WebSocket connection state changes
-   */
-  setConnected(connected) {
-    this.isConnected = connected;
-  }
-  /**
-   * Start the identity server on localhost:3002
-   */
-  async start() {
-    return new Promise((resolve2, reject) => {
-      this.server = http.createServer((req, res) => {
-        res.setHeader("Access-Control-Allow-Origin", "*");
-        res.setHeader("Access-Control-Allow-Methods", "GET, OPTIONS");
-        res.setHeader("Access-Control-Allow-Headers", "Content-Type");
-        res.setHeader("Access-Control-Allow-Private-Network", "true");
-        if (req.method === "OPTIONS") {
-          res.writeHead(204);
-          res.end();
-          return;
-        }
-        if (req.method !== "GET") {
-          res.writeHead(405, { "Content-Type": "application/json" });
-          res.end(JSON.stringify({ error: "Method not allowed" }));
-          return;
-        }
-        const url = new URL(req.url || "/", `http://${req.headers.host}`);
-        if (url.pathname === "/identity") {
-          const response = {
-            machineId: this.machineId,
-            hostname: os2.hostname(),
-            platform: os2.platform(),
-            arch: os2.arch(),
-            connected: this.isConnected
-          };
-          res.writeHead(200, { "Content-Type": "application/json" });
-          res.end(JSON.stringify(response));
-          return;
-        }
-        if (url.pathname === "/health") {
-          res.writeHead(200, { "Content-Type": "application/json" });
-          res.end(JSON.stringify({ status: "ok", machineId: this.machineId }));
-          return;
-        }
-        res.writeHead(404, { "Content-Type": "application/json" });
-        res.end(JSON.stringify({ error: "Not found" }));
-      });
-      this.server.listen(IDENTITY_SERVER_PORT, "127.0.0.1", () => {
-        console.log(`[IdentityServer] Started on http://127.0.0.1:${IDENTITY_SERVER_PORT}`);
-        resolve2();
-      });
-      this.server.on("error", (err) => {
-        if (err.code === "EADDRINUSE") {
-          console.warn(`[IdentityServer] Port ${IDENTITY_SERVER_PORT} already in use, skipping`);
-          resolve2();
-        } else {
-          console.error("[IdentityServer] Failed to start:", err.message);
-          reject(err);
-        }
-      });
-    });
-  }
-  /**
-   * Stop the identity server
-   */
-  async stop() {
-    return new Promise((resolve2) => {
-      if (this.server) {
-        this.server.close(() => {
-          console.log("[IdentityServer] Stopped");
-          this.server = null;
-          resolve2();
-        });
-      } else {
-        resolve2();
-      }
-    });
-  }
-};
-
 // src/daemon/handlers/file-handlers.ts
 var fs4 = __toESM(require("fs"));
 var path5 = __toESM(require("path"));
@@ -3172,7 +3112,7 @@ async function handleExec(command, projectPath) {
 
 // src/daemon/daemon-process.ts
 var fs5 = __toESM(require("fs"));
-var os3 = __toESM(require("os"));
+var os = __toESM(require("os"));
 var path6 = __toESM(require("path"));
 var packageJson = require_package();
 var Daemon = class {
@@ -3183,8 +3123,7 @@ var Daemon = class {
     this.deviceName = null;
     // EP661: Cached device name from server
     this.flyMachineId = null;
-    this.identityServer = null;
-    // EP803: Local identity server for browser detection
+    // EP812: Removed identityServer - browser identity now uses cookie-based pairing
     this.connections = /* @__PURE__ */ new Map();
     // projectPath -> connection
     // EP701: Track which connections are currently live (WebSocket open)
@@ -3208,8 +3147,6 @@ var Daemon = class {
     }
     await this.ipcServer.start();
     console.log("[Daemon] IPC server started");
-    this.identityServer = new IdentityServer(this.machineId);
-    await this.identityServer.start();
     this.registerIPCHandlers();
     await this.restoreConnections();
     this.setupShutdownHandlers();
@@ -3252,9 +3189,9 @@ var Daemon = class {
         machineId: this.machineId,
         deviceId: this.deviceId,
         // EP726: UUID for unified device identification
-        hostname: os3.hostname(),
-        platform: os3.platform(),
-        arch: os3.arch(),
+        hostname: os.hostname(),
+        platform: os.platform(),
+        arch: os.arch(),
         projects
       };
     });
@@ -3468,9 +3405,6 @@ var Daemon = class {
       console.log(`[Daemon] Authenticated for project ${projectId}`);
       touchProject(projectPath);
       this.liveConnections.add(projectPath);
-      if (this.identityServer) {
-        this.identityServer.setConnected(true);
-      }
       const authMessage = message;
       if (authMessage.userId && authMessage.workspaceId) {
         await this.configureGitUser(projectPath, authMessage.userId, authMessage.workspaceId, this.machineId, projectId, authMessage.deviceId);
@@ -3497,9 +3431,6 @@ var Daemon = class {
       const disconnectEvent = event;
       console.log(`[Daemon] Connection closed for ${projectId}: code=${disconnectEvent.code}, willReconnect=${disconnectEvent.willReconnect}`);
       this.liveConnections.delete(projectPath);
-      if (this.identityServer && this.liveConnections.size === 0) {
-        this.identityServer.setConnected(false);
-      }
       if (!disconnectEvent.willReconnect) {
         this.connections.delete(projectPath);
         console.log(`[Daemon] Removed connection for ${projectPath} from map`);
@@ -3517,9 +3448,9 @@ var Daemon = class {
         console.warn(`[Daemon] Could not read daemon PID:`, pidError instanceof Error ? pidError.message : pidError);
       }
       await client.connect(wsUrl, config.access_token, this.machineId, {
-        hostname: os3.hostname(),
-        osPlatform: os3.platform(),
-        osArch: os3.arch(),
+        hostname: os.hostname(),
+        osPlatform: os.platform(),
+        osArch: os.arch(),
         daemonPid
       });
       console.log(`[Daemon] Successfully connected to project ${projectId}`);
@@ -3678,10 +3609,6 @@ var Daemon = class {
       await connection.client.disconnect();
     }
     this.connections.clear();
-    if (this.identityServer) {
-      await this.identityServer.stop();
-      this.identityServer = null;
-    }
     await this.ipcServer.stop();
     console.log("[Daemon] Shutdown complete");
   }