@remixhq/core 0.1.12 → 0.1.14

package/dist/chunk-E6AYE22H.js

@@ -0,0 +1,343 @@
+import {
+  getCurrentBranch
+} from "./chunk-VA6WXRWB.js";
+import {
+  RemixError
+} from "./chunk-YZ34ICNN.js";
+
+// src/infrastructure/binding/collabBindingStore.ts
+import fs2 from "fs/promises";
+import path2 from "path";
+
+// src/shared/fs.ts
+import fs from "fs/promises";
+import path from "path";
+async function reserveDirectory(targetDir) {
+  try {
+    await fs.mkdir(targetDir);
+    return targetDir;
+  } catch (error) {
+    if (error?.code === "EEXIST") {
+      throw new RemixError("Output directory already exists.", {
+        exitCode: 2,
+        hint: `Choose an empty destination path: ${targetDir}`
+      });
+    }
+    throw error;
+  }
+}
+async function reserveAvailableDirPath(preferredDir) {
+  const parent = path.dirname(preferredDir);
+  const base = path.basename(preferredDir);
+  for (let i = 1; i <= 1e3; i += 1) {
+    const candidate = i === 1 ? preferredDir : path.join(parent, `${base}-${i}`);
+    try {
+      await fs.mkdir(candidate);
+      return candidate;
+    } catch (error) {
+      if (error?.code === "EEXIST") continue;
+      throw error;
+    }
+  }
+  throw new RemixError("No available output directory name.", {
+    exitCode: 2,
+    hint: `Tried ${base} through ${base}-1000 under ${parent}.`
+  });
+}
+async function writeJsonAtomic(filePath, value) {
+  const dir = path.dirname(filePath);
+  await fs.mkdir(dir, { recursive: true });
+  const tmp = `${filePath}.tmp-${Date.now()}`;
+  await fs.writeFile(tmp, `${JSON.stringify(value, null, 2)}
+`, "utf8");
+  await fs.rename(tmp, filePath);
+}
+
+// src/infrastructure/binding/collabBindingStore.ts
+function getCollabBindingPath(repoRoot) {
+  return path2.join(repoRoot, ".remix", "config.json");
+}
+function buildBindingFileV3(params) {
+  return {
+    schemaVersion: 3,
+    repoFingerprint: params.repoFingerprint,
+    remoteUrl: params.remoteUrl,
+    defaultBranch: params.defaultBranch,
+    branchBindings: params.branchBindings,
+    ...params.explicitRootBinding ? { explicitRootBinding: params.explicitRootBinding } : {}
+  };
+}
+function normalizeBranchName(value) {
+  const normalized = String(value ?? "").trim();
+  return normalized || null;
+}
+function normalizeProjectId(value) {
+  const normalized = String(value ?? "").trim();
+  return normalized || null;
+}
+function normalizeBranchBinding(value) {
+  if (!value?.currentAppId || !value?.upstreamAppId) return null;
+  return {
+    projectId: normalizeProjectId(value.projectId),
+    currentAppId: value.currentAppId,
+    upstreamAppId: value.upstreamAppId,
+    threadId: value.threadId ?? null,
+    laneId: value.laneId ?? null,
+    bindingMode: value.bindingMode === "legacy" ? "legacy" : value.bindingMode === "explicit_root" ? "explicit_root" : "lane"
+  };
+}
+function buildResolvedBinding(params) {
+  if (!params.binding) return null;
+  return {
+    schemaVersion: 3,
+    projectId: params.binding.projectId ?? params.fallbackProjectId,
+    currentAppId: params.binding.currentAppId,
+    upstreamAppId: params.binding.upstreamAppId,
+    threadId: params.binding.threadId,
+    repoFingerprint: params.repoFingerprint,
+    remoteUrl: params.remoteUrl,
+    defaultBranch: params.defaultBranch,
+    laneId: params.binding.laneId,
+    branchName: params.branchName,
+    bindingMode: params.binding.bindingMode
+  };
+}
+function deriveFallbackProjectId(params) {
+  const candidates = [
+    params.currentBranch ? params.branchBindings[params.currentBranch]?.projectId ?? null : null,
+    params.defaultBranch ? params.branchBindings[params.defaultBranch]?.projectId ?? null : null,
+    ...Object.values(params.branchBindings).map((binding) => binding.projectId),
+    params.legacyProjectId
+  ];
+  for (const candidate of candidates) {
+    if (candidate) return candidate;
+  }
+  return null;
+}
+async function readCollabBindingState(repoRoot, options) {
+  try {
+    const persist = options?.persist === true;
+    const filePath = getCollabBindingPath(repoRoot);
+    const raw = await fs2.readFile(filePath, "utf8");
+    const parsed = JSON.parse(raw);
+    if (!parsed || typeof parsed !== "object") return null;
+    const currentBranch = normalizeBranchName(await getCurrentBranch(repoRoot).catch(() => null));
+    if (parsed.schemaVersion === 1) {
+      if (!parsed.currentAppId || !parsed.upstreamAppId) return null;
+      const projectId = normalizeProjectId(parsed.projectId);
+      const preferredBranch = normalizeBranchName(parsed.preferredBranch ?? parsed.defaultBranch ?? null);
+      const branchKey = preferredBranch ?? currentBranch ?? null;
+      const branchBindings2 = branchKey ? {
+        [branchKey]: {
+          projectId,
+          currentAppId: parsed.currentAppId,
+          upstreamAppId: parsed.upstreamAppId,
+          threadId: parsed.threadId ?? null,
+          laneId: null,
+          bindingMode: "legacy"
+        }
+      } : {};
+      const migratedFile = buildBindingFileV3({
+        repoFingerprint: parsed.repoFingerprint ?? null,
+        remoteUrl: parsed.remoteUrl ?? null,
+        defaultBranch: parsed.defaultBranch ?? null,
+        branchBindings: branchBindings2
+      });
+      if (persist) {
+        try {
+          await writeJsonAtomic(filePath, migratedFile);
+        } catch {
+        }
+      }
+      return {
+        schemaVersion: 3,
+        projectId,
+        repoFingerprint: migratedFile.repoFingerprint,
+        remoteUrl: migratedFile.remoteUrl,
+        defaultBranch: migratedFile.defaultBranch,
+        currentBranch,
+        branchBindings: migratedFile.branchBindings,
+        explicitRootBinding: null,
+        binding: buildResolvedBinding({
+          fallbackProjectId: projectId,
+          repoFingerprint: migratedFile.repoFingerprint,
+          remoteUrl: migratedFile.remoteUrl,
+          defaultBranch: migratedFile.defaultBranch,
+          branchName: branchKey,
+          binding: branchKey ? migratedFile.branchBindings[branchKey] : null
+        })
+      };
+    }
+    if (parsed.schemaVersion !== 2 && parsed.schemaVersion !== 3) return null;
+    const file = parsed;
+    let shouldPersistNormalizedBranchBindings = false;
+    const legacyProjectId = normalizeProjectId(file.projectId);
+    const branchBindings = Object.fromEntries(
+      Object.entries(file.branchBindings ?? {}).map(([branchName, branchBinding]) => {
+        const normalized = normalizeBranchBinding(branchBinding);
+        const rawProjectId = branchBinding && typeof branchBinding === "object" && "projectId" in branchBinding ? normalizeProjectId(branchBinding.projectId) : null;
+        const rawBindingMode = branchBinding && typeof branchBinding === "object" && "bindingMode" in branchBinding ? branchBinding.bindingMode : null;
+        const hasLegacyPreferredBranch = Boolean(branchBinding) && typeof branchBinding === "object" && "preferredBranch" in branchBinding;
+        let normalizedWithProject = normalized;
+        if (normalizedWithProject && !normalizedWithProject.projectId && legacyProjectId) {
+          normalizedWithProject = {
+            ...normalizedWithProject,
+            projectId: legacyProjectId
+          };
+        }
+        if (normalizedWithProject && (rawBindingMode !== normalizedWithProject.bindingMode || hasLegacyPreferredBranch || rawProjectId !== normalizedWithProject.projectId)) {
+          shouldPersistNormalizedBranchBindings = true;
+        }
+        return [branchName, normalizedWithProject];
+      }).filter((entry) => Boolean(entry[1]))
+    );
+    const legacyExplicitBinding = normalizeBranchBinding(file.explicitBinding ?? null);
+    const legacyExplicitBranch = currentBranch ?? normalizeBranchName(file.defaultBranch);
+    if (legacyExplicitBinding && legacyExplicitBranch) {
+      branchBindings[legacyExplicitBranch] = {
+        ...legacyExplicitBinding,
+        projectId: legacyExplicitBinding.projectId ?? branchBindings[legacyExplicitBranch]?.projectId ?? legacyProjectId,
+        bindingMode: "lane"
+      };
+      shouldPersistNormalizedBranchBindings = true;
+    }
+    let explicitRootBinding = normalizeBranchBinding(file.explicitRootBinding ?? null);
+    if (explicitRootBinding && !explicitRootBinding.projectId && legacyProjectId) {
+      explicitRootBinding = {
+        ...explicitRootBinding,
+        projectId: legacyProjectId
+      };
+      shouldPersistNormalizedBranchBindings = true;
+    }
+    if (explicitRootBinding && explicitRootBinding.bindingMode !== "explicit_root") {
+      explicitRootBinding = {
+        ...explicitRootBinding,
+        bindingMode: "explicit_root"
+      };
+      shouldPersistNormalizedBranchBindings = true;
+    }
+    if (persist && ("explicitBinding" in file || "explicitRootBinding" in file || shouldPersistNormalizedBranchBindings || parsed.schemaVersion === 2)) {
+      try {
+        await writeJsonAtomic(
+          filePath,
+          buildBindingFileV3({
+            repoFingerprint: file.repoFingerprint ?? null,
+            remoteUrl: file.remoteUrl ?? null,
+            defaultBranch: file.defaultBranch ?? null,
+            branchBindings,
+            explicitRootBinding
+          })
+        );
+      } catch {
+      }
+    }
+    const resolvedBranch = currentBranch ?? normalizeBranchName(file.defaultBranch);
+    const fallbackProjectId = deriveFallbackProjectId({
+      branchBindings,
+      currentBranch: resolvedBranch,
+      defaultBranch: normalizeBranchName(file.defaultBranch),
+      legacyProjectId: explicitRootBinding?.projectId ?? legacyProjectId
+    });
+    const resolvedBinding = buildResolvedBinding({
+      fallbackProjectId,
+      repoFingerprint: file.repoFingerprint ?? null,
+      remoteUrl: file.remoteUrl ?? null,
+      defaultBranch: file.defaultBranch ?? null,
+      branchName: resolvedBranch,
+      binding: resolvedBranch ? branchBindings[resolvedBranch] ?? null : null
+    }) ?? (resolvedBranch && resolvedBranch === normalizeBranchName(file.defaultBranch) && explicitRootBinding ? buildResolvedBinding({
+      fallbackProjectId,
+      repoFingerprint: file.repoFingerprint ?? null,
+      remoteUrl: file.remoteUrl ?? null,
+      defaultBranch: file.defaultBranch ?? null,
+      branchName: normalizeBranchName(file.defaultBranch),
+      binding: explicitRootBinding
+    }) : null);
+    return {
+      schemaVersion: parsed.schemaVersion,
+      projectId: fallbackProjectId,
+      repoFingerprint: file.repoFingerprint ?? null,
+      remoteUrl: file.remoteUrl ?? null,
+      defaultBranch: file.defaultBranch ?? null,
+      currentBranch,
+      branchBindings,
+      explicitRootBinding: buildResolvedBinding({
+        fallbackProjectId,
+        repoFingerprint: file.repoFingerprint ?? null,
+        remoteUrl: file.remoteUrl ?? null,
+        defaultBranch: file.defaultBranch ?? null,
+        branchName: normalizeBranchName(file.defaultBranch),
+        binding: explicitRootBinding
+      }),
+      binding: resolvedBinding
+    };
+  } catch {
+    return null;
+  }
+}
+async function readCollabBinding(repoRoot) {
+  const state = await readCollabBindingState(repoRoot);
+  return state?.binding ?? null;
+}
+async function writeCollabBinding(repoRoot, binding) {
+  const filePath = getCollabBindingPath(repoRoot);
+  const currentBranch = normalizeBranchName(await getCurrentBranch(repoRoot).catch(() => null));
+  const branchName = normalizeBranchName(binding.branchName) ?? currentBranch ?? binding.defaultBranch ?? "main";
+  const existing = await readCollabBindingState(repoRoot, { persist: true });
+  const branchBindings = { ...existing?.branchBindings ?? {} };
+  branchBindings[branchName] = {
+    projectId: normalizeProjectId(binding.projectId) ?? branchBindings[branchName]?.projectId ?? existing?.projectId ?? null,
+    currentAppId: binding.currentAppId,
+    upstreamAppId: binding.upstreamAppId,
+    threadId: binding.threadId ?? null,
+    laneId: binding.laneId ?? null,
+    bindingMode: binding.bindingMode ?? "lane"
+  };
+  const explicitRootBinding = binding.bindingMode === "explicit_root" ? {
+    ...branchBindings[branchName],
+    bindingMode: "explicit_root"
+  } : existing?.explicitRootBinding ? {
+    projectId: existing.explicitRootBinding.projectId,
+    currentAppId: existing.explicitRootBinding.currentAppId,
+    upstreamAppId: existing.explicitRootBinding.upstreamAppId,
+    threadId: existing.explicitRootBinding.threadId,
+    laneId: existing.explicitRootBinding.laneId,
+    bindingMode: "explicit_root"
+  } : null;
+  await writeJsonAtomic(
+    filePath,
+    buildBindingFileV3({
+      repoFingerprint: binding.repoFingerprint ?? null,
+      remoteUrl: binding.remoteUrl ?? null,
+      defaultBranch: binding.defaultBranch ?? null,
+      branchBindings,
+      explicitRootBinding
+    })
+  );
+  return filePath;
+}
+async function writeCollabBindingSnapshot(params) {
+  const filePath = getCollabBindingPath(params.repoRoot);
+  await writeJsonAtomic(
+    filePath,
+    buildBindingFileV3({
+      repoFingerprint: params.repoFingerprint,
+      remoteUrl: params.remoteUrl,
+      defaultBranch: params.defaultBranch,
+      branchBindings: params.branchBindings,
+      explicitRootBinding: params.explicitRootBinding ?? null
+    })
+  );
+  return filePath;
+}
+
+export {
+  reserveDirectory,
+  reserveAvailableDirPath,
+  writeJsonAtomic,
+  getCollabBindingPath,
+  readCollabBindingState,
+  readCollabBinding,
+  writeCollabBinding,
+  writeCollabBindingSnapshot
+};

