episoda 0.2.22 → 0.2.24

package/dist/index.js

@@ -530,6 +530,24 @@ var require_git_executor = __commonJS({
        * Execute status command
        */
       async executeStatus(cwd, options) {
+        try {
+          const isBareResult = await execAsync("git rev-parse --is-bare-repository", { cwd, timeout: 5e3 });
+          if (isBareResult.stdout.trim() === "true") {
+            const headResult = await execAsync("git symbolic-ref --short HEAD", { cwd, timeout: 5e3 });
+            const branchName = headResult.stdout.trim();
+            return {
+              success: true,
+              output: `## ${branchName}`,
+              details: {
+                uncommittedFiles: [],
+                // No working tree in bare repo
+                branchName,
+                currentBranch: branchName
+              }
+            };
+          }
+        } catch {
+        }
         const result = await this.runGitCommand(["status", "--porcelain", "-b"], cwd, options);
         if (result.success && result.output) {
           const statusInfo = (0, git_parser_1.parseGitStatus)(result.output);
@@ -1861,7 +1879,6 @@ var require_git_executor = __commonJS({
           const fs11 = await Promise.resolve().then(() => __importStar(require("fs"))).then((m) => m.promises);
           const path13 = await Promise.resolve().then(() => __importStar(require("path")));
           let currentPath = cwd;
-          let worktreeMode = false;
           let projectPath = cwd;
           let bareRepoPath;
           for (let i = 0; i < 10; i++) {
@@ -1870,7 +1887,6 @@ var require_git_executor = __commonJS({
             try {
               await fs11.access(bareDir);
               await fs11.access(episodaDir);
-              worktreeMode = true;
               projectPath = currentPath;
               bareRepoPath = bareDir;
               break;
@@ -1884,9 +1900,8 @@ var require_git_executor = __commonJS({
           }
           return {
             success: true,
-            output: worktreeMode ? "Worktree mode project" : "Standard git project",
+            output: bareRepoPath ? "Episoda project" : "Git repository",
             details: {
-              worktreeMode,
               projectPath,
               bareRepoPath
             }
@@ -2468,7 +2483,7 @@ var require_auth = __commonJS({
     exports2.getConfigDir = getConfigDir5;
     exports2.getConfigPath = getConfigPath4;
     exports2.loadConfig = loadConfig6;
-    exports2.saveConfig = saveConfig4;
+    exports2.saveConfig = saveConfig3;
     exports2.validateToken = validateToken;
     var fs11 = __importStar(require("fs"));
     var path13 = __importStar(require("path"));
@@ -2518,7 +2533,7 @@ var require_auth = __commonJS({
         return null;
       }
     }
-    async function saveConfig4(config, configPath) {
+    async function saveConfig3(config, configPath) {
       const fullPath = getConfigPath4(configPath);
       ensureConfigDir(fullPath);
       try {
@@ -3172,7 +3187,8 @@ var WorktreeManager = class _WorktreeManager {
   }
   /**
    * Initialize worktree manager from existing project root
-   * @returns true if valid worktree project, false otherwise
+   * EP971: All projects use worktree architecture
+   * @returns true if valid project, false otherwise
    */
   async initialize() {
     if (!fs3.existsSync(this.bareRepoPath)) {
@@ -3183,7 +3199,7 @@ var WorktreeManager = class _WorktreeManager {
     }
     try {
       const config = this.readConfig();
-      return config?.worktreeMode === true;
+      return config !== null;
     } catch {
       return false;
     }
@@ -3208,7 +3224,6 @@ var WorktreeManager = class _WorktreeManager {
       workspaceSlug,
       projectSlug,
       bareRepoPath: manager.bareRepoPath,
-      worktreeMode: true,
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
       worktrees: []
     };
@@ -3740,6 +3755,60 @@ async function findProjectRoot(startPath) {
   return null;
 }
 
+// src/api/machine-settings.ts
+async function fetchProjectPath(config, projectId) {
+  if (!config.device_id || !config.access_token) {
+    return null;
+  }
+  const serverUrl = config.api_url || "https://episoda.dev";
+  const url = `${serverUrl}/api/dev/machines/${config.device_id}/project-path/${projectId}`;
+  try {
+    const response = await fetch(url, {
+      method: "GET",
+      headers: {
+        "Authorization": `Bearer ${config.access_token}`,
+        "Content-Type": "application/json"
+      }
+    });
+    if (!response.ok) {
+      if (response.status === 404) {
+        return null;
+      }
+      console.debug(`[MachineSettings] fetchProjectPath failed: ${response.status} ${response.statusText}`);
+      return null;
+    }
+    const data = await response.json();
+    return data.data?.path || null;
+  } catch (error) {
+    console.debug(`[MachineSettings] fetchProjectPath network error:`, error);
+    return null;
+  }
+}
+async function syncProjectPath(config, projectId, path13) {
+  if (!config.device_id || !config.access_token) {
+    return false;
+  }
+  const serverUrl = config.api_url || "https://episoda.dev";
+  const url = `${serverUrl}/api/dev/machines/${config.device_id}/project-path/${projectId}`;
+  try {
+    const response = await fetch(url, {
+      method: "PUT",
+      headers: {
+        "Authorization": `Bearer ${config.access_token}`,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({ path: path13 })
+    });
+    if (!response.ok) {
+      console.debug(`[MachineSettings] syncProjectPath failed: ${response.status} ${response.statusText}`);
+    }
+    return response.ok;
+  } catch (error) {
+    console.debug(`[MachineSettings] syncProjectPath network error:`, error);
+    return false;
+  }
+}
+
 // src/commands/dev.ts
 var CONNECTION_MAX_RETRIES = 3;
 function findGitRoot(startDir) {
@@ -3798,14 +3867,11 @@ async function devCommand(options = {}) {
         await new Promise((resolve4) => setTimeout(resolve4, 2e3));
       }
     }
-    const serverUrl = config.api_url || process.env.EPISODA_API_URL || "https://episoda.dev";
     let projectPath;
-    const SETTINGS_CACHE_TTL = 24 * 60 * 60 * 1e3;
-    const cachedSettings = config.project_settings;
-    const isCacheFresh = cachedSettings?.cached_at && Date.now() - cachedSettings.cached_at < SETTINGS_CACHE_TTL;
-    if (isCacheFresh && cachedSettings?.local_project_path) {
-      projectPath = cachedSettings.local_project_path;
-      status.debug(`Using cached project path: ${projectPath}`);
+    const serverPath = await fetchProjectPath(config, config.project_id);
+    if (serverPath && fs4.existsSync(serverPath)) {
+      projectPath = serverPath;
+      status.debug(`Using server-synced project path: ${projectPath}`);
     } else {
       const detectedRoot = findGitRoot(options.cwd || process.cwd());
       projectPath = detectedRoot || path5.resolve(options.cwd || process.cwd());
@@ -3814,44 +3880,19 @@ async function devCommand(options = {}) {
       } else {
         status.warning(`Could not detect git root, using: ${projectPath}`);
       }
-      const updatedConfig = {
-        ...config,
-        project_settings: {
-          ...cachedSettings,
-          local_project_path: projectPath,
-          cached_at: Date.now()
+      syncProjectPath(config, config.project_id, projectPath).then((synced) => {
+        if (synced) {
+          status.debug("Project path synced to server");
         }
-      };
-      await (0, import_core4.saveConfig)(updatedConfig);
-      status.debug("Cached project settings locally");
-      const settingsUrl = `${serverUrl}/api/projects/${config.project_id}/settings`;
-      fetch(settingsUrl, {
-        method: "PATCH",
-        headers: {
-          "Authorization": `Bearer ${config.access_token}`,
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({ local_project_path: projectPath })
       }).catch(() => {
       });
     }
     const isWorktree = await isWorktreeProject(projectPath);
     if (!isWorktree) {
-      const hasGitDir = fs4.existsSync(path5.join(projectPath, ".git"));
-      if (hasGitDir) {
-        status.error("This project is not in worktree mode.");
-        status.info("");
-        status.info("Episoda requires projects to be cloned in worktree mode.");
-        status.info("To set up this project:");
-        status.info("  1. Get the workspace/project slug from episoda.dev");
-        status.info("  2. Run: episoda clone {workspace}/{project}");
-        status.info("  3. Then: cd ~/episoda/{workspace}/{project}");
-        status.info("");
-      } else {
-        status.error("Not a git repository or worktree project.");
-        status.info("Run this command from within a project cloned with `episoda clone`.");
-        status.info("");
-      }
+      status.error("Not an Episoda project.");
+      status.info("");
+      status.info("Use `episoda clone {workspace}/{project}` to set up a project.");
+      status.info("");
       process.exit(1);
     }
     let daemonPid = isDaemonRunning();
@@ -5044,9 +5085,6 @@ function addProject2(projectId, projectPath, options) {
   if (existingByPath) {
     existingByPath.id = projectId;
     existingByPath.last_active = now;
-    if (options?.worktreeMode !== void 0) {
-      existingByPath.worktreeMode = options.worktreeMode;
-    }
     if (options?.bareRepoPath) {
       existingByPath.bareRepoPath = options.bareRepoPath;
     }
@@ -5066,8 +5104,7 @@ function addProject2(projectId, projectPath, options) {
     name: projectName,
     added_at: now,
     last_active: now,
-    // EP944: Worktree mode fields
-    worktreeMode: options?.worktreeMode,
+    // EP971: Bare repo path for worktree architecture
     bareRepoPath: options?.bareRepoPath
   };
   data.projects.push(newProject);
@@ -5105,7 +5142,7 @@ async function cloneCommand(slugArg, options = {}) {
       return;
     }
     throw new Error(
-      `Directory exists but is not a worktree project: ${projectPath}
+      `Directory exists but is not an Episoda project: ${projectPath}
 Please remove it manually or use a different location.`
     );
   }
@@ -5146,7 +5183,6 @@ Please configure a repository in the project settings on episoda.dev.`
     status.success("\u2713 Bootstrap scripts extracted");
     status.info("");
     addProject2(projectDetails.id, projectPath, {
-      worktreeMode: true,
       bareRepoPath
     });
     status.success("\u2713 Project registered with daemon");
@@ -5701,7 +5737,7 @@ import_commander.program.command("connect").description("Connect using a pre-aut
     process.exit(1);
   }
 });
-import_commander.program.command("dev").description("Connect to Episoda and start dev server (worktree mode required)").option("--auto-restart", "Auto-restart dev server if it crashes").option("--connection-only", "Connection-only mode (don't start dev server)").allowUnknownOption().action(async (options, cmd) => {
+import_commander.program.command("dev").description("Connect to Episoda and start dev server").option("--auto-restart", "Auto-restart dev server if it crashes").option("--connection-only", "Connection-only mode (don't start dev server)").allowUnknownOption().action(async (options, cmd) => {
   try {
     const args = process.argv.slice(process.argv.indexOf("dev") + 1);
     const separatorIndex = args.indexOf("--");
@@ -5740,7 +5776,7 @@ import_commander.program.command("disconnect").description("Disconnect from epis
     process.exit(1);
   }
 });
-import_commander.program.command("clone").description("Clone a project in worktree mode for multi-module development").argument("<workspace/project>", "Workspace and project slug (e.g., my-team/my-project)").option("--api-url <url>", "API URL (default: https://episoda.dev)").action(async (slug, options) => {
+import_commander.program.command("clone").description("Clone a project for multi-module development").argument("<workspace/project>", "Workspace and project slug (e.g., my-team/my-project)").option("--api-url <url>", "API URL (default: https://episoda.dev)").action(async (slug, options) => {
   try {
     await cloneCommand(slug, options);
   } catch (error) {