@pmate/cli 0.29.7 → 0.29.9

package/dist/index.d.ts

@@ -12,7 +12,6 @@ declare enum Command {
     Delete = "delete",
     Dev = "dev",
     Env = "env",
-    Pr = "pr",
     Commit = "commit",
     Summary = "summary",
     Linear = "linear",
@@ -124,11 +123,6 @@ type EnvCommandArgs = {
     envVerbose?: boolean;
     envCwd: string;
 };
-type PrCommandArgs = {
-    type: Command.Pr;
-    action: "create" | "merge";
-    prRef?: string;
-};
 type CommitCommandArgs = {
     type: Command.Commit;
     push: boolean;
@@ -1131,7 +1125,7 @@ type VercelDeploysCommandArgs = {
     lastWeek: boolean;
 };
 type VercelCommandArgs = VercelProjectsCommandArgs | VercelDeploysCommandArgs;
-type CommandArgs = NoneCommandArgs | ListCommandArgs | LoginCommandArgs | AddDnsCommandArgs | StsCommandArgs | BucketCommandArgs | DeployCommandArgs | LogCommandArgs | InitCommandArgs | DeleteCommandArgs | DevCommandArgs | EnvCommandArgs | PrCommandArgs | CommitCommandArgs | SummaryCommandArgs | QuizCommandArgs | ServiceCommandArgs | LinearCommandArgs | NotionCommandArgs | OssCommandArgs | QrcodeCommandArgs | RandomCommandArgs | CollectCommandArgs | ChatRoomCommandArgs | FunctionCommandArgs | WorkerCommandArgs | CallCommandArgs | NsCommandArgs | RoleCommandArgs | AccountCommandArgs | OrgCommandArgs | StoreCommandArgs | AppCommandArgs | VercelCommandArgs | HostCommandArgs;
+type CommandArgs = NoneCommandArgs | ListCommandArgs | LoginCommandArgs | AddDnsCommandArgs | StsCommandArgs | BucketCommandArgs | DeployCommandArgs | LogCommandArgs | InitCommandArgs | DeleteCommandArgs | DevCommandArgs | EnvCommandArgs | CommitCommandArgs | SummaryCommandArgs | QuizCommandArgs | ServiceCommandArgs | LinearCommandArgs | NotionCommandArgs | OssCommandArgs | QrcodeCommandArgs | RandomCommandArgs | CollectCommandArgs | ChatRoomCommandArgs | FunctionCommandArgs | WorkerCommandArgs | CallCommandArgs | NsCommandArgs | RoleCommandArgs | AccountCommandArgs | OrgCommandArgs | StoreCommandArgs | AppCommandArgs | VercelCommandArgs | HostCommandArgs;
 
 interface ParsedArgs {
     help: boolean;

package/dist/index.js

@@ -11512,54 +11512,6 @@ var PrCommandHandler = class {
   constructor(cwd = process.cwd()) {
     this.cwd = cwd;
   }
-  async handle(args) {
-    if (args.action === "merge") {
-      await this.handleMerge(args.prRef);
-      return;
-    }
-    await this.ensureGitRepo();
-    await this.ensureGhCli();
-    await this.ensureGhAuth();
-    const context = await this.getRepoContext();
-    let existingPrUrl = await this.findExistingPrUrl(context.currentBranch);
-    if (!this.hasLocalChanges(context)) {
-      await this.handleNoLocalChanges(context, existingPrUrl);
-      return;
-    }
-    const recentLog = await this.runCapture("git", [
-      "log",
-      "--oneline",
-      "-n",
-      "20"
-    ]);
-    console.log("Generating PR metadata using a PMate Function...");
-    const suggestion = await this.getAiSuggestion({
-      status: context.status,
-      diff: truncate(context.diff, 6e3),
-      diffCached: truncate(context.diffCached, 6e3),
-      recentLog: truncate(recentLog, 2e3),
-      baseBranch: context.baseBranch
-    });
-    this.assertNonEmpty("PR title", suggestion.prTitle);
-    this.assertNonEmpty("Commit message", suggestion.commitMessage);
-    const prTitle = normalizePrTitle(suggestion.prTitle);
-    if (prTitle !== suggestion.prTitle.trim()) {
-      ui.info("Normalized PR title", prTitle);
-    }
-    const headBranch = await this.ensureWorkBranch(context, suggestion);
-    if (headBranch !== context.currentBranch) {
-      existingPrUrl = await this.findExistingPrUrl(headBranch);
-    }
-    await this.commitIfNeeded(suggestion.commitMessage);
-    await this.rebaseOntoBase(context.baseBranch);
-    await this.pushBranchIfNeeded(headBranch, context.baseBranch);
-    await this.ensurePr(
-      existingPrUrl,
-      context.baseBranch,
-      headBranch,
-      prTitle
-    );
-  }
   async handleCommit(push = false) {
     await this.ensureGitRepo();
     const context = await this.getRepoContext();
@@ -19429,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(" && ");
@@ -20303,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" });
@@ -25956,8 +25912,6 @@ var HELP_TEXT = [
   `  ${import_chalk4.default.gray("                  <app-name> [--cwd <dir>]")}`,
   `  ${import_chalk4.default.cyan("env")}              Manage app env vars on the server`,
   `  ${import_chalk4.default.gray("                  <app-name> --list|--set <key> --value <value> [--delete <key>] [--cwd <dir>] [--verbose|-v]")}`,
-  `  ${import_chalk4.default.cyan("pr")}               Create or update GitHub PRs with AI assistance`,
-  `  ${import_chalk4.default.gray("                  merge [<pr>] (defaults: --squash --delete-branch)")}`,
   `  ${import_chalk4.default.cyan("commit")}           Create an AI-generated commit from local changes`,
   `  ${import_chalk4.default.gray("                  [--push] [--cwd <dir>]")}`,
   `  ${import_chalk4.default.cyan("summary")}          Summarize a GitHub PR with AI`,
@@ -26231,9 +26185,6 @@ function parseCommandArgs(args) {
   if (args.rest[0] === "env") {
     return parseEnvArgs(args.rest.slice(1));
   }
-  if (args.rest[0] === "pr") {
-    return parsePrArgs(args.rest.slice(1));
-  }
   if (args.rest[0] === "commit") {
     return parseCommitArgs(args.rest.slice(1));
   }
@@ -26597,29 +26548,6 @@ function parseEnvArgs(tokens) {
     envCwd: cwd
   };
 }
-function parsePrArgs(tokens) {
-  const rest = [...tokens];
-  if (rest[0] === "merge") {
-    rest.shift();
-    let prRef;
-    while (rest.length > 0) {
-      const token = rest.shift();
-      if (token.startsWith("-")) {
-        throw new Error(`Unknown pr merge option: ${token}`);
-      }
-      if (prRef) {
-        throw new Error(`Unexpected extra argument for pr merge: ${token}`);
-      }
-      prRef = token;
-    }
-    return { type: "pr" /* Pr */, action: "merge", prRef };
-  }
-  while (rest.length > 0) {
-    const token = rest.shift();
-    throw new Error(`Unknown pr option: ${token}`);
-  }
-  return { type: "pr" /* Pr */, action: "create" };
-}
 function parseCommitArgs(tokens) {
   const rest = [...tokens];
   let push = false;
@@ -27917,11 +27845,6 @@ async function main() {
         await handler.handle(commandArgs);
         return;
       }
-      case "pr" /* Pr */: {
-        const handler = new PrCommandHandler();
-        await handler.handle(commandArgs);
-        return;
-      }
       case "commit" /* Commit */: {
         const handler = new CommitCommandHandler();
         await handler.handle(commandArgs);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.29.7",
+  "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"
+    }
   }
-}
+}