episoda 0.2.45 → 0.2.47

package/dist/daemon/daemon-process.js

@@ -821,14 +821,25 @@ var require_git_executor = __commonJS({
         const baseBranch = command.baseBranch || "main";
         try {
           let stdout;
+          let comparisonSucceeded = false;
           try {
-            const result = await execAsync2(`git log ${baseBranch}.."${command.branch}" --pretty=format:"%H|%an|%ae|%aI|%s" -n ${limit} --`, { cwd, timeout: options?.timeout || 1e4 });
+            const result = await execAsync2(`git log origin/${baseBranch}.."${command.branch}" --pretty=format:"%H|%an|%ae|%aI|%s" -n ${limit} --`, { cwd, timeout: options?.timeout || 1e4 });
             stdout = result.stdout;
-          } catch (error) {
+            comparisonSucceeded = true;
+          } catch {
             try {
-              const result = await execAsync2(`git log "${command.branch}" --pretty=format:"%H|%an|%ae|%aI|%s" -n ${limit} --`, { cwd, timeout: options?.timeout || 1e4 });
+              const result = await execAsync2(`git log ${baseBranch}.."${command.branch}" --pretty=format:"%H|%an|%ae|%aI|%s" -n ${limit} --`, { cwd, timeout: options?.timeout || 1e4 });
               stdout = result.stdout;
-            } catch (branchError) {
+              comparisonSucceeded = true;
+            } catch {
+              stdout = "";
+              comparisonSucceeded = false;
+            }
+          }
+          if (!comparisonSucceeded) {
+            try {
+              await execAsync2(`git rev-parse --verify "${command.branch}"`, { cwd, timeout: options?.timeout || 5e3 });
+            } catch {
               return {
                 success: false,
                 error: "BRANCH_NOT_FOUND",
@@ -2682,7 +2693,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "episoda",
-      version: "0.2.45",
+      version: "0.2.47",
       description: "CLI tool for Episoda local development workflow orchestration",
       main: "dist/index.js",
       types: "dist/index.d.ts",
@@ -4096,14 +4107,11 @@ var TUNNEL_PID_DIR = path7.join(os2.homedir(), ".episoda", "tunnels");
 var TUNNEL_TIMEOUTS = {
   /** Time to wait for Named Tunnel connection (includes API token fetch + connect) */
   NAMED_TUNNEL_CONNECT: 6e4,
-  /** Time to wait for Quick Tunnel connection (simpler, faster connection) */
-  QUICK_TUNNEL_CONNECT: 3e4,
   /** Time to wait for cloudflared process to start before giving up */
   PROCESS_START: 1e4,
   /** Grace period after starting cloudflared before checking status */
   STARTUP_GRACE: 2e3
 };
-var TUNNEL_URL_REGEX = /https:\/\/[a-z0-9-]+\.trycloudflare\.com/i;
 var DEFAULT_RECONNECT_CONFIG = {
   maxRetries: 5,
   initialDelayMs: 1e3,
@@ -4558,151 +4566,21 @@ var TunnelManager = class extends import_events.EventEmitter {
     });
   }
   /**
-   * EP948: Route to the appropriate tunnel process method based on mode
+   * EP948: Start tunnel process (Named Tunnels only)
+   * EP1020: Removed Quick Tunnel fallback - Named Tunnels are the only supported mode
    */
   async startTunnelProcess(options, existingState) {
-    const mode = options.mode || "named";
-    if (mode === "named" && options.tunnelToken) {
-      return this.startNamedTunnelProcess(options, existingState);
-    }
-    console.log(`[Tunnel] EP948: Using Quick Tunnel mode for ${options.moduleUid}`);
-    return this.startQuickTunnelProcess(options, existingState);
-  }
-  /**
-   * EP672-9: Internal method to start the tunnel process (Quick Tunnel mode)
-   * Separated from startTunnel to support reconnection
-   */
-  async startQuickTunnelProcess(options, existingState) {
-    const { moduleUid, port = 3e3, onUrl, onStatusChange } = options;
-    if (!this.cloudflaredPath) {
-      try {
-        this.cloudflaredPath = await ensureCloudflared();
-      } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        return { success: false, error: `Failed to get cloudflared: ${errorMessage}` };
-      }
-    }
-    return new Promise((resolve3) => {
-      const tunnelInfo = {
-        moduleUid,
-        url: "",
-        port,
-        status: "starting",
-        startedAt: /* @__PURE__ */ new Date(),
-        process: null
-        // Will be set below
-      };
-      const process2 = (0, import_child_process6.spawn)(this.cloudflaredPath, [
-        "tunnel",
-        "--url",
-        `http://localhost:${port}`
-      ], {
-        stdio: ["ignore", "pipe", "pipe"]
-      });
-      tunnelInfo.process = process2;
-      tunnelInfo.pid = process2.pid;
-      if (process2.pid) {
-        this.writePidFile(moduleUid, process2.pid);
-      }
-      const state = existingState || {
-        info: tunnelInfo,
-        options,
-        intentionallyStopped: false,
-        retryCount: 0,
-        retryTimeoutId: null
-      };
-      state.info = tunnelInfo;
-      this.tunnelStates.set(moduleUid, state);
-      let urlFound = false;
-      let stdoutBuffer = "";
-      let stderrBuffer = "";
-      const parseOutput = (data) => {
-        if (urlFound) return;
-        const match = data.match(TUNNEL_URL_REGEX);
-        if (match) {
-          urlFound = true;
-          tunnelInfo.url = match[0];
-          tunnelInfo.status = "connected";
-          onStatusChange?.("connected");
-          onUrl?.(tunnelInfo.url);
-          this.emitEvent({
-            type: "started",
-            moduleUid,
-            url: tunnelInfo.url
-          });
-          resolve3({ success: true, url: tunnelInfo.url });
-        }
+    if (!options.tunnelToken) {
+      console.error(`[Tunnel] EP1020: No tunnel token available for ${options.moduleUid}`);
+      return {
+        success: false,
+        error: "Named Tunnel token required. Quick Tunnels are no longer supported."
       };
-      process2.stdout?.on("data", (data) => {
-        stdoutBuffer += data.toString();
-        parseOutput(stdoutBuffer);
-      });
-      process2.stderr?.on("data", (data) => {
-        stderrBuffer += data.toString();
-        parseOutput(stderrBuffer);
-      });
-      process2.on("exit", (code, signal) => {
-        const wasConnected = tunnelInfo.status === "connected";
-        tunnelInfo.status = "disconnected";
-        const currentState = this.tunnelStates.get(moduleUid);
-        if (!urlFound) {
-          const errorMsg = `Tunnel process exited with code ${code}`;
-          tunnelInfo.status = "error";
-          tunnelInfo.error = errorMsg;
-          if (currentState && !currentState.intentionallyStopped) {
-            this.attemptReconnect(moduleUid);
-          } else {
-            this.tunnelStates.delete(moduleUid);
-            onStatusChange?.("error", errorMsg);
-            this.emitEvent({ type: "error", moduleUid, error: errorMsg });
-          }
-          resolve3({ success: false, error: errorMsg });
-        } else if (wasConnected) {
-          if (currentState && !currentState.intentionallyStopped) {
-            console.log(`[Tunnel] ${moduleUid} crashed unexpectedly, attempting reconnect...`);
-            onStatusChange?.("reconnecting");
-            this.attemptReconnect(moduleUid);
-          } else {
-            this.tunnelStates.delete(moduleUid);
-            onStatusChange?.("disconnected");
-            this.emitEvent({ type: "stopped", moduleUid });
-          }
-        }
-      });
-      process2.on("error", (error) => {
-        tunnelInfo.status = "error";
-        tunnelInfo.error = error.message;
-        const currentState = this.tunnelStates.get(moduleUid);
-        if (currentState && !currentState.intentionallyStopped) {
-          this.attemptReconnect(moduleUid);
-        } else {
-          this.tunnelStates.delete(moduleUid);
-          onStatusChange?.("error", error.message);
-          this.emitEvent({ type: "error", moduleUid, error: error.message });
-        }
-        if (!urlFound) {
-          resolve3({ success: false, error: error.message });
-        }
-      });
-      setTimeout(() => {
-        if (!urlFound) {
-          process2.kill();
-          const errorMsg = "Tunnel startup timed out after 30 seconds";
-          tunnelInfo.status = "error";
-          tunnelInfo.error = errorMsg;
-          const currentState = this.tunnelStates.get(moduleUid);
-          if (currentState && !currentState.intentionallyStopped) {
-            this.attemptReconnect(moduleUid);
-          } else {
-            this.tunnelStates.delete(moduleUid);
-            onStatusChange?.("error", errorMsg);
-            this.emitEvent({ type: "error", moduleUid, error: errorMsg });
-          }
-          resolve3({ success: false, error: errorMsg });
-        }
-      }, TUNNEL_TIMEOUTS.QUICK_TUNNEL_CONNECT);
-    });
+    }
+    return this.startNamedTunnelProcess(options, existingState);
   }
+  // EP1020: startQuickTunnelProcess removed - Quick Tunnels no longer supported
+  // All tunnels now use Named Tunnels via Cloudflare API
   /**
    * Start a tunnel for a module
    *
@@ -4771,8 +4649,11 @@ var TunnelManager = class extends import_events.EventEmitter {
           previewUrl: provisionResult.tunnel.preview_url
         };
       } else {
-        console.warn(`[Tunnel] EP948: Named Tunnel provisioning failed: ${provisionResult.error}. Falling back to Quick Tunnel.`);
-        resolvedOptions = { ...resolvedOptions, mode: "quick" };
+        console.error(`[Tunnel] EP1020: Named Tunnel provisioning failed for ${moduleUid}: ${provisionResult.error}`);
+        return {
+          success: false,
+          error: `Named Tunnel provisioning failed: ${provisionResult.error}`
+        };
       }
     }
     return this.startTunnelProcess(resolvedOptions);
@@ -9254,18 +9135,6 @@ var Daemon = class _Daemon {
         const result2 = await previewManager.restartPreview(moduleUid);
         if (result2.success && result2.previewUrl) {
           console.log(`[Daemon] EP833: Preview restarted for ${moduleUid}: ${result2.previewUrl}`);
-          try {
-            await fetchWithAuth(`${apiUrl}/api/modules/${moduleUid}/tunnel`, {
-              method: "POST",
-              body: JSON.stringify({
-                tunnel_url: result2.previewUrl,
-                tunnel_error: null,
-                restart_reason: "health_check_failure"
-              })
-            });
-          } catch (e) {
-            console.warn(`[Daemon] EP833: Failed to report restarted tunnel URL`);
-          }
         } else {
           console.error(`[Daemon] EP833: Preview restart failed for ${moduleUid}: ${result2.error}`);
         }
@@ -9290,18 +9159,6 @@ var Daemon = class _Daemon {
       });
       if (result.success && result.previewUrl) {
         console.log(`[Daemon] EP833: Preview started for ${moduleUid}: ${result.previewUrl}`);
-        try {
-          await fetchWithAuth(`${apiUrl}/api/modules/${moduleUid}/tunnel`, {
-            method: "POST",
-            body: JSON.stringify({
-              tunnel_url: result.previewUrl,
-              tunnel_error: null,
-              restart_reason: "health_check_failure"
-            })
-          });
-        } catch (e) {
-          console.warn(`[Daemon] EP833: Failed to report restarted tunnel URL`);
-        }
       } else {
         console.error(`[Daemon] EP833: Preview start failed for ${moduleUid}: ${result.error}`);
       }