rudel 0.1.8 → 0.1.9

package/dist/cli.js

@@ -1959,7 +1959,7 @@ async function run(app, inputs, context) {
 // package.json
 var package_default = {
   name: "rudel",
-  version: "0.1.8",
+  version: "0.1.9",
   type: "module",
   description: "CLI for the Coding Agent Analytics Platform rudel.ai",
   license: "MIT",
@@ -6132,16 +6132,6 @@ function toDisplayPath(absolutePath) {
   const home = homedir();
   return absolutePath.startsWith(home) ? `~${absolutePath.slice(home.length)}` : absolutePath;
 }
-function groupProjectsForCwd(projects, cwd) {
-  const current = projects.filter((p) => p.projectPath === cwd);
-  const currentSet = new Set(current);
-  const subfolders = projects.filter((p) => !currentSet.has(p) && p.projectPath.startsWith(`${cwd}/`));
-  const subfoldersSet = new Set(subfolders);
-  const others = projects.filter((p) => !currentSet.has(p) && !subfoldersSet.has(p));
-  subfolders.sort((a, b) => a.projectPath.localeCompare(b.projectPath));
-  others.sort((a, b) => a.displayPath.localeCompare(b.displayPath));
-  return { current, subfolders, others };
-}
 
 // ../../packages/agent-adapters/src/adapters/claude-code/settings.ts
 import { execSync } from "child_process";
@@ -7778,33 +7768,314 @@ function getAvailableAdapters() {
 registerAdapter(claudeCodeAdapter);
 registerAdapter(codexAdapter);
 
-// src/commands/dev/list-sessions.ts
-async function runListSessions() {
+// src/lib/project-grouping.ts
+import { homedir as homedir6 } from "os";
+
+// src/lib/git-info.ts
+import { join as join6 } from "path";
+var {$ } = globalThis.Bun;
+function normalizeRemoteUrl(url) {
+  return url.replace(/^(https?:\/\/|git@|ssh:\/\/)/, "").replace(/:/, "/").replace(/\.git$/, "");
+}
+async function getGitInfo(cwd) {
+  const [remoteUrl, branch, sha, packageInfo] = await Promise.all([
+    getGitRemoteUrl(cwd),
+    getGitBranch(cwd),
+    getGitSha(cwd),
+    getPackageInfo(cwd)
+  ]);
+  const gitRemote = remoteUrl ? normalizeRemoteUrl(remoteUrl) : undefined;
+  return {
+    gitRemote,
+    packageName: packageInfo?.name,
+    packageType: packageInfo?.type,
+    branch: branch ?? undefined,
+    sha: sha ?? undefined
+  };
+}
+async function getPackageInfo(cwd) {
+  try {
+    const gitRootResult = await $`git -C ${cwd} rev-parse --show-toplevel`.quiet();
+    const root = gitRootResult.exitCode === 0 ? gitRootResult.text().trim() : cwd;
+    return await getNodePackage(root) ?? await getPythonPackage(root) ?? await getRustPackage(root) ?? await getGoModule(root);
+  } catch {
+    return null;
+  }
+}
+async function getNodePackage(root) {
+  try {
+    const file = Bun.file(join6(root, "package.json"));
+    if (!await file.exists())
+      return null;
+    const pkg = await file.json();
+    return pkg.name ? { name: pkg.name, type: "package.json" } : null;
+  } catch {
+    return null;
+  }
+}
+async function getPythonPackage(root) {
+  try {
+    const file = Bun.file(join6(root, "pyproject.toml"));
+    if (!await file.exists())
+      return null;
+    const content = await file.text();
+    const name = content.match(/^\s*name\s*=\s*"([^"]+)"/m)?.[1];
+    return name ? { name, type: "pyproject.toml" } : null;
+  } catch {
+    return null;
+  }
+}
+async function getRustPackage(root) {
+  try {
+    const file = Bun.file(join6(root, "Cargo.toml"));
+    if (!await file.exists())
+      return null;
+    const content = await file.text();
+    const name = content.match(/^\s*name\s*=\s*"([^"]+)"/m)?.[1];
+    return name ? { name, type: "Cargo.toml" } : null;
+  } catch {
+    return null;
+  }
+}
+async function getGoModule(root) {
+  try {
+    const file = Bun.file(join6(root, "go.mod"));
+    if (!await file.exists())
+      return null;
+    const content = await file.text();
+    const name = content.match(/^module\s+(\S+)/m)?.[1];
+    return name ? { name, type: "go.mod" } : null;
+  } catch {
+    return null;
+  }
+}
+async function getGitRemoteUrl(cwd) {
+  try {
+    const result = await $`git -C ${cwd} remote get-url origin`.quiet();
+    if (result.exitCode !== 0)
+      return null;
+    return result.text().trim() || null;
+  } catch {
+    return null;
+  }
+}
+async function getGitBranch(cwd) {
+  try {
+    const result = await $`git -C ${cwd} rev-parse --abbrev-ref HEAD`.quiet();
+    if (result.exitCode !== 0)
+      return null;
+    return result.text().trim();
+  } catch {
+    return null;
+  }
+}
+async function getGitSha(cwd) {
+  try {
+    const result = await $`git -C ${cwd} rev-parse HEAD`.quiet();
+    if (result.exitCode !== 0)
+      return null;
+    return result.text().trim();
+  } catch {
+    return null;
+  }
+}
+
+// src/lib/remote-cache.ts
+import { homedir as homedir5 } from "os";
+import { join as join7 } from "path";
+var CACHE_PATH = join7(homedir5(), ".rudel", "remote-cache.json");
+async function getRemoteCache() {
+  try {
+    const file = Bun.file(CACHE_PATH);
+    if (!await file.exists())
+      return {};
+    return await file.json();
+  } catch {
+    return {};
+  }
+}
+function getCachedRemote(cache, encodedDir) {
+  return cache[encodedDir] ?? null;
+}
+function cacheRemote(cache, encodedDir, normalizedRemote) {
+  cache[encodedDir] = normalizedRemote;
+}
+async function cacheRemotes(cache) {
+  try {
+    const { mkdir } = await import("fs/promises");
+    const { dirname: dirname3 } = await import("path");
+    await mkdir(dirname3(CACHE_PATH), { recursive: true });
+    await Bun.write(CACHE_PATH, JSON.stringify(cache));
+  } catch {}
+}
+
+// src/lib/project-grouping.ts
+async function scanAndGroupProjects(cwd = process.cwd()) {
   const adapters2 = getAvailableAdapters();
-  const allProjects = [];
+  const projects = [];
   for (const adapter of adapters2) {
-    const projects = await adapter.scanAllSessions();
-    allProjects.push(...projects);
+    const scanned = await adapter.scanAllSessions();
+    projects.push(...scanned);
+  }
+  const groups = await groupProjectsByRemote(projects, cwd);
+  return { projects, groups };
+}
+function extractDisplayName(normalized) {
+  const parts = normalized.split("/");
+  if (parts.length >= 3) {
+    return parts.slice(1).join("/");
+  }
+  return normalized;
+}
+function encodeProjectPath2(projectPath) {
+  return projectPath.replace(/\//g, "-");
+}
+async function groupProjectsByRemote(projects, cwd) {
+  const cache = await getRemoteCache();
+  let cacheUpdated = false;
+  const remotes = await Promise.all(projects.map((p) => getGitRemoteUrl(p.projectPath)));
+  const grouped = new Map;
+  const ungrouped = [];
+  for (let i = 0;i < projects.length; i++) {
+    const project = projects[i];
+    const remote = remotes[i];
+    if (remote) {
+      const normalized = normalizeRemoteUrl(remote);
+      const encodedDir = encodeProjectPath2(project.projectPath);
+      if (getCachedRemote(cache, encodedDir) !== normalized) {
+        cacheRemote(cache, encodedDir, normalized);
+        cacheUpdated = true;
+      }
+      const existing = grouped.get(normalized);
+      if (existing) {
+        existing.projects.push(project);
+      } else {
+        grouped.set(normalized, { remote: normalized, projects: [project] });
+      }
+    } else {
+      const encodedDir = encodeProjectPath2(project.projectPath);
+      const cached = getCachedRemote(cache, encodedDir);
+      if (cached) {
+        const existing = grouped.get(cached);
+        if (existing) {
+          existing.projects.push(project);
+        } else {
+          grouped.set(cached, { remote: cached, projects: [project] });
+        }
+      } else {
+        ungrouped.push(project);
+      }
+    }
   }
+  const groups = [];
+  for (const [, entry] of grouped) {
+    const containsCwd = entry.projects.some((p) => cwd === p.projectPath || cwd.startsWith(`${p.projectPath}/`));
+    groups.push({
+      displayName: extractDisplayName(entry.remote),
+      gitRemote: entry.remote,
+      projects: entry.projects,
+      totalSessions: entry.projects.reduce((s, p) => s + p.sessionCount, 0),
+      containsCwd
+    });
+  }
+  const homeSegments = homedir6().split("/").length;
+  const remainingUngrouped = [];
+  for (const project of ungrouped) {
+    const match = findBestGroupByPath(project, groups, homeSegments);
+    if (match) {
+      match.projects.push(project);
+      match.totalSessions += project.sessionCount;
+      if (cwd === project.projectPath || cwd.startsWith(`${project.projectPath}/`)) {
+        match.containsCwd = true;
+      }
+    } else {
+      remainingUngrouped.push(project);
+    }
+  }
+  for (const project of remainingUngrouped) {
+    const containsCwd = cwd === project.projectPath || cwd.startsWith(`${project.projectPath}/`);
+    groups.push({
+      displayName: project.displayPath,
+      gitRemote: null,
+      projects: [project],
+      totalSessions: project.sessionCount,
+      containsCwd
+    });
+  }
+  groups.sort((a, b) => {
+    if (a.containsCwd !== b.containsCwd)
+      return a.containsCwd ? -1 : 1;
+    const aHasRemote = a.gitRemote !== null;
+    const bHasRemote = b.gitRemote !== null;
+    if (aHasRemote !== bHasRemote)
+      return aHasRemote ? -1 : 1;
+    return a.displayName.localeCompare(b.displayName);
+  });
+  if (cacheUpdated) {
+    cacheRemotes(cache);
+  }
+  return groups;
+}
+function commonPrefixLength(a, b) {
+  const partsA = a.split("/");
+  const partsB = b.split("/");
+  let count = 0;
+  for (let i = 0;i < Math.min(partsA.length, partsB.length); i++) {
+    if (partsA[i] === partsB[i])
+      count++;
+    else
+      break;
+  }
+  return count;
+}
+function findBestGroupByPath(project, groups, homeSegments) {
+  let bestGroup = null;
+  let bestLen = 0;
+  let secondBestLen = 0;
+  for (const group2 of groups) {
+    if (!group2.gitRemote)
+      continue;
+    let groupBest = 0;
+    for (const p of group2.projects) {
+      groupBest = Math.max(groupBest, commonPrefixLength(project.projectPath, p.projectPath));
+    }
+    if (groupBest > bestLen) {
+      secondBestLen = bestLen;
+      bestLen = groupBest;
+      bestGroup = group2;
+    } else if (groupBest > secondBestLen) {
+      secondBestLen = groupBest;
+    }
+  }
+  if (bestGroup && bestLen > homeSegments && bestLen > secondBestLen) {
+    return bestGroup;
+  }
+  return null;
+}
+
+// src/commands/dev/list-sessions.ts
+async function runListSessions() {
+  const { projects: allProjects, groups } = await scanAndGroupProjects();
   if (allProjects.length === 0) {
     console.log("No projects with sessions found.");
     return;
   }
-  const cwd = process.cwd();
-  const grouped = groupProjectsForCwd(allProjects, cwd);
   const lines = [];
-  for (const proj of grouped.current) {
-    const name = getAdapter(proj.source).name;
-    lines.push(`[${name}] ${proj.displayPath} (${proj.sessionCount} sessions) [current]`);
-  }
-  for (const sub of grouped.subfolders) {
-    const name = getAdapter(sub.source).name;
-    const relative = sub.projectPath.slice(cwd.length + 1);
-    lines.push(`  [${name}] ${relative} (${sub.sessionCount} sessions)`);
-  }
-  for (const other of grouped.others) {
-    const name = getAdapter(other.source).name;
-    lines.push(`[${name}] ${other.displayPath} (${other.sessionCount} sessions)`);
+  for (const group2 of groups) {
+    const isCurrent = group2.containsCwd ? " [current]" : "";
+    if (group2.projects.length === 1) {
+      const proj = group2.projects[0];
+      const name = getAdapter(proj.source).name;
+      lines.push(`[${name}] ${proj.displayPath} (${proj.sessionCount} sessions)${isCurrent}`);
+      continue;
+    }
+    const totalSessions2 = group2.projects.reduce((s, p) => s + p.sessionCount, 0);
+    lines.push(`${group2.displayName} (${group2.projects.length} projects, ${totalSessions2} sessions)${isCurrent}`);
+    for (const proj of group2.projects) {
+      const name = getAdapter(proj.source).name;
+      const cwdMarker = proj.projectPath === process.cwd() ? " [cwd]" : "";
+      lines.push(`  [${name}] ${proj.displayPath} (${proj.sessionCount} sessions)${cwdMarker}`);
+    }
   }
   const totalSessions = allProjects.reduce((s, p) => s + p.sessionCount, 0);
   console.log(`${allProjects.length} projects, ${totalSessions} sessions
@@ -7863,8 +8134,8 @@ var X = (t, e = {}, s = {}) => {
         const ut = t.slice(C, w) || t.slice(h, o);
         v = 0;
         for (const Y of ut.replaceAll(ct, "")) {
-          const $ = Y.codePointAt(0) || 0;
-          if (lt($) ? f = m : ht($) ? f = V : E !== A && at($) ? f = E : f = A, c + f > b && (d = Math.min(d, Math.max(C, h) + v)), c + f > i) {
+          const $2 = Y.codePointAt(0) || 0;
+          if (lt($2) ? f = m : ht($2) ? f = V : E !== A && at($2) ? f = E : f = A, c + f > b && (d = Math.min(d, Math.max(C, h) + v)), c + f > i) {
             F = true;
             break t;
           }
@@ -8501,15 +8772,15 @@ var Fe = /\p{M}+/gu;
 var ye = { limit: 1 / 0, ellipsis: "" };
 var jt = (t, r = {}, s = {}) => {
   const i = r.limit ?? 1 / 0, a = r.ellipsis ?? "", o = r?.ellipsisWidth ?? (a ? jt(a, ye, s).width : 0), u = s.ansiWidth ?? 0, l = s.controlWidth ?? 0, n = s.tabWidth ?? 8, c = s.ambiguousWidth ?? 1, g = s.emojiWidth ?? 2, F = s.fullWidthWidth ?? 2, p = s.regularWidth ?? 1, E = s.wideWidth ?? 2;
-  let $ = 0, m = 0, h = t.length, y2 = 0, f = false, v = h, S2 = Math.max(0, i - o), I2 = 0, B2 = 0, A = 0, w = 0;
+  let $2 = 0, m = 0, h = t.length, y2 = 0, f = false, v = h, S2 = Math.max(0, i - o), I2 = 0, B2 = 0, A = 0, w = 0;
   t:
     for (;; ) {
-      if (B2 > I2 || m >= h && m > $) {
-        const _2 = t.slice(I2, B2) || t.slice($, m);
+      if (B2 > I2 || m >= h && m > $2) {
+        const _2 = t.slice(I2, B2) || t.slice($2, m);
         y2 = 0;
         for (const D2 of _2.replaceAll(Fe, "")) {
           const T2 = D2.codePointAt(0) || 0;
-          if (ge(T2) ? w = F : fe(T2) ? w = E : c !== p && pe(T2) ? w = c : w = p, A + w > S2 && (v = Math.min(v, Math.max(I2, $) + y2)), A + w > i) {
+          if (ge(T2) ? w = F : fe(T2) ? w = E : c !== p && pe(T2) ? w = c : w = p, A + w > S2 && (v = Math.min(v, Math.max(I2, $2) + y2)), A + w > i) {
             f = true;
             break t;
           }
@@ -8524,7 +8795,7 @@ var jt = (t, r = {}, s = {}) => {
           f = true;
           break;
         }
-        A += w, I2 = $, B2 = m, m = $ = at2.lastIndex;
+        A += w, I2 = $2, B2 = m, m = $2 = at2.lastIndex;
         continue;
       }
       if (At2.lastIndex = m, At2.test(t)) {
@@ -8532,7 +8803,7 @@ var jt = (t, r = {}, s = {}) => {
           f = true;
           break;
         }
-        A += u, I2 = $, B2 = m, m = $ = At2.lastIndex;
+        A += u, I2 = $2, B2 = m, m = $2 = At2.lastIndex;
         continue;
       }
       if (it2.lastIndex = m, it2.test(t)) {
@@ -8540,7 +8811,7 @@ var jt = (t, r = {}, s = {}) => {
           f = true;
           break;
         }
-        A += w, I2 = $, B2 = m, m = $ = it2.lastIndex;
+        A += w, I2 = $2, B2 = m, m = $2 = it2.lastIndex;
         continue;
       }
       if (nt2.lastIndex = m, nt2.test(t)) {
@@ -8548,7 +8819,7 @@ var jt = (t, r = {}, s = {}) => {
           f = true;
           break;
         }
-        A += w, I2 = $, B2 = m, m = $ = nt2.lastIndex;
+        A += w, I2 = $2, B2 = m, m = $2 = nt2.lastIndex;
         continue;
       }
       if (wt2.lastIndex = m, wt2.test(t)) {
@@ -8556,7 +8827,7 @@ var jt = (t, r = {}, s = {}) => {
           f = true;
           break;
         }
-        A += g, I2 = $, B2 = m, m = $ = wt2.lastIndex;
+        A += g, I2 = $2, B2 = m, m = $2 = wt2.lastIndex;
         continue;
       }
       m += 1;
@@ -8619,34 +8890,34 @@ var Ie = (t, r, s = {}) => {
   let i = "", a, o;
   const u = t.split(" "), l = Ce(u);
   let n = [""];
-  for (const [$, m] of u.entries()) {
+  for (const [$2, m] of u.entries()) {
     s.trim !== false && (n[n.length - 1] = (n.at(-1) ?? "").trimStart());
     let h = M2(n.at(-1) ?? "");
-    if ($ !== 0 && (h >= r && (s.wordWrap === false || s.trim === false) && (n.push(""), h = 0), (h > 0 || s.trim === false) && (n[n.length - 1] += " ", h++)), s.hard && l[$] > r) {
-      const y2 = r - h, f = 1 + Math.floor((l[$] - y2 - 1) / r);
-      Math.floor((l[$] - 1) / r) < f && n.push(""), It2(n, m, r);
+    if ($2 !== 0 && (h >= r && (s.wordWrap === false || s.trim === false) && (n.push(""), h = 0), (h > 0 || s.trim === false) && (n[n.length - 1] += " ", h++)), s.hard && l[$2] > r) {
+      const y2 = r - h, f = 1 + Math.floor((l[$2] - y2 - 1) / r);
+      Math.floor((l[$2] - 1) / r) < f && n.push(""), It2(n, m, r);
       continue;
     }
-    if (h + l[$] > r && h > 0 && l[$] > 0) {
+    if (h + l[$2] > r && h > 0 && l[$2] > 0) {
       if (s.wordWrap === false && h < r) {
         It2(n, m, r);
         continue;
       }
       n.push("");
     }
-    if (h + l[$] > r && s.wordWrap === false) {
+    if (h + l[$2] > r && s.wordWrap === false) {
       It2(n, m, r);
       continue;
     }
     n[n.length - 1] += m;
   }
-  s.trim !== false && (n = n.map(($) => Se($)));
+  s.trim !== false && (n = n.map(($2) => Se($2)));
   const c = n.join(`
 `), g = c[Symbol.iterator]();
   let F = g.next(), p = g.next(), E = 0;
   for (;!F.done; ) {
-    const $ = F.value, m = p.value;
-    if (i += $, $ === ot2 || $ === Gt) {
+    const $2 = F.value, m = p.value;
+    if (i += $2, $2 === ot2 || $2 === Gt) {
       Ht.lastIndex = E + 1;
       const f = Ht.exec(c)?.groups;
       if (f?.code !== undefined) {
@@ -8657,8 +8928,8 @@ var Ie = (t, r, s = {}) => {
     }
     const h = a ? we(a) : undefined;
     m === `
-` ? (o && (i += Kt("")), a && h && (i += Ut(h))) : $ === `
-` && (a && h && (i += Ut(a)), o && (i += Kt(o))), E += $.length, F = p, p = g.next();
+` ? (o && (i += Kt("")), a && h && (i += Ut(h))) : $2 === `
+` && (a && h && (i += Ut(a)), o && (i += Kt(o))), E += $2.length, F = p, p = g.next();
   }
   return i;
 };
@@ -8680,13 +8951,13 @@ var be = (t, r, s, i, a) => {
 };
 var X2 = (t) => {
   const { cursor: r, options: s, style: i } = t, a = t.output ?? process.stdout, o = rt(a), u = t.columnPadding ?? 0, l = t.rowPadding ?? 4, n = o - u, c = nt(a), g = import_picocolors2.default.dim("..."), F = t.maxItems ?? Number.POSITIVE_INFINITY, p = Math.max(c - l, 0), E = Math.max(Math.min(F, p), 5);
-  let $ = 0;
-  r >= E - 3 && ($ = Math.max(Math.min(r - E + 3, s.length - E), 0));
-  let m = E < s.length && $ > 0, h = E < s.length && $ + E < s.length;
-  const y2 = Math.min($ + E, s.length), f = [];
+  let $2 = 0;
+  r >= E - 3 && ($2 = Math.max(Math.min(r - E + 3, s.length - E), 0));
+  let m = E < s.length && $2 > 0, h = E < s.length && $2 + E < s.length;
+  const y2 = Math.min($2 + E, s.length), f = [];
   let v = 0;
   m && v++, h && v++;
-  const S2 = $ + (m ? 1 : 0), I2 = y2 - (h ? 1 : 0);
+  const S2 = $2 + (m ? 1 : 0), I2 = y2 - (h ? 1 : 0);
   for (let A = S2;A < I2; A++) {
     const w = J2(i(s[A], A === r), n, { hard: true, trim: false }).split(`
 `);
@@ -8712,8 +8983,8 @@ function Yt(t, r, s, i) {
 }
 var Te = (t) => t;
 var Me = (t = "", r = "", s) => {
-  const i = s?.output ?? process.stdout, a = rt(i), o = 2, u = s?.titlePadding ?? 1, l = s?.contentPadding ?? 2, n = s?.width === undefined || s.width === "auto" ? 1 : Math.min(1, s.width), c = s?.withGuide ?? _.withGuide ? `${d} ` : "", g = s?.formatBorder ?? Te, F = ((s?.rounded) ? _e : De).map(g), p = g(rt2), E = g(d), $ = M2(c), m = M2(r), h = a - $;
-  let y2 = Math.floor(a * n) - $;
+  const i = s?.output ?? process.stdout, a = rt(i), o = 2, u = s?.titlePadding ?? 1, l = s?.contentPadding ?? 2, n = s?.width === undefined || s.width === "auto" ? 1 : Math.min(1, s.width), c = s?.withGuide ?? _.withGuide ? `${d} ` : "", g = s?.formatBorder ?? Te, F = ((s?.rounded) ? _e : De).map(g), p = g(rt2), E = g(d), $2 = M2(c), m = M2(r), h = a - $2;
+  let y2 = Math.floor(a * n) - $2;
   if (s?.width === "auto") {
     const _2 = t.split(`
 `);
@@ -8775,8 +9046,8 @@ var R2 = { message: (t = [], { symbol: r = import_picocolors2.default.gray(d), s
   if (F.length > 0) {
     const [p, ...E] = F;
     p.length > 0 ? u.push(`${c}${p}`) : u.push(l ? r : "");
-    for (const $ of E)
-      $.length > 0 ? u.push(`${g}${$}`) : u.push(l ? s : "");
+    for (const $2 of E)
+      $2.length > 0 ? u.push(`${g}${$2}`) : u.push(l ? s : "");
   }
   i.write(`${u.join(`
 `)}
@@ -8868,7 +9139,7 @@ ${import_picocolors2.default.cyan(x2)}
 var Ke = import_picocolors2.default.magenta;
 var bt2 = ({ indicator: t = "dots", onCancel: r, output: s = process.stdout, cancelMessage: i, errorMessage: a, frames: o = et2 ? ["\u25D2", "\u25D0", "\u25D3", "\u25D1"] : ["\u2022", "o", "O", "0"], delay: u = et2 ? 80 : 120, signal: l, ...n } = {}) => {
   const c = ct2();
-  let g, F, p = false, E = false, $ = "", m, h = performance.now();
+  let g, F, p = false, E = false, $2 = "", m, h = performance.now();
   const y2 = rt(s), f = n?.styleFrame ?? Ke, v = (b) => {
     const O2 = b > 1 ? a ?? _.messages.error : i ?? _.messages.cancel;
     E = b === 1, p && (L2(O2, b), E && typeof r == "function" && r());
@@ -8888,22 +9159,22 @@ var bt2 = ({ indicator: t = "dots", onCancel: r, output: s = process.stdout, can
     const O2 = (performance.now() - b) / 1000, j2 = Math.floor(O2 / 60), G2 = Math.floor(O2 % 60);
     return j2 > 0 ? `[${j2}m ${G2}s]` : `[${G2}s]`;
   }, T2 = n.withGuide ?? _.withGuide, Y = (b = "") => {
-    p = true, g = Bt({ output: s }), $ = _2(b), h = performance.now(), T2 && s.write(`${import_picocolors2.default.gray(d)}
+    p = true, g = Bt({ output: s }), $2 = _2(b), h = performance.now(), T2 && s.write(`${import_picocolors2.default.gray(d)}
 `);
     let O2 = 0, j2 = 0;
     B2(), F = setInterval(() => {
-      if (c && $ === m)
+      if (c && $2 === m)
         return;
-      w(), m = $;
+      w(), m = $2;
       const G2 = f(o[O2]);
       let tt2;
       if (c)
-        tt2 = `${G2}  ${$}...`;
+        tt2 = `${G2}  ${$2}...`;
       else if (t === "timer")
-        tt2 = `${G2}  ${$} ${D2(h)}`;
+        tt2 = `${G2}  ${$2} ${D2(h)}`;
       else {
         const te = ".".repeat(Math.floor(j2)).slice(0, 3);
-        tt2 = `${G2}  ${$}${te}`;
+        tt2 = `${G2}  ${$2}${te}`;
       }
       const Zt = J2(tt2, y2, { hard: true, trim: false });
       s.write(Zt), O2 = O2 + 1 < o.length ? O2 + 1 : 0, j2 = j2 < 4 ? j2 + 0.125 : 0;
@@ -8913,12 +9184,12 @@ var bt2 = ({ indicator: t = "dots", onCancel: r, output: s = process.stdout, can
       return;
     p = false, clearInterval(F), w();
     const G2 = O2 === 0 ? import_picocolors2.default.green(V) : O2 === 1 ? import_picocolors2.default.red(dt2) : import_picocolors2.default.red($t2);
-    $ = b ?? $, j2 || (t === "timer" ? s.write(`${G2}  ${$} ${D2(h)}
-`) : s.write(`${G2}  ${$}
+    $2 = b ?? $2, j2 || (t === "timer" ? s.write(`${G2}  ${$2} ${D2(h)}
+`) : s.write(`${G2}  ${$2}
 `)), A(), g();
   };
   return { start: Y, stop: (b = "") => L2(b, 0), message: (b = "") => {
-    $ = _2(b ?? $);
+    $2 = _2(b ?? $2);
   }, cancel: (b = "") => L2(b, 1), error: (b = "") => L2(b, 2), clear: () => L2("", 0, true), get isCancelled() {
     return E;
   } };
@@ -8940,13 +9211,13 @@ function qe({ style: t = "heavy", max: r = 100, size: s = 40, ...i } = {}) {
       default:
         return import_picocolors2.default.magenta;
     }
-  }, g = (E, $) => {
+  }, g = (E, $2) => {
     const m = Math.floor(o / l * n);
-    return `${c(E)(zt[t].repeat(m))}${import_picocolors2.default.dim(zt[t].repeat(n - m))} ${$}`;
+    return `${c(E)(zt[t].repeat(m))}${import_picocolors2.default.dim(zt[t].repeat(n - m))} ${$2}`;
   }, F = (E = "") => {
     u = E, a.start(g("initial", E));
-  }, p = (E = 1, $) => {
-    o = Math.min(l, E + o), a.message(g("active", $ ?? u)), u = $ ?? u;
+  }, p = (E = 1, $2) => {
+    o = Math.min(l, E + o), a.message(g("active", $2 ?? u)), u = $2 ?? u;
   };
   return { start: F, stop: a.stop, cancel: a.cancel, error: a.error, clear: a.clear, advance: p, isCancelled: a.isCancelled, message: (E) => p(0, E) };
 }
@@ -10505,13 +10776,13 @@ import {
   rmSync,
   writeFileSync as writeFileSync3
 } from "fs";
-import { homedir as homedir5 } from "os";
-import { join as join6 } from "path";
+import { homedir as homedir7 } from "os";
+import { join as join8 } from "path";
 function getConfigDir() {
-  return process.env.RUDEL_CONFIG_DIR ?? join6(homedir5(), ".rudel");
+  return process.env.RUDEL_CONFIG_DIR ?? join8(homedir7(), ".rudel");
 }
 function getCredentialsPath() {
-  return join6(getConfigDir(), "credentials.json");
+  return join8(getConfigDir(), "credentials.json");
 }
 function saveCredentials(token, apiBaseUrl) {
   const dir = getConfigDir();
@@ -10694,8 +10965,8 @@ async function pMap(iterable, mapper, {
 var pMapSkip = Symbol("skip");
 
 // src/lib/failed-uploads.ts
-import { homedir as homedir6 } from "os";
-import { join as join7 } from "path";
+import { homedir as homedir8 } from "os";
+import { join as join9 } from "path";
 
 // ../../node_modules/.bun/@orpc+contract@1.13.6/node_modules/@orpc/contract/dist/shared/contract.D_dZrO__.mjs
 function mergeErrorMap(errorMap1, errorMap2) {
@@ -11393,7 +11664,7 @@ var contract = {
 };
 
 // src/lib/failed-uploads.ts
-var FAILED_UPLOADS_PATH = join7(homedir6(), ".rudel", "failed-uploads.json");
+var FAILED_UPLOADS_PATH = join9(homedir8(), ".rudel", "failed-uploads.json");
 function normalizeSource(raw) {
   if (typeof raw !== "string")
     return;
@@ -11541,125 +11812,16 @@ function renderBatchSummary(summary, options) {
   }
 }
 
-// src/lib/git-info.ts
-import { join as join8 } from "path";
-var {$ } = globalThis.Bun;
-function normalizeRemoteUrl(url) {
-  return url.replace(/^(https?:\/\/|git@|ssh:\/\/)/, "").replace(/:/, "/").replace(/\.git$/, "");
-}
-async function getGitInfo(cwd) {
-  const [remoteUrl, branch, sha, packageInfo] = await Promise.all([
-    getGitRemoteUrl(cwd),
-    getGitBranch(cwd),
-    getGitSha(cwd),
-    getPackageInfo(cwd)
-  ]);
-  const gitRemote = remoteUrl ? normalizeRemoteUrl(remoteUrl) : undefined;
-  return {
-    gitRemote,
-    packageName: packageInfo?.name,
-    packageType: packageInfo?.type,
-    branch: branch ?? undefined,
-    sha: sha ?? undefined
-  };
-}
-async function getPackageInfo(cwd) {
-  try {
-    const gitRootResult = await $`git -C ${cwd} rev-parse --show-toplevel`.quiet();
-    const root = gitRootResult.exitCode === 0 ? gitRootResult.text().trim() : cwd;
-    return await getNodePackage(root) ?? await getPythonPackage(root) ?? await getRustPackage(root) ?? await getGoModule(root);
-  } catch {
-    return null;
-  }
-}
-async function getNodePackage(root) {
-  try {
-    const file = Bun.file(join8(root, "package.json"));
-    if (!await file.exists())
-      return null;
-    const pkg = await file.json();
-    return pkg.name ? { name: pkg.name, type: "package.json" } : null;
-  } catch {
-    return null;
-  }
-}
-async function getPythonPackage(root) {
-  try {
-    const file = Bun.file(join8(root, "pyproject.toml"));
-    if (!await file.exists())
-      return null;
-    const content = await file.text();
-    const name = content.match(/^\s*name\s*=\s*"([^"]+)"/m)?.[1];
-    return name ? { name, type: "pyproject.toml" } : null;
-  } catch {
-    return null;
-  }
-}
-async function getRustPackage(root) {
-  try {
-    const file = Bun.file(join8(root, "Cargo.toml"));
-    if (!await file.exists())
-      return null;
-    const content = await file.text();
-    const name = content.match(/^\s*name\s*=\s*"([^"]+)"/m)?.[1];
-    return name ? { name, type: "Cargo.toml" } : null;
-  } catch {
-    return null;
-  }
-}
-async function getGoModule(root) {
-  try {
-    const file = Bun.file(join8(root, "go.mod"));
-    if (!await file.exists())
-      return null;
-    const content = await file.text();
-    const name = content.match(/^module\s+(\S+)/m)?.[1];
-    return name ? { name, type: "go.mod" } : null;
-  } catch {
-    return null;
-  }
-}
-async function getGitRemoteUrl(cwd) {
-  try {
-    const result = await $`git -C ${cwd} remote get-url origin`.quiet();
-    if (result.exitCode !== 0)
-      return null;
-    return result.text().trim() || null;
-  } catch {
-    return null;
-  }
-}
-async function getGitBranch(cwd) {
-  try {
-    const result = await $`git -C ${cwd} rev-parse --abbrev-ref HEAD`.quiet();
-    if (result.exitCode !== 0)
-      return null;
-    return result.text().trim();
-  } catch {
-    return null;
-  }
-}
-async function getGitSha(cwd) {
-  try {
-    const result = await $`git -C ${cwd} rev-parse HEAD`.quiet();
-    if (result.exitCode !== 0)
-      return null;
-    return result.text().trim();
-  } catch {
-    return null;
-  }
-}
-
 // src/lib/project-config.ts
 import { existsSync as existsSync5, mkdirSync as mkdirSync3, readFileSync as readFileSync4, writeFileSync as writeFileSync4 } from "fs";
-import { homedir as homedir7 } from "os";
-import { join as join9 } from "path";
+import { homedir as homedir9 } from "os";
+import { join as join10 } from "path";
 var {$: $2 } = globalThis.Bun;
 function getConfigDir2() {
-  return process.env.RUDEL_CONFIG_DIR ?? join9(homedir7(), ".rudel");
+  return process.env.RUDEL_CONFIG_DIR ?? join10(homedir9(), ".rudel");
 }
 function getProjectsConfigPath() {
-  return join9(getConfigDir2(), "projects.json");
+  return join10(getConfigDir2(), "projects.json");
 }
 function loadProjectsConfig() {
   const path = getProjectsConfigPath();
@@ -13503,8 +13665,8 @@ var ConfigError = class extends Error {
 };
 
 // src/logging.ts
-import { homedir as homedir8 } from "os";
-import { join as join11 } from "path";
+import { homedir as homedir10 } from "os";
+import { join as join12 } from "path";
 
 // ../../node_modules/.bun/@logtape+file@2.0.4+2d5de51540e256d2/node_modules/@logtape/file/dist/filesink.base.js
 var AdaptiveFlushStrategy = class {
@@ -13770,7 +13932,7 @@ function getBaseFileSink(path, options) {
 
 // ../../node_modules/.bun/@logtape+file@2.0.4+2d5de51540e256d2/node_modules/@logtape/file/dist/filesink.node.js
 import fs from "fs";
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 import { promisify } from "util";
 var nodeDriver = {
   openSync(path) {
@@ -13810,14 +13972,14 @@ var nodeTimeDriver = {
   readdirSync: fs.readdirSync,
   unlinkSync: fs.unlinkSync,
   mkdirSync: fs.mkdirSync,
-  joinPath: join10
+  joinPath: join11
 };
 var nodeAsyncTimeDriver = {
   ...nodeAsyncDriver,
   readdirSync: fs.readdirSync,
   unlinkSync: fs.unlinkSync,
   mkdirSync: fs.mkdirSync,
-  joinPath: join10
+  joinPath: join11
 };
 function getFileSink(path, options = {}) {
   if (options.nonBlocking)
@@ -13832,8 +13994,8 @@ function getFileSink(path, options = {}) {
 }
 
 // src/logging.ts
-var LOG_DIR = join11(homedir8(), ".rudel", "logs");
-var LOG_FILE = join11(LOG_DIR, "hook-upload.log");
+var LOG_DIR = join12(homedir10(), ".rudel", "logs");
+var LOG_FILE = join12(LOG_DIR, "hook-upload.log");
 async function setupHookLogging() {
   const { mkdir } = await import("fs/promises");
   await mkdir(LOG_DIR, { recursive: true }).catch(() => {});
@@ -14215,8 +14377,8 @@ var setOrgCommand = buildCommand({
 
 // src/lib/classifier.ts
 import { mkdir, unlink } from "fs/promises";
-import { homedir as homedir9 } from "os";
-import { join as join12 } from "path";
+import { homedir as homedir11 } from "os";
+import { join as join13 } from "path";
 
 // src/lib/types.ts
 var SESSION_TAGS = [
@@ -14243,8 +14405,8 @@ var SYSTEM_PROMPT = `You are a session classifier. Analyze the Claude Code sessi
 CRITICAL: Respond with ONLY the tag name. Nothing else. No explanation, no punctuation, no formatting. Just ONE of: research, new_feature, bug_fix, refactoring, documentation, tests`;
 async function classifySession(content) {
   const truncatedContent = content.slice(0, 50000);
-  const tempDir = join12(homedir9(), ".claude", "temp");
-  const tempFile = join12(tempDir, `classify-${Date.now()}.txt`);
+  const tempDir = join13(homedir11(), ".claude", "temp");
+  const tempFile = join13(tempDir, `classify-${Date.now()}.txt`);
   try {
     await mkdir(tempDir, { recursive: true });
     await Bun.write(tempFile, `Classify this session transcript:
@@ -14284,9 +14446,9 @@ ${truncatedContent}`);
 
 // src/lib/session-resolver.ts
 import { access, readdir as readdir3 } from "fs/promises";
-import { homedir as homedir10 } from "os";
-import { basename, dirname as dirname3, join as join13 } from "path";
-var SESSIONS_BASE_DIR3 = join13(homedir10(), ".claude", "projects");
+import { homedir as homedir12 } from "os";
+import { basename, dirname as dirname3, join as join14 } from "path";
+var SESSIONS_BASE_DIR3 = join14(homedir12(), ".claude", "projects");
 async function resolveSession(input) {
   const isPath = input.includes("/") || input.endsWith(".jsonl");
   if (isPath) {
@@ -14318,11 +14480,11 @@ async function resolveFromId(sessionId) {
     throw new Error(`Session not found: ${sessionId}`);
   }
   for (const projectDir of projectDirs) {
-    const sessionDir = join13(SESSIONS_BASE_DIR3, projectDir);
+    const sessionDir = join14(SESSIONS_BASE_DIR3, projectDir);
     try {
       const files = await readdir3(sessionDir);
       if (files.includes(sessionFileName)) {
-        const transcriptPath = join13(sessionDir, sessionFileName);
+        const transcriptPath = join14(sessionDir, sessionFileName);
         const projectPath = await decodeProjectPath(projectDir);
         return {
           transcriptPath,
@@ -14352,45 +14514,26 @@ async function runInteractiveUpload(flags) {
   We("rudel upload");
   const spin = bt2();
   spin.start("Scanning projects...");
-  const adapters2 = getAvailableAdapters();
-  const allProjects = [];
-  for (const adapter of adapters2) {
-    const projects = await adapter.scanAllSessions();
-    allProjects.push(...projects);
-  }
+  const { projects: allProjects, groups } = await scanAndGroupProjects();
   spin.stop(`Found ${allProjects.length} project(s)`);
   if (allProjects.length === 0) {
     R2.warn("No projects with sessions found.");
     Le("Nothing to upload.");
     return;
   }
-  const cwd = process.cwd();
-  const grouped = groupProjectsForCwd(allProjects, cwd);
   const options = [];
   const preSelected = [];
-  for (const proj of grouped.current) {
-    options.push({
-      value: proj,
-      label: `[${getAdapterName(proj.source)}] ${proj.displayPath}`,
-      hint: sessionCountHint(proj.sessionCount)
-    });
-    preSelected.push(proj);
-  }
-  for (const sub of grouped.subfolders) {
-    const relative = sub.projectPath.slice(cwd.length + 1);
-    options.push({
-      value: sub,
-      label: `  [${getAdapterName(sub.source)}] ${relative}`,
-      hint: sessionCountHint(sub.sessionCount)
-    });
-    preSelected.push(sub);
-  }
-  for (const other of grouped.others) {
-    options.push({
-      value: other,
-      label: `[${getAdapterName(other.source)}] ${other.displayPath}`,
-      hint: sessionCountHint(other.sessionCount)
-    });
+  for (const group2 of groups) {
+    for (const proj of group2.projects) {
+      options.push({
+        value: proj,
+        label: `[${getAdapterName(proj.source)}] ${proj.displayPath}`,
+        hint: sessionCountHint(proj.sessionCount)
+      });
+      if (group2.containsCwd) {
+        preSelected.push(proj);
+      }
+    }
   }
   const selected = await je({
     message: "Select projects to upload",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rudel",
-	"version": "0.1.8",
+	"version": "0.1.9",
 	"type": "module",
 	"description": "CLI for the Coding Agent Analytics Platform rudel.ai",
 	"license": "MIT",