@tablation/crew 0.72.0 → 0.72.2

package/dist/cli.js

@@ -2587,7 +2587,9 @@ function parseOneRoute(c, where, file, base, stateDir, raw, missing, crewHome, t
     }
   }
   const hasRepos = Object.keys(repoDirs).length > 0;
-  const dir = c?.dir ? expand(String(c.dir), base) : hasRepos ? Object.values(repoDirs)[0] : missing.req(void 0, `${where}.dir (or ${where}.repos)`) ?? "";
+  const reposBasePath = expand(String(c?.reposBasePath ?? raw.ship?.reposBasePath ?? DEFAULT_REPOS_BASE_PATH), base);
+  const dirIsCloneBase = !c?.dir && !hasRepos && c?.repos && typeof c.repos === "object" && !Array.isArray(c.repos);
+  const dir = c?.dir ? expand(String(c.dir), base) : hasRepos ? Object.values(repoDirs)[0] : dirIsCloneBase ? join7(reposBasePath, splitRoute(route)[0]) : missing.req(void 0, `${where}.dir (or ${where}.repos)`) ?? "";
   const weight = c?.weight === void 0 ? void 0 : Number(c.weight);
   if (weight !== void 0 && !(Number.isFinite(weight) && weight > 0)) {
     missing.add(`${where}.weight must be a positive number (got "${c?.weight}")`);
@@ -2597,8 +2599,9 @@ function parseOneRoute(c, where, file, base, stateDir, raw, missing, crewHome, t
     enabled: c?.enabled === true,
     area: c?.area,
     dir,
+    ...dirIsCloneBase ? { dirIsCloneBase: true } : {},
     repos: repoDirs,
-    reposBasePath: expand(String(c?.reposBasePath ?? raw.ship?.reposBasePath ?? DEFAULT_REPOS_BASE_PATH), base),
+    reposBasePath,
     repoOverrides,
     worktreePrefix: c?.worktreePrefix ? String(c.worktreePrefix) : void 0,
     ...toolchain !== void 0 ? { toolchain } : {},
@@ -2656,7 +2659,7 @@ function dirForRepo(r, repoId) {
 }
 function repoTargetFor(r, repoId) {
   const names = r.resolved?.repoNames;
-  if (!repoId || !names) return Object.keys(r.repos).length ? null : { name: basename3(r.dir), dir: r.dir };
+  if (!repoId || !names) return Object.keys(r.repos).length || r.dirIsCloneBase ? null : { name: basename3(r.dir), dir: r.dir };
   const name = names[repoId];
   if (!name) return null;
   return reposOf(r).find((t) => t.name === name) ?? null;
@@ -2747,6 +2750,15 @@ function reposOf(r) {
   const named = Object.entries(r.repos);
   if (named.length > 0) return named.map(([name, dir]) => ({ name, dir }));
   const trackerNames = r.resolved?.repoNames ? Object.values(r.resolved.repoNames) : [];
+  if (r.dirIsCloneBase) {
+    const [workspace2] = splitRoute(r.route);
+    const remotes2 = r.resolved?.repoRemotes ?? {};
+    return Object.entries(r.resolved?.repoNames ?? {}).map(([id, name]) => ({
+      name,
+      dir: defaultRepoDir(r.reposBasePath, workspace2, name),
+      remote: remotes2[id]
+    }));
+  }
   if (trackerNames.length <= 1) return [{ name: basename3(r.dir), dir: r.dir }];
   const remotes = r.resolved?.repoRemotes ?? {};
   const remoteByName = {};
@@ -8632,6 +8644,7 @@ var VALUE_FLAGS = /* @__PURE__ */ new Set([
   "key",
   "level",
   "limit",
+  "machine-id",
   "max-roles",
   "mcp",
   "member",
@@ -8644,6 +8657,7 @@ var VALUE_FLAGS = /* @__PURE__ */ new Set([
   "ship-name",
   "tail",
   "ticket",
+  "toolchain",
   "workspace",
   "workspace-id",
   "write"
@@ -8798,40 +8812,47 @@ function readPointers(stateDir) {
   try {
     const parsed = JSON.parse(readFileSync16(lastSessionFile(stateDir), "utf8"));
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
-    return Object.fromEntries(Object.entries(parsed).filter((e) => typeof e[1] === "string"));
+    const out = {};
+    for (const [host, v] of Object.entries(parsed)) {
+      const slugs = (Array.isArray(v) ? v : [v]).filter((x) => typeof x === "string" && x !== "");
+      if (slugs.length) out[host] = slugs;
+    }
+    return out;
   } catch {
     return {};
   }
 }
+function writePointers(stateDir, pointers) {
+  const file = lastSessionFile(stateDir);
+  mkdirSync10(dirname8(file), { recursive: true });
+  writeFileSync11(file, `${JSON.stringify(pointers, null, 2)}
+`, { mode: 384 });
+}
 function rememberSession(stateDir, host, workspaceSlug) {
   try {
-    const file = lastSessionFile(stateDir);
-    mkdirSync10(dirname8(file), { recursive: true });
-    writeFileSync11(file, `${JSON.stringify({ ...readPointers(stateDir), [host]: workspaceSlug }, null, 2)}
-`, { mode: 384 });
+    const all = readPointers(stateDir);
+    writePointers(stateDir, { ...all, [host]: [...(all[host] ?? []).filter((w) => w !== workspaceSlug), workspaceSlug] });
   } catch {
   }
 }
-async function resumeKeychainSession(o) {
-  const workspace = readPointers(o.stateDir)[o.host];
-  if (!workspace) return void 0;
-  try {
-    const stored = await o.store.get(o.host, workspace);
-    if (!stored?.apiKey) return void 0;
-    if (!await o.verify(stored.apiKey)) return void 0;
-    return { workspace, apiKey: stored.apiKey };
-  } catch {
-    return void 0;
+async function resumableSessions(o) {
+  const out = [];
+  for (const workspace of readPointers(o.stateDir)[o.host] ?? []) {
+    try {
+      const stored = await o.store.get(o.host, workspace);
+      if (stored?.apiKey && await o.verify(stored.apiKey)) out.push({ workspace, apiKey: stored.apiKey });
+    } catch {
+    }
   }
+  return out;
 }
 function rememberedSessions(stateDir) {
-  return Object.entries(readPointers(stateDir)).map(([host, workspace]) => ({ host, workspace }));
+  return Object.entries(readPointers(stateDir)).flatMap(([host, ws]) => ws.map((workspace) => ({ host, workspace })));
 }
 function forgetSession(stateDir, host) {
   try {
     const { [host]: _gone, ...rest } = readPointers(stateDir);
-    if (Object.keys(rest).length) writeFileSync11(lastSessionFile(stateDir), `${JSON.stringify(rest, null, 2)}
-`, { mode: 384 });
+    if (Object.keys(rest).length) writePointers(stateDir, rest);
     else rmSync10(lastSessionFile(stateDir), { force: true });
   } catch {
   }
@@ -13392,7 +13413,7 @@ function renderConnection(d, route, dir, opts = {}) {
   return `  - route: ${route}
     enabled: false          # arm it deliberately, once doctor is green
 ${opts.area ? `    area: "${opts.area}"
-` : ""}    dir: "${dir}"
+` : ""}    ${dir === null ? "repos: {}              # `crew repos clone` / `crew repos add` fill this in" : `dir: "${dir}"`}
     # worktreePrefix: omitted \u2014 each repo derives its own from its checkout's
     # directory name (ISSUE-400). Only set this if every repo this route
     # serves genuinely wants the SAME prefix, which is rare once an area has
@@ -13937,6 +13958,15 @@ function configuredRepos(text, route, base) {
   const dir = m.get("dir");
   return dir ? [{ name: basename8(String(dir)), dir: expandDir(String(dir), base) }] : [];
 }
+function cloneBaseOf(text, route, base, isCheckout) {
+  const m = routeMapOf(parseDocument2(text), route);
+  const repos = m.get("repos", true);
+  if (isMap(repos) && repos.items.length > 0) return null;
+  const dir = m.get("dir");
+  if (!dir) return null;
+  const abs = expandDir(String(dir), base);
+  return isCheckout(abs) ? null : abs;
+}
 function routeSetsHooks(text, route, name) {
   const m = routeMapOf(parseDocument2(text), route);
   const repos = m.get("repos", true);
@@ -13947,7 +13977,8 @@ function routeSetsHooks(text, route, name) {
   return isMap(hooks) && hooks.items.length > 0;
 }
 function listRepoRows(i) {
-  const checkouts = configuredRepos(i.text, i.route, i.base);
+  const cloneBase = i.isCheckout ? cloneBaseOf(i.text, i.route, i.base, i.isCheckout) : null;
+  const checkouts = configuredRepos(i.text, i.route, i.base).filter((c) => c.dir !== cloneBase);
   const claimed = /* @__PURE__ */ new Set();
   const hooksSourceOf = (c) => i.exists(c.dir) && i.repoHasHooks(c.dir) ? "repo" : routeSetsHooks(i.text, i.route, c.name) ? "route" : "none";
   const originFor = (c, remote) => {
@@ -13997,8 +14028,19 @@ function planRepoAdd(i) {
   const doc = parseDocument2(i.text);
   if (doc.errors.length > 0) throw new ReposError(`config is not valid YAML \u2014 ${doc.errors[0].message}`);
   const m = routeMapOf(doc, i.route);
-  const existing = configuredRepos(i.text, i.route, i.base);
+  let existing = configuredRepos(i.text, i.route, i.base);
   const target = expandDir(i.path, i.base);
+  let droppedDir;
+  const placeholder = m.get("dir");
+  const reposNow = m.get("repos", true);
+  if (i.isCheckout && placeholder && !(isMap(reposNow) && reposNow.items.length > 0)) {
+    const placeholderDir = expandDir(String(placeholder), i.base);
+    if (placeholderDir !== target && !i.isCheckout(placeholderDir)) {
+      droppedDir = placeholderDir;
+      m.delete("dir");
+      existing = [];
+    }
+  }
   if (existing.some((e) => e.dir === target)) {
     throw new ReposError(`${target} is already configured on route ${i.route}`);
   }
@@ -14024,11 +14066,14 @@ function planRepoAdd(i) {
     pair.key = doc.createNode("repos");
     pair.value = doc.createNode({ [oldName]: oldDir, [name]: target });
     mode = "repos";
+  } else if (droppedDir) {
+    m.set("repos", doc.createNode({ [name]: target }));
+    mode = "repos";
   } else {
     m.set("dir", target);
     mode = "dir";
   }
-  return { text: String(doc), mode, name, block: renderBlock(m), warning, unmatched: !matched };
+  return { text: String(doc), mode, name, block: renderBlock(m), warning, unmatched: !matched, droppedDir };
 }
 function planRepoRemove(text, base, route, path) {
   const doc = parseDocument2(text);
@@ -14118,7 +14163,7 @@ function planRepoClone(i) {
   const ship = doc.get("ship", true);
   const basePath = String(m.get("reposBasePath") ?? (isMap(ship) ? ship.get("reposBasePath") : void 0) ?? "~/Crew");
   const target = i.dir ? expandDir(i.dir, i.base) : join26(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 });
+  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 };
 }
 
@@ -18409,6 +18454,7 @@ ${changed2.map((c) => `  - ${c}
       const originOf = (dir) => gitOk(dir, ["remote", "get-url", "origin"]) ?? void 0;
       const text = configText;
       const base = dirname20(cfg.configFile);
+      const isCheckout = (d) => existsSync34(`${d}/.git`);
       try {
         if (sub === "list") {
           if (flag("json")) {
@@ -18419,6 +18465,7 @@ ${changed2.map((c) => `  - ${c}
               resolved: resolvedRemotes,
               originOf,
               exists: (d) => existsSync34(d),
+              isCheckout,
               repoHasHooks: (d) => REPO_CONFIG_FILENAMES.some((f) => {
                 try {
                   return Object.keys(parseRepoConfig(readFileSync28(resolvePath(d, f), "utf8"), f).hooks).length > 0;
@@ -18427,11 +18474,12 @@ ${changed2.map((c) => `  - ${c}
                 }
               })
             });
-            process.stdout.write(`${JSON.stringify({ route: routeName, repos: rows })}
+            process.stdout.write(`${JSON.stringify({ route: routeName, repos: rows, cloneBase: cloneBaseOf(text, routeName, base, isCheckout) })}
 `);
             break;
           }
-          const repos = configuredRepos(text, routeName, base);
+          const cloneBase = cloneBaseOf(text, routeName, base, isCheckout);
+          const repos = configuredRepos(text, routeName, base).filter((r) => r.dir !== cloneBase);
           if (repos.length === 0) process.stdout.write(`route ${routeName} has no checkout configured \u2014 \`crew repos add ${routeName} <path>\`
 `);
           for (const r of repos) {
@@ -18448,7 +18496,7 @@ ${changed2.map((c) => `  - ${c}
           const say = (event, extra, human) => process.stdout.write(json ? `${JSON.stringify({ event, ...extra })}
 ` : `${human}
 `);
-          const plan2 = planRepoClone({ text, base, route: routeName, name: addName, resolved: resolvedRemotes, dir: value("dir") });
+          const plan2 = planRepoClone({ text, base, route: routeName, name: addName, resolved: resolvedRemotes, dir: value("dir"), isCheckout });
           if (existsSync34(plan2.target) && (existsSync34(`${plan2.target}/.git`) || readdirSync14(plan2.target).length > 0)) {
             throw new ReposError(
               existsSync34(`${plan2.target}/.git`) ? `${plan2.target} is already a checkout \u2014 attach it with \`crew repos add ${routeName} ${plan2.name} ${plan2.target}\`` : `${plan2.target} exists and is not empty \u2014 pass --dir to clone somewhere else`
@@ -18470,6 +18518,8 @@ ${changed2.map((c) => `  - ${c}
   crew.yaml was not changed`);
           }
           writeFileSync22(cfg.configFile, plan2.text);
+          if (plan2.droppedDir) process.stderr.write(`crew repos: dropped dir: ${plan2.droppedDir} from route ${routeName} \u2014 it is not a checkout (the clone base); checkouts now live under repos:
+`);
           say("attached", { route: routeName, name: plan2.name, dir: plan2.target, mode: plan2.mode }, `cloned and attached ${plan2.target} to ${routeName} as ${plan2.mode === "dir" ? "dir" : `repos.${plan2.name}`} in ${cfg.configFile}`);
           break;
         }
@@ -18485,8 +18535,11 @@ ${changed2.map((c) => `  - ${c}
           origin,
           resolved: resolvedRemotes,
           name: value("name") ?? addName,
-          nameForExisting: (d) => matchRepoName(originOf(d), resolvedRemotes)
+          nameForExisting: (d) => matchRepoName(originOf(d), resolvedRemotes),
+          isCheckout
         });
+        if (plan.droppedDir) process.stderr.write(`crew repos: dropped dir: ${plan.droppedDir} from route ${routeName} \u2014 it is not a checkout (the clone base); checkouts now live under repos:
+`);
         let rowTracker;
         let rowPayload;
         if (plan.unmatched && origin && !flag("no-create")) {
@@ -18686,8 +18739,8 @@ ${reconstruction.prompt}
         }
       }
       let signInSource = apiKey ? "key" : "device";
-      if (!apiKey && !workspace && dryRun && store) {
-        const resumed = await resumeKeychainSession({
+      if (!apiKey && !workspace && store) {
+        const resumable = await resumableSessions({
           store,
           stateDir: cfg.ship.stateDir,
           host: hostFromUrl4(baseUrl),
@@ -18700,6 +18753,14 @@ ${reconstruction.prompt}
             }
           }
         });
+        if (resumable.length > 1 && connectEvents.json) {
+          stopForChoice(
+            "workspace",
+            `${resumable.length} workspaces have a remembered sign-in on ${hostFromUrl4(baseUrl)} \u2014 which one?`,
+            resumable.map((r) => ({ value: r.workspace, label: r.workspace }))
+          );
+        }
+        const resumed = resumable.length === 1 ? resumable[0] : void 0;
         if (resumed) {
           apiKey = resumed.apiKey;
           workspace = resumed.workspace;
@@ -19095,11 +19156,11 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
         const keyPersisted = keychainBacked || apiKeyFile !== void 0;
         const wizard = firstRun;
         const writeFirstRun = wizard !== void 0 && !dryRun && keyPersisted;
-        const routeDir = value("dir") ?? (writeFirstRun ? join35(DEFAULT_REPOS_BASE_PATH, found.workspaceSlug) : void 0);
+        const routeDir = value("dir");
         const routeBlock = renderConnection(
           found,
           route2,
-          routeDir ?? "REPLACE \u2014 the local checkout this route works",
+          routeDir ?? (writeFirstRun ? null : "REPLACE \u2014 the local checkout this route works"),
           {
             area: value("area"),
             apiKeyFile,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tablation/crew",
-  "version": "0.72.0",
+  "version": "0.72.2",
   "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",