@pi-stef/catalog 0.3.1 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-stef/catalog",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Pi extension for managing skill/package catalogs.",
   "type": "module",
   "license": "MIT",

package/src/commands/sync.ts

@@ -111,7 +111,13 @@ export async function syncCommand(
     errors: [],
   };
 
-  // --- 1. Pull remote catalog (into memory only) ---------------------------
+  // --- 1. Read local state BEFORE pulling ---------------------------------
+  // We need this to detect local-only packages and version changes
+  // (e.g., from `pi update`) that haven't been pushed yet.
+  const localCatalogBeforePull = readCatalog(ctx.home);
+  const localLockBeforePull = readLock(ctx.home);
+
+  // --- 2. Pull remote catalog (into memory only) ---------------------------
   let remoteCatalog = false;
   let pulledData: { catalog: CatalogYaml; lock: LockFile } | undefined;
   try {
@@ -124,9 +130,48 @@ export async function syncCommand(
     summary.errors.push(message);
   }
 
-  // --- 2. Reconcile --------------------------------------------------------
+  // --- 3. Reconcile --------------------------------------------------------
   // Use pulled catalog if available, otherwise read from disk
-  const catalog = pulledData ? pulledData.catalog : readCatalog(ctx.home);
+  let catalog = pulledData ? pulledData.catalog : readCatalog(ctx.home);
+
+  // Merge local-only packages into the catalog.
+  // When a user adds a package locally (ct add) and then syncs, the pull
+  // would overwrite their addition. Detect local packages not in the remote
+  // and merge them back so they get pushed.
+  let hasLocalOnlyPackages = false;
+  if (pulledData) {
+    for (const [key, pkg] of Object.entries(localCatalogBeforePull.packages)) {
+      if (!(key in catalog.packages)) {
+        catalog.packages[key] = pkg;
+        hasLocalOnlyPackages = true;
+      }
+    }
+  }
+
+  // Detect local lock changes (e.g., from `pi update` bumping versions).
+  // If the local lock has different versions than the remote lock, we need
+  // to push so the remote gist reflects the actual installed state.
+  let hasLocalLockChanges = false;
+  if (pulledData) {
+    const remoteLock = pulledData.lock;
+    for (const [key, localEntry] of Object.entries(localLockBeforePull.packages)) {
+      const remoteEntry = remoteLock.packages[key];
+      if (!remoteEntry || remoteEntry.version !== localEntry.version) {
+        hasLocalLockChanges = true;
+        break;
+      }
+    }
+    // Also check for packages in remote but removed locally
+    if (!hasLocalLockChanges) {
+      for (const key of Object.keys(remoteLock.packages)) {
+        if (!(key in localLockBeforePull.packages)) {
+          hasLocalLockChanges = true;
+          break;
+        }
+      }
+    }
+  }
+
   const installed = scanInstalled(ctx.home);
 
   // Build catalog entries for reconcile
@@ -206,7 +251,7 @@ export async function syncCommand(
   const hasGist = readCachedGistId(ctx.home) !== undefined;
   const localHasPackages = Object.keys(catalog.packages).length > 0;
 
-  if (force || summary.actionCount > 0 || (!hasGist && localHasPackages)) {
+  if (force || summary.actionCount > 0 || hasLocalOnlyPackages || hasLocalLockChanges || (!hasGist && localHasPackages)) {
     try {
       const updatedCatalog = readCatalog(ctx.home);
       const updatedLock = readLock(ctx.home);
@@ -237,7 +282,7 @@ export async function syncCommand(
     }
   }
 
-  if (summary.actionCount === 0 && summary.errors.length === 0 && !force) {
+  if (summary.actionCount === 0 && summary.errors.length === 0 && !force && !hasLocalOnlyPackages && !hasLocalLockChanges) {
     ctx.ui.notify("Catalog already up to date.", "info");
     return;
   }
@@ -247,6 +292,12 @@ export async function syncCommand(
   if (summary.pulled) {
     parts.push("Pulled remote catalog.");
   }
+  if (hasLocalOnlyPackages) {
+    parts.push("Merged local-only packages.");
+  }
+  if (hasLocalLockChanges) {
+    parts.push("Pushed local version updates.");
+  }
   if (plan.installs.length > 0) {
     parts.push(`${plan.installs.length} install(s): ${plan.installs.map((a) => a.key).join(", ")}`);
   }