@pmate/cli 0.29.8 → 0.29.9

package/dist/index.js

@@ -19381,8 +19381,11 @@ var ServiceRuntimeRunner = class {
       `cd "${repoDir}"`,
       `if [ -f ~/.profile ]; then . ~/.profile; fi`,
       `if [ -f ~/.bashrc ]; then . ~/.bashrc; fi`,
-      `if [ -n "$(git status --porcelain)" ]; then git reset --hard HEAD; git clean -fd; fi`,
-      `git pull --rebase`,
+      ...server === "local" ? [
+        `test "$(git branch --show-current)" = main || { echo 'Local service checkout must be on main' >&2; exit 1; }`,
+        `test -z "$(git status --porcelain)" || { echo 'Local service checkout has uncommitted changes; refusing to discard them' >&2; exit 1; }`,
+        `git pull --ff-only origin main`
+      ] : [`if [ -n "$(git status --porcelain)" ]; then git reset --hard HEAD; git clean -fd; fi`, `git pull --rebase`],
       ...envSyncCommand ? [envSyncCommand] : [],
       `"${scriptPath}" restart --env ${shellQuote2(envName)}`
     ].join(" && ");
@@ -20255,6 +20258,7 @@ var ServiceRuntimeRunner = class {
     });
   }
   runRemoteCommand(server, command) {
+    if (server === "local") return this.runCommandWithEnv("bash", ["-c", command], import_node_os10.default.homedir());
     return new Promise((resolve, reject) => {
       const target = `pmate@${server}`;
       const child = (0, import_node_child_process10.spawn)("ssh", buildSshBashArgs(target, command), { stdio: "inherit" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.29.8",
+  "version": "0.29.9",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {
@@ -11,6 +11,16 @@
   "files": [
     "dist"
   ],
+  "scripts": {
+    "build": "npm run clean && tsup --config tsup.config.ts && node scripts/copy-templates.js",
+    "clean": "rimraf dist",
+    "dev": "ts-node src/index.ts",
+    "release": "pnpm publish",
+    "start": "node dist/index.js",
+    "test": "vitest run src/tests",
+    "typecheck": "tsc --noEmit",
+    "prepare": "npm run build"
+  },
   "keywords": [
     "cli",
     "typescript",
@@ -57,13 +67,10 @@
     "typescript": "^5.9.3",
     "vitest": "^4.0.17"
   },
-  "scripts": {
-    "build": "npm run clean && tsup --config tsup.config.ts && node scripts/copy-templates.js",
-    "clean": "rimraf dist",
-    "dev": "ts-node src/index.ts",
-    "release": "pnpm publish",
-    "start": "node dist/index.js",
-    "test": "vitest run src/tests",
-    "typecheck": "tsc --noEmit"
+  "pnpm": {
+    "overrides": {
+      "@pmate/meta": "^1.3.1",
+      "@pmate/utils": "^1.1.4"
+    }
   }
-}
+}