package/dist/chunk-OZRXDDEL.js

@@ -0,0 +1,46 @@
+import {
+  RemixError
+} from "./chunk-YZ34ICNN.js";
+
+// src/config/model.ts
+import { z } from "zod";
+var DEFAULT_API_URL = "http://192.168.8.251:8000";
+var DEFAULT_SUPABASE_URL = "https://xtfxwbckjpfmqubnsusu.supabase.co";
+var DEFAULT_SUPABASE_ANON_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Inh0Znh3YmNranBmbXF1Ym5zdXN1Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NjA2MDEyMzAsImV4cCI6MjA3NjE3NzIzMH0.dzWGAWrK4CvrmHVHzf8w7JlUZohdap0ZPnLZnABMV8s";
+function isValidUrl(value) {
+  try {
+    new URL(value);
+    return true;
+  } catch {
+    return false;
+  }
+}
+var urlSchema = z.string().min(1).transform((s) => s.trim()).refine((s) => isValidUrl(s), "Invalid URL.").transform((s) => s.replace(/\/+$/, ""));
+var configSchema = z.object({
+  apiUrl: urlSchema,
+  supabaseUrl: urlSchema,
+  supabaseAnonKey: z.string().min(1)
+});
+var cachedConfig = null;
+async function resolveConfig(_opts) {
+  if (cachedConfig) return cachedConfig;
+  const cfgRaw = {
+    apiUrl: DEFAULT_API_URL,
+    supabaseUrl: DEFAULT_SUPABASE_URL,
+    supabaseAnonKey: DEFAULT_SUPABASE_ANON_KEY
+  };
+  const parsedCfg = configSchema.safeParse(cfgRaw);
+  if (!parsedCfg.success) {
+    throw new RemixError("Invalid core configuration.", {
+      exitCode: 1,
+      hint: parsedCfg.error.issues.map((i) => `${i.path.join(".") || "config"}: ${i.message}`).join("; ")
+    });
+  }
+  cachedConfig = parsedCfg.data;
+  return parsedCfg.data;
+}
+
+export {
+  configSchema,
+  resolveConfig
+};

