@pify/cli 0.4.6 → 0.4.8

package/catalog.json

@@ -1,5 +1,5 @@
 {
-  "version": 28,
+  "version": 31,
   "org": "pifydev",
   "scope": "@pify",
   "remote": "https://raw.githubusercontent.com/pifydev/cli/main/catalog.json",
@@ -30,7 +30,13 @@
       "npm": "@pify/compact",
       "repo": "https://github.com/pifydev/compact",
       "description": "Proactive auto-compaction: compact between turns when the context window crosses a threshold",
-      "status": "published"
+      "status": "published",
+      "conflicts": [
+        "pi-auto-compact",
+        "@capyup/pi-auto-compact",
+        "@loka1/pi-auto-compact",
+        "@sting8k/pi-vcc"
+      ]
     },
     {
       "name": "goal",
@@ -63,12 +69,15 @@
       "name": "pretty",
       "npm": "@pify/pretty",
       "repo": "https://github.com/pifydev/pretty",
-      "description": "Compact theme-aware rendering for built-in tools: summaries, highlighted reads, word-level diff emphasis",
+      "description": "Compact theme-aware rendering for built-in tools: summaries, highlighted reads, word-level diffs, pre-apply diff previews",
       "status": "published",
       "conflicts": [
         "pi-pretty",
         "pi-pretty-tui",
-        "pi-tool-display"
+        "pi-tool-display",
+        "pi-rtk-optimizer",
+        "pi-claude-code-ui",
+        "pi-compact-ui"
       ]
     },
     {
@@ -103,14 +112,14 @@
       "name": "subagent",
       "npm": "@pify/subagent",
       "repo": "https://github.com/pifydev/subagent",
-      "description": "Spawn scoped subagents: agent_run/agent_result, @agent mentions, custom agent types, ask_supervisor, results delivered not polled",
+      "description": "Spawn scoped subagents: agent_run/agent_result, @agent mentions, custom agent types, ask_supervisor, shell gates with bounded repair, task outcome separate from session status, results delivered not polled",
       "status": "published"
     },
     {
       "name": "swarm",
       "npm": "@pify/swarm",
       "repo": "https://github.com/pifydev/swarm",
-      "description": "Run many pi agents in parallel: fan-out with per-item routing, concurrency queue, shared mailbox, results delivered not polled",
+      "description": "Run many pi agents in parallel: fan-out with per-item routing, needs-DAG with skip-on-upstream-failure, per-item shell gates, concurrency queue, shared mailbox, first hard failure interrupts early, results delivered not polled",
       "status": "published"
     },
     {

package/dist/cli.js

@@ -210,19 +210,20 @@ function piStatus() {
 }
 async function fetchLatestPiVersion() {
   if (isOffline()) return null;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), 5e3);
   try {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), 5e3);
     const res = await fetch(LATEST_VERSION_URL, {
       signal: controller.signal,
       headers: { "user-agent": `pify/${VERSION}` }
     });
-    clearTimeout(timer);
     if (!res.ok) return null;
     const data = await res.json();
     return typeof data.version === "string" ? data.version : null;
   } catch {
     return null;
+  } finally {
+    clearTimeout(timer);
   }
 }
 function compareSemver(a, b) {
@@ -432,20 +433,21 @@ function installedPifyPackages() {
 }
 async function fetchLatestPackageVersion(name) {
   if (isOffline()) return null;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), 5e3);
   try {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), 5e3);
     const res = await fetch(`https://registry.npmjs.org/@pify/${encodeURIComponent(name)}/latest`, {
       signal: controller.signal,
       headers: { "user-agent": `pify/${VERSION}`, accept: "application/json" },
       redirect: "error"
     });
