@ghl-ai/aw 0.1.59 → 0.1.60

package/commands/push.mjs

@@ -864,16 +864,14 @@ function collectBatchFiles(folderAbsPath, registrySubDir) {
   let walkDir = folderAbsPath;
   let walkBaseName = relPath;
 
-  for (let i = 0; i < segments.length; i++) {
-    if (PUSHABLE_TYPES.includes(segments[i])) {
-      const namespaceParts = segments.slice(0, i);
-      walkBaseName = namespaceParts.join('/');
-      walkDir = join(registrySubDir, ...namespaceParts);
-      typeFilter = segments[i];
-      if (i + 1 < segments.length) {
-        subPathFilter = segments.slice(i + 1).join('/');
-      }
-      break;
+  const typeIdx = findPushableTypeIndex(segments);
+  if (typeIdx !== -1) {
+    const namespaceParts = segments.slice(0, typeIdx);
+    walkBaseName = namespaceParts.join('/');
+    walkDir = join(registrySubDir, ...namespaceParts);
+    typeFilter = segments[typeIdx];
+    if (typeIdx + 1 < segments.length) {
+      subPathFilter = segments.slice(typeIdx + 1).join('/');
     }
   }
 
@@ -881,7 +879,10 @@ function collectBatchFiles(folderAbsPath, registrySubDir) {
   return entries
     .filter(entry => {
       if (typeFilter && entry.type !== typeFilter) return false;
-      if (subPathFilter && !entry.slug.startsWith(subPathFilter)) return false;
+      if (subPathFilter) {
+        const prefix = `${subPathFilter}/`;
+        if (entry.slug !== subPathFilter && !entry.slug.startsWith(prefix)) return false;
+      }
       return true;
     })
     .map(entry => {
@@ -920,29 +921,37 @@ function findSkillSlugParts(namespaceParts, skillParts, registrySubDir) {
   return [skillParts[0]];
 }
 
+function findPushableTypeIndex(parts) {
+  for (let i = 0; i < parts.length; i++) {
+    if ((parts[i] === 'agents' || parts[i] === 'commands') && parts[i + 1] === 'evals') {
+      return i + 1;
+    }
+    if (PUSHABLE_TYPES.includes(parts[i])) return i;
+  }
+  return -1;
+}
+
 function parseRegistryPath(relPath, registrySubDir = null) {
   const parts = relPath.split('/');
-  for (let i = 0; i < parts.length; i++) {
-    if (PUSHABLE_TYPES.includes(parts[i]) && i + 1 < parts.length) {
-      const namespaceParts = parts.slice(0, i);
-      if (parts[i] === 'skills') {
-        const skillParts = parts.slice(i + 1).map(part => part.replace(/\.md$/, ''));
-        const slugParts = findSkillSlugParts(namespaceParts, skillParts, registrySubDir);
-        return {
-          type: parts[i],
-          namespace: namespaceParts.join('/'),
-          slug: slugParts.join('/'),
-        };
-      }
+  const typeIdx = findPushableTypeIndex(parts);
+  if (typeIdx === -1 || typeIdx + 1 >= parts.length) return null;
 
-      return {
-        type: parts[i],
-        namespace: namespaceParts.join('/'),
-        slug: parts[i + 1].replace(/\.md$/, ''),
-      };
-    }
+  const namespaceParts = parts.slice(0, typeIdx);
+  if (parts[typeIdx] === 'skills') {
+    const skillParts = parts.slice(typeIdx + 1).map(part => part.replace(/\.md$/, ''));
+    const slugParts = findSkillSlugParts(namespaceParts, skillParts, registrySubDir);
+    return {
+      type: parts[typeIdx],
+      namespace: namespaceParts.join('/'),
+      slug: slugParts.join('/'),
+    };
   }
-  return null;
+
+  return {
+    type: parts[typeIdx],
+    namespace: namespaceParts.join('/'),
+    slug: parts[typeIdx + 1].replace(/\.md$/, ''),
+  };
 }
 
 // ── Colocated eval resolution ─────────────────────────────────────────
@@ -1447,6 +1456,8 @@ export async function pushCommand(args) {
   const namespacePath = meta.namespace;
   const isDir = !isDeletedFile && statSync(absPath).isDirectory();
   const registryPathWithExt = resolved.registryPath.endsWith('.md')
+    || (!isDeletedFile && absPath && !absPath.endsWith('.md'))
+    || (isDeletedFile && /\.[^/]+$/.test(resolved.registryPath))
     ? resolved.registryPath
     : `${resolved.registryPath}.md`;
   const registryTarget = isDir

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghl-ai/aw",
-  "version": "0.1.59",
+  "version": "0.1.60",
   "description": "Agentic Workspace CLI — pull, push & manage agents, skills and commands from the registry",
   "type": "module",
   "bin": {