package/dist/chunk-P6JHXOV4.js

@@ -0,0 +1,236 @@
+import {
+  RemixError
+} from "./chunk-YZ34ICNN.js";
+
+// src/auth/session.ts
+import { z } from "zod";
+var storedSessionSchema = z.object({
+  access_token: z.string().min(1),
+  refresh_token: z.string().min(1),
+  expires_at: z.number().int().positive(),
+  token_type: z.string().min(1).optional(),
+  user: z.object({
+    id: z.string().min(1),
+    email: z.string().email().optional().nullable()
+  }).optional()
+});
+
+// src/auth/localSessionStore.ts
+import fs from "fs/promises";
+import os from "os";
+import path from "path";
+function xdgConfigHome() {
+  const value = process.env.XDG_CONFIG_HOME;
+  if (typeof value === "string" && value.trim()) return value;
+  return path.join(os.homedir(), ".config");
+}
+async function maybeLoadKeytar() {
+  try {
+    const mod = await new Function("return import('keytar')")();
+    const candidates = [mod, mod?.default].filter(Boolean);
+    for (const candidate of candidates) {
+      const value = candidate;
+      if (typeof value.getPassword === "function" && typeof value.setPassword === "function") {
+        return value;
+      }
+    }
+  } catch {
+    return null;
+  }
+  return null;
+}
+async function ensurePathPermissions(filePath) {
+  const dir = path.dirname(filePath);
+  await fs.mkdir(dir, { recursive: true });
+  try {
+    await fs.chmod(dir, 448);
+  } catch {
+  }
+  try {
+    await fs.chmod(filePath, 384);
+  } catch {
+  }
+}
+async function writeJsonAtomic(filePath, value) {
+  await fs.mkdir(path.dirname(filePath), { recursive: true });
+  const tmpPath = `${filePath}.tmp-${Date.now()}-${Math.random().toString(16).slice(2)}`;
+  await fs.writeFile(tmpPath, JSON.stringify(value, null, 2) + "\n", "utf8");
+  await fs.rename(tmpPath, filePath);
+}
+async function writeSessionFileFallback(filePath, session) {
+  await writeJsonAtomic(filePath, session);
+  await ensurePathPermissions(filePath);
+}
+function createLocalSessionStore(params) {
+  const service = params?.service?.trim() || "remix-cli";
+  const account = params?.account?.trim() || "default";
+  const filePath = params?.filePath?.trim() || path.join(xdgConfigHome(), "remix", "session.json");
+  async function readKeytar() {
+    const keytar = await maybeLoadKeytar();
+    if (!keytar) return null;
+    const raw = await keytar.getPassword(service, account).catch(() => null);
+    if (!raw) return null;
+    try {
+      const parsed = storedSessionSchema.safeParse(JSON.parse(raw));
+      return parsed.success ? parsed.data : null;
+    } catch {
+      return null;
+    }
+  }
+  async function readFile() {
+    const raw = await fs.readFile(filePath, "utf8").catch(() => null);
+    if (!raw) return null;
+    try {
+      const parsed = storedSessionSchema.safeParse(JSON.parse(raw));
+      if (!parsed.success) return null;
+      await ensurePathPermissions(filePath);
+      return parsed.data;
+    } catch {
+      return null;
+    }
+  }
+  function pickFreshest(a, b) {
+    if (!a) return b;
+    if (!b) return a;
+    return a.expires_at >= b.expires_at ? a : b;
+  }
+  return {
+    async getSession() {
+      const [k, f] = await Promise.all([readKeytar(), readFile()]);
+      return pickFreshest(k, f);
+    },
+    async setSession(session) {
+      const parsed = storedSessionSchema.safeParse(session);
+      if (!parsed.success) {
+        throw new Error("Session data is invalid and was not stored.");
+      }
+      await writeSessionFileFallback(filePath, parsed.data);
+      const keytar = await maybeLoadKeytar();
+      if (keytar) {
+        try {
+          await keytar.setPassword(service, account, JSON.stringify(parsed.data));
+        } catch {
+        }
+      }
+    }
+  };
+}
+
+// src/auth/tokenProvider.ts
+function shouldRefreshSoon(session, skewSeconds = 60) {
+  const nowSec = Math.floor(Date.now() / 1e3);
+  return session.expires_at <= nowSec + skewSeconds;
+}
+function createStoredSessionTokenProvider(params) {
+  return async (opts) => {
+    const forceRefresh = Boolean(opts?.forceRefresh);
+    const envToken = process.env.COMERGE_ACCESS_TOKEN;
+    if (typeof envToken === "string" && envToken.trim().length > 0) {
+      return { token: envToken.trim(), session: null, fromEnv: true };
+    }
+    let session = await params.sessionStore.getSession();
+    if (!session) {
+      throw new RemixError("Not signed in.", {
+        exitCode: 2,
+        hint: "Run `remix login`, or set COMERGE_ACCESS_TOKEN for CI."
+      });
+    }
+    if (forceRefresh || shouldRefreshSoon(session)) {
+      try {
+        session = await params.refreshStoredSession({ config: params.config, session });
+        await params.sessionStore.setSession(session);
+      } catch (err) {
+        void err;
+      }
+    }
+    return { token: session.access_token, session, fromEnv: false };
+  };
+}
+
+// src/auth/supabase.ts
+import { createClient } from "@supabase/supabase-js";
+function createInMemoryStorage() {
+  const map = /* @__PURE__ */ new Map();
+  return {
+    getItem: (k) => map.get(k) ?? null,
+    setItem: (k, v) => {
+      map.set(k, v);
+    },
+    removeItem: (k) => {
+      map.delete(k);
+    }
+  };
+}
+function createSupabaseClient(config, storage) {
+  return createClient(config.supabaseUrl, config.supabaseAnonKey, {
+    auth: {
+      flowType: "pkce",
+      persistSession: false,
+      autoRefreshToken: false,
+      detectSessionInUrl: false,
+      storage
+    },
+    global: {
+      headers: {
+        "X-Requested-By": "comerge-cli"
+      }
+    }
+  });
+}
+function toStoredSession(session) {
+  if (!session.access_token || !session.refresh_token || !session.expires_at) {
+    throw new RemixError("Supabase session is missing required fields.", { exitCode: 1 });
+  }
+  return {
+    access_token: session.access_token,
+    refresh_token: session.refresh_token,
+    expires_at: session.expires_at,
+    token_type: session.token_type ?? void 0,
+    user: session.user ? { id: session.user.id, email: session.user.email ?? null } : void 0
+  };
+}
+function createSupabaseAuthHelpers(config) {
+  const storage = createInMemoryStorage();
+  const supabase = createSupabaseClient(config, storage);
+  return {
+    async startGoogleLogin(params) {
+      const { data, error } = await supabase.auth.signInWithOAuth({
+        provider: "google",
+        options: {
+          redirectTo: params.redirectTo,
+          skipBrowserRedirect: true,
+          queryParams: {
+            access_type: "offline",
+            prompt: "consent"
+          }
+        }
+      });
+      if (error) throw error;
+      if (!data?.url) throw new RemixError("Supabase did not return an OAuth URL.", { exitCode: 1 });
+      return { url: data.url };
+    },
+    async exchangeCode(params) {
+      const { data, error } = await supabase.auth.exchangeCodeForSession(params.code);
+      if (error) throw error;
+      if (!data?.session) throw new RemixError("Supabase did not return a session.", { exitCode: 1 });
+      return toStoredSession(data.session);
+    },
+    async refreshWithStoredSession(params) {
+      const { data, error } = await supabase.auth.setSession({
+        access_token: params.session.access_token,
+        refresh_token: params.session.refresh_token
+      });
+      if (error) throw error;
+      if (!data?.session) throw new RemixError("No session returned after refresh.", { exitCode: 1 });
+      return toStoredSession(data.session);
+    }
+  };
+}
+
+export {
+  storedSessionSchema,
+  createLocalSessionStore,
+  shouldRefreshSoon,
+  createStoredSessionTokenProvider,
+  createSupabaseAuthHelpers
+};