bosun 0.36.0 → 0.36.2

package/workspace-manager.mjs

@@ -142,10 +142,94 @@ function extractSlug(url) {
   return "";
 }
 
+function extractGithubSlug(url) {
+  const raw = String(url || "").trim();
+  if (!raw) return "";
+  if (!/github\.com[:/]/i.test(raw)) return "";
+  return extractSlug(raw);
+}
+
 function resolveRepoUrl(repo) {
   return repo.url || (repo.slug ? `https://github.com/${repo.slug.replace(/\.git$/i, "")}.git` : "");
 }
 
+function normalizeWorkspaceRepoEntry(repo, index = 0) {
+  const raw =
+    typeof repo === "string"
+      ? { slug: repo }
+      : (repo && typeof repo === "object" ? repo : null);
+  if (!raw) return null;
+  const slug = String(raw.slug || extractGithubSlug(raw.url) || "").trim();
+  const url = String(raw.url || resolveRepoUrl({ slug }) || "").trim();
+  const name = String(raw.name || raw.id || extractRepoName(slug || url || raw.path || ""))
+    .trim()
+    .replace(/\.git$/i, "");
+  if (!name && !slug && !url) return null;
+  return {
+    name: name || `repo-${index + 1}`,
+    slug,
+    url,
+    primary: raw.primary === true || index === 0,
+  };
+}
+
+function normalizeWorkspaceEntry(workspace, index = 0) {
+  if (!workspace || typeof workspace !== "object") return null;
+  const fallbackId = `workspace-${index + 1}`;
+  const id = normalizeId(workspace.id || workspace.name || fallbackId);
+  if (!id) return null;
+  const repos = Array.isArray(workspace.repos)
+    ? workspace.repos
+        .map((repo, repoIndex) => normalizeWorkspaceRepoEntry(repo, repoIndex))
+        .filter(Boolean)
+    : [];
+  let activeRepo = String(workspace.activeRepo || "").trim();
+  if (!activeRepo && repos[0]?.name) activeRepo = repos[0].name;
+  if (activeRepo && !repos.some((repo) => repo.name === activeRepo)) {
+    activeRepo = repos[0]?.name || "";
+  }
+  return {
+    ...workspace,
+    id,
+    name: String(workspace.name || workspace.id || id).trim() || id,
+    repos,
+    createdAt: workspace.createdAt || new Date().toISOString(),
+    activeRepo: activeRepo || null,
+  };
+}
+
+function normalizeWorkspaceList(workspaces) {
+  if (!Array.isArray(workspaces)) return [];
+  const deduped = new Map();
+  for (let i = 0; i < workspaces.length; i += 1) {
+    const normalized = normalizeWorkspaceEntry(workspaces[i], i);
+    if (!normalized) continue;
+    const existing = deduped.get(normalized.id);
+    if (!existing) {
+      deduped.set(normalized.id, normalized);
+      continue;
+    }
+    const mergedRepos = [...existing.repos];
+    const existingRepoNames = new Set(existing.repos.map((repo) => repo.name));
+    for (const repo of normalized.repos) {
+      if (existingRepoNames.has(repo.name)) continue;
+      existingRepoNames.add(repo.name);
+      mergedRepos.push(repo);
+    }
+    deduped.set(normalized.id, {
+      ...existing,
+      ...normalized,
+      repos: mergedRepos,
+      activeRepo:
+        normalized.activeRepo ||
+        existing.activeRepo ||
+        mergedRepos[0]?.name ||
+        null,
+    });
+  }
+  return [...deduped.values()];
+}
+
 function makeNonGitBackupPath(repoPath) {
   const stamp = new Date().toISOString().replace(/[:.]/g, "-");
   let candidate = `${repoPath}.non-git-backup-${stamp}`;
@@ -224,7 +308,7 @@ function saveBosunConfig(configDir, config) {
 
 function getWorkspacesFromConfig(configDir) {
   const config = loadBosunConfig(configDir);
-  return Array.isArray(config.workspaces) ? config.workspaces : [];
+  return normalizeWorkspaceList(config.workspaces);
 }
 
 function saveWorkspacesToConfig(configDir, workspaces, activeWorkspace) {

package/workspace-monitor.mjs

@@ -193,7 +193,7 @@ class WorkspaceMonitor {
 
       await this.logWorkspace(
         attemptId,
-        `[${new Date().toISOString()}] ⚠️  STUCK DETECTED: ${stuckCheck.reason}\n` +
+        `[${new Date().toISOString()}] :alert:  STUCK DETECTED: ${stuckCheck.reason}\n` +
           `  Time since last progress: ${Math.round((now - state.lastProgressAt) / 60000)} minutes\n` +
           `  Recommendation: ${stuckCheck.recommendation}\n\n`,
       );
@@ -214,7 +214,7 @@ class WorkspaceMonitor {
     for (const warning of warnings) {
       await this.logWorkspace(
         attemptId,
-        `[${new Date().toISOString()}] ⚠️  ${warning}\n`,
+        `[${new Date().toISOString()}] :alert:  ${warning}\n`,
       );
     }
 

package/workspace-registry.mjs

@@ -224,11 +224,11 @@ export function formatRegistryDiagnostics(errors, warnings) {
   const parts = [];
   if (errors && errors.length > 0) {
     parts.push(
-      `❌ Registry errors:\n${errors.map((e) => `  • ${e}`).join("\n")}`,
+      `:close: Registry errors:\n${errors.map((e) => `  • ${e}`).join("\n")}`,
     );
   }
   if (warnings && warnings.length > 0) {
-    parts.push(`⚠️ ${warnings.map((w) => w).join("\n⚠️ ")}`);
+    parts.push(`:alert: ${warnings.map((w) => w).join("\n:alert: ")}`);
   }
   return parts.length > 0 ? parts.join("\n") : null;
 }

package/worktree-manager.mjs

@@ -73,7 +73,7 @@ function fixGitConfigCorruption(repoRoot) {
     });
     if (bareResult.stdout?.trim() === "true") {
       console.warn(
-        `${TAG} ⚠️ Detected core.bare=true on main repo — fixing git config corruption`,
+        `${TAG} :alert: Detected core.bare=true on main repo — fixing git config corruption`,
       );
       spawnSync("git", ["config", "--unset", "core.bare"], {
         cwd: repoRoot,