@pmate/cli 0.23.0 → 0.24.1

package/dist/index.js

@@ -9633,9 +9633,10 @@ function loadRepoConfig(cwd) {
   return normalizeRepoConfig(parsed, paths.configPath);
 }
 function loadAppConfig(cwd, options = {}) {
-  const paths = findRepoConfigPaths(cwd, options.searchParents ?? false);
+  const searchParents = options.searchParents ?? true;
+  const paths = findRepoConfigPaths(cwd, searchParents);
   if (!paths) {
-    const suffix = options.searchParents ? " or parent directories" : "";
+    const suffix = searchParents ? " or parent directories" : "";
     throw new Error(`No .pmate.yaml found in ${cwd}${suffix}`);
   }
   const parsed = loadMergedRepoYaml(paths);
@@ -17233,6 +17234,7 @@ init_sessionStore();
 
 // src/appIcon.ts
 var import_node_fs15 = require("fs");
+var import_node_os7 = __toESM(require("os"));
 var import_node_path20 = __toESM(require("path"));
 var import_sharp = __toESM(require("sharp"));
 init_namespacedRef();
@@ -17254,6 +17256,8 @@ var IOS_ICON_SPECS = [
 var pngToIco = require("png-to-ico").default;
 var APP_ICON_VARIANT_KEY_PATTERN = /^[a-z0-9]+$/;
 var DATA_URL_PATTERN = /^data:([^;,]+);base64,([a-z0-9+/=]+)$/i;
+var DEFAULT_APP_ICON_VARIANT_BUCKET = "parrot-static";
+var DEFAULT_APP_ICON_VARIANT_PUBLIC_BASE_URL = "https://parrot-static.pmate.chat";
 var DEFAULT_APP_ICON_VARIANT_NAME = "webp512x512";
 function normalizeAppIcon(icon, cwd) {
   if (typeof icon !== "string" || !icon.trim()) {
@@ -17271,7 +17275,7 @@ function normalizeAppIcon(icon, cwd) {
   }
   throw new Error("App icon must be an http(s) URL. Upload SVG files to OSS first and use the public link.");
 }
-async function prepareAppPayload(payload, cwd) {
+async function prepareAppPayload(payload, cwd, options) {
   if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
     throw new Error("App payload must be a JSON object.");
   }
@@ -17286,7 +17290,8 @@ async function prepareAppPayload(payload, cwd) {
     normalized.icons = await withDefaultSvgIconVariant(
       normalized.icon,
       normalized.icons,
-      cwd
+      cwd,
+      options?.appRef || inferAppRefFromPayload(normalized)
     );
   }
   return normalized;
@@ -17381,17 +17386,35 @@ async function renderAppIconVariant(input) {
     (0, import_node_fs15.mkdirSync)(import_node_path20.default.dirname(outputPath), { recursive: true });
     (0, import_node_fs15.writeFileSync)(outputPath, bytes);
   }
+  if (input.name) {
+    return {
+      value: await uploadAppIconVariantAsset({
+        appRef: input.appRef,
+        icon: input.icon,
+        name: input.name,
+        format: input.format,
+        bytes,
+        sourcePath: outputPath
+      }),
+      ...outputPath ? { outputPath } : {}
+    };
+  }
   return {
     value: createImageDataUrl(bytes, input.format),
     ...outputPath ? { outputPath } : {}
   };
 }
-function loadAppIconVariantFile(filePath, cwd) {
-  const absolutePath = import_node_path20.default.resolve(cwd, filePath);
+async function loadAppIconVariantFile(input) {
+  const absolutePath = import_node_path20.default.resolve(input.cwd, input.filePath);
   const format = inferVariantFormatFromPath(absolutePath);
-  const bytes = (0, import_node_fs15.readFileSync)(absolutePath);
   return {
-    value: createImageDataUrl(bytes, format),
+    value: input.name ? await uploadAppIconVariantAsset({
+      appRef: input.appRef,
+      icon: input.icon,
+      name: input.name,
+      format,
+      sourcePath: absolutePath
+    }) : createImageDataUrl((0, import_node_fs15.readFileSync)(absolutePath), format),
     format,
     absolutePath
   };
@@ -17487,9 +17510,11 @@ function isSupportedImageDataUrl(value) {
   const mimeType = match[1]?.toLowerCase();
   return mimeType === "image/png" || mimeType === "image/webp" || mimeType === "image/svg+xml" || mimeType === "image/x-icon";
 }
-async function withDefaultSvgIconVariant(icon, icons, cwd) {
+async function withDefaultSvgIconVariant(icon, icons, cwd, appRef) {
   const variant = await renderAppIconVariant({
     icon,
+    name: DEFAULT_APP_ICON_VARIANT_NAME,
+    appRef,
     width: 512,
     height: 512,
     format: "webp",
@@ -17500,6 +17525,75 @@ async function withDefaultSvgIconVariant(icon, icons, cwd) {
     [DEFAULT_APP_ICON_VARIANT_NAME]: variant.value
   };
 }
+function inferAppRefFromPayload(payload) {
+  const id = payload.id;
+  const namespace = payload.namespace;
+  if (typeof id !== "string" || !id.trim()) {
+    return void 0;
+  }
+  if (typeof namespace !== "string" || !namespace.trim()) {
+    return void 0;
+  }
+  return `${namespace.trim().toLowerCase()}:${id.trim()}`;
+}
+async function uploadAppIconVariantAsset(input) {
+  const objectKey = buildAppIconVariantObjectKey(input);
+  const sourcePath = input.sourcePath || writeTempAppIconVariantFile(objectKey, input.format, input.bytes);
+  const shouldCleanup = !input.sourcePath;
+  try {
+    await AliyunService.uploadFile(sourcePath, DEFAULT_APP_ICON_VARIANT_BUCKET, objectKey);
+  } finally {
+    if (shouldCleanup) {
+      (0, import_node_fs15.rmSync)(import_node_path20.default.dirname(sourcePath), { recursive: true, force: true });
+    }
+  }
+  return `${DEFAULT_APP_ICON_VARIANT_PUBLIC_BASE_URL}/${objectKey}`;
+}
+function buildAppIconVariantObjectKey(input) {
+  return import_node_path20.default.posix.join(
+    "apps",
+    `${resolveAppIconAssetStem(input.icon, input.appRef)}-${input.name}.${extensionForIconFormat(input.format)}`
+  );
+}
+function resolveAppIconAssetStem(icon, appRef) {
+  if (icon) {
+    try {
+      const url = new URL(icon);
+      const ext = import_node_path20.default.posix.extname(url.pathname);
+      const basename = import_node_path20.default.posix.basename(url.pathname, ext);
+      const normalized = sanitizeAppIconAssetStem(basename);
+      if (normalized) {
+        return normalized;
+      }
+    } catch {
+    }
+  }
+  if (appRef) {
+    const { objectId } = parseNamespacedRef(appRef, {
+      entityLabel: "app ref"
+    });
+    const normalized = sanitizeAppIconAssetStem(objectId);
+    if (normalized) {
+      return normalized;
+    }
+  }
+  throw new Error("Unable to determine an asset key for the app icon variant upload.");
+}
+function sanitizeAppIconAssetStem(value) {
+  return value.trim().replace(/[^a-z0-9._-]+/gi, "-").replace(/-+/g, "-").replace(/^-|-$/g, "").toLowerCase();
+}
+function extensionForIconFormat(format) {
+  return format === "ico" ? "ico" : format;
+}
+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_fs15.mkdtempSync)(import_node_path20.default.join(import_node_os7.default.tmpdir(), "pmate-app-icon-"));
+  const tempPath = import_node_path20.default.join(tempDir, import_node_path20.default.basename(objectKey) || `variant.${extensionForIconFormat(format)}`);
+  (0, import_node_fs15.writeFileSync)(tempPath, bytes);
+  return tempPath;
+}
 
 // src/commands/AppCommandHandler.ts
 init_namespacedRef();
@@ -17555,7 +17649,7 @@ var AppCommandHandler = class {
         return;
       }
       case "update": {
-        const payload = await this.preparePayload(args.filePath);
+        const payload = await this.preparePayload(args.filePath, args.id);
         const pathname = this.buildAppPath(args.id);
         const record = await this.request(
           baseUrl,
@@ -17614,7 +17708,13 @@ var AppCommandHandler = class {
         if (existingIcons[name] && !args.force) {
           throw new Error(`App icon variant "${name}" already exists for ${args.id}. Re-run with --force to overwrite it.`);
         }
-        const source = args.filePath ? loadAppIconVariantFile(args.filePath, process.cwd()) : await this.renderIconVariantFromApp(record, args);
+        const source = args.filePath ? await loadAppIconVariantFile({
+          filePath: args.filePath,
+          cwd: process.cwd(),
+          name,
+          appRef: args.id,
+          icon: record.icon
+        }) : await this.renderIconVariantFromApp(record, args);
         const updatedIcons = {
           ...existingIcons,
           [name]: source.value
@@ -17711,9 +17811,9 @@ var AppCommandHandler = class {
       throw new Error(`Invalid JSON in ${absolutePath}: ${message}`);
     }
   }
-  async preparePayload(filePath) {
+  async preparePayload(filePath, appRef) {
     const absolutePath = this.resolveFilePath(filePath);
-    return prepareAppPayload(this.readJsonFile(filePath), import_node_path21.default.dirname(absolutePath));
+    return prepareAppPayload(this.readJsonFile(filePath), import_node_path21.default.dirname(absolutePath), { appRef });
   }
   resolveFilePath(filePath) {
     return import_node_path21.default.resolve(process.cwd(), filePath);
@@ -17811,6 +17911,8 @@ var AppCommandHandler = class {
     }
     return renderAppIconVariant({
       icon: record.icon,
+      name: args.name,
+      appRef: args.id,
       width: args.width,
       height: args.height,
       format: args.format || "png",
@@ -17838,7 +17940,7 @@ var import_promises6 = require("readline/promises");
 
 // src/services/ServiceRuntimeRunner.ts
 var import_node_fs17 = require("fs");
-var import_node_os7 = __toESM(require("os"));
+var import_node_os8 = __toESM(require("os"));
 var import_node_path22 = __toESM(require("path"));
 var import_node_child_process10 = require("child_process");
 var import_node_readline = require("readline");
@@ -18010,7 +18112,7 @@ var ServiceRuntimeRunner = class {
     if (repository) {
       const repoName = repository.replace(/\/+$/, "").split("/").pop()?.replace(/\.git$/i, "");
       if (repoName) {
-        const candidate = import_node_path22.default.join(import_node_os7.default.homedir(), "dev", "pmate", repoName);
+        const candidate = import_node_path22.default.join(import_node_os8.default.homedir(), "dev", "pmate", repoName);
         if ((0, import_node_fs17.existsSync)(candidate)) {
           return candidate;
         }

package/package.json

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