@pmate/cli 0.24.3 → 0.24.5

package/dist/index.js

@@ -12234,6 +12234,7 @@ var PrCommandHandler = class {
     return Boolean(context.status.trim()) || Boolean(context.diff.trim()) || Boolean(context.diffCached.trim());
   }
   async handleNoLocalChanges(context, existingPrUrl) {
+    await this.pushCurrentBranchIfAheadOfRemote(context.currentBranch);
     if (existingPrUrl) {
       await this.pushBranchIfNeeded(context.currentBranch, context.baseBranch);
       ui.info(`PR already exists: ${existingPrUrl}`);
@@ -12436,6 +12437,51 @@ ${lines}`;
     ui.info(`Pushing branch ${branchName}`);
     await this.run("git", ["push", "-u", "origin", branchName]);
   }
+  async pushCurrentBranchIfAheadOfRemote(branchName) {
+    if (!branchName || branchName === "HEAD") {
+      throw new Error("Cannot inspect remote sync from detached HEAD.");
+    }
+    const remoteRef = await this.getRemoteTrackingRef(branchName);
+    if (!remoteRef) {
+      ui.info(`No remote branch found for ${branchName}; pushing branch`);
+      await this.pushCurrentBranch();
+      return;
+    }
+    const counts = (await this.runCapture("git", [
+      "rev-list",
+      "--left-right",
+      "--count",
+      `${remoteRef}...HEAD`
+    ])).trim().split(/\s+/).map((item) => Number(item));
+    const behind = counts[0] ?? 0;
+    const ahead = counts[1] ?? 0;
+    if (ahead <= 0) {
+      return;
+    }
+    if (behind > 0) {
+      ui.warn(
+        `Current branch is ${ahead} commit(s) ahead and ${behind} commit(s) behind ${remoteRef}; pushing may require reconciliation.`
+      );
+    }
+    await this.pushCurrentBranch();
+  }
+  async getRemoteTrackingRef(branchName) {
+    const upstream = (await this.runCapture(
+      "git",
+      ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"],
+      true
+    )).trim();
+    if (upstream) {
+      return upstream;
+    }
+    const originBranch = `origin/${branchName}`;
+    const hasOriginBranch = await this.run(
+      "git",
+      ["show-ref", "--verify", "--quiet", `refs/remotes/${originBranch}`],
+      true
+    );
+    return hasOriginBranch === 0 ? originBranch : "";
+  }
   async pushCurrentBranch() {
     const branchName = (await this.runCapture("git", ["rev-parse", "--abbrev-ref", "HEAD"])).trim();
     if (!branchName || branchName === "HEAD") {
@@ -18081,6 +18127,12 @@ var ServiceRegistryNotFoundError = class extends Error {
     this.name = "ServiceRegistryNotFoundError";
   }
 };
+var ServiceEnvNotFoundError = class extends Error {
+  constructor(appId) {
+    super(`Service env not found: ${appId}`);
+    this.name = "ServiceEnvNotFoundError";
+  }
+};
 var ServiceRegistryClient = class {
   constructor(baseUrl) {
     this.baseUrl = baseUrl;
@@ -18120,7 +18172,7 @@ var ServiceRegistryClient = class {
       payload
     );
   }
-  async listEnvItems(appId, options = {}) {
+  async listEnvItems(serviceId, options = {}) {
     const params = new URLSearchParams();
     if (options.scope) {
       params.set("scope", options.scope);
@@ -18130,14 +18182,14 @@ var ServiceRegistryClient = class {
     }
     const payload = await this.request(
       "GET",
-      `/apps/by-id/${encodeURIComponent(appId)}/env${params.size > 0 ? `?${params.toString()}` : ""}`
+      `/services/by-id/${encodeURIComponent(serviceId)}/env${params.size > 0 ? `?${params.toString()}` : ""}`
     );
     return payload.items;
   }
-  async resolveEnv(appId, options) {
+  async resolveEnv(serviceId, options) {
     return this.requestWithBody(
       "POST",
-      `/apps/by-id/${encodeURIComponent(appId)}/env/resolve`,
+      `/services/by-id/${encodeURIComponent(serviceId)}/env/resolve`,
       {
         stage: options.stage,
         ...options.branch ? { branch: options.branch } : {},
@@ -18145,6 +18197,35 @@ var ServiceRegistryClient = class {
       }
     );
   }
+  async pullEnv(serviceId, options) {
+    const pathname = `/services/by-id/${encodeURIComponent(serviceId)}/env/pull`;
+    const response = await fetch(`${this.resolveBaseUrl()}${pathname}`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${this.readToken()}`,
+        Accept: "application/json",
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        stage: options.stage,
+        ...options.branch ? { branch: options.branch } : {},
+        format: options.format
+      })
+    });
+    let payload = null;
+    try {
+      payload = await response.json();
+    } catch {
+      payload = null;
+    }
+    if (response.status === 404) {
+      throw new ServiceEnvNotFoundError(serviceId);
+    }
+    if (!response.ok || !payload?.success || payload.data === void 0) {
+      throw new Error(payload?.message || `Env pull failed with status ${response.status}`);
+    }
+    return payload.data;
+  }
   resolveBaseUrl() {
     return (this.baseUrl || process.env.PMATE_APPS_API_BASE_URL || "https://apps-api.pmate.chat").replace(/\/+$/, "");
   }
