@anytio/pspm 0.9.0 → 0.9.2

package/dist/index.js

@@ -5,8 +5,8 @@ import { join, dirname, basename, resolve, relative } from 'path';
 import * as ini from 'ini';
 import ignore from 'ignore';
 import { createHash, randomBytes } from 'crypto';
-import * as semver from 'semver';
-import semver__default from 'semver';
+import * as semver2 from 'semver';
+import semver2__default from 'semver';
 import { checkbox } from '@inquirer/prompts';
 import { readFileSync } from 'fs';
 import { fileURLToPath, URL as URL$1 } from 'url';
@@ -258,6 +258,58 @@ async function undeprecateSkillVersion(username, skillName, version3) {
     };
   }
 }
+async function listGithubSkillVersions(owner, repo, name) {
+  const config2 = getConfig();
+  try {
+    const response = await fetch(
+      `${config2.baseUrl}/api/skills/@github/${owner}/${repo}/${name}/versions`,
+      {
+        method: "GET",
+        headers: {
+          "Content-Type": "application/json",
+          ...config2.apiKey ? { Authorization: `Bearer ${config2.apiKey}` } : {}
+        }
+      }
+    );
+    if (!response.ok) {
+      const error = await response.text();
+      return { status: response.status, error };
+    }
+    const data = await response.json();
+    return { status: response.status, data };
+  } catch (error) {
+    return {
+      status: 500,
+      error: error instanceof Error ? error.message : "Unknown error"
+    };
+  }
+}
+async function getGithubSkillVersion(owner, repo, name, version3) {
+  const config2 = getConfig();
+  try {
+    const response = await fetch(
+      `${config2.baseUrl}/api/skills/@github/${owner}/${repo}/${name}/versions/${version3}`,
+      {
+        method: "GET",
+        headers: {
+          "Content-Type": "application/json",
+          ...config2.apiKey ? { Authorization: `Bearer ${config2.apiKey}` } : {}
+        }
+      }
+    );
+    if (!response.ok) {
+      const error = await response.text();
+      return { status: response.status, error };
+    }
+    const data = await response.json();
+    return { status: response.status, data };
+  } catch (error) {
+    return {
+      status: 500,
+      error: error instanceof Error ? error.message : "Unknown error"
+    };
+  }
+}
 async function changeSkillAccess(username, skillName, input) {
   const config2 = getConfig();
   if (!config2) {
@@ -786,22 +838,98 @@ var init_manifest = __esm({
     PSPM_SCHEMA_URL = "https://pspm.dev/schema/v1/pspm.json";
   }
 });
-function resolveVersion(range, availableVersions) {
-  const sorted = availableVersions.filter((v) => semver.valid(v)).sort((a, b) => semver.rcompare(a, b));
+var init_integrity2 = __esm({
+  "../../packages/shared/pspm-types/src/integrity.ts"() {
+  }
+});
+
+// ../../packages/shared/pspm-types/src/local.ts
+var init_local = __esm({
+  "../../packages/shared/pspm-types/src/local.ts"() {
+  }
+});
+
+// ../../packages/shared/pspm-types/src/lockfile.ts
+var init_lockfile2 = __esm({
+  "../../packages/shared/pspm-types/src/lockfile.ts"() {
+  }
+});
+
+// ../../packages/shared/pspm-types/src/manifest.ts
+var init_manifest2 = __esm({
+  "../../packages/shared/pspm-types/src/manifest.ts"() {
+  }
+});
+
+// ../../packages/shared/pspm-types/src/specifier.ts
+function parseRegistrySpecifier(specifier) {
+  const match = specifier.match(REGISTRY_SPECIFIER_PATTERN);
+  if (!match) {
+    return null;
+  }
+  const namespace = match[1];
+  const owner = match[2];
+  const name = match[3];
+  const subname = match[4];
+  const versionRange = match[5];
+  if (!owner || !name) {
+    return null;
+  }
+  if (namespace === "github" && !subname) {
+    return null;
+  }
+  if (namespace !== "github" && subname) {
+    return null;
+  }
+  return {
+    namespace,
+    owner,
+    name,
+    subname: subname || void 0,
+    versionRange: versionRange || void 0
+  };
+}
+var REGISTRY_SPECIFIER_PATTERN;
+var init_specifier = __esm({
+  "../../packages/shared/pspm-types/src/specifier.ts"() {
+    REGISTRY_SPECIFIER_PATTERN = /^@(user|org|github)\/([a-zA-Z0-9_-]+)\/([a-zA-Z0-9._-]+)(?:\/([a-z][a-z0-9-]*))?(?:@(.+))?$/;
+  }
+});
+var init_version = __esm({
+  "../../packages/shared/pspm-types/src/version.ts"() {
+  }
+});
+
+// ../../packages/shared/pspm-types/src/index.ts
+var init_src = __esm({
+  "../../packages/shared/pspm-types/src/index.ts"() {
+    init_integrity2();
+    init_local();
+    init_lockfile2();
+    init_manifest2();
+    init_specifier();
+    init_version();
+  }
+});
+function resolveVersion2(range, availableVersions) {
+  const sorted = availableVersions.filter((v) => semver2.valid(v)).sort((a, b) => semver2.rcompare(a, b));
   if (!range || range === "latest" || range === "*") {
     return sorted[0] ?? null;
   }
-  return semver.maxSatisfying(sorted, range);
+  return semver2.maxSatisfying(sorted, range);
+}
+function isNewerVersion2(a, b) {
+  return semver2.gt(a, b);
 }
 function findHighestSatisfying(ranges, availableVersions) {
-  const sorted = availableVersions.filter((v) => semver.valid(v)).sort((a, b) => semver.rcompare(a, b));
+  const sorted = availableVersions.filter((v) => semver2.valid(v)).sort((a, b) => semver2.rcompare(a, b));
   if (sorted.length === 0) return null;
   const normalizedRanges = ranges.map(
     (r) => !r || r === "latest" || r === "*" ? "*" : r
   );
   for (const version3 of sorted) {
     const satisfiesAll = normalizedRanges.every(
-      (range) => semver.satisfies(version3, range)
+      (range) => semver2.satisfies(version3, range)
     );
     if (satisfiesAll) {
       return version3;
@@ -809,7 +937,7 @@ function findHighestSatisfying(ranges, availableVersions) {
   }
   return null;
 }
-var init_version = __esm({
+var init_version2 = __esm({
   "src/lib/version.ts"() {
   }
 });
@@ -872,8 +1000,8 @@ async function resolveRecursive(rootDeps, config2) {
       continue;
     }
     processing.add(name);
-    const match = name.match(/^@user\/([^/]+)\/([^/]+)$/);
-    if (!match) {
+    const parsed = parseRegistrySpecifier(name);
+    if (!parsed) {
       graph.errors.push({
         type: "package_not_found",
         package: name,
@@ -881,10 +1009,23 @@ async function resolveRecursive(rootDeps, config2) {
       });
       continue;
     }
-    const [, username, skillName] = match;
     try {
-      const versionsResponse = await listSkillVersions(username, skillName);
-      if (versionsResponse.status !== 200) {
+      let versionsData;
+      let versionsStatus;
+      if (parsed.namespace === "github" && parsed.subname) {
+        const resp = await listGithubSkillVersions(
+          parsed.owner,
+          parsed.name,
+          parsed.subname
+        );
+        versionsStatus = resp.status;
+        versionsData = resp.data;
+      } else {
+        const resp = await listSkillVersions(parsed.owner, parsed.name);
+        versionsStatus = resp.status;
+        versionsData = resp.status === 200 ? resp.data : void 0;
+      }
+      if (versionsStatus !== 200 || !versionsData) {
         graph.errors.push({
           type: "package_not_found",
           package: name,
@@ -892,8 +1033,7 @@ async function resolveRecursive(rootDeps, config2) {
         });
         continue;
       }
-      const versions = versionsResponse.data;
-      if (versions.length === 0) {
+      if (versionsData.length === 0) {
         graph.errors.push({
           type: "package_not_found",
           package: name,
@@ -901,7 +1041,7 @@ async function resolveRecursive(rootDeps, config2) {
         });
         continue;
       }
-      const availableVersions = versions.map((v) => v.version);
+      const availableVersions = versionsData.map((v) => v.version);
       const resolvedVersion = findHighestSatisfying(
         [versionRange],
         availableVersions
@@ -914,12 +1054,28 @@ async function resolveRecursive(rootDeps, config2) {
         });
         continue;
       }
-      const versionResponse = await getSkillVersion(
-        username,
-        skillName,
-        resolvedVersion
-      );
-      if (versionResponse.status !== 200 || !versionResponse.data) {
+      let versionData = null;
+      if (parsed.namespace === "github" && parsed.subname) {
+        const resp = await getGithubSkillVersion(
+          parsed.owner,
+          parsed.name,
+          parsed.subname,
+          resolvedVersion
+        );
+        if (resp.status === 200 && resp.data) {
+          versionData = resp.data;
+        }
+      } else {
+        const resp = await getSkillVersion(
+          parsed.owner,
+          parsed.name,
+          resolvedVersion
+        );
+        if (resp.status === 200 && resp.data) {
+          versionData = resp.data;
+        }
+      }
+      if (!versionData) {
         graph.errors.push({
           type: "fetch_error",
           package: name,
@@ -927,20 +1083,19 @@ async function resolveRecursive(rootDeps, config2) {
         });
         continue;
       }
-      const versionInfo = versionResponse.data;
-      const manifest = versionInfo.manifest;
+      const manifest = versionData.manifest;
       const dependencies = manifest?.dependencies ?? {};
       const node = {
         name,
         version: resolvedVersion,
         versionRange,
-        downloadUrl: versionInfo.downloadUrl,
-        integrity: `sha256-${Buffer.from(versionInfo.checksum, "hex").toString("base64")}`,
+        downloadUrl: versionData.downloadUrl,
+        integrity: `sha256-${Buffer.from(versionData.checksum, "hex").toString("base64")}`,
         depth,
         dependencies,
         dependents: [dependent],
         isDirect: depth === 0,
-        deprecated: versionInfo.deprecationMessage ?? void 0
+        deprecated: versionData.deprecationMessage ?? void 0
       };
       graph.nodes.set(name, node);
       for (const [depName, depRange] of Object.entries(dependencies)) {
@@ -967,14 +1122,23 @@ async function resolveRecursive(rootDeps, config2) {
     const uniqueDependents = [...new Set(ranges.map((r) => r.dependent))];
     node.dependents = uniqueDependents;
     const allRanges = ranges.map((r) => r.range);
-    const match = name.match(/^@user\/([^/]+)\/([^/]+)$/);
-    if (!match) continue;
-    const [, username, skillName] = match;
+    const p2Parsed = parseRegistrySpecifier(name);
+    if (!p2Parsed) continue;
     try {
-      const versionsResponse = await listSkillVersions(username, skillName);
-      if (versionsResponse.status !== 200) continue;
-      const versions = versionsResponse.data;
-      const availableVersions = versions.map((v) => v.version);
+      let p2Versions;
+      if (p2Parsed.namespace === "github" && p2Parsed.subname) {
+        const resp = await listGithubSkillVersions(
+          p2Parsed.owner,
+          p2Parsed.name,
+          p2Parsed.subname
+        );
+        p2Versions = resp.status === 200 ? resp.data : void 0;
+      } else {
+        const resp = await listSkillVersions(p2Parsed.owner, p2Parsed.name);
+        p2Versions = resp.status === 200 ? resp.data : void 0;
+      }
+      if (!p2Versions) continue;
+      const availableVersions = p2Versions.map((v) => v.version);
       const finalVersion = findHighestSatisfying(allRanges, availableVersions);
       if (!finalVersion) {
         graph.conflicts.push({
@@ -993,18 +1157,33 @@ async function resolveRecursive(rootDeps, config2) {
         continue;
       }
       if (finalVersion !== node.version) {
-        const versionResponse = await getSkillVersion(
-          username,
-          skillName,
-          finalVersion
-        );
-        if (versionResponse.status === 200 && versionResponse.data) {
-          const versionInfo = versionResponse.data;
+        let p2VersionData = null;
+        if (p2Parsed.namespace === "github" && p2Parsed.subname) {
+          const resp = await getGithubSkillVersion(
+            p2Parsed.owner,
+            p2Parsed.name,
+            p2Parsed.subname,
+            finalVersion
+          );
+          if (resp.status === 200 && resp.data) {
+            p2VersionData = resp.data;
+          }
+        } else {
+          const resp = await getSkillVersion(
+            p2Parsed.owner,
+            p2Parsed.name,
+            finalVersion
+          );
+          if (resp.status === 200 && resp.data) {
+            p2VersionData = resp.data;
+          }
+        }
+        if (p2VersionData) {
           node.version = finalVersion;
-          node.downloadUrl = versionInfo.downloadUrl;
-          node.integrity = `sha256-${Buffer.from(versionInfo.checksum, "hex").toString("base64")}`;
-          node.deprecated = versionInfo.deprecationMessage ?? void 0;
-          const manifest = versionInfo.manifest;
+          node.downloadUrl = p2VersionData.downloadUrl;
+          node.integrity = `sha256-${Buffer.from(p2VersionData.checksum, "hex").toString("base64")}`;
+          node.deprecated = p2VersionData.deprecationMessage ?? void 0;
+          const manifest = p2VersionData.manifest;
           node.dependencies = manifest?.dependencies ?? {};
         }
       }
@@ -1119,30 +1298,55 @@ function printResolutionErrors(errors, conflicts = []) {
 var MAX_DEPENDENCY_DEPTH;
 var init_resolver = __esm({
   "src/lib/resolver.ts"() {
+    init_src();
     init_api_client();
-    init_version();
+    init_version2();
     MAX_DEPENDENCY_DEPTH = 5;
   }
 });
 
 // src/lib/specifier.ts
-function parseSkillSpecifier(specifier) {
-  const match = specifier.match(SPECIFIER_PATTERN);
+function parseRegistrySpecifier2(specifier) {
+  const match = specifier.match(REGISTRY_SPECIFIER_PATTERN2);
   if (!match) {
     return null;
   }
-  const username = match[1];
-  const name = match[2];
-  if (!username || !name) {
+  const namespace = match[1];
+  const owner = match[2];
+  const name = match[3];
+  const subname = match[4];
+  const versionRange = match[5];
+  if (!owner || !name) {
+    return null;
+  }
+  if (namespace === "github" && !subname) {
+    return null;
+  }
+  if (namespace !== "github" && subname) {
     return null;
   }
   return {
-    username,
+    namespace,
+    owner,
     name,
-    versionRange: match[3]
+    subname: subname || void 0,
+    versionRange: versionRange || void 0
   };
 }
-function parseGitHubSpecifier(specifier) {
+function generateRegistryIdentifier2(spec) {
+  let base = `@${spec.namespace}/${spec.owner}/${spec.name}`;
+  if (spec.subname) {
+    base += `/${spec.subname}`;
+  }
+  if (spec.versionRange) {
+    base += `@${spec.versionRange}`;
+  }
+  return base;
+}
+function isRegistrySpecifier2(specifier) {
+  return specifier.startsWith("@user/") || specifier.startsWith("@org/") || specifier.startsWith("@github/");
+}
+function parseGitHubSpecifier2(specifier) {
   const match = specifier.match(GITHUB_SPECIFIER_PATTERN);
   if (!match) {
     return null;
@@ -1159,7 +1363,7 @@ function parseGitHubSpecifier(specifier) {
     ref: ref || void 0
   };
 }
-function formatGitHubSpecifier(spec) {
+function formatGitHubSpecifier2(spec) {
   let result = `github:${spec.owner}/${spec.repo}`;
   if (spec.path) {
     result += `/${spec.path}`;
@@ -1169,7 +1373,7 @@ function formatGitHubSpecifier(spec) {
   }
   return result;
 }
-function getGitHubSkillName(spec) {
+function getGitHubSkillName2(spec) {
   if (spec.path) {
     const segments = spec.path.split("/").filter(Boolean);
     const lastSegment = segments[segments.length - 1];
@@ -1179,7 +1383,7 @@ function getGitHubSkillName(spec) {
   }
   return spec.repo;
 }
-function isGitHubSpecifier(specifier) {
+function isGitHubSpecifier2(specifier) {
   return specifier.startsWith("github:");
 }
 function isGitHubUrl(input) {
@@ -1225,10 +1429,10 @@ function parseGitHubShorthand(input) {
     path: path || void 0
   };
 }
-var SPECIFIER_PATTERN, GITHUB_SPECIFIER_PATTERN, GITHUB_URL_TREE_PATTERN, GITHUB_URL_PATTERN, GITHUB_SHORTHAND_PATTERN;
-var init_specifier = __esm({
+var REGISTRY_SPECIFIER_PATTERN2, GITHUB_SPECIFIER_PATTERN, GITHUB_URL_TREE_PATTERN, GITHUB_URL_PATTERN, GITHUB_SHORTHAND_PATTERN;
+var init_specifier2 = __esm({
   "src/lib/specifier.ts"() {
-    SPECIFIER_PATTERN = /^@user\/([a-zA-Z0-9_-]+)\/([a-z][a-z0-9_-]*)(?:@(.+))?$/;
+    REGISTRY_SPECIFIER_PATTERN2 = /^@(user|org|github)\/([a-zA-Z0-9_-]+)\/([a-zA-Z0-9._-]+)(?:\/([a-z][a-z0-9-]*))?(?:@(.+))?$/;
     GITHUB_SPECIFIER_PATTERN = /^github:([a-zA-Z0-9_-]+)\/([a-zA-Z0-9_.-]+)(\/[^@]+)?(?:@(.+))?$/;
     GITHUB_URL_TREE_PATTERN = /^https?:\/\/github\.com\/([^/]+)\/([^/]+)\/tree\/([^/]+)(?:\/(.+))?$/;
     GITHUB_URL_PATTERN = /^https?:\/\/github\.com\/([^/]+)\/([^/]+?)(?:\.git)?\/?$/;
@@ -1244,8 +1448,8 @@ var init_lib = __esm({
     init_lockfile();
     init_manifest();
     init_resolver();
-    init_specifier();
-    init_version();
+    init_specifier2();
+    init_version2();
   }
 });
 function resolveAgentConfig(name, overrides, global) {
@@ -1890,7 +2094,7 @@ async function listLockfileWellKnownPackages() {
     })
   );
 }
-var init_lockfile2 = __esm({
+var init_lockfile3 = __esm({
   "src/lockfile.ts"() {
     init_config();
     init_lib();
@@ -1992,7 +2196,7 @@ async function addWellKnownDependency(baseUrl, skillNames) {
   }
   await writeManifest(manifest);
 }
-var init_manifest2 = __esm({
+var init_manifest3 = __esm({
   "src/manifest.ts"() {
     init_config();
   }
@@ -2063,8 +2267,19 @@ async function removeAgentSymlinks(skillName, options) {
     }
   }
 }
-function getRegistrySkillPath(username, skillName) {
-  return `.pspm/skills/${username}/${skillName}`;
+function getRegistrySkillPath(ownerOrNamespace, skillNameOrOwner, skillName) {
+  if (skillName !== void 0) {
+    const namespace = ownerOrNamespace;
+    const owner = skillNameOrOwner;
+    if (namespace === "org") {
+      return `.pspm/skills/_org/${owner}/${skillName}`;
+    }
+    if (namespace === "github") {
+      return `.pspm/skills/_github-registry/${owner}/${skillName}`;
+    }
+    return `.pspm/skills/${owner}/${skillName}`;
+  }
+  return `.pspm/skills/${ownerOrNamespace}/${skillNameOrOwner}`;
 }
 function getGitHubSkillPath(owner, repo, path) {
   if (path) {
@@ -2281,7 +2496,7 @@ var add_exports = {};
 __export(add_exports, {
   add: () => add
 });
-function isLocalSpecifier2(specifier) {
+function isLocalSpecifier3(specifier) {
   return specifier.startsWith("file:") || specifier.startsWith("./") || specifier.startsWith("../");
 }
 function parseLocalPath(specifier) {
@@ -2290,7 +2505,7 @@ function parseLocalPath(specifier) {
   }
   return specifier;
 }
-function normalizeToFileSpecifier(path) {
+function normalizeToFileSpecifier2(path) {
   if (path.startsWith("file:")) {
     return path;
   }
@@ -2306,18 +2521,27 @@ async function add(specifiers, options) {
   const validationErrors = [];
   for (const specifier of specifiers) {
     try {
-      if (isLocalSpecifier2(specifier)) {
+      if (isLocalSpecifier3(specifier)) {
         const resolved = await validateLocalPackage(specifier);
         resolvedPackages.push(resolved);
-      } else if (isGitHubSpecifier(specifier) || isGitHubUrl(specifier) || isGitHubShorthand(specifier)) {
+      } else if (isGitHubSpecifier2(specifier) || isGitHubUrl(specifier) || isGitHubShorthand(specifier)) {
         const resolved = await validateGitHubPackage(specifier);
         resolvedPackages.push(resolved);
       } else if (isWellKnownSpecifier(specifier)) {
         const resolved = await validateWellKnownPackage(specifier);
         resolvedPackages.push(resolved);
-      } else {
+      } else if (isRegistrySpecifier2(specifier)) {
         const resolved = await validateRegistryPackage(specifier);
         resolvedPackages.push(resolved);
+      } else {
+        throw new Error(
+          `Unknown specifier format "${specifier}". Supported formats:
+  @user/{username}/{name}[@version]  (registry)
+  @org/{orgname}/{name}[@version]    (organization)
+  github:owner/repo[/path][@ref]     (github)
+  file:./path/to/skill               (local)
+  owner/repo                         (github shorthand)`
+        );
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
@@ -2354,7 +2578,12 @@ async function add(specifiers, options) {
   if (registryPackages.length > 0) {
     const rootDeps = {};
     for (const pkg of registryPackages) {
-      const fullName = `@user/${pkg.username}/${pkg.name}`;
+      const fullName = generateRegistryIdentifier2({
+        namespace: pkg.namespace,
+        owner: pkg.owner,
+        name: pkg.name,
+        subname: pkg.subname
+      });
       rootDeps[fullName] = pkg.versionRange || `^${pkg.resolvedVersion}`;
     }
     console.log("Resolving dependencies...");
@@ -2487,11 +2716,11 @@ function getSymlinkRoot() {
   return isGlobalMode() ? homedir() : process.cwd();
 }
 async function installFromNode(node, options) {
-  const match = node.name.match(/^@user\/([^/]+)\/([^/]+)$/);
-  if (!match) {
+  const parsed = parseRegistrySpecifier2(node.name);
+  if (!parsed) {
     throw new Error(`Invalid package name: ${node.name}`);
   }
-  const [, username, name] = match;
+  const { namespace, owner, name, subname } = parsed;
   console.log(`Installing ${node.name}@${node.version}...`);
   const config2 = await resolveConfig();
   const apiKey = getTokenForRegistry(config2, config2.registryUrl);
@@ -2513,7 +2742,15 @@ async function installFromNode(node, options) {
     throw new Error("Checksum verification failed");
   }
   const skillsDir = getSkillsDir();
-  const destDir = join(skillsDir, username, name);
+  const effectiveSkillName = subname ?? name;
+  let destDir;
+  if (namespace === "org") {
+    destDir = join(skillsDir, "_org", owner, effectiveSkillName);
+  } else if (namespace === "github" && subname) {
+    destDir = join(skillsDir, "_github-registry", owner, name, subname);
+  } else {
+    destDir = join(skillsDir, owner, effectiveSkillName);
+  }
   await mkdir(destDir, { recursive: true });
   const { writeFile: writeFile11 } = await import('fs/promises');
   const tempFile = join(destDir, ".temp.tgz");
@@ -2552,9 +2789,10 @@ async function installFromNode(node, options) {
   const agents = options.resolvedAgents;
   if (agents[0] !== "none") {
     const skillManifest = await readManifest();
+    const pathSkillName = namespace === "github" && subname ? `${name}/${subname}` : name;
     const skillInfo = {
-      name,
-      sourcePath: getRegistrySkillPath(username, name)
+      name: effectiveSkillName,
+      sourcePath: getRegistrySkillPath(namespace, owner, pathSkillName)
     };
     await createAgentSymlinks([skillInfo], {
       agents,
@@ -2570,73 +2808,110 @@ async function validateRegistryPackage(specifier) {
   const config2 = await resolveConfig();
   const registryUrl = config2.registryUrl;
   const apiKey = getTokenForRegistry(config2, registryUrl);
-  const parsed = parseSkillSpecifier(specifier);
+  const parsed = parseRegistrySpecifier2(specifier);
   if (!parsed) {
     throw new Error(
-      `Invalid skill specifier "${specifier}". Use format: @user/{username}/{name}[@{version}]`
+      `Invalid skill specifier "${specifier}". Use format: @user/{username}/{name}[@{version}] or @org/{orgname}/{name}[@{version}]`
     );
   }
-  const { username, name, versionRange } = parsed;
+  const { namespace, owner, name, subname, versionRange } = parsed;
+  const fullName = generateRegistryIdentifier2({
+    namespace,
+    owner,
+    name,
+    subname
+  });
   configure2({ registryUrl, apiKey });
   console.log(`Resolving ${specifier}...`);
-  const versionsResponse = await listSkillVersions(username, name);
-  if (versionsResponse.status !== 200) {
-    if (versionsResponse.status === 401) {
-      if (!apiKey) {
+  let versions;
+  if (namespace === "github" && subname) {
+    const versionsResponse = await listGithubSkillVersions(
+      owner,
+      name,
+      subname
+    );
+    if (versionsResponse.status !== 200 || !versionsResponse.data) {
+      if (versionsResponse.status === 401) {
         throw new Error(
-          `Package @user/${username}/${name} requires authentication. Please run 'pspm login' to authenticate`
+          apiKey ? `Access denied to ${fullName}. You may not have permission to access this private package.` : `Package ${fullName} requires authentication. Please run 'pspm login' to authenticate`
         );
       }
-      throw new Error(
-        `Access denied to @user/${username}/${name}. You may not have permission to access this private package.`
+      throw new Error(versionsResponse.error || `Skill ${fullName} not found`);
+    }
+    versions = versionsResponse.data;
+  } else {
+    const versionsResponse = await listSkillVersions(owner, name);
+    if (versionsResponse.status !== 200) {
+      if (versionsResponse.status === 401) {
+        if (!apiKey) {
+          throw new Error(
+            `Package ${fullName} requires authentication. Please run 'pspm login' to authenticate`
+          );
+        }
+        throw new Error(
+          `Access denied to ${fullName}. You may not have permission to access this private package.`
+        );
+      }
+      const errorMessage = extractApiErrorMessage(
+        versionsResponse,
+        `Skill ${fullName} not found`
       );
+      throw new Error(errorMessage);
     }
-    const errorMessage = extractApiErrorMessage(
-      versionsResponse,
-      `Skill @user/${username}/${name} not found`
-    );
-    throw new Error(errorMessage);
+    versions = versionsResponse.data;
   }
-  const versions = versionsResponse.data;
   if (versions.length === 0) {
-    throw new Error(`Skill @user/${username}/${name} not found`);
+    throw new Error(`Skill ${fullName} not found`);
   }
   const versionStrings = versions.map((v) => v.version);
-  const resolvedVersion = resolveVersion(versionRange || "*", versionStrings);
+  const resolvedVersion = resolveVersion2(versionRange || "*", versionStrings);
   if (!resolvedVersion) {
     throw new Error(
-      `No version matching "${versionRange || "latest"}" found for @user/${username}/${name}. Available versions: ${versionStrings.join(", ")}`
+      `No version matching "${versionRange || "latest"}" found for ${fullName}. Available versions: ${versionStrings.join(", ")}`
     );
   }
-  const versionResponse = await getSkillVersion(
-    username,
-    name,
-    resolvedVersion
-  );
-  if (versionResponse.status !== 200 || !versionResponse.data) {
-    const errorMessage = extractApiErrorMessage(
-      versionResponse,
-      `Version ${resolvedVersion} not found`
+  let downloadUrl;
+  let checksum;
+  if (namespace === "github" && subname) {
+    const versionResponse = await getGithubSkillVersion(
+      owner,
+      name,
+      subname,
+      resolvedVersion
     );
-    throw new Error(errorMessage);
+    if (versionResponse.status !== 200 || !versionResponse.data) {
+      throw new Error(`Version ${resolvedVersion} not found for ${fullName}`);
+    }
+    downloadUrl = versionResponse.data.downloadUrl;
+    checksum = versionResponse.data.checksum;
+  } else {
+    const versionResponse = await getSkillVersion(owner, name, resolvedVersion);
+    if (versionResponse.status !== 200 || !versionResponse.data) {
+      const errorMessage = extractApiErrorMessage(
+        versionResponse,
+        `Version ${resolvedVersion} not found`
+      );
+      throw new Error(errorMessage);
+    }
+    downloadUrl = versionResponse.data.downloadUrl;
+    checksum = versionResponse.data.checksum;
   }
-  console.log(`Resolved @user/${username}/${name}@${resolvedVersion}`);
+  console.log(`Resolved ${fullName}@${resolvedVersion}`);
   return {
     type: "registry",
     specifier,
-    username,
+    namespace,
+    owner,
     name,
+    subname,
     versionRange,
     resolvedVersion,
-    versionInfo: {
-      downloadUrl: versionResponse.data.downloadUrl,
-      checksum: versionResponse.data.checksum
-    }
+    versionInfo: { downloadUrl, checksum }
   };
 }
 function parseAnyGitHubFormat(specifier) {
-  if (isGitHubSpecifier(specifier)) {
-    return parseGitHubSpecifier(specifier);
+  if (isGitHubSpecifier2(specifier)) {
+    return parseGitHubSpecifier2(specifier);
   }
   if (isGitHubUrl(specifier)) {
     return parseGitHubUrl(specifier);
@@ -2679,7 +2954,7 @@ async function installGitHubPackage(resolved, options) {
     downloadResult.buffer,
     skillsDir
   );
-  const lockfileSpecifier = formatGitHubSpecifier({
+  const lockfileSpecifier = formatGitHubSpecifier2({
     owner: parsed.owner,
     repo: parsed.repo,
     path: parsed.path
@@ -2697,7 +2972,7 @@ async function installGitHubPackage(resolved, options) {
   const agents = options.resolvedAgents;
   if (agents[0] !== "none") {
     const manifest = await readManifest();
-    const skillName = getGitHubSkillName(parsed);
+    const skillName = getGitHubSkillName2(parsed);
     const skillInfo = {
       name: skillName,
       sourcePath: getGitHubSkillPath(parsed.owner, parsed.repo, parsed.path)
@@ -2717,7 +2992,7 @@ async function installGitHubPackage(resolved, options) {
 async function validateLocalPackage(specifier) {
   const path = parseLocalPath(specifier);
   const resolvedPath = resolve(process.cwd(), path);
-  const normalizedSpecifier = normalizeToFileSpecifier(path);
+  const normalizedSpecifier = normalizeToFileSpecifier2(path);
   console.log(`Resolving ${specifier}...`);
   try {
     const stats = await stat(resolvedPath);
@@ -2866,8 +3141,8 @@ var init_add = __esm({
     init_errors();
     init_github();
     init_lib();
-    init_lockfile2();
-    init_manifest2();
+    init_lockfile3();
+    init_manifest3();
     init_symlinks();
     init_wellknown();
   }
@@ -2877,7 +3152,7 @@ var init_add = __esm({
 init_api_client();
 init_config();
 init_lib();
-function isLocalSpecifier(specifier) {
+function isLocalSpecifier2(specifier) {
   return specifier.startsWith("file:") || specifier.startsWith("./") || specifier.startsWith("../");
 }
 async function access(specifier, options) {
@@ -2896,8 +3171,8 @@ async function access(specifier, options) {
     let packageName;
     let packageUsername;
     if (specifier) {
-      if (isGitHubSpecifier(specifier)) {
-        const ghSpec = parseGitHubSpecifier(specifier);
+      if (isGitHubSpecifier2(specifier)) {
+        const ghSpec = parseGitHubSpecifier2(specifier);
         if (ghSpec) {
           console.error(`Error: Cannot change visibility of GitHub packages.`);
           console.error(
@@ -2912,7 +3187,7 @@ async function access(specifier, options) {
         }
         process.exit(1);
       }
-      if (isLocalSpecifier(specifier)) {
+      if (isLocalSpecifier2(specifier)) {
         console.error(`Error: Cannot change visibility of local packages.`);
         console.error(
           `  "${specifier}" is a local directory, not a registry package.`
@@ -2922,10 +3197,12 @@ async function access(specifier, options) {
         );
         process.exit(1);
       }
-      const parsed = parseSkillSpecifier(specifier);
+      const parsed = parseRegistrySpecifier2(specifier);
       if (!parsed) {
         console.error(`Error: Invalid package specifier "${specifier}".`);
-        console.error(`  Use format: @user/{username}/{name}`);
+        console.error(
+          `  Use format: @user/{username}/{name} or @org/{orgname}/{name}`
+        );
         console.error(``);
         console.error(`  Examples:`);
         console.error(`    pspm access @user/myname/my-skill --public`);
@@ -2935,7 +3212,7 @@ async function access(specifier, options) {
         process.exit(1);
       }
       packageName = parsed.name;
-      packageUsername = parsed.username;
+      packageUsername = parsed.owner;
     } else {
       const { readFile: readFile10 } = await import('fs/promises');
       const { join: join18 } = await import('path');
@@ -2991,7 +3268,7 @@ async function access(specifier, options) {
     }
     const result = response.data;
     console.log(
-      `+ @user/${result.username}/${result.name} is now ${result.visibility}`
+      `+ @${result.namespace ?? "user"}/${result.username}/${result.name} is now ${result.visibility}`
     );
     if (visibility === "public") {
       console.log("");
@@ -3012,7 +3289,7 @@ init_add();
 // src/commands/audit.ts
 init_config();
 init_lib();
-init_lockfile2();
+init_lockfile3();
 async function audit(options) {
   try {
     const lockfile = await readLockfile();
@@ -3082,7 +3359,7 @@ async function audit(options) {
     }
     const githubSkills = await listLockfileGitHubPackages();
     for (const { specifier } of githubSkills) {
-      const parsed = parseGitHubSpecifier(specifier);
+      const parsed = parseGitHubSpecifier2(specifier);
       if (!parsed) continue;
       const destDir = parsed.path ? join(
         projectRoot,
@@ -3280,14 +3557,19 @@ async function deprecate(specifier, message, options) {
   try {
     const apiKey = await requireApiKey();
     const registryUrl = await getRegistryUrl();
-    const parsed = parseSkillSpecifier(specifier);
+    const parsed = parseRegistrySpecifier2(specifier);
     if (!parsed) {
       console.error(
-        `Error: Invalid skill specifier "${specifier}". Use format: @user/{username}/{name}@{version}`
+        `Error: Invalid skill specifier "${specifier}". Use format: @user/{username}/{name}@{version} or @org/{orgname}/{name}@{version}`
       );
       process.exit(1);
     }
-    const { username, name, versionRange } = parsed;
+    const { owner, name, versionRange } = parsed;
+    const fullName = generateRegistryIdentifier2({
+      namespace: parsed.namespace,
+      owner,
+      name
+    });
     if (!versionRange) {
       console.error(
         "Error: Version is required for deprecation. Use format: @user/{username}/{name}@{version}"
@@ -3296,23 +3578,15 @@ async function deprecate(specifier, message, options) {
     }
     configure2({ registryUrl, apiKey });
     if (options.undo) {
-      console.log(
-        `Removing deprecation from @user/${username}/${name}@${versionRange}...`
-      );
-      const response = await undeprecateSkillVersion(
-        username,
-        name,
-        versionRange
-      );
+      console.log(`Removing deprecation from ${fullName}@${versionRange}...`);
+      const response = await undeprecateSkillVersion(owner, name, versionRange);
       if (response.status !== 200) {
         console.error(
           `Error: ${response.error || "Failed to remove deprecation"}`
         );
         process.exit(1);
       }
-      console.log(
-        `Removed deprecation from @user/${username}/${name}@${versionRange}`
-      );
+      console.log(`Removed deprecation from ${fullName}@${versionRange}`);
     } else {
       if (!message) {
         console.error(
@@ -3320,9 +3594,9 @@ async function deprecate(specifier, message, options) {
         );
         process.exit(1);
       }
-      console.log(`Deprecating @user/${username}/${name}@${versionRange}...`);
+      console.log(`Deprecating ${fullName}@${versionRange}...`);
       const response = await deprecateSkillVersion(
-        username,
+        owner,
         name,
         versionRange,
         message
@@ -3333,7 +3607,7 @@ async function deprecate(specifier, message, options) {
         );
         process.exit(1);
       }
-      console.log(`Deprecated @user/${username}/${name}@${versionRange}`);
+      console.log(`Deprecated ${fullName}@${versionRange}`);
       console.log(`Message: ${message}`);
       console.log("");
       console.log(
@@ -3573,8 +3847,8 @@ init_config();
 init_errors();
 init_github();
 init_lib();
-init_lockfile2();
-init_manifest2();
+init_lockfile3();
+init_manifest3();
 init_symlinks();
 function getCacheFilePath(cacheDir, integrity) {
   const match = integrity.match(/^sha256-(.+)$/);
@@ -3659,14 +3933,14 @@ async function installFromLockfile(options) {
 `);
       configure2({ registryUrl, apiKey });
       for (const { fullName, versionRange } of missingDeps) {
-        const parsed = parseSkillSpecifier(fullName);
+        const parsed = parseRegistrySpecifier2(fullName);
         if (!parsed) {
           console.error(`Error: Invalid dependency specifier: ${fullName}`);
           continue;
         }
-        const { username, name } = parsed;
+        const { owner, name } = parsed;
         console.log(`Resolving ${fullName}@${versionRange}...`);
-        const versionsResponse = await listSkillVersions(username, name);
+        const versionsResponse = await listSkillVersions(owner, name);
         if (versionsResponse.status !== 200) {
           const errorMessage = extractApiErrorMessage(
             versionsResponse,
@@ -3683,14 +3957,14 @@ async function installFromLockfile(options) {
         const versionStrings = versions.map(
           (v) => v.version
         );
-        const resolved = resolveVersion(versionRange || "*", versionStrings);
+        const resolved = resolveVersion2(versionRange || "*", versionStrings);
         if (!resolved) {
           console.error(
             `Error: No version matching "${versionRange}" for ${fullName}`
           );
           continue;
         }
-        const versionResponse = await getSkillVersion(username, name, resolved);
+        const versionResponse = await getSkillVersion(owner, name, resolved);
         if (versionResponse.status !== 200 || !versionResponse.data) {
           const errorMessage = extractApiErrorMessage(
             versionResponse,
@@ -3750,7 +4024,7 @@ Resolving ${missingGitHubDeps.length} GitHub dependency(ies)...
 `
       );
       for (const { specifier, ref } of missingGitHubDeps) {
-        const parsed = parseGitHubSpecifier(specifier);
+        const parsed = parseGitHubSpecifier2(specifier);
         if (!parsed) {
           console.error(`Error: Invalid GitHub specifier: ${specifier}`);
           continue;
@@ -3810,12 +4084,12 @@ Installing ${packageCount} registry skill(s)...
       const installOrder = computeInstallOrder(packages);
       const entries = installOrder.filter((name) => packages[name]).map((name) => [name, packages[name]]);
       for (const [fullName, entry] of entries) {
-        const match = fullName.match(/^@user\/([^/]+)\/([^/]+)$/);
-        if (!match) {
+        const parsedName = parseRegistrySpecifier2(fullName);
+        if (!parsedName) {
           console.warn(`Warning: Invalid skill name in lockfile: ${fullName}`);
           continue;
         }
-        const [, username, name] = match;
+        const { namespace: ns, owner: pkgOwner, name, subname } = parsedName;
         console.log(`Installing ${fullName}@${entry.version}...`);
         let tarballBuffer;
         let fromCache = false;
@@ -3864,7 +4138,21 @@ Installing ${packageCount} registry skill(s)...
           }
           await writeToCache(cacheDir, entry.integrity, tarballBuffer);
         }
-        const destDir = join(skillsDir, username, name);
+        const effectiveSkillName = subname ?? name;
+        let destDir;
+        if (ns === "org") {
+          destDir = join(skillsDir, "_org", pkgOwner, effectiveSkillName);
+        } else if (ns === "github" && subname) {
+          destDir = join(
+            skillsDir,
+            "_github-registry",
+            pkgOwner,
+            name,
+            subname
+          );
+        } else {
+          destDir = join(skillsDir, pkgOwner, effectiveSkillName);
+        }
         await rm(destDir, { recursive: true, force: true });
         await mkdir(destDir, { recursive: true });
         const tempFile = join(destDir, ".temp.tgz");
@@ -3882,9 +4170,10 @@ Installing ${packageCount} registry skill(s)...
         console.log(
           `  Installed to ${destDir}${fromCache ? " (from cache)" : ""}`
         );
+        const pathSkillName = ns === "github" && subname ? `${name}/${subname}` : name;
         installedSkills.push({
-          name,
-          sourcePath: getRegistrySkillPath(username, name)
+          name: effectiveSkillName,
+          sourcePath: getRegistrySkillPath(ns, pkgOwner, pathSkillName)
         });
       }
     }
@@ -3895,7 +4184,7 @@ Installing ${packageCount} registry skill(s)...
 Installing ${githubCount} GitHub skill(s)...
 `);
       for (const [specifier, entry] of Object.entries(githubPackages)) {
-        const parsed = parseGitHubSpecifier(specifier);
+        const parsed = parseGitHubSpecifier2(specifier);
         if (!parsed) {
           console.warn(
             `Warning: Invalid GitHub specifier in lockfile: ${specifier}`
@@ -3950,7 +4239,7 @@ Installing ${githubCount} GitHub skill(s)...
           console.log(
             `  Installed to ${destPath}${fromCache ? " (from cache)" : ""}`
           );
-          const skillName = getGitHubSkillName(parsed);
+          const skillName = getGitHubSkillName2(parsed);
           installedSkills.push({
             name: skillName,
             sourcePath: getGitHubSkillPath(
@@ -3996,8 +4285,8 @@ All ${totalCount} skill(s) installed.`);
 // src/commands/link.ts
 init_agents();
 init_lib();
-init_lockfile2();
-init_manifest2();
+init_lockfile3();
+init_manifest3();
 init_symlinks();
 async function link(options) {
   try {
@@ -4025,26 +4314,32 @@ async function link(options) {
     const skills = [];
     const registrySkills = await listLockfileSkills();
     for (const { name } of registrySkills) {
-      const parsed = parseSkillSpecifier(name);
+      const parsed = parseRegistrySpecifier2(name);
       if (!parsed) {
         console.warn(`Warning: Invalid skill name in lockfile: ${name}`);
         continue;
       }
+      const effectiveName = parsed.subname ?? parsed.name;
+      const pathName = parsed.namespace === "github" && parsed.subname ? `${parsed.name}/${parsed.subname}` : parsed.name;
       skills.push({
-        name: parsed.name,
-        sourcePath: getRegistrySkillPath(parsed.username, parsed.name)
+        name: effectiveName,
+        sourcePath: getRegistrySkillPath(
+          parsed.namespace,
+          parsed.owner,
+          pathName
+        )
       });
     }
     const githubSkills = await listLockfileGitHubPackages();
     for (const { specifier } of githubSkills) {
-      const parsed = parseGitHubSpecifier(specifier);
+      const parsed = parseGitHubSpecifier2(specifier);
       if (!parsed) {
         console.warn(
           `Warning: Invalid GitHub specifier in lockfile: ${specifier}`
         );
         continue;
       }
-      const skillName = getGitHubSkillName(parsed);
+      const skillName = getGitHubSkillName2(parsed);
       skills.push({
         name: skillName,
         sourcePath: getGitHubSkillPath(parsed.owner, parsed.repo, parsed.path)
@@ -4079,8 +4374,8 @@ async function link(options) {
 // src/commands/list.ts
 init_agents();
 init_lib();
-init_lockfile2();
-init_manifest2();
+init_lockfile3();
+init_manifest3();
 init_symlinks();
 async function list(options) {
   try {
@@ -4097,10 +4392,15 @@ async function list(options) {
     const projectRoot = process.cwd();
     const skills = [];
     for (const { name: fullName, entry } of registrySkills) {
-      const match = fullName.match(/^@user\/([^/]+)\/([^/]+)$/);
-      if (!match) continue;
-      const [, username, skillName] = match;
-      const sourcePath = getRegistrySkillPath(username, skillName);
+      const parsed = parseRegistrySpecifier2(fullName);
+      if (!parsed) continue;
+      const skillName = parsed.subname ?? parsed.name;
+      const pathName = parsed.namespace === "github" && parsed.subname ? `${parsed.name}/${parsed.subname}` : parsed.name;
+      const sourcePath = getRegistrySkillPath(
+        parsed.namespace,
+        parsed.owner,
+        pathName
+      );
       const absolutePath = join(projectRoot, sourcePath);
       let status = "installed";
       try {
@@ -4125,10 +4425,10 @@ async function list(options) {
       });
     }
     for (const { specifier, entry } of githubSkills) {
-      const parsed = parseGitHubSpecifier(specifier);
+      const parsed = parseGitHubSpecifier2(specifier);
       if (!parsed) continue;
       const ghEntry = entry;
-      const skillName = getGitHubSkillName(parsed);
+      const skillName = getGitHubSkillName2(parsed);
       const sourcePath = getGitHubSkillPath(
         parsed.owner,
         parsed.repo,
@@ -4442,7 +4742,7 @@ async function logout() {
 
 // src/commands/migrate.ts
 init_config();
-init_lockfile2();
+init_lockfile3();
 async function migrate(options) {
   try {
     const legacySkillsDir = getLegacySkillsDir();
@@ -4542,20 +4842,20 @@ async function migrate(options) {
     process.exit(1);
   }
 }
-function resolveVersion2(range, availableVersions) {
-  const sorted = availableVersions.filter((v) => semver.valid(v)).sort((a, b) => semver.rcompare(a, b));
+function resolveVersion3(range, availableVersions) {
+  const sorted = availableVersions.filter((v) => semver2.valid(v)).sort((a, b) => semver2.rcompare(a, b));
   if (range === "latest") {
     return sorted[0] ?? null;
   }
-  return semver.maxSatisfying(sorted, range);
+  return semver2.maxSatisfying(sorted, range);
 }
-function compareVersions2(a, b) {
-  return semver.compare(a, b);
+function compareVersions3(a, b) {
+  return semver2.compare(a, b);
 }
-function getLatestVersion2(versions) {
-  const valid3 = versions.filter((v) => semver.valid(v));
-  if (valid3.length === 0) return null;
-  return valid3.sort((a, b) => semver.rcompare(a, b))[0];
+function getLatestVersion3(versions) {
+  const valid5 = versions.filter((v) => semver2.valid(v));
+  if (valid5.length === 0) return null;
+  return valid5.sort((a, b) => semver2.rcompare(a, b))[0];
 }
 
 // ../../packages/server/skill-registry/src/client/outdated.ts
@@ -4588,14 +4888,14 @@ function createOutdatedChecker(config2) {
       const versions = await fetchRegistryVersions(username, name);
       const versionStrings = versions.map((v) => v.version);
       const range = versionRange || "*";
-      const wanted = resolveVersion2(range, versionStrings);
-      const latest = getLatestVersion2(versionStrings);
+      const wanted = resolveVersion3(range, versionStrings);
+      const latest = getLatestVersion3(versionStrings);
       const currentVersionInfo = versions.find(
         (v) => v.version === entry.version
       );
       const deprecated = currentVersionInfo?.deprecationMessage ?? void 0;
-      const isOutdated = wanted !== null && compareVersions2(entry.version, wanted) < 0 || latest !== null && compareVersions2(entry.version, latest) < 0;
-      const wantedBehindLatest = wanted !== null && latest !== null && compareVersions2(wanted, latest) < 0;
+      const isOutdated = wanted !== null && compareVersions3(entry.version, wanted) < 0 || latest !== null && compareVersions3(entry.version, latest) < 0;
+      const wantedBehindLatest = wanted !== null && latest !== null && compareVersions3(wanted, latest) < 0;
       return {
         name: specifier,
         current: entry.version,
@@ -4728,8 +5028,8 @@ async function checkOutdated(config2, options) {
 
 // src/commands/outdated.ts
 init_config();
-init_lockfile2();
-init_manifest2();
+init_lockfile3();
+init_manifest3();
 async function outdated(packages, options) {
   try {
     const lockfile = await readLockfile();
@@ -4937,8 +5237,8 @@ async function publishCommand(options) {
       dependencies: manifest.dependencies
     };
     if (options.bump) {
-      const semver4 = await import('semver');
-      const newVersion = semver4.default.inc(packageJson2.version, options.bump);
+      const semver6 = await import('semver');
+      const newVersion = semver6.default.inc(packageJson2.version, options.bump);
       if (!newVersion) {
         console.error(
           `Error: Failed to bump version from ${packageJson2.version}`
@@ -5067,7 +5367,7 @@ async function publishCommand(options) {
       const visibility = result.skill.visibility;
       const visibilityIcon = visibility === "public" ? "\u{1F310}" : "\u{1F512}";
       console.log(
-        `+ @user/${result.skill.username}/${result.skill.name}@${result.version.version}`
+        `+ @${result.skill.namespace ?? "user"}/${result.skill.username}/${result.skill.name}@${result.version.version}`
       );
       console.log(`Checksum: ${result.version.checksum}`);
       console.log(`Visibility: ${visibilityIcon} ${visibility}`);
@@ -5094,17 +5394,17 @@ async function publishCommand(options) {
 init_agents();
 init_config();
 init_lib();
-init_lockfile2();
-init_manifest2();
+init_lockfile3();
+init_manifest3();
 init_symlinks();
 async function remove(nameOrSpecifier) {
   try {
     const manifest = await readManifest();
     const agentConfigs = manifest?.agents;
     const agents = getAvailableAgents(agentConfigs);
-    if (isGitHubSpecifier(nameOrSpecifier)) {
+    if (isGitHubSpecifier2(nameOrSpecifier)) {
       await removeGitHub(nameOrSpecifier, agents, agentConfigs);
-    } else if (nameOrSpecifier.startsWith("@user/")) {
+    } else if (isRegistrySpecifier2(nameOrSpecifier)) {
       await removeRegistry(nameOrSpecifier, agents, agentConfigs);
     } else {
       await removeByShortName(nameOrSpecifier, agents, agentConfigs);
@@ -5116,14 +5416,13 @@ async function remove(nameOrSpecifier) {
   }
 }
 async function removeRegistry(specifier, agents, agentConfigs) {
-  const match = specifier.match(/^@user\/([^/]+)\/([^@/]+)/);
-  if (!match) {
+  const parsed = parseRegistrySpecifier2(specifier);
+  if (!parsed) {
     console.error(`Error: Invalid skill specifier: ${specifier}`);
     process.exit(1);
   }
-  const fullName = `@user/${match[1]}/${match[2]}`;
-  const username = match[1];
-  const name = match[2];
+  const { namespace, owner, name } = parsed;
+  const fullName = `@${namespace}/${owner}/${name}`;
   console.log(`Removing ${fullName}...`);
   const removedFromLockfile = await removeFromLockfile(fullName);
   const removedFromManifest = await removeDependency(fullName);
@@ -5137,7 +5436,7 @@ async function removeRegistry(specifier, agents, agentConfigs) {
     agentConfigs
   });
   const skillsDir = getSkillsDir();
-  const destDir = join(skillsDir, username, name);
+  const destDir = namespace === "org" ? join(skillsDir, "_org", owner, name) : join(skillsDir, owner, name);
   try {
     await rm(destDir, { recursive: true, force: true });
   } catch {
@@ -5145,7 +5444,7 @@ async function removeRegistry(specifier, agents, agentConfigs) {
   console.log(`Removed ${fullName}`);
 }
 async function removeGitHub(specifier, agents, agentConfigs) {
-  const parsed = parseGitHubSpecifier(specifier);
+  const parsed = parseGitHubSpecifier2(specifier);
   if (!parsed) {
     console.error(`Error: Invalid GitHub specifier: ${specifier}`);
     process.exit(1);
@@ -5158,7 +5457,7 @@ async function removeGitHub(specifier, agents, agentConfigs) {
     console.error(`Error: ${lockfileKey} not found in lockfile or pspm.json`);
     process.exit(1);
   }
-  const skillName = getGitHubSkillName(parsed);
+  const skillName = getGitHubSkillName2(parsed);
   await removeAgentSymlinks(skillName, {
     agents,
     projectRoot: process.cwd(),
@@ -5176,8 +5475,8 @@ async function removeGitHub(specifier, agents, agentConfigs) {
 async function removeByShortName(shortName, agents, agentConfigs) {
   const registrySkills = await listLockfileSkills();
   const foundRegistry = registrySkills.find((s) => {
-    const match = s.name.match(/^@user\/([^/]+)\/([^/]+)$/);
-    return match && match[2] === shortName;
+    const parsed = parseRegistrySpecifier2(s.name);
+    return parsed && parsed.name === shortName;
   });
   if (foundRegistry) {
     await removeRegistry(foundRegistry.name, agents, agentConfigs);
@@ -5185,9 +5484,9 @@ async function removeByShortName(shortName, agents, agentConfigs) {
   }
   const githubSkills = await listLockfileGitHubPackages();
   const foundGitHub = githubSkills.find((s) => {
-    const parsed = parseGitHubSpecifier(s.specifier);
+    const parsed = parseGitHubSpecifier2(s.specifier);
     if (!parsed) return false;
-    return getGitHubSkillName(parsed) === shortName;
+    return getGitHubSkillName2(parsed) === shortName;
   });
   if (foundGitHub) {
     await removeGitHub(foundGitHub.specifier, agents, agentConfigs);
@@ -5240,7 +5539,7 @@ async function search(query, options) {
       return;
     }
     for (const skill of skills) {
-      const name = `@user/${skill.username}/${skill.name}`;
+      const name = `@${skill.namespace ?? "user"}/${skill.username}/${skill.name}`;
       const desc = skill.description ? ` - ${skill.description.slice(0, 80)}${skill.description.length > 80 ? "..." : ""}` : "";
       const downloads = skill.totalDownloads > 0 ? ` (${formatDownloads(skill.totalDownloads)} downloads)` : "";
       console.log(`  ${name}${downloads}`);
@@ -5260,7 +5559,7 @@ ${total} skill(s) found.`);
       const first = skills[0];
       console.log(
         `
-Install with: pspm add @user/${first.username}/${first.name}`
+Install with: pspm add @${first.namespace ?? "user"}/${first.username}/${first.name}`
       );
     }
   } catch (error) {
@@ -5288,14 +5587,19 @@ async function unpublish(specifier, options) {
   try {
     const apiKey = await requireApiKey();
     const registryUrl = await getRegistryUrl();
-    const parsed = parseSkillSpecifier(specifier);
+    const parsed = parseRegistrySpecifier2(specifier);
     if (!parsed) {
       console.error(
-        `Error: Invalid skill specifier "${specifier}". Use format: @user/{username}/{name}[@{version}]`
+        `Error: Invalid skill specifier "${specifier}". Use format: @user/{username}/{name}[@{version}] or @org/{orgname}/{name}[@{version}]`
       );
       process.exit(1);
     }
-    const { username, name, versionRange } = parsed;
+    const { owner, name, versionRange } = parsed;
+    const fullName = generateRegistryIdentifier2({
+      namespace: parsed.namespace,
+      owner,
+      name
+    });
     configure2({ registryUrl, apiKey });
     if (versionRange) {
       console.log(`Unpublishing ${specifier}...`);
@@ -5305,7 +5609,7 @@ async function unpublish(specifier, options) {
         );
         process.exit(1);
       }
-      const response = await deleteSkillVersion(username, name, versionRange);
+      const response = await deleteSkillVersion(owner, name, versionRange);
       if (response.status !== 200) {
         const errorMessage = extractApiErrorMessage(
           response,
@@ -5314,16 +5618,16 @@ async function unpublish(specifier, options) {
         console.error(`Error: ${errorMessage}`);
         process.exit(1);
       }
-      console.log(`Unpublished @user/${username}/${name}@${versionRange}`);
+      console.log(`Unpublished ${fullName}@${versionRange}`);
     } else {
-      console.log(`Unpublishing all versions of @user/${username}/${name}...`);
+      console.log(`Unpublishing all versions of ${fullName}...`);
       if (!options.force) {
         console.error(
           "Warning: This will delete ALL versions. Use --force to confirm."
         );
         process.exit(1);
       }
-      const response = await deleteSkill(username, name);
+      const response = await deleteSkill(owner, name);
       if (response.status !== 200) {
         const errorMessage = extractApiErrorMessage(
           response,
@@ -5332,7 +5636,7 @@ async function unpublish(specifier, options) {
         console.error(`Error: ${errorMessage}`);
         process.exit(1);
       }
-      console.log(`Unpublished @user/${username}/${name} (all versions)`);
+      console.log(`Unpublished ${fullName} (all versions)`);
     }
   } catch (error) {
     const message = error instanceof Error ? error.message : "Unknown error";
@@ -5346,7 +5650,7 @@ init_api_client();
 init_config();
 init_errors();
 init_lib();
-init_lockfile2();
+init_lockfile3();
 init_add();
 async function update(options) {
   try {
@@ -5362,11 +5666,13 @@ async function update(options) {
     const updates = [];
     console.log("Checking for updates...\n");
     for (const { name, entry } of skills) {
-      const match = name.match(/^@user\/([^/]+)\/([^/]+)$/);
-      if (!match) continue;
-      const [, username, skillName] = match;
+      const parsed = parseRegistrySpecifier2(name);
+      if (!parsed) continue;
       try {
-        const versionsResponse = await listSkillVersions(username, skillName);
+        const versionsResponse = await listSkillVersions(
+          parsed.owner,
+          parsed.name
+        );
         if (versionsResponse.status !== 200) {
           const errorMessage = extractApiErrorMessage(
             versionsResponse,
@@ -5380,7 +5686,7 @@ async function update(options) {
         const versionStrings = versions.map(
           (v) => v.version
         );
-        const latest = resolveVersion("*", versionStrings);
+        const latest = resolveVersion2("*", versionStrings);
         if (latest && latest !== entry.version) {
           updates.push({
             name,
@@ -5405,11 +5711,10 @@ async function update(options) {
       return;
     }
     console.log("\nUpdating...\n");
-    for (const { name, latest } of updates) {
-      const match = name.match(/^@user\/([^/]+)\/([^/]+)$/);
-      if (!match) continue;
-      const [, username, skillName] = match;
-      const specifier = `@user/${username}/${skillName}@${latest}`;
+    for (const { name: pkgName, latest } of updates) {
+      const parsed = parseRegistrySpecifier2(pkgName);
+      if (!parsed) continue;
+      const specifier = `${pkgName}@${latest}`;
       await add([specifier], {});
     }
     console.log("\nAll skills updated.");
@@ -5424,12 +5729,12 @@ async function upgrade() {
   try {
     const currentVersion = getCurrentVersion();
     console.log("Checking for updates...\n");
-    const latestVersion = getLatestVersion3(packageName);
+    const latestVersion = getLatestVersion4(packageName);
     if (!latestVersion) {
       console.error("Error: Could not fetch latest version from registry.");
       process.exit(1);
     }
-    if (currentVersion === latestVersion) {
+    if (semver2.valid(currentVersion) && semver2.valid(latestVersion) && !semver2.gt(latestVersion, currentVersion)) {
       console.log(`Already on the latest version: ${currentVersion}`);
       return;
     }
@@ -5462,7 +5767,7 @@ function getCurrentVersion() {
     return "unknown";
   }
 }
-function getLatestVersion3(packageName) {
+function getLatestVersion4(packageName) {
   try {
     const output = execSync(`npm view ${packageName} version`, {
       encoding: "utf-8",
@@ -5514,7 +5819,7 @@ function getInstallCommand(pm, packageName, version3) {
 }
 
 // src/commands/version.ts
-init_manifest2();
+init_manifest3();
 async function version(bump, options = {}) {
   try {
     const manifest = await readManifest();
@@ -5530,7 +5835,7 @@ async function version(bump, options = {}) {
       );
       process.exit(1);
     }
-    if (!semver__default.valid(manifest.version)) {
+    if (!semver2__default.valid(manifest.version)) {
       console.error(
         `Error: Current version "${manifest.version}" is not valid semver.`
       );
@@ -5539,7 +5844,7 @@ async function version(bump, options = {}) {
       );
       process.exit(1);
     }
-    const newVersion = semver__default.inc(manifest.version, bump);
+    const newVersion = semver2__default.inc(manifest.version, bump);
     if (!newVersion) {
       console.error(`Error: Failed to bump version from ${manifest.version}`);
       process.exit(1);
@@ -5585,6 +5890,9 @@ async function whoami() {
     process.exit(1);
   }
 }
+
+// src/update-notifier.ts
+init_version2();
 var PACKAGE_NAME = "@anytio/pspm";
 var CHECK_INTERVAL_MS = 24 * 60 * 60 * 1e3;
 var CACHE_DIR = join(homedir(), ".pspm");
@@ -5593,7 +5901,7 @@ async function checkForUpdates(currentVersion) {
   try {
     const cache = await readCache();
     if (cache && Date.now() - cache.lastCheck < CHECK_INTERVAL_MS) {
-      if (cache.latestVersion !== currentVersion) {
+      if (isNewerVersion2(cache.latestVersion, currentVersion)) {
         printUpdateWarning(currentVersion, cache.latestVersion);
       }
       return;
@@ -5628,7 +5936,7 @@ function fetchAndCache(currentVersion) {
     };
     writeCache(cache).catch(() => {
     });
-    if (latestVersion !== currentVersion) {
+    if (isNewerVersion2(latestVersion, currentVersion)) {
       printUpdateWarning(currentVersion, latestVersion);
     }
   } catch {
@@ -5650,7 +5958,7 @@ var packageJson = JSON.parse(
 );
 var version2 = packageJson.version;
 var program = new Command();
-program.name("pspm").description("Prompt Skill Package Manager for AI coding agents").version(version2);
+program.name("pspm").description("Package manager for AI agent skills").version(version2);
 var configCmd = program.command("config").description("Manage PSPM configuration");
 configCmd.command("show").description("Show resolved configuration").action(async () => {
   await configShow();
@@ -5794,6 +6102,9 @@ program.command("deprecate <specifier> [message]").description(
   await deprecate(specifier, message, { undo: options.undo });
 });
 await program.parseAsync();
-await checkForUpdates(version2);
+var executedCommand = program.args[0];
+if (executedCommand !== "upgrade") {
+  await checkForUpdates(version2);
+}
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map