@fenglimg/fabric-cli 2.1.0-rc.2 → 2.2.0-rc.3

package/dist/sync-EA5HZMXM.js

@@ -0,0 +1,395 @@
+#!/usr/bin/env node
+import {
+  regenerateBindingsSnapshot
+} from "./chunk-H3FE6VIK.js";
+import "./chunk-EOT63RDH.js";
+import {
+  getProjectTranslator
+} from "./chunk-2CY4BMTH.js";
+import {
+  loadGlobalConfig,
+  resolveGlobalRoot
+} from "./chunk-XCBVSGCS.js";
+
+// src/commands/sync.ts
+import { defineCommand } from "citty";
+
+// src/sync/run-sync.ts
+import { execFileSync } from "child_process";
+import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "fs";
+import { join } from "path";
+import { GLOBAL_STATE_DIR, storeRelativePath } from "@fenglimg/fabric-shared";
+import { GenericIOError } from "@fenglimg/fabric-shared/errors";
+
+// src/sync/state-machine.ts
+function syncTransition(state, event) {
+  switch (state) {
+    case "pending":
+      if (event === "rebase_clean") return "synced";
+      if (event === "rebase_conflict") return "conflict";
+      if (event === "network_unavailable") return "offline";
+      break;
+    case "conflict":
+      if (event === "user_continue") return "synced";
+      if (event === "user_abort") return "aborted";
+      if (event === "network_unavailable") return "offline";
+      break;
+    case "offline":
+      if (event === "retry" || event === "rebase_clean") return "synced";
+      if (event === "rebase_conflict") return "conflict";
+      if (event === "network_unavailable") return "offline";
+      break;
+    case "synced":
+    case "aborted":
+      break;
+  }
+  throw new Error(`invalid sync transition: '${state}' --${event}-->`);
+}
+function planSync(stores) {
+  return { stores: stores.map((s) => ({ ...s, state: "pending" })) };
+}
+function applySyncEvent(session, alias, event) {
+  return {
+    stores: session.stores.map(
+      (s) => s.alias === alias ? { ...s, state: syncTransition(s.state, event) } : s
+    )
+  };
+}
+function continueSync(session) {
+  const conflicted = session.stores.find((s) => s.state === "conflict");
+  if (conflicted === void 0) {
+    throw new Error("`sync --continue` with no conflicted store to resume");
+  }
+  return applySyncEvent(session, conflicted.alias, "user_continue");
+}
+function abortSync(session) {
+  const conflicted = session.stores.find((s) => s.state === "conflict");
+  if (conflicted === void 0) {
+    throw new Error("`sync --abort` with no conflicted store to abort");
+  }
+  return applySyncEvent(session, conflicted.alias, "user_abort");
+}
+function isSyncSettled(session) {
+  return session.stores.every((s) => s.state !== "pending" && s.state !== "conflict");
+}
+function deferredPushStores(session) {
+  return session.stores.filter((s) => s.state === "offline");
+}
+
+// src/sync/run-sync.ts
+var NO_GLOBAL_CONFIG = "no global Fabric config \u2014 run `fabric install --global <url>` first";
+var NO_SESSION = "no sync in progress \u2014 run `fabric sync` first";
+var NO_CONFLICT = "no conflicted store to resume \u2014 sync is not paused";
+function syncSessionPath(globalRoot) {
+  return join(globalRoot, GLOBAL_STATE_DIR, "sync-session.json");
+}
+function loadSession(globalRoot) {
+  const path = syncSessionPath(globalRoot);
+  if (!existsSync(path)) {
+    return null;
+  }
+  const raw = readFileSync(path, "utf8");
+  try {
+    return JSON.parse(raw);
+  } catch (error) {
+    const corruptedPath = `${path}.corrupted.${Date.now()}`;
+    try {
+      writeFileSync(corruptedPath, raw, "utf8");
+    } catch {
+    }
+    throw new GenericIOError(
+      `sync-session.json is corrupt (forensic copy: ${corruptedPath}). Parse error: ${error instanceof Error ? error.message : String(error)}`,
+      {
+        actionHint: `Delete ${path} to start a fresh sync (any in-progress rebase must be resolved manually with git first).`,
+        details: { path, corruptedPath }
+      }
+    );
+  }
+}
+function saveSession(globalRoot, session) {
+  const path = syncSessionPath(globalRoot);
+  mkdirSync(join(path, ".."), { recursive: true });
+  const tmpPath = `${path}.${process.pid}.tmp`;
+  writeFileSync(tmpPath, `${JSON.stringify(session, null, 2)}
+`, "utf8");
+  renameSync(tmpPath, path);
+}
+function clearSession(globalRoot) {
+  rmSync(syncSessionPath(globalRoot), { force: true });
+}
+function defaultPull(storeDir) {
+  try {
+    execFileSync("git", ["pull", "--rebase"], {
+      cwd: storeDir,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    return "clean";
+  } catch (error) {
+    const detail = `${gitErrText(error, "stdout")}${gitErrText(error, "stderr")}`;
+    if (/CONFLICT|could not apply|needs merge|rebase --continue/i.test(detail)) {
+      return "conflict";
+    }
+    if (/could not resolve host|could not read from remote|unable to access|connection|network is unreachable|timed out/i.test(
+      detail
+    )) {
+      return "offline";
+    }
+    const gitMessage = detail.trim().length > 0 ? detail.trim() : "unknown git error";
+    throw new GenericIOError(`git pull --rebase failed in ${storeDir}: ${gitMessage}`, {
+      actionHint: "resolve the git issue above (e.g. authentication, a dirty working tree, or a detached HEAD), then re-run `fabric sync`",
+      details: error
+    });
+  }
+}
+function gitErrText(error, key) {
+  const value = error[key];
+  return typeof value === "string" || Buffer.isBuffer(value) ? String(value) : "";
+}
+function defaultPush(storeDir) {
+  try {
+    execFileSync("git", ["push"], {
+      cwd: storeDir,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    return "clean";
+  } catch (error) {
+    const detail = `${gitErrText(error, "stdout")}${gitErrText(error, "stderr")}`;
+    if (/could not resolve host|could not read from remote|unable to access|connection|network is unreachable|timed out/i.test(
+      detail
+    )) {
+      return "offline";
+    }
+    const gitMessage = detail.trim().length > 0 ? detail.trim() : "unknown git error";
+    throw new GenericIOError(`git push failed in ${storeDir}: ${gitMessage}`, {
+      actionHint: "resolve the git issue above (e.g. authentication, no upstream branch, or a rejected non-fast-forward push), then re-run `fabric sync`",
+      details: error
+    });
+  }
+}
+function defaultCommitDirty(storeDir) {
+  try {
+    execFileSync("git", ["rev-parse", "--is-inside-work-tree"], {
+      cwd: storeDir,
+      stdio: ["ignore", "ignore", "ignore"]
+    });
+  } catch {
+    return;
+  }
+  try {
+    execFileSync("git", ["add", "-A"], { cwd: storeDir, stdio: ["ignore", "ignore", "pipe"] });
+    try {
+      execFileSync("git", ["diff", "--cached", "--quiet"], {
+        cwd: storeDir,
+        stdio: ["ignore", "ignore", "ignore"]
+      });
+      return;
+    } catch {
+      execFileSync("git", ["commit", "-m", "fabric: sync local knowledge changes"], {
+        cwd: storeDir,
+        stdio: ["ignore", "ignore", "pipe"]
+      });
+    }
+  } catch {
+  }
+}
+function runRebaseStep(storeDir, step) {
+  try {
+    execFileSync("git", ["rebase", `--${step}`], {
+      cwd: storeDir,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+  } catch (error) {
+    const detail = `${gitErrText(error, "stdout")}${gitErrText(error, "stderr")}`.trim();
+    const gitMessage = detail.length > 0 ? detail : "unknown git error";
+    throw new GenericIOError(`git rebase --${step} failed in ${storeDir}: ${gitMessage}`, {
+      actionHint: step === "continue" ? "resolve the remaining conflicts (git status) and stage them, then re-run `fabric sync --continue`; or run `fabric sync --abort` to discard the rebase" : "inspect the store with `git status`; if no rebase is in progress the session may already be resolved \u2014 delete sync-session.json to reset",
+      details: error
+    });
+  }
+}
+function defaultRebaseContinue(storeDir) {
+  runRebaseStep(storeDir, "continue");
+}
+function defaultRebaseAbort(storeDir) {
+  runRebaseStep(storeDir, "abort");
+}
+var OUTCOME_EVENT = {
+  clean: "rebase_clean",
+  conflict: "rebase_conflict",
+  offline: "network_unavailable"
+};
+function walkPending(session, storeDirOf, pull, push, commit, pushableAliases) {
+  let next = session;
+  for (const store of session.stores) {
+    if (store.state !== "pending") {
+      continue;
+    }
+    const dir = storeDirOf(store);
+    commit(dir);
+    const pullOutcome = pull(dir);
+    if (pullOutcome !== "clean") {
+      next = applySyncEvent(next, store.alias, OUTCOME_EVENT[pullOutcome]);
+      if (pullOutcome === "conflict") {
+        break;
+      }
+      continue;
+    }
+    if (!pushableAliases.has(store.alias)) {
+      next = applySyncEvent(next, store.alias, "rebase_clean");
+      continue;
+    }
+    const pushOutcome = push(dir);
+    next = applySyncEvent(
+      next,
+      store.alias,
+      pushOutcome === "clean" ? "rebase_clean" : "network_unavailable"
+    );
+  }
+  return next;
+}
+function finalize(session, options, globalRoot) {
+  const settled = isSyncSettled(session);
+  let snapshotWritten = false;
+  if (settled) {
+    clearSession(globalRoot);
+    const snapshot = regenerateBindingsSnapshot(options.projectRoot, {
+      globalRoot,
+      now: options.now,
+      ...options.writeScope === void 0 ? {} : { writeScope: options.writeScope }
+    });
+    snapshotWritten = snapshot !== null;
+  } else {
+    saveSession(globalRoot, session);
+  }
+  return { session, settled, deferred: deferredPushStores(session), snapshotWritten };
+}
+function runStartSync(options) {
+  const globalRoot = options.globalRoot ?? resolveGlobalRoot();
+  const config = loadGlobalConfig(globalRoot);
+  if (config === null) {
+    throw new Error(NO_GLOBAL_CONFIG);
+  }
+  const syncable = config.stores.filter((store) => store.remote !== void 0);
+  const session = planSync(
+    syncable.map((store) => ({ alias: store.alias, store_uuid: store.store_uuid }))
+  );
+  const storeDirOf = (status) => join(globalRoot, storeRelativePath(status.store_uuid));
+  const pushableAliases = pushableAliasesOf(config);
+  const walked = walkPending(
+    session,
+    storeDirOf,
+    options.pull ?? defaultPull,
+    options.push ?? defaultPush,
+    options.commit ?? defaultCommitDirty,
+    pushableAliases
+  );
+  return finalize(walked, options, globalRoot);
+}
+function pushableAliasesOf(config) {
+  return new Set(
+    config.stores.filter((store) => store.remote !== void 0 && (store.writable ?? true)).map((store) => store.alias)
+  );
+}
+function runContinueSync(options) {
+  const globalRoot = options.globalRoot ?? resolveGlobalRoot();
+  const session = loadSession(globalRoot);
+  if (session === null) {
+    throw new GenericIOError(NO_SESSION, {
+      actionHint: "Run `fabric sync` to start a sync before `--continue`/`--abort`."
+    });
+  }
+  const conflicted = session.stores.find((store) => store.state === "conflict");
+  if (conflicted === void 0) {
+    throw new GenericIOError(NO_CONFLICT, {
+      actionHint: "The sync is not paused on a conflict; there is nothing to resume."
+    });
+  }
+  const storeDirOf = (status) => join(globalRoot, storeRelativePath(status.store_uuid));
+  (options.rebaseContinue ?? defaultRebaseContinue)(storeDirOf(conflicted));
+  const pushableAliases = pushableAliasesOf(loadGlobalConfig(globalRoot) ?? { stores: [] });
+  const push = options.push ?? defaultPush;
+  let advanced;
+  if (pushableAliases.has(conflicted.alias)) {
+    const pushOutcome = push(storeDirOf(conflicted));
+    advanced = applySyncEvent(
+      session,
+      conflicted.alias,
+      pushOutcome === "clean" ? "user_continue" : "network_unavailable"
+    );
+  } else {
+    advanced = continueSync(session);
+  }
+  const resumed = walkPending(
+    advanced,
+    storeDirOf,
+    options.pull ?? defaultPull,
+    push,
+    options.commit ?? defaultCommitDirty,
+    pushableAliases
+  );
+  return finalize(resumed, options, globalRoot);
+}
+function runAbortSync(options) {
+  const globalRoot = options.globalRoot ?? resolveGlobalRoot();
+  const session = loadSession(globalRoot);
+  if (session === null) {
+    throw new GenericIOError(NO_SESSION, {
+      actionHint: "Run `fabric sync` to start a sync before `--continue`/`--abort`."
+    });
+  }
+  const conflicted = session.stores.find((store) => store.state === "conflict");
+  if (conflicted === void 0) {
+    throw new GenericIOError(NO_CONFLICT, {
+      actionHint: "The sync is not paused on a conflict; there is nothing to resume."
+    });
+  }
+  const storeDirOf = (status) => join(globalRoot, storeRelativePath(status.store_uuid));
+  (options.rebaseAbort ?? defaultRebaseAbort)(storeDirOf(conflicted));
+  const pushableAliases = pushableAliasesOf(loadGlobalConfig(globalRoot) ?? { stores: [] });
+  const resumed = walkPending(
+    abortSync(session),
+    storeDirOf,
+    options.pull ?? defaultPull,
+    options.push ?? defaultPush,
+    options.commit ?? defaultCommitDirty,
+    pushableAliases
+  );
+  return finalize(resumed, options, globalRoot);
+}
+
+// src/commands/sync.ts
+function report(result, projectRoot) {
+  const t = getProjectTranslator(projectRoot);
+  for (const store of result.session.stores) {
+    console.log(`${store.alias}	${store.state}`);
+  }
+  if (result.deferred.length > 0) {
+    console.log(t("cli.sync.deferred", { count: String(result.deferred.length) }));
+  }
+  if (!result.settled) {
+    console.log(t("cli.sync.paused"));
+  }
+}
+var sync_default = defineCommand({
+  meta: { name: "sync", description: "Pull --rebase + push every mounted store; resume conflicts" },
+  args: {
+    continue: { type: "boolean", description: "Resume after resolving a rebase conflict" },
+    abort: { type: "boolean", description: "Abort the conflicted store's rebase" }
+  },
+  run({ args }) {
+    const projectRoot = process.cwd();
+    const options = { projectRoot, now: (/* @__PURE__ */ new Date()).toISOString() };
+    if (args.continue === true) {
+      report(runContinueSync(options), projectRoot);
+      return;
+    }
+    if (args.abort === true) {
+      report(runAbortSync(options), projectRoot);
+      return;
+    }
+    report(runStartSync(options), projectRoot);
+  }
+});
+export {
+  sync_default as default
+};

package/dist/{uninstall-TAXSUSKH.js → uninstall-F75MPKQC.js}

@@ -7,10 +7,10 @@ import {
   HOOK_SCRIPT_DESTINATIONS,
   SKILL_DESTINATIONS,
   fabricAgentsSnapshotPath
-} from "./chunk-F46ORPOA.js";
+} from "./chunk-XHHCRDIR.js";
 import {
   paint
-} from "./chunk-WWNXR34K.js";
+} from "./chunk-BO4XIZWZ.js";
 import {
   createDebugLogger,
   resolveDevMode
@@ -18,10 +18,10 @@ import {
 import {
   detectClientSupports,
   resolveClients
-} from "./chunk-MF3OTILQ.js";
+} from "./chunk-XC5RUHLK.js";
 import {
   t
-} from "./chunk-PWLW3B57.js";
+} from "./chunk-2CY4BMTH.js";
 
 // src/commands/uninstall.ts
 import { existsSync as existsSync2, statSync } from "fs";
@@ -49,6 +49,12 @@ async function uninstallFabricImportSkill(projectRoot) {
 async function uninstallFabricSyncSkill(projectRoot) {
   return removeSkill("skill-sync", SKILL_DESTINATIONS.fabricSync, projectRoot);
 }
+async function uninstallFabricAuditSkill(projectRoot) {
+  return removeSkill("skill-audit", SKILL_DESTINATIONS.fabricAudit, projectRoot);
+}
+async function uninstallFabricConnectSkill(projectRoot) {
+  return removeSkill("skill-connect", SKILL_DESTINATIONS.fabricConnect, projectRoot);
+}
 async function removeSkill(step, rels, projectRoot) {
   const results = [];
   for (const rel of rels) {
@@ -75,6 +81,27 @@ async function removeKnowledgeHintNarrowHook(projectRoot) {
     projectRoot
   );
 }
+async function removeCitePolicyEvictHook(projectRoot) {
+  return removeHookScripts(
+    "hook-cite-policy-evict-script",
+    HOOK_SCRIPT_DESTINATIONS.citePolicyEvict,
+    projectRoot
+  );
+}
+async function removeSessionEndMarkerHook(projectRoot) {
+  return removeHookScripts(
+    "hook-session-end-script",
+    HOOK_SCRIPT_DESTINATIONS.sessionEndMarker,
+    projectRoot
+  );
+}
+async function removePostTooluseMutationHook(projectRoot) {
+  return removeHookScripts(
+    "hook-post-tooluse-script",
+    HOOK_SCRIPT_DESTINATIONS.postTooluseMutation,
+    projectRoot
+  );
+}
 async function removeHookScripts(step, rels, projectRoot) {
   const results = [];
   for (const rel of rels) {
@@ -304,6 +331,36 @@ async function uninstallBootstrapStage(projectRoot, _opts = {}) {
     projectRoot,
     () => removeArchiveHintHook(projectRoot)
   );
+  await runAndCollect(
+    results,
+    "hook-cite-policy-evict-script",
+    projectRoot,
+    () => removeCitePolicyEvictHook(projectRoot)
+  );
+  await runAndCollect(
+    results,
+    "hook-session-end-script",
+    projectRoot,
+    () => removeSessionEndMarkerHook(projectRoot)
+  );
+  await runAndCollect(
+    results,
+    "hook-post-tooluse-script",
+    projectRoot,
+    () => removePostTooluseMutationHook(projectRoot)
+  );
+  await runAndCollect(
+    results,
+    "skill-connect",
+    projectRoot,
+    () => uninstallFabricConnectSkill(projectRoot)
+  );
+  await runAndCollect(
+    results,
+    "skill-audit",
+    projectRoot,
+    () => uninstallFabricAuditSkill(projectRoot)
+  );
   await runAndCollect(
     results,
     "skill-sync",

package/dist/whoami-66YKY5DZ.js

@@ -0,0 +1,47 @@
+#!/usr/bin/env node
+import {
+  getProjectTranslator
+} from "./chunk-2CY4BMTH.js";
+import {
+  warnUnknownFlags,
+  whoami
+} from "./chunk-5LQIHYFC.js";
+import "./chunk-5ZUMLCD5.js";
+import "./chunk-XCBVSGCS.js";
+
+// src/commands/whoami.ts
+import { defineCommand } from "citty";
+var whoami_default = defineCommand({
+  meta: { name: "whoami", description: "Show this machine's Fabric uid and mounted stores" },
+  args: {
+    // F27: `--json` machine-readable output (was silently ignored — the command
+    // declared no args, so citty swallowed the flag and still printed text).
+    json: { type: "boolean", description: "Emit machine-readable JSON instead of text" }
+  },
+  run({ args }) {
+    warnUnknownFlags(["json"]);
+    const info = whoami();
+    if (args.json === true) {
+      console.log(JSON.stringify(info, null, 2));
+      return;
+    }
+    const t = getProjectTranslator();
+    if (info === null) {
+      console.log(t("cli.cmd.no-global-config"));
+      return;
+    }
+    console.log(t("cli.whoami.uid", { uid: info.uid }));
+    if (info.stores.length === 0) {
+      console.log(t("cli.whoami.stores-none"));
+      return;
+    }
+    console.log(t("cli.whoami.stores-label"));
+    const localOnly = t("cli.shared.local-only");
+    for (const store of info.stores) {
+      console.log(`  ${store.alias}	${store.store_uuid}${store.local_only ? `	${localOnly}` : ""}`);
+    }
+  }
+});
+export {
+  whoami_default as default
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fenglimg/fabric-cli",
-  "version": "2.1.0-rc.2",
+  "version": "2.2.0-rc.3",
   "description": "Fabric CLI — installs the MCP server + skills + hooks for Claude Code, Cursor, and Codex CLI; runs doctor / knowledge maintenance.",
   "license": "MIT",
   "author": "wangzhichao <fenglimg90@gmail.com>",
@@ -45,8 +45,8 @@
     "tree-sitter-javascript": "^0.25.0",
     "tree-sitter-typescript": "^0.23.2",
     "web-tree-sitter": "^0.26.8",
-    "@fenglimg/fabric-server": "2.1.0-rc.2",
-    "@fenglimg/fabric-shared": "2.1.0-rc.2"
+    "@fenglimg/fabric-server": "2.2.0-rc.3",
+    "@fenglimg/fabric-shared": "2.2.0-rc.3"
   },
   "devDependencies": {
     "@types/node": "^22.15.0",