prpm 2.1.8 → 2.1.10

package/dist/index.js

@@ -204,6 +204,15 @@ function removeCollectionFromLockfile(lockfile, collectionKey) {
   delete lockfile.collections[collectionKey];
   lockfile.generated = (/* @__PURE__ */ new Date()).toISOString();
 }
+function listCollectionsFromLockfile(lockfile) {
+  if (!lockfile || !lockfile.collections) {
+    return [];
+  }
+  return Object.entries(lockfile.collections).map(([key, collection]) => ({
+    key,
+    ...collection
+  }));
+}
 var import_fs, import_path, import_crypto, LOCKFILE_NAME, LOCKFILE_VERSION;
 var init_lockfile = __esm({
   "src/core/lockfile.ts"() {
@@ -17589,7 +17598,9 @@ async function installFromLockfile(options) {
           // Force reinstall when installing from lockfile
           location: locationOverride,
           manifestFile,
-          hookMapping: options.hookMapping
+          hookMapping: options.hookMapping,
+          fromCollection: lockEntry.fromCollection
+          // Preserve collection metadata
         });
         successCount++;
       } catch (error) {
@@ -21302,6 +21313,9 @@ function getManifestSchema() {
 }
 
 // src/utils/manifest-loader.ts
+function toOrganizationSlug(value) {
+  return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").replace(/-+/g, "-");
+}
 async function findAndLoadManifests() {
   const prpmJsonPath = (0, import_path17.join)(process.cwd(), "prpm.json");
   let prpmJsonExists = false;
@@ -21502,8 +21516,8 @@ function normalizeFilePaths2(files) {
 function predictScopedPackageName(manifestName, username, organization) {
   const usernameLowercase = username.toLowerCase();
   if (organization) {
-    const orgNameLowercase = organization.toLowerCase();
-    const expectedPrefix = `@${orgNameLowercase}/`;
+    const orgSlug = toOrganizationSlug(organization);
+    const expectedPrefix = `@${orgSlug}/`;
     if (!manifestName.startsWith(expectedPrefix)) {
       return `${expectedPrefix}${manifestName}`;
     }
@@ -21598,6 +21612,7 @@ function formatTarballSize(sizeInBytes) {
 
 // src/commands/publish.ts
 init_init();
+var toOrgSlug = (value) => value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").replace(/-+/g, "-");
 async function listPackages2() {
   const { manifests, collections, source } = await findAndLoadManifests();
   console.log(`
@@ -21827,6 +21842,7 @@ ${"=".repeat(60)}`);
       let lastError = null;
       let retryCount = 0;
       let publishSuccess = false;
+      let sawGatewayLikeError = false;
       while (retryCount <= MAX_RETRIES && !publishSuccess) {
         try {
           if (retryCount > 0 && RETRY_DELAY_MS > 0) {
@@ -21865,9 +21881,11 @@ ${"=".repeat(60)}`);
           }
           let selectedOrgId;
           let selectedOrgName;
+          let selectedOrgSlug;
           if (manifest.organization && userInfo) {
+            const manifestOrgSlug = toOrgSlug(manifest.organization);
             const orgFromManifest = (_a = userInfo.organizations) == null ? void 0 : _a.find(
-              (org) => org.name === manifest.organization || org.id === manifest.organization
+              (org) => org.id === manifest.organization || org.name === manifest.organization || org.slug && typeof org.slug === "string" && org.slug.toLowerCase() === manifestOrgSlug || org.name && toOrgSlug(typeof org.name === "string" ? org.name : "") === manifestOrgSlug
             );
             if (!orgFromManifest) {
               throw new Error(
@@ -21881,6 +21899,7 @@ ${"=".repeat(60)}`);
             }
             selectedOrgId = orgFromManifest.id;
             selectedOrgName = orgFromManifest.name;
+            selectedOrgSlug = (typeof orgFromManifest.slug === "string" ? orgFromManifest.slug : void 0) || (orgFromManifest.name ? toOrgSlug(String(orgFromManifest.name)) : void 0);
           }
           let publishAsAuthor;
           if ((userInfo == null ? void 0 : userInfo.is_admin) && manifest.author) {
@@ -21889,7 +21908,7 @@ ${"=".repeat(60)}`);
           const scopedPackageName = predictScopedPackageName(
             manifest.name,
             (userInfo == null ? void 0 : userInfo.username) || config.username || "unknown",
-            selectedOrgName || manifest.organization
+            selectedOrgSlug || manifest.organization
           );
           console.log(`   Source: ${source}`);
           console.log(`   Package: ${scopedPackageName}@${manifest.version}`);
@@ -22020,7 +22039,40 @@ ${"=".repeat(60)}`);
             userInfo,
             packageName
           );
+          if (sawGatewayLikeError && pkgError.toLowerCase().includes("version already exists")) {
+            const assumedName = predictScopedPackageName(
+              manifest.name,
+              (userInfo == null ? void 0 : userInfo.username) || config.username || "unknown",
+              manifest.organization
+            );
+            let webappUrl;
+            const registryUrl = config.registryUrl || "https://registry.prpm.dev";
+            if (registryUrl.includes("localhost") || registryUrl.includes("127.0.0.1")) {
+              webappUrl = "http://localhost:5173";
+            } else if (registryUrl.includes("registry.prpm.dev")) {
+              webappUrl = "https://prpm.dev";
+            } else {
+              webappUrl = registryUrl;
+            }
+            const packageSlug = assumedName.startsWith("@") ? assumedName.slice(1) : assumedName;
+            const packagePath = packageSlug.split("/").map((segment) => encodeURIComponent(segment)).join("/");
+            const packageUrl = `${webappUrl}/packages/${packagePath}`;
+            console.log(
+              `
+\u2705 ${displayName}@${manifest.version} now exists on the registry after a transient gateway error; assuming publish succeeded.`
+            );
+            publishedPackages.push({
+              name: assumedName,
+              version: manifest.version,
+              url: packageUrl
+            });
+            publishSuccess = true;
+            break;
+          }
           if (isRetriableError(pkgError) && retryCount < MAX_RETRIES) {
+            if (pkgError.includes("Bad Gateway") || pkgError.includes("Service Unavailable") || pkgError.includes("502") || pkgError.includes("503") || pkgError.includes("504")) {
+              sawGatewayLikeError = true;
+            }
             console.error(
               `
 \u26A0\uFE0F  Temporary error publishing ${displayName}: ${pkgError}`
@@ -22744,6 +22796,7 @@ init_install();
 init_telemetry();
 init_errors();
 async function handleUpgrade(packageName, options = {}) {
+  var _a;
   const startTime = Date.now();
   let success = false;
   let error;
@@ -22805,6 +22858,82 @@ ${emoji} Upgrading ${packageId}: ${currentVersion} \u2192 ${latestVersion} (${up
         );
       }
     }
+    if (!packageName) {
+      const lockfile = await readLockfile();
+      if (lockfile) {
+        const installedCollections = listCollectionsFromLockfile(lockfile);
+        for (const collection of installedCollections) {
+          try {
+            const latestCollection = await client.getCollection(
+              collection.name_slug
+            );
+            if (!latestCollection) continue;
+            const currentVersion = collection.version;
+            const latestVersion = latestCollection.version || "1.0.0";
+            if (currentVersion !== latestVersion) {
+              console.log(
+                `
+\u{1F4E6} Collection ${collection.name_slug}: ${currentVersion} \u2192 ${latestVersion}`
+              );
+              const installedPackageIds = new Set(collection.packages);
+              const newPackages = latestCollection.packages.filter(
+                (pkg) => {
+                  var _a2;
+                  return !installedPackageIds.has(((_a2 = pkg.package) == null ? void 0 : _a2.name) || "");
+                }
+              );
+              if (newPackages.length > 0) {
+                console.log(
+                  `   \u{1F4E5} ${newPackages.length} new package(s) added to collection`
+                );
+                const existingCollectionPkg = installedPackages.find(
+                  (p) => {
+                    var _a2;
+                    return ((_a2 = p.fromCollection) == null ? void 0 : _a2.name_slug) === collection.name_slug;
+                  }
+                );
+                const collectionFormat = existingCollectionPkg == null ? void 0 : existingCollectionPkg.format;
+                for (const pkg of newPackages) {
+                  const pkgName = (_a = pkg.package) == null ? void 0 : _a.name;
+                  if (!pkgName) continue;
+                  try {
+                    console.log(`   \u{1F4E5} Installing new package: ${pkgName}`);
+                    await handleInstall(`${pkgName}@${pkg.version || "latest"}`, {
+                      as: collectionFormat,
+                      fromCollection: {
+                        name_slug: collection.name_slug,
+                        version: latestVersion
+                      }
+                    });
+                    upgradedCount++;
+                  } catch (err) {
+                    console.error(
+                      `   \u274C Failed to install ${pkgName}: ${err instanceof Error ? err.message : String(err)}`
+                    );
+                  }
+                }
+              }
+              addCollectionToLockfile(lockfile, collection.name_slug, {
+                name_slug: collection.name_slug,
+                version: latestVersion,
+                packages: [
+                  ...collection.packages,
+                  ...newPackages.map((p) => {
+                    var _a2;
+                    return (_a2 = p.package) == null ? void 0 : _a2.name;
+                  }).filter((n) => !!n)
+                ]
+              });
+              await writeLockfile(lockfile);
+            }
+          } catch (err) {
+            console.error(
+              `   \u26A0\uFE0F Could not check collection ${collection.name_slug}: ${err instanceof Error ? err.message : String(err)}`
+            );
+          }
+        }
+      }
+    }
     if (upgradedCount === 0) {
       console.log("\n\u2705 All packages are at the latest version!\n");
     } else {

package/dist/schemas/prpm-manifest.schema.json

@@ -147,10 +147,11 @@
     },
     "organization": {
       "type": "string",
-      "description": "Organization name or ID to publish this package under. If not specified, publishes to personal account.",
+      "description": "Organization slug or ID to publish this package under (used for package scope). If not specified, publishes to personal account. Slugs should be lowercase, alphanumeric with hyphens (spaces removed).",
       "examples": [
         "my-team",
-        "my-company"
+        "my-company",
+        "my-senior-dev"
       ]
     },
     "private": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prpm",
-  "version": "2.1.8",
+  "version": "2.1.10",
   "description": "Prompt Package Manager CLI - Install and manage prompt-based files",
   "main": "dist/index.js",
   "bin": {
@@ -45,9 +45,9 @@
   "license": "MIT",
   "dependencies": {
     "@octokit/rest": "^22.0.0",
-    "@pr-pm/converters": "^2.1.9",
-    "@pr-pm/registry-client": "^2.3.8",
-    "@pr-pm/types": "^2.1.9",
+    "@pr-pm/converters": "^2.1.11",
+    "@pr-pm/registry-client": "^2.3.10",
+    "@pr-pm/types": "^2.1.11",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
     "commander": "^11.1.0",

package/schemas/prpm-manifest.schema.json

@@ -147,10 +147,11 @@
     },
     "organization": {
       "type": "string",
-      "description": "Organization name or ID to publish this package under. If not specified, publishes to personal account.",
+      "description": "Organization slug or ID to publish this package under (used for package scope). If not specified, publishes to personal account. Slugs should be lowercase, alphanumeric with hyphens (spaces removed).",
       "examples": [
         "my-team",
-        "my-company"
+        "my-company",
+        "my-senior-dev"
       ]
     },
     "private": {