@pmate/cli 0.24.35 → 0.24.37

package/dist/index.js

@@ -9503,8 +9503,8 @@ __export(index_exports, {
   parseCommandArgs: () => parseCommandArgs
 });
 module.exports = __toCommonJS(index_exports);
-var import_node_fs23 = require("fs");
-var import_node_path27 = __toESM(require("path"));
+var import_node_fs24 = require("fs");
+var import_node_path28 = __toESM(require("path"));
 var import_chalk4 = __toESM(require("chalk"));
 
 // src/cli.ts
@@ -14957,9 +14957,9 @@ ${indent}\`\`\``;
   static richTextToPlain(richText) {
     return richText.map((item) => item.plain_text ?? item.text?.content ?? "").join("").trim();
   }
-  static async requestJson(path28, init) {
+  static async requestJson(path29, init) {
     const token = this.getToken();
-    const response = await fetch(`${this.baseUrl}${path28}`, {
+    const response = await fetch(`${this.baseUrl}${path29}`, {
       method: init.method,
       headers: {
         Authorization: `Bearer ${token}`,
@@ -16076,6 +16076,9 @@ var QuizCommandHandler = class {
 };
 
 // src/commands/CollectCommandHandler.ts
+var import_node_fs13 = require("fs");
+var import_node_os7 = __toESM(require("os"));
+var import_node_path18 = __toESM(require("path"));
 var import_playwright = require("playwright");
 
 // src/collectStore.ts
@@ -16278,6 +16281,12 @@ var CollectCommandHandler = class {
       collectedAt: syncedAt
     }));
     const merged = mergeMessages(existing?.messages ?? [], incoming);
+    const messagesWithArchivedImages = await archiveMessageImages(
+      rootDir,
+      target.sourceKey,
+      threadKey,
+      merged.messages
+    );
     const stored = {
       source: target.sourceKey,
       endpoint: target.endpoint,
@@ -16287,8 +16296,8 @@ var CollectCommandHandler = class {
       unread: thread.unread,
       lastMessageAt: thread.time,
       lastSyncedAt: syncedAt,
-      messageCount: merged.messages.length,
-      messages: merged.messages
+      messageCount: messagesWithArchivedImages.length,
+      messages: messagesWithArchivedImages
     };
     await writeStoredThread(rootDir, stored);
     return {
@@ -16439,6 +16448,50 @@ var CollectCommandHandler = class {
     }
   }
 };
+async function archiveMessageImages(rootDir, sourceKey, threadKey, messages2) {
+  const attachmentRoot = resolveLocalAttachmentRoot(sourceKey);
+  if (!attachmentRoot) {
+    return messages2;
+  }
+  return Promise.all(
+    messages2.map(async (message) => ({
+      ...message,
+      images: await Promise.all(
+        message.images.map(
+          (imagePath) => archiveMessageImage(rootDir, attachmentRoot, threadKey, imagePath)
+        )
+      )
+    }))
+  );
+}
+async function archiveMessageImage(rootDir, attachmentRoot, threadKey, imagePath) {
+  if (!imagePath || isExternalImageRef(imagePath) || imagePath.startsWith("attachments/")) {
+    return imagePath;
+  }
+  const normalized = import_node_path18.default.posix.normalize(imagePath.replace(/\\/g, "/"));
+  if (normalized.startsWith("../") || import_node_path18.default.posix.isAbsolute(normalized)) {
+    return imagePath;
+  }
+  const sourcePath = import_node_path18.default.join(attachmentRoot, ...normalized.split("/"));
+  const destinationRelativePath = import_node_path18.default.posix.join("attachments", threadKey, normalized);
+  const destinationPath = import_node_path18.default.join(rootDir, ...destinationRelativePath.split("/"));
+  try {
+    await import_node_fs13.promises.mkdir(import_node_path18.default.dirname(destinationPath), { recursive: true });
+    await import_node_fs13.promises.copyFile(sourcePath, destinationPath);
+    return destinationRelativePath;
+  } catch {
+    return imagePath;
+  }
+}
+function resolveLocalAttachmentRoot(sourceKey) {
+  if (sourceKey !== "cc" && sourceKey !== "yelling") {
+    return null;
+  }
+  return import_node_path18.default.join(import_node_os7.default.homedir(), "Library", "Application Support", sourceKey, "attachments.noindex");
+}
+function isExternalImageRef(imagePath) {
+  return /^[a-z][a-z0-9+.-]*:/i.test(imagePath);
+}
 function normalizeText(value) {
   return value.replace(/\s+/g, " ").replace(/\u200B/g, "").trim();
 }
@@ -16663,7 +16716,7 @@ function pad2(value) {
 }
 
 // src/commands/ChatRoomCommandHandler.ts
-var import_node_fs13 = require("fs");
+var import_node_fs14 = require("fs");
 var ChatRoomCommandHandler = class {
   async handle(args) {
     const sdk = await loadChatSdk();
@@ -16713,8 +16766,8 @@ var ChatRoomCommandHandler = class {
     const a = await this.connect(sdk, args.botA, args.app, args.hubUrl, args.authBaseUrl);
     const b = await this.connect(sdk, args.botB, args.app, args.hubUrl, args.authBaseUrl);
     try {
-      const botA = sdk.parsePmateBotKeyJson((0, import_node_fs13.readFileSync)(args.botA, "utf8"));
-      const botB = sdk.parsePmateBotKeyJson((0, import_node_fs13.readFileSync)(args.botB, "utf8"));
+      const botA = sdk.parsePmateBotKeyJson((0, import_node_fs14.readFileSync)(args.botA, "utf8"));
+      const botB = sdk.parsePmateBotKeyJson((0, import_node_fs14.readFileSync)(args.botB, "utf8"));
       await a.requestFriend({ to: botB.name, message: "smoke friend request" });
       await b.acceptFriend({ to: botA.name, message: "smoke friend accept" });
       await a.sendDm({ to: botB.name, text: "smoke dm from a" });
@@ -16733,7 +16786,7 @@ var ChatRoomCommandHandler = class {
     if (!botPath) {
       throw new Error("Missing required option: --bot");
     }
-    const botKey = sdk.parsePmateBotKeyJson((0, import_node_fs13.readFileSync)(botPath, "utf8"));
+    const botKey = sdk.parsePmateBotKeyJson((0, import_node_fs14.readFileSync)(botPath, "utf8"));
     const client = sdk.createChatClient({ appId, botKey, hubUrl, authBaseUrl });
     await client.connect();
     return client;
@@ -16745,8 +16798,8 @@ async function loadChatSdk() {
 }
 
 // src/commands/AgentCommandHandler.ts
-var import_node_fs14 = require("fs");
-var import_node_path18 = __toESM(require("path"));
+var import_node_fs15 = require("fs");
+var import_node_path19 = __toESM(require("path"));
 init_AgentLlmClient();
 init_sessionStore();
 
@@ -16779,8 +16832,8 @@ function descriptorPathSegments(descriptor) {
   return ["chains", normalized.chain, "namespaces", normalized.ns, normalized.kind, normalized.name];
 }
 function buildPathUrl(baseUrl, pathSegments, query) {
-  const path28 = `/${pathSegments.map((segment) => encodeURIComponent(segment)).join("/")}`;
-  const url = new URL(path28, baseUrl);
+  const path29 = `/${pathSegments.map((segment) => encodeURIComponent(segment)).join("/")}`;
+  const url = new URL(path29, baseUrl);
   if (query) {
     for (const [key, value] of Object.entries(query)) {
       url.searchParams.set(key, String(value));
@@ -17237,11 +17290,11 @@ var AgentCommandHandler = class {
     }).token;
   }
   readJsonFile(filePath) {
-    const absolutePath = import_node_path18.default.resolve(process.cwd(), filePath);
-    if (!(0, import_node_fs14.existsSync)(absolutePath)) {
+    const absolutePath = import_node_path19.default.resolve(process.cwd(), filePath);
+    if (!(0, import_node_fs15.existsSync)(absolutePath)) {
       throw new Error(`JSON file not found: ${absolutePath}`);
     }
-    const raw = (0, import_node_fs14.readFileSync)(absolutePath, "utf8");
+    const raw = (0, import_node_fs15.readFileSync)(absolutePath, "utf8");
     try {
       return JSON.parse(raw);
     } catch (error) {
@@ -17252,14 +17305,14 @@ var AgentCommandHandler = class {
   readJsonObjectFile(filePath) {
     const parsed = this.readJsonFile(filePath);
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-      const absolutePath = import_node_path18.default.resolve(process.cwd(), filePath);
+      const absolutePath = import_node_path19.default.resolve(process.cwd(), filePath);
       throw new Error(`Invalid JSON in ${absolutePath}: expected an object`);
     }
     return parsed;
   }
   tryReadJsonObjectFile(filePath) {
     const absolutePath = this.resolveExistingFile(filePath);
-    const raw = (0, import_node_fs14.readFileSync)(absolutePath, "utf8");
+    const raw = (0, import_node_fs15.readFileSync)(absolutePath, "utf8");
     try {
       const parsed = JSON.parse(raw);
       if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
@@ -17271,8 +17324,8 @@ var AgentCommandHandler = class {
     }
   }
   resolveExistingFile(filePath) {
-    const absolutePath = import_node_path18.default.resolve(process.cwd(), filePath);
-    if (!(0, import_node_fs14.existsSync)(absolutePath)) {
+    const absolutePath = import_node_path19.default.resolve(process.cwd(), filePath);
+    if (!(0, import_node_fs15.existsSync)(absolutePath)) {
       throw new Error(`File not found: ${absolutePath}`);
     }
     return absolutePath;
@@ -17356,8 +17409,8 @@ var AgentCommandHandler = class {
 };
 
 // src/commands/RunnerCommandHandler.ts
-var import_node_fs15 = require("fs");
-var import_node_path19 = __toESM(require("path"));
+var import_node_fs16 = require("fs");
+var import_node_path20 = __toESM(require("path"));
 init_sessionStore();
 init_namespacedRef();
 var RunnerCommandHandler = class {
@@ -17452,11 +17505,11 @@ var RunnerCommandHandler = class {
     }).token;
   }
   readJsonFile(filePath) {
-    const absolutePath = import_node_path19.default.resolve(process.cwd(), filePath);
-    if (!(0, import_node_fs15.existsSync)(absolutePath)) {
+    const absolutePath = import_node_path20.default.resolve(process.cwd(), filePath);
+    if (!(0, import_node_fs16.existsSync)(absolutePath)) {
       throw new Error(`JSON file not found: ${absolutePath}`);
     }
-    const raw = (0, import_node_fs15.readFileSync)(absolutePath, "utf8");
+    const raw = (0, import_node_fs16.readFileSync)(absolutePath, "utf8");
     try {
       return JSON.parse(raw);
     } catch (error) {
@@ -17575,8 +17628,8 @@ var NsCommandHandler = class {
 };
 
 // src/commands/StoreCommandHandler.ts
-var import_node_fs16 = require("fs");
-var import_node_path20 = __toESM(require("path"));
+var import_node_fs17 = require("fs");
+var import_node_path21 = __toESM(require("path"));
 var StoreCommandHandler = class {
   async handle(args) {
     if (args.scope === "namespace") {
@@ -17718,11 +17771,11 @@ var StoreCommandHandler = class {
     return payload.data ?? [];
   }
   readJsonFile(filePath) {
-    const absolutePath = import_node_path20.default.resolve(process.cwd(), filePath);
-    if (!(0, import_node_fs16.existsSync)(absolutePath)) {
+    const absolutePath = import_node_path21.default.resolve(process.cwd(), filePath);
+    if (!(0, import_node_fs17.existsSync)(absolutePath)) {
       throw new Error(`JSON file not found: ${absolutePath}`);
     }
-    const raw = (0, import_node_fs16.readFileSync)(absolutePath, "utf8");
+    const raw = (0, import_node_fs17.readFileSync)(absolutePath, "utf8");
     try {
       return JSON.parse(raw);
     } catch (error) {
@@ -17774,14 +17827,14 @@ var StoreCommandHandler = class {
 };
 
 // src/commands/AppCommandHandler.ts
-var import_node_fs18 = require("fs");
-var import_node_path22 = __toESM(require("path"));
+var import_node_fs19 = require("fs");
+var import_node_path23 = __toESM(require("path"));
 init_sessionStore();
 
 // src/appIcon.ts
-var import_node_fs17 = require("fs");
-var import_node_os7 = __toESM(require("os"));
-var import_node_path21 = __toESM(require("path"));
+var import_node_fs18 = require("fs");
+var import_node_os8 = __toESM(require("os"));
+var import_node_path22 = __toESM(require("path"));
 var import_sharp = __toESM(require("sharp"));
 init_namespacedRef();
 var ANDROID_ICON_SPECS = [
@@ -17886,13 +17939,13 @@ function createAppIconExportPlans(input) {
     if (!input.outDir) {
       throw new Error("App icon preset export requires --out-dir.");
     }
-    const outDir = import_node_path21.default.resolve(input.cwd, input.outDir);
-    (0, import_node_fs17.mkdirSync)(outDir, { recursive: true });
+    const outDir = import_node_path22.default.resolve(input.cwd, input.outDir);
+    (0, import_node_fs18.mkdirSync)(outDir, { recursive: true });
     return specs.map((spec) => ({
       width: spec.width,
       height: spec.height,
       format: "png",
-      outputPath: import_node_path21.default.join(
+      outputPath: import_node_path22.default.join(
         outDir,
         `${namespace}-${objectId}-${spec.name}-${spec.width}x${spec.height}.png`
       )
@@ -17905,8 +17958,8 @@ function createAppIconExportPlans(input) {
   if (!input.output) {
     throw new Error("Single-size app icon export requires --output.");
   }
-  const resolvedOutput = import_node_path21.default.resolve(input.cwd, input.output);
-  (0, import_node_fs17.mkdirSync)(import_node_path21.default.dirname(resolvedOutput), { recursive: true });
+  const resolvedOutput = import_node_path22.default.resolve(input.cwd, input.output);
+  (0, import_node_fs18.mkdirSync)(import_node_path22.default.dirname(resolvedOutput), { recursive: true });
   return [
     {
       width: input.width,
@@ -17920,7 +17973,7 @@ async function exportAppIcon(icon, plans) {
   const svg = await resolveAppIconSvg(icon);
   for (const plan of plans) {
     const bytes = await renderAppIcon(svg, plan.width, plan.height, plan.format);
-    (0, import_node_fs17.writeFileSync)(plan.outputPath, bytes);
+    (0, import_node_fs18.writeFileSync)(plan.outputPath, bytes);
   }
 }
 async function renderAppIconVariant(input) {
@@ -17928,9 +17981,9 @@ async function renderAppIconVariant(input) {
   const bytes = await renderAppIcon(svg, input.width, input.height, input.format);
   let outputPath;
   if (input.output) {
-    outputPath = import_node_path21.default.resolve(input.cwd, input.output);
-    (0, import_node_fs17.mkdirSync)(import_node_path21.default.dirname(outputPath), { recursive: true });
-    (0, import_node_fs17.writeFileSync)(outputPath, bytes);
+    outputPath = import_node_path22.default.resolve(input.cwd, input.output);
+    (0, import_node_fs18.mkdirSync)(import_node_path22.default.dirname(outputPath), { recursive: true });
+    (0, import_node_fs18.writeFileSync)(outputPath, bytes);
   }
   if (input.name) {
     return {
@@ -17951,7 +18004,7 @@ async function renderAppIconVariant(input) {
   };
 }
 async function loadAppIconVariantFile(input) {
-  const absolutePath = import_node_path21.default.resolve(input.cwd, input.filePath);
+  const absolutePath = import_node_path22.default.resolve(input.cwd, input.filePath);
   const format = inferVariantFormatFromPath(absolutePath);
   return {
     value: input.name ? await uploadAppIconVariantAsset({
@@ -17960,7 +18013,7 @@ async function loadAppIconVariantFile(input) {
       name: input.name,
       format,
       sourcePath: absolutePath
-    }) : createImageDataUrl((0, import_node_fs17.readFileSync)(absolutePath), format),
+    }) : createImageDataUrl((0, import_node_fs18.readFileSync)(absolutePath), format),
     format,
     absolutePath
   };
@@ -18019,7 +18072,7 @@ function shouldAutoGenerateDefaultVariant(icon) {
   return looksLikeSvgMarkup(icon) || looksLikeSvgUrl(icon);
 }
 function inferVariantFormatFromPath(filePath) {
-  const ext = import_node_path21.default.extname(filePath).toLowerCase();
+  const ext = import_node_path22.default.extname(filePath).toLowerCase();
   switch (ext) {
     case ".png":
       return "png";
@@ -18090,13 +18143,13 @@ async function uploadAppIconVariantAsset(input) {
     await AliyunService.uploadFile(sourcePath, DEFAULT_APP_ICON_VARIANT_BUCKET, objectKey);
   } finally {
     if (shouldCleanup) {
-      (0, import_node_fs17.rmSync)(import_node_path21.default.dirname(sourcePath), { recursive: true, force: true });
+      (0, import_node_fs18.rmSync)(import_node_path22.default.dirname(sourcePath), { recursive: true, force: true });
     }
   }
   return `${DEFAULT_APP_ICON_VARIANT_PUBLIC_BASE_URL}/${objectKey}`;
 }
 function buildAppIconVariantObjectKey(input) {
-  return import_node_path21.default.posix.join(
+  return import_node_path22.default.posix.join(
     "apps",
     `${resolveAppIconAssetStem(input.icon, input.appRef)}-${input.name}.${extensionForIconFormat(input.format)}`
   );
@@ -18105,8 +18158,8 @@ function resolveAppIconAssetStem(icon, appRef) {
   if (icon) {
     try {
       const url = new URL(icon);
-      const ext = import_node_path21.default.posix.extname(url.pathname);
-      const basename = import_node_path21.default.posix.basename(url.pathname, ext);
+      const ext = import_node_path22.default.posix.extname(url.pathname);
+      const basename = import_node_path22.default.posix.basename(url.pathname, ext);
       const normalized = sanitizeAppIconAssetStem(basename);
       if (normalized) {
         return normalized;
@@ -18135,9 +18188,9 @@ function writeTempAppIconVariantFile(objectKey, format, bytes) {
   if (!bytes) {
     throw new Error("App icon variant upload requires bytes or a source file.");
   }
-  const tempDir = (0, import_node_fs17.mkdtempSync)(import_node_path21.default.join(import_node_os7.default.tmpdir(), "pmate-app-icon-"));
-  const tempPath = import_node_path21.default.join(tempDir, import_node_path21.default.basename(objectKey) || `variant.${extensionForIconFormat(format)}`);
-  (0, import_node_fs17.writeFileSync)(tempPath, bytes);
+  const tempDir = (0, import_node_fs18.mkdtempSync)(import_node_path22.default.join(import_node_os8.default.tmpdir(), "pmate-app-icon-"));
+  const tempPath = import_node_path22.default.join(tempDir, import_node_path22.default.basename(objectKey) || `variant.${extensionForIconFormat(format)}`);
+  (0, import_node_fs18.writeFileSync)(tempPath, bytes);
   return tempPath;
 }
 
@@ -18346,10 +18399,10 @@ var AppCommandHandler = class {
   }
   readJsonFile(filePath) {
     const absolutePath = this.resolveFilePath(filePath);
-    if (!(0, import_node_fs18.existsSync)(absolutePath)) {
+    if (!(0, import_node_fs19.existsSync)(absolutePath)) {
       throw new Error(`JSON file not found: ${absolutePath}`);
     }
-    const raw = (0, import_node_fs18.readFileSync)(absolutePath, "utf8");
+    const raw = (0, import_node_fs19.readFileSync)(absolutePath, "utf8");
     try {
       return JSON.parse(raw);
     } catch (error) {
@@ -18359,10 +18412,10 @@ var AppCommandHandler = class {
   }
   async preparePayload(filePath, appRef) {
     const absolutePath = this.resolveFilePath(filePath);
-    return prepareAppPayload(this.readJsonFile(filePath), import_node_path22.default.dirname(absolutePath), { appRef });
+    return prepareAppPayload(this.readJsonFile(filePath), import_node_path23.default.dirname(absolutePath), { appRef });
   }
   resolveFilePath(filePath) {
-    return import_node_path22.default.resolve(process.cwd(), filePath);
+    return import_node_path23.default.resolve(process.cwd(), filePath);
   }
   async request(baseUrl, token, method, pathname, body) {
     const response = await fetch(`${baseUrl}${pathname}`, {
@@ -18482,19 +18535,20 @@ function readNamespaceFromPayload(payload) {
 }
 
 // src/commands/ServiceCommandHandler.ts
-var import_node_fs20 = require("fs");
+var import_node_fs21 = require("fs");
 var import_promises6 = require("fs/promises");
-var import_node_path24 = __toESM(require("path"));
+var import_node_path25 = __toESM(require("path"));
 var import_node_child_process11 = require("child_process");
 var import_promises7 = require("readline/promises");
 
 // src/services/ServiceRuntimeRunner.ts
-var import_node_fs19 = require("fs");
-var import_node_os8 = __toESM(require("os"));
-var import_node_path23 = __toESM(require("path"));
+var import_node_fs20 = require("fs");
+var import_node_os9 = __toESM(require("os"));
+var import_node_path24 = __toESM(require("path"));
 var import_node_child_process10 = require("child_process");
 var import_node_readline = require("readline");
 var import_chalk3 = __toESM(require("chalk"));
+var import_dotenv = require("dotenv");
 
 // src/services/ServiceRegistryClient.ts
 init_sessionStore();
@@ -18577,7 +18631,10 @@ var ServiceRegistryClient = class {
       {
         stage: options.stage,
         ...options.branch ? { branch: options.branch } : {},
-        ...options.includeSecretValue ? { includeSecretValue: true } : {}
+        ...options.includeSecretValue ? { includeSecretValue: true } : {},
+        ...options.includeHost === false ? { includeHost: false } : {},
+        ...options.hostId ? { hostId: options.hostId } : {},
+        ...options.hostTarget ? { hostTarget: options.hostTarget } : {}
       }
     );
   }
@@ -18617,6 +18674,9 @@ var ServiceRegistryClient = class {
       body: JSON.stringify({
         stage: options.stage,
         ...options.branch ? { branch: options.branch } : {},
+        ...options.includeHost === false ? { includeHost: false } : {},
+        ...options.hostId ? { hostId: options.hostId } : {},
+        ...options.hostTarget ? { hostTarget: options.hostTarget } : {},
         format: options.format
       })
     });
@@ -18931,18 +18991,18 @@ var ServiceRuntimeRunner = class {
   }
   resolveRepoRoot(service, cwd) {
     if (cwd) {
-      return import_node_path23.default.resolve(process.cwd(), cwd);
+      return import_node_path24.default.resolve(process.cwd(), cwd);
     }
     const repository = this.getType(service) === "vite" || this.getType(service) === "static" ? this.getSite(service).repository?.trim() : this.getType(service) === "fc" ? this.getFc(service).repository?.trim() : this.getType(service) === "ios" || this.getType(service) === "android" ? void 0 : this.getNetwork(service).repository?.trim();
     if (repository) {
       const repoName = repository.replace(/\/+$/, "").split("/").pop()?.replace(/\.git$/i, "");
       if (repoName) {
         const candidates = [
-          import_node_path23.default.join(import_node_os8.default.homedir(), "dev", "pmate", repoName),
-          import_node_path23.default.join(import_node_os8.default.homedir(), "dev", "pmate-envs", repoName)
+          import_node_path24.default.join(import_node_os9.default.homedir(), "dev", "pmate", repoName),
+          import_node_path24.default.join(import_node_os9.default.homedir(), "dev", "pmate-envs", repoName)
         ];
         for (const candidate of candidates) {
-          if ((0, import_node_fs19.existsSync)(candidate)) {
+          if ((0, import_node_fs20.existsSync)(candidate)) {
             return candidate;
           }
         }
@@ -18956,12 +19016,12 @@ var ServiceRuntimeRunner = class {
     if (!dir) {
       throw new Error(`Missing service dir for ${service.id}`);
     }
-    return import_node_path23.default.resolve(repoRoot, dir);
+    return import_node_path24.default.resolve(repoRoot, dir);
   }
   async deployVite(service, options) {
     const appDir = this.resolveLocalDir(service, options.cwd);
-    const packageJsonPath = import_node_path23.default.join(appDir, "package.json");
-    if (!(0, import_node_fs19.existsSync)(packageJsonPath)) {
+    const packageJsonPath = import_node_path24.default.join(appDir, "package.json");
+    if (!(0, import_node_fs20.existsSync)(packageJsonPath)) {
       throw new Error(`No package.json found at ${packageJsonPath}`);
     }
     const pkg2 = this.loadPackageJson(packageJsonPath);
@@ -18969,9 +19029,15 @@ var ServiceRuntimeRunner = class {
     if (!pkgName) {
       throw new Error(`Missing package name in ${packageJsonPath}`);
     }
-    await this.runCommand("pnpm", ["--filter", pkgName, "build"], this.resolveRepoRoot(service, options.cwd));
-    const distDir = import_node_path23.default.join(appDir, "dist");
-    if (!(0, import_node_fs19.existsSync)(distDir)) {
+    const buildEnv = await this.buildLocalBuildEnv(service.id, options.envName ?? "prod");
+    await this.runCommandWithEnv(
+      "pnpm",
+      ["--filter", pkgName, "build"],
+      this.resolveRepoRoot(service, options.cwd),
+      buildEnv
+    );
+    const distDir = import_node_path24.default.join(appDir, "dist");
+    if (!(0, import_node_fs20.existsSync)(distDir)) {
       throw new Error(`No dist directory found at ${distDir}`);
     }
     const site = this.getSite(service);
@@ -18983,8 +19049,8 @@ var ServiceRuntimeRunner = class {
   }
   async deployStatic(service, options) {
     const appDir = this.resolveLocalDir(service, options.cwd);
-    const srcDir = import_node_path23.default.join(appDir, "src");
-    if (!(0, import_node_fs19.existsSync)(srcDir)) {
+    const srcDir = import_node_path24.default.join(appDir, "src");
+    if (!(0, import_node_fs20.existsSync)(srcDir)) {
       throw new Error(`No src directory found at ${srcDir}`);
     }
     const site = this.getSite(service);
@@ -18994,13 +19060,32 @@ var ServiceRuntimeRunner = class {
     }
     await AliyunService.uploadDirectory(srcDir, bucketName);
   }
+  async buildLocalBuildEnv(serviceId, envName = "prod") {
+    if (!this.envProvider) {
+      return void 0;
+    }
+    let pulled;
+    try {
+      pulled = await this.envProvider(serviceId, {
+        stage: this.envNameToStage(envName),
+        format: "dotenv"
+      });
+    } catch (error) {
+      if (error instanceof ServiceEnvNotFoundError) {
+        ui.warn(`No env found for ${serviceId}; building without service env.`);
+        return void 0;
+      }
+      throw error;
+    }
+    return pulled?.content ? (0, import_dotenv.parse)(pulled.content) : void 0;
+  }
   async deployFc(service, options = {}) {
     const fc = this.getFc(service);
     this.validateFcConfig(service, fc);
     const repoRoot = this.resolveRepoRoot(service);
     const appDir = this.resolveLocalDir(service);
-    const packageJsonPath = import_node_path23.default.join(appDir, "package.json");
-    if (!(0, import_node_fs19.existsSync)(packageJsonPath)) {
+    const packageJsonPath = import_node_path24.default.join(appDir, "package.json");
+    if (!(0, import_node_fs20.existsSync)(packageJsonPath)) {
       throw new Error(`No package.json found at ${packageJsonPath}`);
     }
     const pkg2 = this.loadPackageJson(packageJsonPath);
@@ -19053,15 +19138,15 @@ var ServiceRuntimeRunner = class {
     const repoRoot = this.resolveRepoRoot(service, options.cwd);
     const appDir = this.resolveLocalDir(service, options.cwd);
     await this.ensurePnpmWorkspaceRoot(repoRoot);
-    const configPath = import_node_path23.default.join(appDir, fc.configFile ?? "s.yaml");
-    if (!(0, import_node_fs19.existsSync)(configPath)) {
+    const configPath = import_node_path24.default.join(appDir, fc.configFile ?? "s.yaml");
+    if (!(0, import_node_fs20.existsSync)(configPath)) {
       throw new Error(`Missing FC config file at ${configPath}`);
     }
-    const packageJsonPath = import_node_path23.default.join(appDir, "package.json");
-    if (!(0, import_node_fs19.existsSync)(packageJsonPath)) {
+    const packageJsonPath = import_node_path24.default.join(appDir, "package.json");
+    if (!(0, import_node_fs20.existsSync)(packageJsonPath)) {
       throw new Error(`No package.json found at ${packageJsonPath}`);
     }
-    const rawConfig = (0, import_node_fs19.readFileSync)(configPath, "utf8");
+    const rawConfig = (0, import_node_fs20.readFileSync)(configPath, "utf8");
     if (!rawConfig.includes(fc.functionName)) {
       throw new Error(`FC config ${configPath} does not mention functionName ${fc.functionName}`);
     }
@@ -19137,7 +19222,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, options.envName);
+    const envSyncCommand = await this.buildNodeEnvSyncCommand(service.id, appDir, options.envName, server);
     const command = [
       `cd "$HOME"`,
       `[ -d "${repoDir}/.git" ] || git clone "${gitUrl}" "${repoDir}"`,
@@ -19155,13 +19240,17 @@ var ServiceRuntimeRunner = class {
     ].join(" && ");
     await this.runRemoteCommand(server, command);
   }
-  async buildNodeEnvSyncCommand(serviceId, appDir, envName = "prod") {
+  async buildNodeEnvSyncCommand(serviceId, appDir, envName = "prod", hostTarget) {
     if (!this.envProvider) {
       return void 0;
     }
     let pulled;
     try {
-      pulled = await this.envProvider(serviceId, { stage: this.envNameToStage(envName), format: "dotenv" });
+      pulled = await this.envProvider(serviceId, {
+        stage: this.envNameToStage(envName),
+        format: "dotenv",
+        ...hostTarget ? { hostTarget } : {}
+      });
     } catch (error) {
       if (error instanceof ServiceEnvNotFoundError) {
         ui.warn(`No env found for ${serviceId}; skipping .env.local sync.`);
@@ -19202,7 +19291,7 @@ var ServiceRuntimeRunner = class {
     const gitUrl = this.withToken(repoUrl);
     const scriptPath = script.startsWith("/") || script.startsWith("./") ? script : `./${script}`;
     const envName = options.envName ?? "prod";
-    const envSyncCommand = await this.buildScriptEnvSyncCommand(service.id, envName);
+    const envSyncCommand = await this.buildScriptEnvSyncCommand(service.id, envName, server);
     const command = [
       `cd "$HOME"`,
       `[ -d "${repoDir}/.git" ] || git clone "${gitUrl}" "${repoDir}"`,
@@ -19234,7 +19323,7 @@ var ServiceRuntimeRunner = class {
     const repoDir = this.getRepoDirName(repository);
     const scriptPath = script.startsWith("/") || script.startsWith("./") ? script : `./${script}`;
     const envName = options.envName ?? "prod";
-    const envSyncCommand = await this.buildScriptEnvSyncCommand(service.id, envName);
+    const envSyncCommand = await this.buildScriptEnvSyncCommand(service.id, envName, server);
     const command = [
       `cd "$HOME"`,
       `cd "${repoDir}"`,
@@ -19245,13 +19334,17 @@ var ServiceRuntimeRunner = class {
     ].join(" && ");
     await this.runRemoteCommand(server, command);
   }
-  async buildScriptEnvSyncCommand(serviceId, envName) {
+  async buildScriptEnvSyncCommand(serviceId, envName, hostTarget) {
     if (!this.envProvider) {
       return void 0;
     }
     let pulled;
     try {
-      pulled = await this.envProvider(serviceId, { stage: this.envNameToStage(envName), format: "dotenv" });
+      pulled = await this.envProvider(serviceId, {
+        stage: this.envNameToStage(envName),
+        format: "dotenv",
+        ...hostTarget ? { hostTarget } : {}
+      });
     } catch (error) {
       if (error instanceof ServiceEnvNotFoundError) {
         ui.warn(`No env found for ${serviceId}; skipping PMate env file sync.`);
@@ -19314,7 +19407,7 @@ var ServiceRuntimeRunner = class {
       const serverAddress = await resolveServerAddress(server);
       const templateName = exposeType === "websocket" ? "nginx.ws.template" : "nginx.rest.template";
       const templatePath = this.resolveTemplatePath(templateName);
-      const template = (0, import_node_fs19.readFileSync)(templatePath, "utf8");
+      const template = (0, import_node_fs20.readFileSync)(templatePath, "utf8");
       const host = `${subdomain}.${("domain" in network ? network.domain?.trim() : void 0) || "pmate.chat"}`;
       const rendered = template.replace(/\$\{\{PORT\}\}/g, String(port)).replace(/\$\{\{HOSTS\}\}/g, host).replace(/\$\{\{HOST\}\}/g, host);
       const remotePath = `/etc/nginx/sites-enabled/${subdomain}.conf`;
@@ -19346,11 +19439,11 @@ var ServiceRuntimeRunner = class {
     }
     if (config.ensurePackageJson) {
       const appDir = this.resolveLocalDir(service, options.cwd);
-      const packageJsonPath = import_node_path23.default.join(appDir, "package.json");
-      if (!(0, import_node_fs19.existsSync)(packageJsonPath)) {
+      const packageJsonPath = import_node_path24.default.join(appDir, "package.json");
+      if (!(0, import_node_fs20.existsSync)(packageJsonPath)) {
         throw new Error(`Missing package.json at ${packageJsonPath}`);
       }
-      const pkgStat = (0, import_node_fs19.statSync)(packageJsonPath);
+      const pkgStat = (0, import_node_fs20.statSync)(packageJsonPath);
       if (!pkgStat.isFile()) {
         throw new Error(`package.json is not a file at ${packageJsonPath}`);
       }
@@ -19780,9 +19873,9 @@ var ServiceRuntimeRunner = class {
     return tokens;
   }
   readPathValue(source, pathExpr) {
-    const path28 = pathExpr.split(".").map((segment) => segment.trim()).filter(Boolean);
+    const path29 = pathExpr.split(".").map((segment) => segment.trim()).filter(Boolean);
     let cursor = source;
-    for (const segment of path28) {
+    for (const segment of path29) {
       if (!cursor || typeof cursor !== "object" || Array.isArray(cursor)) {
         return void 0;
       }
@@ -19825,12 +19918,12 @@ var ServiceRuntimeRunner = class {
   }
   resolveTemplatePath(templateName) {
     const candidates = [
-      import_node_path23.default.join(__dirname, "..", "templates", templateName),
-      import_node_path23.default.join(__dirname, "..", "src", "templates", templateName),
-      import_node_path23.default.join(__dirname, "templates", templateName)
+      import_node_path24.default.join(__dirname, "..", "templates", templateName),
+      import_node_path24.default.join(__dirname, "..", "src", "templates", templateName),
+      import_node_path24.default.join(__dirname, "templates", templateName)
     ];
     for (const candidate of candidates) {
-      if ((0, import_node_fs19.existsSync)(candidate)) {
+      if ((0, import_node_fs20.existsSync)(candidate)) {
         return candidate;
       }
     }
@@ -19862,7 +19955,7 @@ var ServiceRuntimeRunner = class {
     });
   }
   loadPackageJson(packageJsonPath) {
-    const raw = (0, import_node_fs19.readFileSync)(packageJsonPath, "utf8");
+    const raw = (0, import_node_fs20.readFileSync)(packageJsonPath, "utf8");
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed !== "object") {
       throw new Error(`Invalid package.json at ${packageJsonPath}`);
@@ -19871,7 +19964,7 @@ var ServiceRuntimeRunner = class {
   }
   writePackageJson(packageJsonPath, data) {
     const serialized = JSON.stringify(data, null, 2);
-    (0, import_node_fs19.writeFileSync)(packageJsonPath, `${serialized}
+    (0, import_node_fs20.writeFileSync)(packageJsonPath, `${serialized}
 `, "utf8");
   }
   validateFcConfig(service, fc) {
@@ -19898,8 +19991,8 @@ var ServiceRuntimeRunner = class {
     }
   }
   async ensurePnpmWorkspaceRoot(repoRoot) {
-    const workspacePath = import_node_path23.default.join(repoRoot, "pnpm-workspace.yaml");
-    if (!(0, import_node_fs19.existsSync)(workspacePath)) {
+    const workspacePath = import_node_path24.default.join(repoRoot, "pnpm-workspace.yaml");
+    if (!(0, import_node_fs20.existsSync)(workspacePath)) {
       throw new Error(`Missing pnpm-workspace.yaml at ${workspacePath}`);
     }
   }
@@ -19973,16 +20066,16 @@ var ServiceRuntimeRunner = class {
     if (!privateKeyPath) {
       throw new Error("Missing ssl.prv in ~/.pmate/config.yaml.");
     }
-    if (!(0, import_node_fs19.existsSync)(certificatePath)) {
+    if (!(0, import_node_fs20.existsSync)(certificatePath)) {
       throw new Error(`SSL certificate file not found: ${certificatePath}`);
     }
-    if (!(0, import_node_fs19.existsSync)(privateKeyPath)) {
+    if (!(0, import_node_fs20.existsSync)(privateKeyPath)) {
       throw new Error(`SSL private key file not found: ${privateKeyPath}`);
     }
     return {
       certName: host,
-      certificate: (0, import_node_fs19.readFileSync)(certificatePath, "utf8"),
-      privateKey: (0, import_node_fs19.readFileSync)(privateKeyPath, "utf8")
+      certificate: (0, import_node_fs20.readFileSync)(certificatePath, "utf8"),
+      privateKey: (0, import_node_fs20.readFileSync)(privateKeyPath, "utf8")
     };
   }
   resolveFcProtocol(fc, certConfig) {
@@ -20376,7 +20469,7 @@ var ServiceCommandHandler = class {
             format: "dotenv"
           }
         );
-        const outputPath = import_node_path24.default.resolve(process.cwd(), args.output);
+        const outputPath = import_node_path25.default.resolve(process.cwd(), args.output);
         await (0, import_promises6.writeFile)(outputPath, payload.content, "utf8");
         ui.success(`Wrote env file for ${args.appId} to ${outputPath}`);
         this.renderJson({ ...payload, output: outputPath }, args.json);
@@ -20598,11 +20691,11 @@ var ServiceCommandHandler = class {
     return (baseUrl || process.env.PMATE_APPS_API_BASE_URL || "https://apps-api.pmate.chat").replace(/\/+$/, "");
   }
   readJsonFile(filePath) {
-    const absolutePath = import_node_path24.default.resolve(process.cwd(), filePath);
-    if (!(0, import_node_fs20.existsSync)(absolutePath)) {
+    const absolutePath = import_node_path25.default.resolve(process.cwd(), filePath);
+    if (!(0, import_node_fs21.existsSync)(absolutePath)) {
       throw new Error(`JSON file not found: ${absolutePath}`);
     }
-    const raw = (0, import_node_fs20.readFileSync)(absolutePath, "utf8");
+    const raw = (0, import_node_fs21.readFileSync)(absolutePath, "utf8");
     try {
       return JSON.parse(raw);
     } catch (error) {
@@ -21327,9 +21420,9 @@ var RoleCommandHandler = class {
 };
 
 // src/commands/AccountCommandHandler.ts
-var import_node_fs21 = require("fs");
+var import_node_fs22 = require("fs");
 var import_node_crypto4 = require("crypto");
-var import_node_path25 = __toESM(require("path"));
+var import_node_path26 = __toESM(require("path"));
 init_sessionStore();
 var AccountCommandHandler = class {
   async handle(args) {
@@ -21337,9 +21430,9 @@ var AccountCommandHandler = class {
       case "bot-keygen": {
         const keyFile = this.generateBotKeyFile(args.app, args.name);
         const outPath = args.out ? this.resolveFilePath(args.out) : this.resolveDefaultBotKeyPath(args.app, args.name);
-        (0, import_node_fs21.mkdirSync)(import_node_path25.default.dirname(outPath), { recursive: true });
-        (0, import_node_fs21.writeFileSync)(outPath, JSON.stringify(keyFile, null, 2), { mode: 384 });
-        (0, import_node_fs21.chmodSync)(outPath, 384);
+        (0, import_node_fs22.mkdirSync)(import_node_path26.default.dirname(outPath), { recursive: true });
+        (0, import_node_fs22.writeFileSync)(outPath, JSON.stringify(keyFile, null, 2), { mode: 384 });
+        (0, import_node_fs22.chmodSync)(outPath, 384);
         if (!args.json) {
           ui.success(`Bot key saved to ${outPath}`);
         }
@@ -21789,10 +21882,10 @@ var AccountCommandHandler = class {
       throw new Error("Missing visible apps input");
     }
     const absolutePath = this.resolveFilePath(args.filePath);
-    if (!(0, import_node_fs21.existsSync)(absolutePath)) {
+    if (!(0, import_node_fs22.existsSync)(absolutePath)) {
       throw new Error(`JSON file not found: ${absolutePath}`);
     }
-    const raw = (0, import_node_fs21.readFileSync)(absolutePath, "utf8");
+    const raw = (0, import_node_fs22.readFileSync)(absolutePath, "utf8");
     let parsed;
     try {
       parsed = JSON.parse(raw);
@@ -21806,10 +21899,10 @@ var AccountCommandHandler = class {
     return parsed;
   }
   resolveFilePath(filePath) {
-    return import_node_path25.default.resolve(process.cwd(), filePath);
+    return import_node_path26.default.resolve(process.cwd(), filePath);
   }
   resolveDefaultBotKeyPath(app, name) {
-    return import_node_path25.default.join(this.homeDir(), ".pmate", "bots", app, `${name}.bot-key.json`);
+    return import_node_path26.default.join(this.homeDir(), ".pmate", "bots", app, `${name}.bot-key.json`);
   }
   homeDir() {
     return process.env.HOME || process.env.USERPROFILE || process.cwd();
@@ -21832,10 +21925,10 @@ var AccountCommandHandler = class {
       throw new Error("Missing bot key file");
     }
     const absolutePath = this.resolveFilePath(filePath);
-    if (!(0, import_node_fs21.existsSync)(absolutePath)) {
+    if (!(0, import_node_fs22.existsSync)(absolutePath)) {
       throw new Error(`Bot key file not found: ${absolutePath}`);
     }
-    const parsed = JSON.parse((0, import_node_fs21.readFileSync)(absolutePath, "utf8"));
+    const parsed = JSON.parse((0, import_node_fs22.readFileSync)(absolutePath, "utf8"));
     if (parsed.type !== "pmate-bot-key" || parsed.version !== 1 || parsed.algorithm !== "ed25519" || !parsed.publicKey || !parsed.privateKey) {
       throw new Error(`Invalid PMate bot key file: ${absolutePath}`);
     }
@@ -21887,8 +21980,8 @@ function encodePathSegment(value) {
 }
 
 // src/commands/OrgCommandHandler.ts
-var import_node_fs22 = require("fs");
-var import_node_path26 = __toESM(require("path"));
+var import_node_fs23 = require("fs");
+var import_node_path27 = __toESM(require("path"));
 init_sessionStore();
 var OrgCommandHandler = class {
   async handle(args) {
@@ -22059,11 +22152,11 @@ var OrgCommandHandler = class {
     if (!filePath) {
       throw new Error(`Missing ${itemLabel} input`);
     }
-    const absolutePath = import_node_path26.default.resolve(process.cwd(), filePath);
-    if (!(0, import_node_fs22.existsSync)(absolutePath)) {
+    const absolutePath = import_node_path27.default.resolve(process.cwd(), filePath);
+    if (!(0, import_node_fs23.existsSync)(absolutePath)) {
       throw new Error(`JSON file not found: ${absolutePath}`);
     }
-    const raw = (0, import_node_fs22.readFileSync)(absolutePath, "utf8");
+    const raw = (0, import_node_fs23.readFileSync)(absolutePath, "utf8");
     let parsed;
     try {
       parsed = JSON.parse(raw);
@@ -25139,7 +25232,7 @@ function requireValue12(tokens, option) {
 
 // src/index.ts
 var pkg = JSON.parse(
-  (0, import_node_fs23.readFileSync)(import_node_path27.default.resolve(__dirname, "..", "package.json"), "utf8")
+  (0, import_node_fs24.readFileSync)(import_node_path28.default.resolve(__dirname, "..", "package.json"), "utf8")
 );
 var HELP_TEXT = [
   import_chalk4.default.bold(`pmate v${pkg.version}`),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.24.35",
+  "version": "0.24.37",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {
@@ -56,8 +56,8 @@
     "yaml": "^2.8.2"
   },
   "devDependencies": {
-    "@pmate/agent-sdk": "^1.1.14",
-    "@pmate/meta": "^1.1.13",
+    "@pmate/agent-sdk": "^1.1.16",
+    "@pmate/meta": "^1.1.15",
     "@pmate/utils": "^1.1.4",
     "@types/node": "^25.0.3",
     "@types/pngjs": "^6.0.5",
@@ -69,7 +69,7 @@
   },
   "pnpm": {
     "overrides": {
-      "@pmate/meta": "^1.1.13",
+      "@pmate/meta": "^1.1.15",
       "@pmate/utils": "^1.1.4"
     }
   }