@fenglimg/fabric-cli 2.2.0-rc.1 → 2.2.0-rc.10

package/dist/{sync-UJ4BBCZJ.js → sync-DT5UJMMR.js}

@@ -1,25 +1,28 @@
 #!/usr/bin/env node
 import {
-  regenerateBindingsSnapshot
-} from "./chunk-WU6GAPKH.js";
-import "./chunk-L4Q55UC4.js";
+  paint
+} from "./chunk-NLNH64A3.js";
 import {
-  getProjectTranslator
-} from "./chunk-2CY4BMTH.js";
-import "./chunk-LFIKMVY7.js";
+  regenerateBindingsSnapshot
+} from "./chunk-PTGQAZEW.js";
+import "./chunk-EOT63RDH.js";
+import "./chunk-QFIVFZRH.js";
 import {
   loadGlobalConfig,
   resolveGlobalRoot
-} from "./chunk-RYAFBNES.js";
+} from "./chunk-FNHDQTPC.js";
+import {
+  getProjectTranslator
+} from "./chunk-HORSMSZL.js";
 
 // src/commands/sync.ts
 import { defineCommand } from "citty";
 
 // src/sync/run-sync.ts
 import { execFileSync } from "child_process";
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "fs";
+import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "fs";
 import { join } from "path";
-import { GLOBAL_STATE_DIR, storeRelativePath } from "@fenglimg/fabric-shared";
+import { GLOBAL_STATE_DIR, storeRelativePathForMount } from "@fenglimg/fabric-shared";
 import { GenericIOError } from "@fenglimg/fabric-shared/errors";
 
 // src/sync/state-machine.ts
@@ -33,6 +36,7 @@ function syncTransition(state, event) {
     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";
@@ -88,13 +92,31 @@ function loadSession(globalRoot) {
   if (!existsSync(path)) {
     return null;
   }
-  return JSON.parse(readFileSync(path, "utf8"));
+  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 });
-  writeFileSync(path, `${JSON.stringify(session, null, 2)}
+  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 });
@@ -127,28 +149,105 @@ 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) {
-  execFileSync("git", ["rebase", "--continue"], { cwd: storeDir, stdio: "ignore" });
+  runRebaseStep(storeDir, "continue");
 }
 function defaultRebaseAbort(storeDir) {
-  execFileSync("git", ["rebase", "--abort"], { cwd: storeDir, stdio: "ignore" });
+  runRebaseStep(storeDir, "abort");
 }
 var OUTCOME_EVENT = {
   clean: "rebase_clean",
   conflict: "rebase_conflict",
   offline: "network_unavailable"
 };
-function walkPending(session, storeDirOf, pull) {
+function walkPending(session, storeDirOf, pull, push, commit, pushableAliases) {
   let next = session;
   for (const store of session.stores) {
     if (store.state !== "pending") {
       continue;
     }
-    const outcome = pull(storeDirOf(store));
-    next = applySyncEvent(next, store.alias, OUTCOME_EVENT[outcome]);
-    if (outcome === "conflict") {
-      break;
+    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;
 }
@@ -178,38 +277,99 @@ function runStartSync(options) {
   const session = planSync(
     syncable.map((store) => ({ alias: store.alias, store_uuid: store.store_uuid }))
   );
-  const storeDirOf = (status) => join(globalRoot, storeRelativePath(status.store_uuid));
-  const walked = walkPending(session, storeDirOf, options.pull ?? defaultPull);
+  const storeDirOf = makeStoreDirResolver(globalRoot, config.stores);
+  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 makeStoreDirResolver(globalRoot, stores) {
+  return (status) => join(
+    globalRoot,
+    storeRelativePathForMount(
+      stores.find((store) => store.store_uuid === status.store_uuid) ?? {
+        store_uuid: status.store_uuid
+      }
+    )
+  );
+}
 function runContinueSync(options) {
   const globalRoot = options.globalRoot ?? resolveGlobalRoot();
   const session = loadSession(globalRoot);
   if (session === null) {
-    throw new Error(NO_SESSION);
+    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 Error(NO_CONFLICT);
+    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));
+  const resumeConfig = loadGlobalConfig(globalRoot) ?? { stores: [] };
+  const storeDirOf = makeStoreDirResolver(globalRoot, resumeConfig.stores);
   (options.rebaseContinue ?? defaultRebaseContinue)(storeDirOf(conflicted));
-  const resumed = walkPending(continueSync(session), storeDirOf, options.pull ?? defaultPull);
+  const pushableAliases = pushableAliasesOf(resumeConfig);
+  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 Error(NO_SESSION);
+    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 Error(NO_CONFLICT);
+    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));
+  const resumeConfig = loadGlobalConfig(globalRoot) ?? { stores: [] };
+  const storeDirOf = makeStoreDirResolver(globalRoot, resumeConfig.stores);
   (options.rebaseAbort ?? defaultRebaseAbort)(storeDirOf(conflicted));
-  const resumed = walkPending(abortSync(session), storeDirOf, options.pull ?? defaultPull);
+  const pushableAliases = pushableAliasesOf(resumeConfig);
+  const resumed = walkPending(
+    abortSync(session),
+    storeDirOf,
+    options.pull ?? defaultPull,
+    options.push ?? defaultPush,
+    options.commit ?? defaultCommitDirty,
+    pushableAliases
+  );
   return finalize(resumed, options, globalRoot);
 }
 
@@ -226,7 +386,7 @@ function report(result, projectRoot) {
     console.log(t("cli.sync.paused"));
   }
 }
-var sync_default = defineCommand({
+var syncCommand = defineCommand({
   meta: { name: "sync", description: "Pull --rebase + push every mounted store; resume conflicts" },
   args: {
     continue: { type: "boolean", description: "Resume after resolving a rebase conflict" },
@@ -234,6 +394,11 @@ var sync_default = defineCommand({
   },
   run({ args }) {
     const projectRoot = process.cwd();
+    if (args.continue === true && args.abort === true) {
+      console.error(paint.error("fabric sync: --continue and --abort cannot be used together"));
+      process.exitCode = 1;
+      return;
+    }
     const options = { projectRoot, now: (/* @__PURE__ */ new Date()).toISOString() };
     if (args.continue === true) {
       report(runContinueSync(options), projectRoot);
@@ -246,6 +411,8 @@ var sync_default = defineCommand({
     report(runStartSync(options), projectRoot);
   }
 });
+var sync_default = syncCommand;
 export {
-  sync_default as default
+  sync_default as default,
+  syncCommand
 };