episoda 0.2.96 → 0.2.98

package/dist/daemon/daemon-process.js

@@ -2786,7 +2786,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "episoda",
-      version: "0.2.96",
+      version: "0.2.98",
       description: "CLI tool for Episoda local development workflow orchestration",
       main: "dist/index.js",
       types: "dist/index.d.ts",
@@ -4406,6 +4406,48 @@ var WorktreeManager = class _WorktreeManager {
     }
     return { valid, stale, orphaned };
   }
+  /**
+   * EP1190: Clean up non-module worktrees (like 'main')
+   *
+   * In K1273 per-user-per-workspace model, only EP### worktrees should exist.
+   * The 'main' worktree and other non-module worktrees are legacy artifacts
+   * that can contain stale code and should be removed.
+   *
+   * @returns Object with removed paths and errors
+   */
+  async cleanupNonModuleWorktrees() {
+    const removed = [];
+    const errors = [];
+    try {
+      const validation = await this.validateWorktrees();
+      for (const orphanPath of validation.orphaned) {
+        const dirName = path7.basename(orphanPath);
+        const isModuleWorktree = /^EP\d+$/.test(dirName);
+        if (!isModuleWorktree) {
+          console.log(`[WorktreeManager] EP1190: Found non-module worktree: ${dirName}`);
+          try {
+            const removeResult = await this.gitExecutor.execute({
+              action: "worktree_remove",
+              path: orphanPath,
+              force: true
+              // Force removal since it's not tracked
+            }, { cwd: this.bareRepoPath });
+            if (removeResult.success) {
+              removed.push(dirName);
+              console.log(`[WorktreeManager] EP1190: Removed non-module worktree: ${dirName}`);
+            } else {
+              errors.push(`Failed to remove ${dirName}: ${removeResult.output}`);
+            }
+          } catch (removeError) {
+            errors.push(`Error removing ${dirName}: ${removeError.message}`);
+          }
+        }
+      }
+    } catch (error) {
+      errors.push(`Validation error: ${error.message}`);
+    }
+    return { removed, errors };
+  }
   /**
    * Get project configuration
    */
@@ -9425,7 +9467,6 @@ async function fetchEnvVars2() {
   }
 }
 var Daemon = class _Daemon {
-  // 60 seconds
   constructor() {
     this.machineId = "";
     this.machineUuid = null;
@@ -9464,6 +9505,9 @@ var Daemon = class _Daemon {
     // Health checks are orthogonal to push-based state sync - they detect dead tunnels
     this.healthCheckInterval = null;
     this.healthCheckInProgress = false;
+    // 60 seconds
+    // EP1190: Worktree cleanup runs every N health checks (5 * 60s = 5 minutes)
+    this.healthCheckCounter = 0;
     this.ipcServer = new IPCServer();
   }
   static {
@@ -9480,6 +9524,9 @@ var Daemon = class _Daemon {
   static {
     this.HEALTH_CHECK_INTERVAL_MS = 6e4;
   }
+  static {
+    this.WORKTREE_CLEANUP_EVERY_N_CHECKS = 5;
+  }
   /**
    * Start the daemon
    */
@@ -9555,6 +9602,8 @@ var Daemon = class _Daemon {
         // EP1091: New preferred field name
         deviceId: this.machineUuid,
         // EP726: Kept for backward compatibility
+        machineName: this.deviceName,
+        // EP1186: User-friendly machine name from server
         hostname: os8.hostname(),
         platform: os8.platform(),
         arch: os8.arch(),
@@ -10374,6 +10423,10 @@ var Daemon = class _Daemon {
     client.on("machine_uuid_update", async (message) => {
       try {
         const uuidMsg = message;
+        if (uuidMsg.machineName) {
+          this.deviceName = uuidMsg.machineName;
+          console.log(`[Daemon] EP1186: Machine name updated: ${this.deviceName}`);
+        }
         if (uuidMsg.machineUuid) {
           this.machineUuid = uuidMsg.machineUuid;
           console.log(`[Daemon] EP1095: Machine UUID updated: ${this.machineUuid}`);
@@ -11211,6 +11264,11 @@ var Daemon = class _Daemon {
         if (config?.access_token) {
           await this.performHealthChecks(config);
         }
+        this.healthCheckCounter++;
+        if (this.healthCheckCounter >= _Daemon.WORKTREE_CLEANUP_EVERY_N_CHECKS) {
+          this.healthCheckCounter = 0;
+          await this.auditWorktreesOnStartup();
+        }
       } catch (error) {
         console.error("[Daemon] EP929: Health check error:", error instanceof Error ? error.message : error);
       } finally {
@@ -11397,6 +11455,19 @@ var Daemon = class _Daemon {
           console.warn("[Daemon] EP1035: Failed to prune stale worktrees:", pruneError.message);
         }
       }
+      try {
+        const cleanupResult = await manager.cleanupNonModuleWorktrees();
+        if (cleanupResult.removed.length > 0) {
+          console.log(`[Daemon] EP1190: Cleaned up ${cleanupResult.removed.length} non-module worktree(s): ${cleanupResult.removed.join(", ")}`);
+        }
+        if (cleanupResult.errors.length > 0) {
+          for (const err of cleanupResult.errors) {
+            console.warn(`[Daemon] EP1190: Non-module cleanup error: ${err}`);
+          }
+        }
+      } catch (cleanupError) {
+        console.warn("[Daemon] EP1190: Failed to cleanup non-module worktrees:", cleanupError.message);
+      }
     } catch (error) {
       console.warn(`[Daemon] EP1035: Failed to audit ${projectPath}:`, error);
     }