@ghl-ai/aw 0.1.34-beta.16 → 0.1.34-beta.17

package/apply.mjs

@@ -1,6 +1,6 @@
 // apply.mjs — Apply sync plan (file operations). Zero dependencies.
 
-import { readFileSync, writeFileSync, mkdirSync, cpSync, existsSync } from 'node:fs';
+import { readFileSync, writeFileSync, mkdirSync, cpSync, existsSync, unlinkSync, rmSync, readdirSync } from 'node:fs';
 import { dirname } from 'node:path';
 
 function writeConflictMarkers(filePath, localContent, registryContent) {
@@ -51,6 +51,24 @@ export function applyActions(actions, { teamNS } = {}) {
       }
 
       case 'ORPHAN':
+        // File was removed from registry — delete local copy
+        if (existsSync(act.targetPath)) {
+          try {
+            unlinkSync(act.targetPath);
+            // Clean up empty parent dirs, stop at .aw_registry/ boundary
+            let dir = dirname(act.targetPath);
+            while (!dir.endsWith('.aw_registry') && !dir.endsWith('.aw_registry/')) {
+              if (readdirSync(dir).length === 0) {
+                rmSync(dir);
+                dir = dirname(dir);
+              } else {
+                break;
+              }
+            }
+          } catch { /* best effort */ }
+        }
+        break;
+
       case 'UNCHANGED':
         break;
     }

package/commands/pull.mjs

@@ -320,7 +320,7 @@ export async function pullAsync(args) {
       config.addPattern(workspaceDir, pattern);
     }
 
-    const { actions: rawActions } = computePlan(registryDirs, workspaceDir, [pattern], { skipOrphans: true });
+    const { actions: rawActions } = computePlan(registryDirs, workspaceDir, [pattern], { skipOrphans: false });
     const actions = filterActions(rawActions, pattern);
     const conflictCount = applyActions(actions, { teamNS: teamNSOverride || renameNamespace || undefined });
     updateManifest(workspaceDir, actions, cfg.namespace, { fromTemplate: !!renameNamespace });
@@ -418,6 +418,7 @@ function printSummary(actions, verbose, conflictCount) {
     if (counts.ADD > 0) parts.push(chalk.green(`${counts.ADD} new`));
     if (counts.UPDATE > 0) parts.push(chalk.cyan(`${counts.UPDATE} updated`));
     if (counts.CONFLICT > 0) parts.push(chalk.red(`${counts.CONFLICT} conflict`));
+    if (counts.ORPHAN > 0) parts.push(chalk.yellow(`${counts.ORPHAN} removed`));
     const detail = parts.length > 0 ? ` (${parts.join(', ')})` : '';
 
     fmt.logSuccess(`${typeActions.length} ${type} pulled${detail}`);

package/fmt.mjs

@@ -81,7 +81,7 @@ export function actionLabel(action) {
     case 'UPDATE':    return chalk.bgCyan.black(' UPD ');
     case 'SKIP':      return chalk.bgYellow.black(' SKP ');
     case 'CONFLICT':  return chalk.bgRed.white(' CON ');
-    case 'ORPHAN':    return chalk.bgYellow.black(' ORP ');
+    case 'ORPHAN':    return chalk.bgRed.white(' DEL ');
     case 'UNCHANGED': return chalk.dim(' --- ');
     default:          return chalk.dim(` ${action} `);
   }
@@ -94,6 +94,6 @@ export function countSummary(counts) {
   if (counts.UNCHANGED > 0) parts.push(chalk.dim(`${counts.UNCHANGED} unchanged`));
   if (counts.SKIP > 0)      parts.push(chalk.yellow(`${counts.SKIP} skipped`));
   if (counts.CONFLICT > 0)  parts.push(chalk.red(`${counts.CONFLICT} conflict`));
-  if (counts.ORPHAN > 0)    parts.push(chalk.yellow(`${counts.ORPHAN} orphan`));
+  if (counts.ORPHAN > 0)    parts.push(chalk.red(`${counts.ORPHAN} removed`));
   return parts.join(chalk.dim(' · '));
 }

package/package.json

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

package/plan.mjs

@@ -100,8 +100,14 @@ export function computePlan(registryDirs, workspaceDir, includePatterns = [], {
 
   // Orphans: in manifest but not in plan
   if (manifest.files && !skipOrphans) {
+    // Build a set of all targetFilenames in the plan for exact matching
+    const planTargets = new Set(actions.map(a => a.targetFilename));
+
     for (const [manifestKey, manifestEntry] of Object.entries(manifest.files)) {
-      // manifestKey is now namespace/type/slug.md or namespace/type/slug/relPath
+      // Already handled by the plan — not an orphan
+      if (planTargets.has(manifestKey)) continue;
+
+      // manifestKey is namespace/type/slug.md or namespace/type/slug/relPath
       const parts = manifestKey.split('/');
       // Find the type segment
       let typeIdx = -1;
@@ -115,22 +121,20 @@ export function computePlan(registryDirs, workspaceDir, includePatterns = [], {
       const namespace = parts.slice(0, typeIdx).join('/');
       const type = parts[typeIdx];
       const slug = parts[typeIdx + 1]?.replace(/\.md$/, '');
-      const key = `${namespace}/${type}/${slug}`;
-      if (!plan.has(key)) {
-        actions.push({
-          slug,
-          source: manifestEntry.source || 'unknown',
-          type,
-          action: 'ORPHAN',
-          sourcePath: '',
-          targetPath: join(workspaceDir, manifestKey),
-          targetFilename: manifestKey,
-          isDirectory: false,
-          registryHash: '',
-          namespacePath: parts.slice(0, typeIdx).join('/'),
-          registryPath: '',
-        });
-      }
+
+      actions.push({
+        slug,
+        source: manifestEntry.source || 'unknown',
+        type,
+        action: 'ORPHAN',
+        sourcePath: '',
+        targetPath: join(workspaceDir, manifestKey),
+        targetFilename: manifestKey,
+        isDirectory: false,
+        registryHash: '',
+        namespacePath: namespace,
+        registryPath: '',
+      });
     }
   }