@logic-joe/fleek 0.2.10 → 0.2.11

package/dist/fleek.mjs

@@ -4632,7 +4632,7 @@ var require_setup_session = __commonJS({
     exports.SETUP_SESSION_TTL_MINUTES = 30;
     exports.SETUP_SESSION_OPEN_MAX = 10;
     exports.SETUP_SESSION_CLAIM_LIMIT = 10;
-    exports.FLEEK_CLI_SETUP_VERSION_DEFAULT = "0.2.10";
+    exports.FLEEK_CLI_SETUP_VERSION_DEFAULT = "0.2.11";
     exports.FLEEK_CLI_PACKAGE = "@logic-joe/fleek";
     exports.FLEEK_CANONICAL_SERVER = "https://api.onfleek.app";
     exports.SETUP_CLIENT_APPS = ["claude-code", "codex", "orca", "cursor", "other"];
@@ -31856,8 +31856,8 @@ var require_secret_shape = __commonJS({
       }
       return hostEnd > start2;
     }
-    function scanUrl(text6, start2, end, sep11) {
-      const authorityStart = sep11 + 3;
+    function scanUrl(text6, start2, end, sep10) {
+      const authorityStart = sep10 + 3;
       let authorityEnd = authorityStart;
       while (authorityEnd < end) {
         const code = text6.charCodeAt(authorityEnd);
@@ -31868,7 +31868,7 @@ var require_secret_shape = __commonJS({
       for (let i2 = authorityStart; i2 < authorityEnd; i2++)
         if (text6.charCodeAt(i2) === 64)
           return "url_userinfo";
-      const scheme = lowerAscii(text6, start2, sep11);
+      const scheme = lowerAscii(text6, start2, sep10);
       if (scheme !== "https" && scheme !== "http" || !validUrlHost(text6, authorityStart, authorityEnd))
         return scanTokens(text6, start2, end, true);
       const head = lowerAscii(text6, start2, Math.min(end, start2 + 48));
@@ -31907,9 +31907,9 @@ var require_secret_shape = __commonJS({
       }
       return null;
     }
-    function schemeStart(text6, sep11, floor) {
-      let s = sep11;
-      const limit = Math.max(floor, sep11 - 32);
+    function schemeStart(text6, sep10, floor) {
+      let s = sep10;
+      const limit = Math.max(floor, sep10 - 32);
       while (s > limit) {
         const code = text6.charCodeAt(s - 1);
         const letter = code >= 65 && code <= 90 || code >= 97 && code <= 122;
@@ -31918,7 +31918,7 @@ var require_secret_shape = __commonJS({
         else
           break;
       }
-      while (s < sep11) {
+      while (s < sep10) {
         const code = text6.charCodeAt(s);
         if (code >= 65 && code <= 90 || code >= 97 && code <= 122)
           return s;
@@ -36097,9 +36097,9 @@ var require_dist2 = __commonJS({
 var import_types10 = __toESM(require_dist(), 1);
 import { spawn as spawn9 } from "node:child_process";
 import { createHash as createHash9, randomBytes as randomBytes12 } from "node:crypto";
-import { realpath as realpath20, rm as rm13 } from "node:fs/promises";
+import { rm as rm13 } from "node:fs/promises";
 import { hostname as osHostname2 } from "node:os";
-import { join as join33, sep as sep10 } from "node:path";
+import { join as join33 } from "node:path";
 import { parseArgs } from "node:util";
 
 // src/config.ts
@@ -37311,7 +37311,8 @@ var EN = {
   "kit.offline": "Server not reachable: status unknown. The installed kits keep working.",
   "kit.doubleE1": "{target}: Fleek Work Protocol installed twice (global and bundle). Run fleek kit pull again.",
   "kit.disabled": "{kit} removed from the bundle.",
-  "kit.cleanupPending": "Not cleaned up yet ({reason}): withdrawn kit files are still in {path}. Fix it and run fleek kit status again.",
+  "kit.cleanupPending": "Not cleaned up yet ({reason}): withdrawn kit files are still in {path}. Fix it and run {command}.",
+  "kit.cleanupPendingSummary": "Not cleaned up yet ({reason}): withdrawn kit files are still in {path}.",
   "kit.none": "No kits.",
   "kit.installed": "installed: {version}",
   "kit.localLine": "{project}: {kits}",
@@ -37493,7 +37494,7 @@ var EN = {
   "errors.kitProjectRequired": "Which project? Pass --project <key or id> (or run it in a pulled checkout).",
   "errors.kitKeyUnknown": "No project you can access has the key {key}.",
   "kit.formerOffline": "Could not check former project {project} (offline) - it is checked again next time.",
-  "errors.kitRunCleanupPending": "Withdrawn kit parts are still in {path} (cleanup pending). Not started - fix the reported problem, then run fleek kit status.",
+  "errors.kitRunCleanupPending": "Withdrawn kit parts from project {project} remain in {path}. Fix the reported problem, then run {command}.",
   "errors.kitRunCodexCheckout": "Codex reads kit skills only inside a project checkout. Start fleek kit run codex in the project's git checkout.",
   "errors.kitNoCheckout": "Not a git checkout.",
   "errors.kitNotPulled": "No kits pulled for {project}.",
@@ -38076,7 +38077,8 @@ var DE = {
   "kit.offline": "Server nicht erreichbar: Status unbekannt. Die installierten Kits funktionieren weiter.",
   "kit.doubleE1": "{target}: Fleek Work Protocol doppelt installiert (global und im Bundle). Führe fleek kit pull erneut aus.",
   "kit.disabled": "{kit} aus dem Bundle entfernt.",
-  "kit.cleanupPending": "Noch nicht aufgeräumt ({reason}): Zurückgezogene Kit-Dateien liegen noch in {path}. Behebe das und führe fleek kit status erneut aus.",
+  "kit.cleanupPending": "Noch nicht aufgeräumt ({reason}): Zurückgezogene Kit-Dateien liegen noch in {path}. Behebe das und führe {command} aus.",
+  "kit.cleanupPendingSummary": "Noch nicht aufgeräumt ({reason}): Zurückgezogene Kit-Dateien liegen noch in {path}.",
   "kit.none": "Keine Kits.",
   "kit.installed": "installiert: {version}",
   "kit.localLine": "{project}: {kits}",
@@ -38258,7 +38260,7 @@ var DE = {
   "errors.kitProjectRequired": "Welches Projekt? Nutze --project <Schlüssel oder ID> (oder führe es in einem Checkout mit geholten Kits aus).",
   "errors.kitKeyUnknown": "Kein Projekt, auf das du zugreifen kannst, hat den Schlüssel {key}.",
   "kit.formerOffline": "Früheres Projekt {project} konnte nicht geprüft werden (offline) - es wird beim nächsten Mal erneut geprüft.",
-  "errors.kitRunCleanupPending": "Zurückgezogene Kit-Teile liegen noch in {path} (Bereinigung ausstehend). Nicht gestartet - behebe das gemeldete Problem und führe dann fleek kit status aus.",
+  "errors.kitRunCleanupPending": "Zurückgezogene Kit-Teile aus Projekt {project} liegen noch in {path}. Behebe das gemeldete Problem und führe dann {command} aus.",
   "errors.kitRunCodexCheckout": "Codex liest Kit-Skills nur in einem Projekt-Checkout. Starte fleek kit run codex im Git-Checkout des Projekts.",
   "errors.kitNoCheckout": "Kein Git-Checkout.",
   "errors.kitNotPulled": "Für {project} sind keine Kits geholt.",
@@ -55945,6 +55947,9 @@ function installedOf(kit2, previous2, downgraded) {
   const minVersion = downgraded ? kit2.version : Math.max(previous2?.minVersion ?? kit2.version, kit2.version);
   return { kitKey: kit2.kitKey, kind: kit2.kind, role: kit2.role, version: kit2.version, versionId: kit2.versionId, contentHash: kit2.contentHash, placement: kit2.placement, minVersion };
 }
+function cleanupStatusCommand(profileKey2, projectId) {
+  return `fleek --profile ${profileKey2} kit status --project ${projectId}`;
+}
 var tupleId = (kitKey, version2) => `${kitKey}@${version2}`;
 function checkoutTuples(checkouts) {
   const out = /* @__PURE__ */ new Map();
@@ -56255,7 +56260,7 @@ async function settleFormerProjects(ctx, profile, exclude) {
   return { pending, offline };
 }
 function reportFormer(ctx, settlement) {
-  for (const item2 of settlement?.pending ?? []) ctx.out.error(ctx.out.style.warn(ctx.t("kit.cleanupPending", { path: neutralizeLine(item2.root), reason: item2.reason })));
+  for (const item2 of settlement?.pending ?? []) ctx.out.error(ctx.out.style.warn(ctx.t("kit.cleanupPendingSummary", { path: neutralizeLine(item2.root), reason: neutralizeLine(item2.reason) })));
   for (const projectId of settlement?.offline ?? []) ctx.out.error(ctx.out.style.warn(ctx.t("kit.formerOffline", { project: projectId })));
 }
 async function staleKeyRefusal(ctx, profile, project) {
@@ -56414,7 +56419,7 @@ async function kitPull(ctx, projectRef, values, options = {}) {
       for (const entry of listedMcp) ctx.out.line(s.warn(ctx.t("kit.mcpManual", { target: entry.target, entry: s.cmd(neutralizeLine(`${entry.name} ${entry.url}`)) })));
       for (const key of unsigned2) ctx.out.line(s.warn(ctx.t("kit.unsignedPending", { kit: key })));
       ctx.out.line(s.ok(summary.changed ? ctx.t("kit.pulled", { count: installed.length }) : ctx.t("kit.upToDate")));
-      for (const pending of skippedRoots) ctx.out.error(s.warn(ctx.t("kit.cleanupPending", { path: neutralizeLine(pending.root), reason: pending.reason })));
+      for (const pending of skippedRoots) ctx.out.error(s.warn(ctx.t("kit.cleanupPending", { path: neutralizeLine(pending.root), reason: neutralizeLine(pending.reason), command: cleanupStatusCommand(profile.key, projectId) })));
       const runnable = targets.find((target) => KIT_CAPABILITIES[target].launcher);
       if (options.nextStep !== false && runnable && !skippedRoots.length && !former.pending.length) {
         ctx.out.line(`  ${ctx.t("next.step", { command: s.cmd(`fleek kit run ${runnable}${here ? "" : ` --project ${ref}`}`) })}`);
@@ -56548,7 +56553,7 @@ async function kitStatus(ctx, values, options = {}) {
       for (const [target, value] of Object.entries(e1)) if (value === "both") ctx.out.line(s.warn(ctx.t("kit.doubleE1", { target })));
       for (const key of withdrawn.keys()) ctx.out.line(s.warn(ctx.t("kit.disabled", { kit: key })));
       for (const tuple of checkoutWithdrawn) ctx.out.line(s.warn(ctx.t("kit.disabled", { kit: tuple })));
-      for (const pending of cleanupPending) ctx.out.error(s.warn(ctx.t("kit.cleanupPending", { path: neutralizeLine(pending.root), reason: pending.reason })));
+      for (const pending of cleanupPending) ctx.out.error(s.warn(ctx.t("kit.cleanupPending", { path: neutralizeLine(pending.root), reason: neutralizeLine(pending.reason), command: cleanupStatusCommand(profileHint.key, projectId) })));
       if (rows.some((row) => row.state === "update")) {
         ctx.out.line(`  ${ctx.t("next.step", { command: s.cmd(`fleek kit pull${values.project ? ` ${neutralizeLine(values.project)}` : ""}`) })}`);
       }
@@ -56640,6 +56645,20 @@ function defaultSpawn(program, args, options) {
     child.once("exit", (code, signal) => done(code ?? (signal ? 128 : 1)));
   });
 }
+async function assertKitCleanup(ctx, profileKey2) {
+  const pendingCleanup = [];
+  for (const projectId of await localProjects(ctx.configDir, profileKey2)) {
+    for (const item2 of await new KitDomain(ctx.configDir, profileKey2, projectId).cleanupPending()) pendingCleanup.push({ ...item2, projectId });
+  }
+  for (const item2 of pendingCleanup) ctx.out.error(ctx.out.style.warn(ctx.t("kit.cleanupPending", { path: neutralizeLine(item2.root), reason: neutralizeLine(item2.reason), command: cleanupStatusCommand(profileKey2, item2.projectId) })));
+  const here = await realpath16(ctx.deps.cwd ?? process.cwd()).catch(() => null);
+  const blocking = here ? pendingCleanup.find((item2) => here === item2.root || here.startsWith(item2.root + sep8)) : void 0;
+  if (blocking) throw new CliError("errors.kitRunCleanupPending", KIT_EXIT.revokedOrNotEntitled, {
+    path: neutralizeLine(blocking.root),
+    project: blocking.projectId,
+    command: cleanupStatusCommand(profileKey2, blocking.projectId)
+  }, "CLEANUP_PENDING");
+}
 async function kitRun(ctx, client, values, userArgs) {
   if (!client || !KIT_TARGETS.includes(client)) throw usage2();
   const target = client;
@@ -56664,11 +56683,7 @@ async function kitRun(ctx, client, values, userArgs) {
       else ctx.info(notice);
     }
   }
-  const pendingCleanup = await domain.cleanupPending();
-  for (const item2 of pendingCleanup) ctx.out.error(ctx.out.style.warn(ctx.t("kit.cleanupPending", { path: neutralizeLine(item2.root), reason: item2.reason })));
-  const here = await realpath16(ctx.deps.cwd ?? process.cwd()).catch(() => null);
-  const blocking = here ? pendingCleanup.find((item2) => here === item2.root || here.startsWith(item2.root + sep8)) : void 0;
-  if (blocking) throw new CliError("errors.kitRunCleanupPending", KIT_EXIT.revokedOrNotEntitled, { path: blocking.root }, "CLEANUP_PENDING");
+  await assertKitCleanup(ctx, profile.key);
   const gen = await domain.current();
   if (!gen) throw new CliError("errors.kitNotPulled", EXIT.failed, { project: projectId }, "KIT_NOT_PULLED");
   const state = gen.state.targets[target];
@@ -60486,12 +60501,10 @@ async function kitAuto(ctx, values, client, passthrough) {
       return await kitRun({ ...kitCtx, deps: { ...ctx.deps, spawn: spawnWith } }, client, { ...values, project: found.projectId, orcaLaunch: true, program }, passthrough);
     } catch (error) {
       if (!(error instanceof CliError) || !["NEEDS_LOGIN", "TRANSIENT", "KIT_PROXY_UNAVAILABLE", "RATE_LIMITED", "UNAVAILABLE_ON_SERVER"].includes(error.code ?? "")) throw error;
-      const here = await realpath20(cwd), pending = domain ? await domain.cleanupPending() : [];
-      const blocking = pending.find((item2) => here === item2.root || here.startsWith(item2.root + sep10));
-      if (blocking) throw new CliError("errors.kitRunCleanupPending", KIT_EXIT.revokedOrNotEntitled, { path: blocking.root }, "CLEANUP_PENDING");
+      await assertKitCleanup(kitCtx, found.profile.key);
       ctx.out.error(ctx.s.warn(ctx.t(values["dry-run"] ? "kit.autoDryRunFallback" : "kit.autoFallback", { code: error instanceof CliError ? error.code ?? error.key : "INTERNAL" })));
     }
-  }
+  } else if (found) await assertKitCleanup(kitContext(ctx, values, found), found.profile.key);
   if (values["dry-run"]) {
     ctx.out.json({ program, args: passthrough, attached: false });
     return EXIT.ok;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logic-joe/fleek",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": "fleek - command line client for the Fleek agent hub (MCP over OAuth, OS keychain, signed role/project kits)",
   "license": "Apache-2.0",
   "type": "module",