@tablation/crew 0.98.0 → 0.99.0

package/dist/cli.js

@@ -1602,6 +1602,28 @@ import { dirname as dirname3, join as join9 } from "path";
 var ForgeError = class extends Error {
 };
 var DEFAULT_FORGE_USERNAME = "x-access-token";
+var DEFAULT_FORGE_HOST = "github.com";
+var FORGE_DESCRIPTORS = {
+  github: {
+    kind: "github",
+    httpsUrl: (host, remote) => `https://${host}/${remote}.git`,
+    sshUrl: (host, remote) => `git@${host}:${remote}.git`,
+    credentialUsername: DEFAULT_FORGE_USERNAME
+  },
+  gitlab: {
+    kind: "gitlab",
+    httpsUrl: (host, remote) => `https://${host}/${remote}.git`,
+    sshUrl: (host, remote) => `git@${host}:${remote}.git`,
+    credentialUsername: "oauth2"
+  }
+};
+function normalizeForgeHost(host) {
+  const h = host?.trim().toLowerCase().replace(/^[a-z][a-z0-9+.-]*:\/\//, "").replace(/\/+$/, "");
+  return h || DEFAULT_FORGE_HOST;
+}
+function forgeDescriptorFor(host) {
+  return normalizeForgeHost(host).includes("gitlab") ? FORGE_DESCRIPTORS.gitlab : FORGE_DESCRIPTORS.github;
+}
 var DEFAULT_KEYCHAIN_SERVICE = "crew-forge";
 function defaultTokenFilePath(stateDir, host) {
   return join9(stateDir, "forges", `${host.replace(/[^a-z0-9.-]/gi, "_")}.token`);
@@ -1814,7 +1836,7 @@ function parseForges(raw) {
       throw new ForgeError(`${where}.token.source must be one of: ${Object.keys(TOKEN_SOURCES).join(", ")}`);
     }
     out[host.toLowerCase()] = {
-      username: typeof e.username === "string" && e.username ? e.username : DEFAULT_FORGE_USERNAME,
+      username: typeof e.username === "string" && e.username ? e.username : forgeDescriptorFor(host).credentialUsername,
       token
     };
   }
@@ -2932,6 +2954,7 @@ function parseResolved(raw, m, where) {
     reposModelId: raw.reposModelId,
     repoNames: raw.repoNames,
     repoRemotes: raw.repoRemotes,
+    repoForgeHosts: raw.repoForgeHosts,
     models: {
       issues: m.req(raw.models?.issues, `${where}.resolved.models.issues`),
       comments: m.req(raw.models?.comments, `${where}.resolved.models.comments`),
@@ -3437,23 +3460,29 @@ function reposOf(r) {
   if (r.dirIsCloneBase) {
     const [workspace2] = splitRoute(r.route);
     const remotes2 = r.resolved?.repoRemotes ?? {};
+    const hosts = r.resolved?.repoForgeHosts ?? {};
     return Object.entries(r.resolved?.repoNames ?? {}).map(([id, name]) => ({
       name,
       dir: defaultRepoDir(r.reposBasePath, workspace2, name),
-      remote: remotes2[id]
+      remote: remotes2[id],
+      ...hosts[id] ? { forgeHost: hosts[id] } : {}
     }));
   }
   if (trackerNames.length <= 1) return [{ name: basename3(r.dir), dir: r.dir }];
   const remotes = r.resolved?.repoRemotes ?? {};
   const remoteByName = {};
+  const hostByName = {};
   for (const [id, name] of Object.entries(r.resolved.repoNames)) {
     if (remotes[id]) remoteByName[name] = remotes[id];
+    const h = r.resolved?.repoForgeHosts?.[id];
+    if (h) hostByName[name] = h;
   }
   const [workspace] = splitRoute(r.route);
   return trackerNames.map((name) => ({
     name,
     dir: defaultRepoDir(r.reposBasePath, workspace, name),
-    remote: remoteByName[name]
+    remote: remoteByName[name],
+    ...hostByName[name] ? { forgeHost: hostByName[name] } : {}
   }));
 }
 function passengerRepoTargets(r) {
@@ -3469,10 +3498,12 @@ function passengerCheckoutTargets(r) {
   const remotes = r.resolved?.repoRemotes ?? {};
   return passengerRepoTargets(r).map((t) => {
     const id = repoIdForName(r, t.name);
+    const forgeHost = t.forgeHost ?? (id ? r.resolved?.repoForgeHosts?.[id] : void 0);
     return {
       name: t.name,
       dir: passengerCheckoutDir(r.reposBasePath, workspace, t.name),
-      remote: t.remote ?? (id ? remotes[id] : void 0)
+      remote: t.remote ?? (id ? remotes[id] : void 0),
+      ...forgeHost ? { forgeHost } : {}
     };
   });
 }
@@ -4780,8 +4811,10 @@ function setForgeTokenHosts(hosts) {
 }
 function cloneUrlFor(remote, opts = {}) {
   const origin = opts.originUrl?.trim() ?? "";
-  const scheme = tokenHosts.has("github.com") ? "https" : /^https?:\/\//i.test(origin) ? "https" : /^(git@|ssh:\/\/)/i.test(origin) ? "ssh" : opts.scheme ?? "ssh";
-  return scheme === "https" ? `https://github.com/${remote}.git` : `git@github.com:${remote}.git`;
+  const host = normalizeForgeHost(opts.host);
+  const scheme = tokenHosts.has(host) ? "https" : /^https?:\/\//i.test(origin) ? "https" : /^(git@|ssh:\/\/)/i.test(origin) ? "ssh" : opts.scheme ?? "ssh";
+  const forge = forgeDescriptorFor(host);
+  return scheme === "https" ? forge.httpsUrl(host, remote) : forge.sshUrl(host, remote);
 }
 function originUrlOf(dir, remoteName) {
   try {
@@ -5244,7 +5277,7 @@ function probePushAuth(o, run2 = realGit, baseEnv = process.env) {
     const raw = (err3.stderr ? String(err3.stderr) : err3.message).trim().split("\n").filter(Boolean).slice(-2).join(" / ");
     const detail = raw || "push dry-run failed";
     const f = o.forge;
-    if (!f) return { state: "failed", detail, hint: pushAuthHint(o.remoteUrl) };
+    if (!f) return { state: "failed", detail: hostOfRemote(o.remoteUrl) ? `${hostOfRemote(o.remoteUrl)}: ${detail}` : detail, hint: pushAuthHint(o.remoteUrl) };
     if (!f.hasToken) {
       return {
         state: "failed",
@@ -13156,7 +13189,8 @@ function planRepoClone(i) {
   const basePath = String(m.get("reposBasePath") ?? (isMap(ship) ? ship.get("reposBasePath") : void 0) ?? "~/Crew");
   const target = i.dir ? expandDir(i.dir, i.base) : join29(expandDir(basePath, i.base), i.route.split("/")[0], name);
   const add = planRepoAdd({ text: i.text, base: i.base, route: i.route, path: target, origin: remote, resolved: i.resolved, name, isCheckout: i.isCheckout });
-  return { ...add, remote, target };
+  const forgeHost = i.resolved?.repoForgeHosts?.[id];
+  return { ...add, remote, target, ...forgeHost ? { forgeHost } : {} };
 }
 
 // src/doctor-fix.ts
@@ -15282,7 +15316,7 @@ function runForge(a, io) {
     const doc = parseDocument4(io.readFile(io.configFile));
     doc.setIn(["ship", "forges", host, "token"], tok);
     io.writeFile(io.configFile, doc.toString());
-    io.forges = { ...io.forges ?? {}, [host]: { username: "x-access-token", token: tok } };
+    io.forges = { ...io.forges ?? {}, [host]: { username: forgeDescriptorFor(host).credentialUsername, token: tok } };
     existing = forgeFor(io.forges, host);
   }
   if (existing.entry.token.source === "env") {
@@ -16279,6 +16313,10 @@ async function discover(o) {
       repos.filter((r) => r.remote).map((r) => [r.id, r.remote])
     );
     if (Object.keys(remotes).length > 0) out.repoRemotes = remotes;
+    const forgeHosts = Object.fromEntries(
+      repos.filter((r) => r.forge_host?.trim()).map((r) => [r.id, r.forge_host.trim().toLowerCase()])
+    );
+    if (Object.keys(forgeHosts).length > 0) out.repoForgeHosts = forgeHosts;
   }
   if (o.area) {
     if (!out.areaModelId) problems.push(`--area given but this project has no "Projects" table`);
@@ -18432,7 +18470,8 @@ function passengerCheckoutSyncSpecs(cfg, workspaceId) {
         gitRemoteName: effective.branch.remote,
         base: effective.branch.base,
         originUrl: ordinary ? originUrlOf(ordinary.dir, effective.branch.remote) : null,
-        cloneScheme: cfg.ship.cloneScheme
+        cloneScheme: cfg.ship.cloneScheme,
+        ...target.forgeHost ? { forgeHost: target.forgeHost } : {}
       });
     }
   }
@@ -18442,7 +18481,7 @@ function syncAllPassengerCheckouts(cfg) {
   return passengerCheckoutSyncSpecs(cfg).map((spec) => ({
     name: spec.name,
     workspaceId: spec.workspaceId,
-    outcome: syncPassengerCheckout(spec.dir, spec.remote, spec.gitRemoteName, spec.base, { originUrl: spec.originUrl, scheme: spec.cloneScheme })
+    outcome: syncPassengerCheckout(spec.dir, spec.remote, spec.gitRemoteName, spec.base, { originUrl: spec.originUrl, scheme: spec.cloneScheme, host: spec.forgeHost })
   }));
 }
 
@@ -18815,7 +18854,7 @@ function createSyncDaemonServer(targets, secret) {
     try {
       const synced = targets.map((t) => ({
         name: t.name,
-        outcome: syncPassengerCheckout(t.dir, t.remote, t.gitRemoteName, t.base, { originUrl: t.originUrl, scheme: t.cloneScheme })
+        outcome: syncPassengerCheckout(t.dir, t.remote, t.gitRemoteName, t.base, { originUrl: t.originUrl, scheme: t.cloneScheme, host: t.forgeHost })
       }));
       res.writeHead(200, { "Content-Type": "application/json" }).end(JSON.stringify({ synced }));
     } catch (error) {
@@ -19511,7 +19550,7 @@ async function runRoleAgentLocked(role, decision, ctx, hooks, held) {
       const target = repoTargetFor(route2, result.ticket.repo_id);
       ticketRepo = target?.name;
       try {
-        if (target && ensureRepoCheckout(target.dir, target.remote, { scheme: ship.cloneScheme })) {
+        if (target && ensureRepoCheckout(target.dir, target.remote, { scheme: ship.cloneScheme, host: target.forgeHost })) {
           emit.emit(`cloned ${target.name} into ${target.dir}`, { step: "select", role });
         }
       } catch (e) {
@@ -21828,7 +21867,7 @@ ${cu.tail.trimEnd()}
             const target = repoTargetFor(w.route, result.ticket.repo_id);
             fleetTicketRepo = target?.name;
             try {
-              if (target && ensureRepoCheckout(target.dir, target.remote, { scheme: cfg.ship.cloneScheme })) {
+              if (target && ensureRepoCheckout(target.dir, target.remote, { scheme: cfg.ship.cloneScheme, host: target.forgeHost })) {
                 wemit.emit(`cloned ${target.name} into ${target.dir}`, { step: "select", role: w.role });
               }
             } catch (e) {
@@ -22045,7 +22084,7 @@ ${cu.tail.trimEnd()}
             const target = repoTargetFor(route2, result.ticket.repo_id);
             ticketRepo = target?.name;
             try {
-              if (target && ensureRepoCheckout(target.dir, target.remote, { scheme: cfg.ship.cloneScheme })) {
+              if (target && ensureRepoCheckout(target.dir, target.remote, { scheme: cfg.ship.cloneScheme, host: target.forgeHost })) {
                 emit.emit(`cloned ${target.name} into ${target.dir}`, { step: "select", role: current });
               }
             } catch (e) {
@@ -22785,7 +22824,7 @@ ${cu.tail.trimEnd()}
           }
           say("cloning", { remote: plan2.remote, target: plan2.target }, `cloning ${plan2.remote} into ${plan2.target}`);
           try {
-            ensureRepoCheckout(plan2.target, plan2.remote, { scheme: cfg.ship.cloneScheme ?? "https" });
+            ensureRepoCheckout(plan2.target, plan2.remote, { scheme: cfg.ship.cloneScheme ?? "https", host: plan2.forgeHost });
           } catch (e) {
             if (!(e instanceof GitError)) throw e;
             const authHint = /authentication failed|could not read (username|password)|permission denied|terminal prompts disabled|repository not found/i.test(e.message) ? "\n  hint: git could not authenticate \u2014 run `gh auth login` (or add an SSH key and set ship.cloneScheme: ssh), then re-run" : "";
@@ -23375,6 +23414,7 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
           reposModelId: found.reposModelId,
           repoNames: found.repoNames,
           repoRemotes: found.repoRemotes,
+          repoForgeHosts: found.repoForgeHosts,
           models: found.models,
           seats: found.seats,
           holds: found.holds.map((h) => ({ id: h.id, role: h.name })),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tablation/crew",
-  "version": "0.98.0",
+  "version": "0.99.0",
   "description": "A standing team of headless agents that picks work off a Tablation board, does it on a machine you control, and reports back.",
   "type": "module",
   "license": "MIT",