-    clearTimeout(timer);
     if (!res.ok) return null;
     const data = await res.json();
     return typeof data.version === "string" ? data.version : null;
   } catch {
     return null;
+  } finally {
+    clearTimeout(timer);
   }
 }
 function installedVersionOnDisk(name, scope) {
@@ -592,16 +594,17 @@ async function refreshCatalog() {
 async function fetchRemoteCatalog(defaultUrl, timeoutMs) {
   if (isOffline()) return null;
   const url = process.env.PIFY_CATALOG_URL || defaultUrl;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
   try {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), timeoutMs);
     const res = await fetch(url, { signal: controller.signal });
-    clearTimeout(timer);
     if (!res.ok) return null;
     const data = await res.json();
     return validateCatalog(data) ? data : null;
   } catch {
     return null;
+  } finally {
+    clearTimeout(timer);
   }
 }
 function readCache() {
@@ -866,31 +869,34 @@ function planApply(profile2, installedNow) {
   for (const entry of profile2.packages) {
     const current = installedNow.get(entry.name);
     if (!current) {
-      rows.push({ name: entry.name, action: "install", from: null, to: entry.version });
+      rows.push({ name: entry.name, action: "install", from: null, to: entry.version, scope: entry.scope });
       continue;
     }
     const onDisk = installedVersionOnDisk(entry.name, current.scope).version;
-    if (entry.version && onDisk && entry.version !== onDisk) {
-      rows.push({ name: entry.name, action: "change", from: onDisk, to: entry.version });
+    const scopeMismatch = current.scope !== entry.scope;
+    const versionMismatch = Boolean(entry.version && onDisk && entry.version !== onDisk);
+    if (scopeMismatch || versionMismatch) {
+      rows.push({ name: entry.name, action: "change", from: onDisk, to: entry.version, scope: entry.scope });
     } else {
-      rows.push({ name: entry.name, action: "keep", from: onDisk, to: entry.version });
+      rows.push({ name: entry.name, action: "keep", from: onDisk, to: entry.version, scope: entry.scope });
     }
   }
-  for (const [name] of installedNow) {
+  for (const [name, cur] of installedNow) {
     if (!profile2.packages.some((p) => p.name === name)) {
-      rows.push({ name, action: "extra", from: installedVersionOnDisk(name, "user").version, to: null });
+      rows.push({ name, action: "extra", from: installedVersionOnDisk(name, cur.scope).version, to: null, scope: cur.scope });
     }
   }
   return rows.sort((a, b) => a.name.localeCompare(b.name));
 }
 function describe(row) {
+  const scope = row.scope === "project" ? " [project]" : "";
   switch (row.action) {
     case "install":
-      return `install ${row.to ? `@ ${row.to}` : "(latest)"}`;
+      return `install ${row.to ? `@ ${row.to}` : "(latest)"}${scope}`;
     case "change":
-      return `${row.from} \u2192 ${row.to}`;
+      return `${row.from ?? "unknown"} \u2192 ${row.to ?? "latest"}${scope}`;
     case "keep":
-      return `already ${row.from ?? "installed"}`;
+      return `already ${row.from ?? "installed"}${scope}`;
     case "extra":
       return `installed here, not in the profile (left alone)`;
   }
@@ -942,6 +948,7 @@ async function profile(args, opts) {
     for (const row of work) {
       const spec = row.to ? `npm:@pify/${row.name}@${row.to}` : `npm:@pify/${row.name}`;
       const argv = ["install", spec];
+      if (row.scope === "project") argv.push("-l");
       step(`pi ${argv.join(" ")}`);
       if (await delegate(argv) !== 0) failed.push(row.name);
     }

package/dist/index.d.ts

@@ -21,6 +21,13 @@ interface PlanRow {
     action: PlanAction;
     from: string | null;
     to: string | null;
+    /**
+     * Where the package should end up. For install/change/keep this is the
+     * profile entry's recorded scope, so applying installs into the same scope it
+     * was saved from (project scope needs pi's `-l`). For `extra` rows there is
+     * no profile entry, so it reflects where the package is currently installed.
+     */
+    scope: "user" | "project";
 }
 /**
  * What applying this profile would do. Packages installed here but absent from

package/dist/index.js

@@ -221,16 +221,17 @@ async function refreshCatalog() {
 async function fetchRemoteCatalog(defaultUrl, timeoutMs) {
   if (isOffline()) return null;
   const url = process.env.PIFY_CATALOG_URL || defaultUrl;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
   try {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), timeoutMs);
     const res = await fetch(url, { signal: controller.signal });
-    clearTimeout(timer);
     if (!res.ok) return null;
     const data = await res.json();
     return validateCatalog(data) ? data : null;
   } catch {
     return null;
+  } finally {
+    clearTimeout(timer);
   }
 }
 function readCache() {
@@ -399,19 +400,20 @@ function piStatus() {
 }
 async function fetchLatestPiVersion() {
   if (isOffline()) return null;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), 5e3);
   try {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), 5e3);
     const res = await fetch(LATEST_VERSION_URL, {
       signal: controller.signal,
       headers: { "user-agent": `pify/${VERSION}` }
     });
-    clearTimeout(timer);
     if (!res.ok) return null;
     const data = await res.json();
     return typeof data.version === "string" ? data.version : null;
   } catch {
     return null;
+  } finally {
+    clearTimeout(timer);
   }
 }
 function compareSemver(a, b) {
@@ -640,19 +642,21 @@ function planApply(profile, installedNow) {
   for (const entry of profile.packages) {
     const current = installedNow.get(entry.name);
     if (!current) {
-      rows.push({ name: entry.name, action: "install", from: null, to: entry.version });
+      rows.push({ name: entry.name, action: "install", from: null, to: entry.version, scope: entry.scope });
       continue;
     }
     const onDisk = installedVersionOnDisk(entry.name, current.scope).version;
-    if (entry.version && onDisk && entry.version !== onDisk) {
-      rows.push({ name: entry.name, action: "change", from: onDisk, to: entry.version });
+    const scopeMismatch = current.scope !== entry.scope;
+    const versionMismatch = Boolean(entry.version && onDisk && entry.version !== onDisk);
+    if (scopeMismatch || versionMismatch) {
+      rows.push({ name: entry.name, action: "change", from: onDisk, to: entry.version, scope: entry.scope });
     } else {
-      rows.push({ name: entry.name, action: "keep", from: onDisk, to: entry.version });
+      rows.push({ name: entry.name, action: "keep", from: onDisk, to: entry.version, scope: entry.scope });
     }
   }
-  for (const [name] of installedNow) {
+  for (const [name, cur] of installedNow) {
     if (!profile.packages.some((p) => p.name === name)) {
-      rows.push({ name, action: "extra", from: installedVersionOnDisk(name, "user").version, to: null });
+      rows.push({ name, action: "extra", from: installedVersionOnDisk(name, cur.scope).version, to: null, scope: cur.scope });
     }
   }
   return rows.sort((a, b) => a.name.localeCompare(b.name));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pify/cli",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "Front door for the Pify suite: install and update the pi coding agent, manage @pify packages, and scaffold Pi Packages",
   "keywords": [
     "pify",