@@ -18226,6 +18307,9 @@ function normalizeRepository(repository) {
 
 // src/services/ServiceRuntimeRunner.ts
 var ServiceRuntimeRunner = class {
+  constructor(envProvider) {
+    this.envProvider = envProvider;
+  }
   async deploy(service, options = {}) {
     switch (this.getType(service)) {
       case "vite":
@@ -18612,6 +18696,7 @@ var ServiceRuntimeRunner = class {
       `pkg="${appDir}/package.json"`,
       `if [ -f "$pkg" ] && node -e 'const fs=require("node:fs"); const p=JSON.parse(fs.readFileSync(process.argv[1],"utf8")); process.exit(p?.scripts?.build ? 0 : 1);' "$pkg"; then (cd "${appDir}" && pnpm run build); fi`
     ].join("; ");
+    const envSyncCommand = await this.buildNodeEnvSyncCommand(service.id, appDir);
     const command = [
       `cd "$HOME"`,
       `[ -d "${repoDir}/.git" ] || git clone "${gitUrl}" "${repoDir}"`,
@@ -18621,6 +18706,7 @@ var ServiceRuntimeRunner = class {
       `if [ -n "$(git status --porcelain)" ]; then git reset --hard HEAD; git clean -fd; fi`,
       `git pull`,
       `pnpm install`,
+      ...envSyncCommand ? [envSyncCommand] : [],
       buildIfNeeded,
       `if [ -f "${appDir}/ecosystem.config.cjs" ]; then eco="${appDir}/ecosystem.config.cjs"; elif [ -f "${appDir}/ecosystem.config.js" ]; then eco="${appDir}/ecosystem.config.js"; else echo "Missing pm2 config: ${appDir}/ecosystem.config.cjs|.js" 1>&2; exit 2; fi`,
       pm2Start,
@@ -18628,6 +18714,33 @@ var ServiceRuntimeRunner = class {
     ].join(" && ");
     await this.runRemoteCommand(server, command);
   }
+  async buildNodeEnvSyncCommand(serviceId, appDir) {
+    if (!this.envProvider) {
+      return void 0;
+    }
+    let pulled;
+    try {
+      pulled = await this.envProvider(serviceId, { stage: "prod", format: "dotenv" });
+    } catch (error) {
+      if (error instanceof ServiceEnvNotFoundError) {
+        ui.warn(`No env found for ${serviceId}; skipping .env.local sync.`);
+        return void 0;
+      }
+      throw error;
+    }
+    const content = pulled?.content;
+    if (!content) {
+      ui.warn(`No env found for ${serviceId}; skipping .env.local sync.`);
+      return void 0;
+    }
+    const encodedContent = Buffer.from(content, "utf8").toString("base64");
+    return [
+      `env_local="${appDir}/.env.local"`,
+      `mkdir -p "$(dirname "$env_local")"`,
+      `printf '%s' ${shellQuote2(encodedContent)} | base64 --decode > "$env_local"`,
+      `echo "[pmate] Synced env to $env_local"`
+    ].join(" && ");
+  }
   async deployScriptManaged(service) {
     const network = this.getNetwork(service);
     const runner = this.getRunner(service);
@@ -19473,6 +19586,9 @@ var ServiceRuntimeRunner = class {
     return new Promise((resolve) => setTimeout(resolve, ms));
   }
 };
+function shellQuote2(value) {
+  return `'${value.replace(/'/g, `'\\''`)}'`;
+}
 
 // src/commands/ServiceCommandHandler.ts
 init_namespacedRef();
@@ -19480,7 +19596,9 @@ var ServiceCommandHandler = class {
   async handle(args) {
     const baseUrl = this.resolveBaseUrl(args.baseUrl);
     const registry = new ServiceRegistryClient(baseUrl);
-    const runtime = new ServiceRuntimeRunner();
+    const runtime = new ServiceRuntimeRunner(
+      (appId, options) => registry.pullEnv(appId, options)
+    );
     switch (args.action) {
       case "list": {
         const items = await registry.listServices({
@@ -19682,7 +19800,7 @@ var ServiceCommandHandler = class {
           "POST",
           `${this.buildEnvBasePath(args.targetAppId)}/copy-from`,
           {
-            sourceAppId: args.sourceAppId,
+            sourceServiceId: args.sourceAppId,
             ...args.scope ? { scope: args.scope } : {},
             ...args.includeSecret ? { includeSecret: true } : {},
             ...args.overwrite ? { overwrite: true } : {},
@@ -19733,7 +19851,7 @@ var ServiceCommandHandler = class {
     return payload.data;
   }
   buildEnvBasePath(appId) {
-    return `/apps/by-id/${encodeURIComponent(appId)}/env`;
+    return `/services/by-id/${encodeURIComponent(appId)}/env`;
   }
   buildEnvPath(appId, query) {
     const params = new URLSearchParams();

package/package.json

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