@pmate/cli 0.21.6 → 0.21.7

package/dist/index.js

@@ -11660,7 +11660,7 @@ var PrepareDevCommandHandler = class {
       this.renderOpen(result2, args.json);
       return result2;
     }
-    const result = await this.closeEnvironment(args.repo, args.envIndex, envRoot);
+    const result = await this.closeEnvironment(args.repo, args.envIndex, envRoot, baseRoot);
     this.renderClose(result, args.json);
     return result;
   }
@@ -11732,9 +11732,10 @@ var PrepareDevCommandHandler = class {
     }
     throw new Error(`No available dev environment found for ${repo} under ${envRoot}`);
   }
-  async closeEnvironment(repo, envIndex, envRoot) {
+  async closeEnvironment(repo, envIndex, envRoot, baseRoot) {
     const envPath = import_node_path10.default.join(envRoot, `${repo}-${envIndex}`);
     const lockPath = import_node_path10.default.join(envPath, LOCK_FILE_NAME);
+    const baseRepoPath = import_node_path10.default.join(baseRoot, repo);
     if (!await this.pathExists(envPath) || !await this.pathExists(import_node_path10.default.join(envPath, ".git"))) {
       throw new Error(`Dev environment not found: ${envPath}`);
     }
@@ -11744,6 +11745,7 @@ var PrepareDevCommandHandler = class {
         `Cannot close ${repo}-${envIndex}: local changes detected. Commit or clean the worktree first.`
       );
     }
+    const baseRepoSync = await this.syncBaseRepo(baseRepoPath);
     const removedLock = await this.removeLock(lockPath);
     return {
       action: "close",
@@ -11751,7 +11753,9 @@ var PrepareDevCommandHandler = class {
       envIndex,
       envPath,
       lockPath,
-      removedLock
+      removedLock,
+      baseRepoPath,
+      baseRepoSync
     };
   }
   resolveRoot(input, fallbackSegments) {
@@ -11766,6 +11770,33 @@ var PrepareDevCommandHandler = class {
       throw new Error(`Expected ${cwd} to be on main, got ${branch || "(detached)"}`);
     }
   }
+  async syncBaseRepo(baseRepoPath) {
+    if (!await this.pathExists(baseRepoPath) || !await this.pathExists(import_node_path10.default.join(baseRepoPath, ".git"))) {
+      throw new Error(`Cannot close dev environment: base repo not found: ${baseRepoPath}`);
+    }
+    const origin = await this.safeGitOutput(baseRepoPath, ["remote", "get-url", "origin"]);
+    if (!origin || this.isLocalOrigin(origin)) {
+      throw new Error(
+        `Cannot close dev environment: base repo has invalid origin: ${baseRepoPath}`
+      );
+    }
+    const branch = await this.safeGitOutput(baseRepoPath, ["branch", "--show-current"]);
+    if (branch !== "main") {
+      throw new Error(
+        `Cannot close dev environment: base repo must be on main before sync, got ${branch || "(detached)"}.`
+      );
+    }
+    if (await this.hasUncommittedChanges(baseRepoPath)) {
+      throw new Error(
+        `Cannot close dev environment: base repo has local changes: ${baseRepoPath}`
+      );
+    }
+    await this.runGit(["pull", "--ff-only"], baseRepoPath);
+    return {
+      attempted: true,
+      updated: true
+    };
+  }
   async hasUncommittedChanges(cwd) {
     const status = await this.getGitOutput(cwd, ["status", "--porcelain"]);
     if (!status) {
@@ -11851,7 +11882,9 @@ var PrepareDevCommandHandler = class {
     }
     ui.success(`Closed ${result.repo}-${result.envIndex}`, {
       path: result.envPath,
-      lockRemoved: result.removedLock
+      lockRemoved: result.removedLock,
+      baseRepo: result.baseRepoPath,
+      baseRepoSynced: result.baseRepoSync.updated
     });
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.21.6",
+  "version": "0.21.7",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {