supbuddy 3.2.4 → 3.2.6

package/dist/bin.js

@@ -19807,7 +19807,7 @@ function cliBuildKind(env3 = process.env) {
   return raw === "host" || raw === "npm" ? raw : "dev";
 }
 function cliVersion(env3 = process.env) {
-  return "3.2.4".trim() || "0.0.0-dev";
+  return "3.2.6".trim() || "0.0.0-dev";
 }
 function isDevBuild(env3) {
   return cliBuildKind(env3) === "dev";

package/dist/daemon/worker.cjs

@@ -56955,15 +56955,19 @@ function sshProxyCommand(socksPort = TAILNET_SOCKS_PORT) {
   return `nc -X 5 -x localhost:${socksPort} %h %p`;
 }
 function sshOptionsFor(args) {
+  const q = (p) => {
+    if (p.includes('"')) throw new Error(`refusing to build an ssh option for a path containing a double quote: ${p}`);
+    return `"${p}"`;
+  };
   return [
     "-o",
     `ProxyCommand=${sshProxyCommand(args.socksPort)}`,
     "-o",
-    `UserKnownHostsFile=${args.knownHostsFile}`,
+    `UserKnownHostsFile=${q(args.knownHostsFile)}`,
     "-o",
     "StrictHostKeyChecking=yes",
     "-o",
-    `IdentityFile=${args.identityFile}`,
+    `IdentityFile=${q(args.identityFile)}`,
     "-o",
     "IdentitiesOnly=yes",
     "-o",
@@ -57182,6 +57186,43 @@ exec /usr/bin/${name2} ${opts} "$@"
   });
   return { ok: true, session };
 }
+async function inspectLocalWork(git, localPath) {
+  const out = { uncommitted: 0, unpushed: 0, noUpstream: false, notAGitRepo: false };
+  const inside = await git(["rev-parse", "--is-inside-work-tree"], localPath).catch(() => ({ exitCode: 1, stdout: "" }));
+  if (inside.exitCode !== 0 || inside.stdout.trim() !== "true") {
+    out.notAGitRepo = true;
+    return out;
+  }
+  const status = await git(["status", "--porcelain"], localPath).catch(() => ({ exitCode: 1, stdout: "" }));
+  if (status.exitCode === 0) {
+    out.uncommitted = status.stdout.split("\n").filter((l) => l.trim()).length;
+  }
+  const counts = await git(["rev-list", "--count", "@{upstream}..HEAD"], localPath).catch(() => ({ exitCode: 1, stdout: "" }));
+  if (counts.exitCode === 0) {
+    out.unpushed = Number.parseInt(counts.stdout.trim(), 10) || 0;
+  } else {
+    out.noUpstream = true;
+  }
+  return out;
+}
+function hasWorkAtRisk(risk) {
+  return risk.notAGitRepo || risk.noUpstream || risk.uncommitted > 0 || risk.unpushed > 0;
+}
+function describeWorkAtRisk(risk, localPath) {
+  if (risk.notAGitRepo) {
+    return `${localPath} is not a git repository, so a one-way sync from the cloud would delete anything here that the box does not have, with no way to recover it. Choose "this machine's copy" as the authority, or start sync on a directory under version control.`;
+  }
+  const parts = [];
+  if (risk.uncommitted > 0) {
+    parts.push(`${risk.uncommitted} uncommitted change${risk.uncommitted === 1 ? "" : "s"} (commit or stash them)`);
+  }
+  if (risk.noUpstream) {
+    parts.push("a branch that has never been pushed, so none of its commits are on the box (push it first)");
+  } else if (risk.unpushed > 0) {
+    parts.push(`${risk.unpushed} unpushed commit${risk.unpushed === 1 ? "" : "s"} (push them first)`);
+  }
+  return `Refusing to overwrite this machine: ${localPath} has ${parts.join(", and ")}. The box clones the repository from its REMOTE, so it has never seen that work, and a first sync with the cloud as authority would delete it. Choose "this machine's copy" instead, or resolve the above and try again.`;
+}
 const execFileAsync$1 = require$$0$3.promisify(node_child_process.execFile);
 const sessions = /* @__PURE__ */ new Map();
 const shimDirFor = (dataDir) => path$1.join(tailnetPaths(dataDir).dir, "shim");
@@ -57233,14 +57274,30 @@ function runtimeDeps(deps) {
     })
   };
 }
+const defaultGit = async (gitArgs, cwd) => {
+  try {
+    const { stdout } = await execFileAsync$1("git", gitArgs, { cwd, timeout: 15e3 });
+    return { exitCode: 0, stdout };
+  } catch (e) {
+    const err = e;
+    return { exitCode: typeof err.code === "number" ? err.code : 1, stdout: String(err.stdout ?? "") };
+  }
+};
 async function startProjectSync(deps, args) {
   const existing = sessions.get(args.projectId);
   if (existing) return { ok: true, session: existing };
+  if (args.authority === "cloud" && !args.force) {
+    const risk = await inspectLocalWork(deps.git ?? defaultGit, args.localPath);
+    if (hasWorkAtRisk(risk)) {
+      return { ok: false, unavailable: describeWorkAtRisk(risk, args.localPath) };
+    }
+  }
   const res = await startSync(runtimeDeps(deps), args);
   if (!res.ok) return res;
   sessions.set(args.projectId, res.session);
   return res;
 }
+const PAUSED_WHEN_STOPPED = /* @__PURE__ */ new Set(["connecting", "idle", "unknown"]);
 async function projectSyncStatus(deps, projectId, opts = {}) {
   const state = sessions.get(projectId);
   if (!state) return null;
@@ -57254,7 +57311,7 @@ async function projectSyncStatus(deps, projectId, opts = {}) {
       next = { ...next, promoteError: e instanceof Error ? e.message : String(e) };
     }
   }
-  if (opts.stackStopped && (next.phase === "connecting" || next.phase === "idle")) {
+  if (opts.stackStopped && PAUSED_WHEN_STOPPED.has(next.phase)) {
     next = { ...next, phase: "paused" };
   }
   sessions.set(projectId, next);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supbuddy",
-  "version": "3.2.4",
+  "version": "3.2.6",
   "description": "Run multiple Supabase projects at once on custom local domains with HTTPS. A headless CLI and daemon (proxy, DNS, Supabase/Compose lifecycle, MCP) for macOS and Linux.",
   "keywords": [
     "supabase",