@pi-stef/catalog 0.3.0 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-stef/catalog",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Pi extension for managing skill/package catalogs.",
   "type": "module",
   "license": "MIT",
@@ -19,10 +19,16 @@
   ],
   "dependencies": {
     "@octokit/rest": "^21.0.0",
-    "js-yaml": "^4.1.0",
+    "@pi-stef/agent-workflows": "^0.3.0",
+    "@pi-stef/atlassian": "^0.3.0",
+    "@pi-stef/catalog": "^0.3.0",
+    "@pi-stef/figma": "^0.3.0",
+    "@pi-stef/paths": "^0.3.0",
+    "@pi-stef/team": "^0.3.0",
+    "@pi-stef/web": "^0.3.0",
     "@sinclair/typebox": "*",
-    "zod": "^3.25.62",
-    "@pi-stef/paths": "0.3.0"
+    "js-yaml": "^4.1.0",
+    "zod": "^3.25.62"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "*"

package/src/commands/sync.ts

@@ -111,7 +111,11 @@ export async function syncCommand(
     errors: [],
   };
 
-  // --- 1. Pull remote catalog (into memory only) ---------------------------
+  // --- 1. Read local catalog BEFORE pulling --------------------------------
+  // We need this to detect local-only packages that haven't been pushed yet.
+  const localCatalogBeforePull = readCatalog(ctx.home);
+
+  // --- 2. Pull remote catalog (into memory only) ---------------------------
   let remoteCatalog = false;
   let pulledData: { catalog: CatalogYaml; lock: LockFile } | undefined;
   try {
@@ -124,9 +128,24 @@ 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;
+      }
+    }
+  }
+
   const installed = scanInstalled(ctx.home);
 
   // Build catalog entries for reconcile
@@ -206,7 +225,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 || (!hasGist && localHasPackages)) {
     try {
       const updatedCatalog = readCatalog(ctx.home);
       const updatedLock = readLock(ctx.home);
@@ -237,7 +256,7 @@ export async function syncCommand(
     }
   }
 
-  if (summary.actionCount === 0 && summary.errors.length === 0 && !force) {
+  if (summary.actionCount === 0 && summary.errors.length === 0 && !force && !hasLocalOnlyPackages) {
     ctx.ui.notify("Catalog already up to date.", "info");
     return;
   }
@@ -247,6 +266,9 @@ export async function syncCommand(
   if (summary.pulled) {
     parts.push("Pulled remote catalog.");
   }
+  if (hasLocalOnlyPackages) {
+    parts.push("Merged local-only packages.");
+  }
   if (plan.installs.length > 0) {
     parts.push(`${plan.installs.length} install(s): ${plan.installs.map((a) => a.key).join(", ")}`);
   }

package/src/register.ts

@@ -12,7 +12,6 @@ import {
   SUBCOMMAND_DEFS,
   getAliasMap,
 } from "./commands/definitions.js";
-import { parseSubcommand } from "./commands/dispatch.js";
 import { addCommand, type AddCtx } from "./commands/add.js";
 import { initCommand, type InitContext } from "./commands/init.js";
 import { removeCommand, type RemoveCtx } from "./commands/remove.js";
@@ -66,9 +65,27 @@ async function handleSubcommand(
     return;
   }
 
-  // Parse the raw argument string into structured { positional, flags }
+  // Parse the raw argument string into structured { positional, flags }.
+  // Note: the subcommand has already been extracted by the /ct handler,
+  // so we only parse flags from the remaining args — positional tokens
+  // are passed through directly.
   const rawParts = (args ?? "").trim().split(/\s+/).filter(Boolean);
-  const parsed = parseSubcommand(rawParts);
+  const flags: Record<string, true | string> = {};
+  const positional: string[] = [];
+  for (const token of rawParts) {
+    if (token.startsWith("--")) {
+      const body = token.slice(2);
+      const eqIdx = body.indexOf("=");
+      if (eqIdx !== -1) {
+        flags[body.slice(0, eqIdx)] = body.slice(eqIdx + 1);
+      } else {
+        flags[body] = true;
+      }
+    } else {
+      positional.push(token);
+    }
+  }
+  const parsed = { subcommand: canonical, flags, positional };
 
   switch (canonical) {
     case "add":