bosun 0.27.0 → 0.27.2

package/autofix.mjs

@@ -28,7 +28,7 @@
  */
 
 import { spawn, execSync } from "node:child_process";
-import { existsSync, mkdirSync, createWriteStream } from "node:fs";
+import { existsSync, mkdirSync, createWriteStream, readFileSync } from "node:fs";
 import { readFile, writeFile } from "node:fs/promises";
 import { resolve, dirname } from "node:path";
 import { fileURLToPath } from "node:url";

package/bosun.schema.json

@@ -221,6 +221,53 @@
       "type": "string",
       "enum": ["codex-sdk", "kanban", "disabled"]
     },
+    "activeWorkspace": {
+      "type": "string",
+      "description": "ID of the currently active workspace"
+    },
+    "workspaces": {
+      "type": "array",
+      "description": "Multi-repo workspace definitions",
+      "items": {
+        "type": "object",
+        "additionalProperties": true,
+        "required": ["id", "name"],
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Unique workspace identifier (lowercase, alphanumeric, dashes)"
+          },
+          "name": {
+            "type": "string",
+            "description": "Human-readable workspace name"
+          },
+          "repos": {
+            "type": "array",
+            "description": "Repositories in this workspace",
+            "items": {
+              "type": "object",
+              "additionalProperties": true,
+              "required": ["name"],
+              "properties": {
+                "name": { "type": "string", "description": "Repository directory name" },
+                "url": { "type": "string", "description": "Git clone URL" },
+                "slug": { "type": "string", "description": "GitHub slug (org/repo)" },
+                "primary": { "type": "boolean", "description": "Whether this is the primary repo" },
+                "branch": { "type": "string", "description": "Default branch to track" }
+              }
+            }
+          },
+          "activeRepo": {
+            "type": ["string", "null"],
+            "description": "Currently active repository name within the workspace"
+          },
+          "createdAt": {
+            "type": "string",
+            "description": "ISO 8601 creation timestamp"
+          }
+        }
+      }
+    },
     "defaultRepository": { "type": "string" },
     "repositoryDefaults": { "$ref": "#/$defs/repositoryDefaults" },
     "repositories": {

package/cli.mjs

@@ -24,7 +24,7 @@ import {
   mkdirSync,
 } from "node:fs";
 import { fileURLToPath } from "node:url";
-import { fork, spawn } from "node:child_process";
+import { execFileSync, fork, spawn } from "node:child_process";
 import os from "node:os";
 import { createDaemonCrashTracker } from "./daemon-restart-policy.mjs";
 import {
@@ -109,6 +109,12 @@ function showHelp() {
       CONTAINER_ENABLED=1       Enable container isolation for agent execution
       CONTAINER_RUNTIME=docker  Runtime to use (docker|podman|container)
 
+  WORKSPACES
+    --workspace-list            List configured workspaces
+    --workspace-add <name>      Create a new workspace
+    --workspace-switch <id>     Switch active workspace
+    --workspace-add-repo        Add repo to workspace (interactive)
+
   VIBE-KANBAN
     --no-vk-spawn               Don't auto-spawn Vibe-Kanban
     --vk-ensure-interval <ms>   VK health check interval (default: 60000)
@@ -329,7 +335,6 @@ function getDaemonPid() {
     if (!existsSync(PID_FILE)) return null;
     const pid = parseInt(readFileSync(PID_FILE, "utf8").trim(), 10);
     if (isNaN(pid)) return null;
-    // Check if process is alive
     try {
       process.kill(pid, 0);
       return pid;
@@ -341,6 +346,28 @@ function getDaemonPid() {
   }
 }
 
+/**
+ * Scan for ghost bosun daemon-child processes that are alive but have no PID
+ * file (e.g. PID file was removed by compat migration). Uses pgrep on Linux/Mac.
+ * Returns an array of PIDs (may be empty).
+ */
+function findGhostDaemonPids() {
+  if (process.platform === "win32") return [];
+  try {
+    const out = execFileSync(
+      "pgrep",
+      ["-f", "bosun.*--daemon-child|cli\.mjs.*--daemon-child"],
+      { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 3000 },
+    ).trim();
+    return out
+      .split("\n")
+      .map((s) => parseInt(s.trim(), 10))
+      .filter((n) => Number.isFinite(n) && n > 0 && n !== process.pid);
+  } catch {
+    return [];
+  }
+}
+
 function writePidFile(pid) {
   try {
     mkdirSync(dirname(PID_FILE), { recursive: true });
@@ -366,6 +393,28 @@ function startDaemon() {
     process.exit(1);
   }
 
+  // Check for ghost processes that have no PID file (e.g. after compat migration
+  // deleted the old codex-monitor directory and its PID file with it).
+  const ghosts = findGhostDaemonPids();
+  if (ghosts.length > 0) {
+    console.log(`  ⚠️  Found ${ghosts.length} ghost bosun daemon process(es) with no PID file: ${ghosts.join(", ")}`);
+    console.log(`  Stopping ghost process(es) before starting fresh...`);
+    for (const gpid of ghosts) {
+      try { process.kill(gpid, "SIGTERM"); } catch { /* already dead */ }
+    }
+    // Give them a moment to exit
+    const deadline = Date.now() + 3000;
+    let alive = ghosts.filter((p) => isProcessAlive(p));
+    while (alive.length > 0 && Date.now() < deadline) {
+      Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 200);
+      alive = alive.filter((p) => isProcessAlive(p));
+    }
+    for (const gpid of alive) {
+      try { process.kill(gpid, "SIGKILL"); } catch { /* ok */ }
+    }
+    console.log(`  ✅ Ghost process(es) stopped.`);
+  }
+
   // Ensure log directory exists
   try {
     mkdirSync(dirname(DAEMON_LOG), { recursive: true });
@@ -456,8 +505,16 @@ function daemonStatus() {
   if (pid) {
     console.log(`  bosun daemon is running (PID ${pid})`);
   } else {
-    console.log("  bosun daemon is not running.");
-    removePidFile();
+    // Check for ghost processes (alive but no PID file)
+    const ghosts = findGhostDaemonPids();
+    if (ghosts.length > 0) {
+      console.log(`  ⚠️  bosun daemon is NOT tracked (no PID file), but ${ghosts.length} ghost process(es) found: ${ghosts.join(", ")}`);
+      console.log(`  The daemon is likely running but its PID file was lost.`);
+      console.log(`  Run --stop-daemon to clean up, then --daemon to restart.`);
+    } else {
+      console.log("  bosun daemon is not running.");
+      removePidFile();
+    }
   }
   process.exit(0);
 }
@@ -667,6 +724,97 @@ async function main() {
   // agent sessions that happen to have hook config files in their tree.
   process.env.VE_MANAGED = "1";
 
+  // Handle workspace commands
+  if (args.includes("--workspace-list") || args.includes("workspace-list")) {
+    const { listWorkspaces, getActiveWorkspace } = await import("./workspace-manager.mjs");
+    const configDirArg = getArgValue("--config-dir");
+    const configDir = configDirArg || process.env.BOSUN_DIR || resolve(os.homedir(), "bosun");
+    const workspaces = listWorkspaces(configDir);
+    const active = getActiveWorkspace(configDir);
+    if (workspaces.length === 0) {
+      console.log("\n  No workspaces configured. Run 'bosun --setup' to create one.\n");
+    } else {
+      console.log("\n  Workspaces:");
+      for (const ws of workspaces) {
+        const marker = ws.id === active?.id ? " ← active" : "";
+        console.log(`    ${ws.name} (${ws.id})${marker}`);
+        for (const repo of ws.repos || []) {
+          const primary = repo.primary ? " [primary]" : "";
+          const exists = repo.exists ? "✓" : "✗";
+          console.log(`      ${exists} ${repo.name} — ${repo.slug || repo.url || "local"}${primary}`);
+        }
+      }
+      console.log("");
+    }
+    process.exit(0);
+  }
+
+  if (args.includes("--workspace-add")) {
+    const { createWorkspace } = await import("./workspace-manager.mjs");
+    const configDirArg = getArgValue("--config-dir");
+    const configDir = configDirArg || process.env.BOSUN_DIR || resolve(os.homedir(), "bosun");
+    const name = getArgValue("--workspace-add");
+    if (!name) {
+      console.error("  Error: workspace name is required. Usage: bosun --workspace-add <name>");
+      process.exit(1);
+    }
+    try {
+      const ws = createWorkspace(configDir, { name });
+      console.log(`\n  ✓ Workspace "${ws.name}" created at ${ws.path}\n`);
+    } catch (err) {
+      console.error(`  Error: ${err.message}`);
+      process.exit(1);
+    }
+    process.exit(0);
+  }
+
+  if (args.includes("--workspace-switch")) {
+    const { setActiveWorkspace, getWorkspace } = await import("./workspace-manager.mjs");
+    const configDirArg = getArgValue("--config-dir");
+    const configDir = configDirArg || process.env.BOSUN_DIR || resolve(os.homedir(), "bosun");
+    const wsId = getArgValue("--workspace-switch");
+    if (!wsId) {
+      console.error("  Error: workspace ID required. Usage: bosun --workspace-switch <id>");
+      process.exit(1);
+    }
+    try {
+      setActiveWorkspace(configDir, wsId);
+      const ws = getWorkspace(configDir, wsId);
+      console.log(`\n  ✓ Switched to workspace "${ws?.name || wsId}"\n`);
+    } catch (err) {
+      console.error(`  Error: ${err.message}`);
+      process.exit(1);
+    }
+    process.exit(0);
+  }
+
+  if (args.includes("--workspace-add-repo")) {
+    const { addRepoToWorkspace, getActiveWorkspace, listWorkspaces } = await import("./workspace-manager.mjs");
+    const configDirArg = getArgValue("--config-dir");
+    const configDir = configDirArg || process.env.BOSUN_DIR || resolve(os.homedir(), "bosun");
+    const active = getActiveWorkspace(configDir);
+    if (!active) {
+      console.error("  No active workspace. Create one first: bosun --workspace-add <name>");
+      process.exit(1);
+    }
+    const url = getArgValue("--workspace-add-repo");
+    if (!url) {
+      console.error("  Error: repo URL required. Usage: bosun --workspace-add-repo <git-url>");
+      process.exit(1);
+    }
+    try {
+      console.log(`  Cloning into workspace "${active.name}"...`);
+      const repo = addRepoToWorkspace(configDir, active.id, { url });
+      console.log(`\n  ✓ Added repo "${repo.name}" to workspace "${active.name}"`);
+      if (repo.cloned) console.log(`    Cloned to: ${repo.path}`);
+      console.log("");
+    } catch (err) {
+      console.error(`  Error: ${err.message}`);
+      process.exit(1);
+    }
+    process.exit(0);
+  }
+
   // Handle --setup
   if (args.includes("--setup") || args.includes("setup")) {
     const configDirArg = getArgValue("--config-dir");

package/compat.mjs

@@ -11,7 +11,7 @@
  * should be imported as early as possible in the startup path.
  */
 
-import { existsSync, readdirSync, readFileSync, writeFileSync, mkdirSync, copyFileSync } from "node:fs";
+import { existsSync, readdirSync, readFileSync, writeFileSync, mkdirSync, copyFileSync, rmSync } from "node:fs";
 import { resolve, join } from "node:path";
 
 // ── Legacy config file names accepted from old codex-monitor installations ───
@@ -255,12 +255,29 @@ function rewriteEnvContent(content) {
 }
 
 /**
- * If BOSUN_DIR is not set but CODEX_MONITOR_DIR is (or legacy dir exists),
- * transparently set BOSUN_DIR to point at the legacy dir so bosun reads
- * from it without requiring a migration step.
+ * Remove the legacy codex-monitor config directory after successful migration.
+ * Runs in a deferred setTimeout so it doesn't block startup.
+ */
+function scheduleLegacyCleanup(legacyDir) {
+  if (!legacyDir || !existsSync(legacyDir)) return;
+  setTimeout(() => {
+    try {
+      rmSync(legacyDir, { recursive: true, force: true });
+      console.log(`[compat] Cleaned up legacy config directory: ${legacyDir}`);
+    } catch (err) {
+      console.warn(
+        `[compat] Could not remove legacy directory ${legacyDir}: ${err.message}`,
+      );
+    }
+  }, 5000);
+}
+
+/**
+ * If BOSUN_DIR is not set but a legacy codex-monitor dir exists,
+ * automatically migrate config to ~/bosun and set BOSUN_DIR to the new location.
+ * After successful migration, schedule legacy directory removal.
  *
- * This is the "zero-friction" path: existing users just upgrade the package and
- * it works. Migration is optional (improves going forward).
+ * Returns true if legacy dir was detected and migration was performed.
  */
 export function autoApplyLegacyDir() {
   // Already set — nothing to do
@@ -269,10 +286,39 @@ export function autoApplyLegacyDir() {
   const legacyDir = getLegacyConfigDir();
   if (!legacyDir) return false;
 
-  process.env.BOSUN_DIR = legacyDir;
+  const newDir = getNewConfigDir();
+
+  // If new dir already has config, just use it (already migrated)
+  if (hasLegacyMarkers(newDir)) {
+    // Legacy dir still exists but new dir is set up — clean up legacy
+    scheduleLegacyCleanup(legacyDir);
+    return false;
+  }
+
+  // Perform migration
   console.log(
-    `[compat] Legacy codex-monitor config detected at ${legacyDir} — using it as BOSUN_DIR.`,
+    `[compat] Legacy codex-monitor config detected at ${legacyDir} — migrating to ${newDir}...`,
   );
+  const result = migrateFromLegacy(legacyDir, newDir);
+
+  if (result.errors.length > 0) {
+    console.warn(
+      `[compat] Migration had errors: ${result.errors.join(", ")}`,
+    );
+    // Fall back to legacy dir if migration failed
+    process.env.BOSUN_DIR = legacyDir;
+    return true;
+  }
+
+  if (result.migrated.length > 0) {
+    console.log(
+      `[compat] Migrated ${result.migrated.length} files to ${newDir}: ${result.migrated.join(", ")}`,
+    );
+  }
+
+  // Schedule cleanup of legacy directory
+  scheduleLegacyCleanup(legacyDir);
+
   return true;
 }
 

package/config.mjs

@@ -59,11 +59,6 @@ function isWslInteropRuntime() {
 }
 
 function resolveConfigDir(repoRoot) {
-  const repoPath = resolve(repoRoot || process.cwd());
-  const packageDir = resolve(__dirname);
-  if (isPathInside(repoPath, packageDir) || hasConfigFiles(packageDir)) {
-    return packageDir;
-  }
   const preferWindowsDirs =
     process.platform === "win32" && !isWslInteropRuntime();
   const baseDir = preferWindowsDirs
@@ -737,6 +732,15 @@ export function loadConfig(argv = process.argv, options = {}) {
   let configData = configFile.data || {};
 
   const repoRootOverride = cli["repo-root"] || process.env.REPO_ROOT || "";
+
+  // Load workspace configuration
+  const workspacesDir = resolve(configDir, "workspaces");
+  const activeWorkspace = cli["workspace"] ||
+    process.env.BOSUN_WORKSPACE ||
+    configData.activeWorkspace ||
+    configData.defaultWorkspace ||
+    "";
+
   let repositories = loadRepoConfig(configDir, configData, {
     repoRootOverride,
   });
@@ -1626,9 +1630,11 @@ export function loadConfig(argv = process.argv, options = {}) {
     executorConfig,
     scheduler,
 
-    // Multi-repo
+    // Multi-repo / Workspaces
     repositories,
     selectedRepository,
+    workspacesDir,
+    activeWorkspace,
 
     // Agent prompts
     agentPrompts,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bosun",
-  "version": "0.27.0",
+  "version": "0.27.2",
   "description": "AI-powered orchestrator supervisor — manages AI agent executors with failover, auto-restarts on failure, analyzes crashes with Codex SDK, creates PRs via Vibe-Kanban API, and sends Telegram notifications. Supports N executors with weighted distribution, multi-repo projects, and auto-setup.",
   "type": "module",
   "license": "Apache 2.0",
@@ -43,6 +43,7 @@
     "./maintenance": "./maintenance.mjs",
     "./telegram-bot": "./telegram-bot.mjs",
     "./ui-server": "./ui-server.mjs",
+    "./workspace-manager": "./workspace-manager.mjs",
     "./workspace-registry": "./workspace-registry.mjs",
     "./shared-workspace-registry": "./shared-workspace-registry.mjs",
     "./workspace-reaper": "./workspace-reaper.mjs",
@@ -173,6 +174,7 @@
     "vibe-kanban-wrapper.mjs",
     "vk-error-resolver.mjs",
     "vk-log-stream.mjs",
+    "workspace-manager.mjs",
     "workspace-monitor.mjs",
     "workspace-reaper.mjs",
     "workspace-registry.mjs",

package/publish.mjs

@@ -224,10 +224,8 @@ function main() {
     const status = run(NPM_BIN, publishArgs, env);
     if (status === 0 && !dryRun) {
       console.log(
-        "\n[publish] REMINDER: deprecate the legacy npm package to redirect users:\n" +
-        "  npm deprecate bosun@'*' \"Renamed to bosun. Install: npm install -g bosun\"\n" +
-        "  # If a scoped legacy package exists:\n" +
-        "  npm deprecate bosun@'*' \"Renamed to bosun. Install: npm install -g bosun\"\n",
+        "\n[publish]  :\n" +
+        "  npm deprecate openfleet@'*' \"⚠️ openfleet has been renamed to bosun. Install the latest: npm install -g bosun\"\n",
       );
     }
     process.exit(status);

package/setup.mjs

@@ -1815,52 +1815,130 @@ async function main() {
     );
     configJson.projectName = env.PROJECT_NAME;
 
-    // ── Step 3: Repository ─────────────────────────────────
-    heading("Step 3 of 9 — Repository Configuration");
-    const multiRepo = isAdvancedSetup
-      ? await prompt.confirm(
-          "Do you have multiple repositories (e.g. separate backend/frontend)?",
-          false,
-        )
-      : false;
-
-    if (multiRepo) {
-      info("Configure each repository. The first is the primary.\n");
-      let addMore = true;
-      let repoIdx = 0;
-      while (addMore) {
-        const repoName = await prompt.ask(
-          `  Repo ${repoIdx + 1} — name`,
-          repoIdx === 0 ? basename(repoRoot) : "",
-        );
-        const repoPath = await prompt.ask(
-          `  Repo ${repoIdx + 1} — local path`,
-          repoIdx === 0 ? repoRoot : "",
-        );
-        const repoSlug = await prompt.ask(
-          `  Repo ${repoIdx + 1} — GitHub slug`,
-          repoIdx === 0 ? env.GITHUB_REPO : "",
+    // ── Step 3: Workspace & Repository ─────────────────────
+    heading("Step 3 of 9 — Workspace & Repository Configuration");
+
+    const useWorkspaces = await prompt.confirm(
+      "Set up multi-repo workspaces? (organizes repos into ~/bosun/workspaces/)",
+      isAdvancedSetup,
+    );
+
+    if (useWorkspaces) {
+      info("Workspaces group related repositories together.\n");
+      info(`Repositories will be cloned into: ${resolve(configDir, "workspaces")}\n`);
+
+      configJson.workspaces = [];
+      let addMoreWs = true;
+      let wsIdx = 0;
+
+      while (addMoreWs) {
+        const wsName = await prompt.ask(
+          `  Workspace ${wsIdx + 1} — name`,
+          wsIdx === 0 ? projectName : "",
         );
-        configJson.repositories.push({
-          name: repoName,
-          path: repoPath,
-          slug: repoSlug,
-          primary: repoIdx === 0,
+        const wsId = wsName.toLowerCase().replace(/[^a-z0-9_-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
+
+        const wsRepos = [];
+        let addMoreRepos = true;
+        let repoIdx = 0;
+
+        while (addMoreRepos) {
+          const repoUrl = await prompt.ask(
+            `    Repo ${repoIdx + 1} — git URL (SSH or HTTPS)`,
+            repoIdx === 0 ? (env.GITHUB_REPO ? `git@github.com:${env.GITHUB_REPO}.git` : "") : "",
+          );
+          const defaultName = repoUrl
+            ? (repoUrl.match(/[/:]([^/]+?)(?:\.git)?$/) || [])[1] || ""
+            : "";
+          const repoName = await prompt.ask(
+            `    Repo ${repoIdx + 1} — directory name`,
+            defaultName || (repoIdx === 0 ? basename(repoRoot) : ""),
+          );
+          const repoSlug = await prompt.ask(
+            `    Repo ${repoIdx + 1} — GitHub slug (org/repo)`,
+            repoIdx === 0 ? env.GITHUB_REPO : "",
+          );
+
+          wsRepos.push({
+            name: repoName,
+            url: repoUrl,
+            slug: repoSlug,
+            primary: repoIdx === 0,
+          });
+          repoIdx++;
+          addMoreRepos = await prompt.confirm("    Add another repo to this workspace?", false);
+        }
+
+        configJson.workspaces.push({
+          id: wsId,
+          name: wsName,
+          repos: wsRepos,
+          createdAt: new Date().toISOString(),
+          activeRepo: wsRepos[0]?.name || null,
         });
-        repoIdx++;
-        addMore = await prompt.confirm("Add another repository?", false);
+
+        // Also populate legacy repositories array for backward compat
+        for (const repo of wsRepos) {
+          configJson.repositories.push({
+            name: repo.name,
+            slug: repo.slug,
+            primary: repo.primary,
+          });
+        }
+
+        wsIdx++;
+        addMoreWs = await prompt.confirm("Add another workspace?", false);
+      }
+
+      if (configJson.workspaces.length > 0) {
+        configJson.activeWorkspace = configJson.workspaces[0].id;
       }
     } else {
-      // Single-repo: omit path — config.mjs auto-detects via git
-      configJson.repositories.push({
-        name: basename(repoRoot),
-        slug: env.GITHUB_REPO,
-        primary: true,
-      });
-      if (!isAdvancedSetup) {
-        info(
-          "Using single-repo defaults (recommended mode). Re-run setup in Advanced mode for multi-repo config.",
-        );
+      // Single-repo mode (classic) — still works as before
+      const multiRepo = isAdvancedSetup
+        ? await prompt.confirm(
+            "Do you have multiple repositories (e.g. separate backend/frontend)?",
+            false,
+          )
+        : false;
+
+      if (multiRepo) {
+        info("Configure each repository. The first is the primary.\n");
+        let addMore = true;
+        let repoIdx = 0;
+        while (addMore) {
+          const repoName = await prompt.ask(
+            `  Repo ${repoIdx + 1} — name`,
+            repoIdx === 0 ? basename(repoRoot) : "",
+          );
+          const repoPath = await prompt.ask(
+            `  Repo ${repoIdx + 1} — local path`,
+            repoIdx === 0 ? repoRoot : "",
+          );
+          const repoSlug = await prompt.ask(
+            `  Repo ${repoIdx + 1} — GitHub slug`,
+            repoIdx === 0 ? env.GITHUB_REPO : "",
+          );
+          configJson.repositories.push({
+            name: repoName,
+            path: repoPath,
+            slug: repoSlug,
+            primary: repoIdx === 0,
+          });
+          repoIdx++;
+          addMore = await prompt.confirm("Add another repository?", false);
+        }
+      } else {
+        configJson.repositories.push({
+          name: basename(repoRoot),
+          slug: env.GITHUB_REPO,
+          primary: true,
+        });
+        if (!isAdvancedSetup) {
+          info(
+            "Using single-repo defaults (recommended mode). Re-run setup in Advanced mode for multi-repo config.",
+          );
+        }
       }
     }
 

package/task-store.mjs

@@ -144,6 +144,9 @@ function defaultTask(overrides = {}) {
     tags: [],
     draft: false,
     projectId: null,
+    workspace: null,
+    repository: null,
+    repositories: [],
     baseBranch: null,
     branchName: null,
     prNumber: null,

package/ui/app.js

@@ -65,6 +65,7 @@ import {
   selectedSessionId,
   sessionsData,
 } from "./components/session-list.js";
+import { WorkspaceSwitcher, loadWorkspaces } from "./components/workspace-switcher.js";
 import { DiffViewer } from "./components/diff-viewer.js";
 import {
   CommandPalette,
@@ -112,15 +113,16 @@ if (typeof document !== "undefined" && !document.getElementById("offline-banner-
   gap: 12px;
   padding: 12px 16px;
   margin: 8px 16px;
-  background: rgba(239, 68, 68, 0.15);
-  border: 1px solid rgba(239, 68, 68, 0.3);
-  border-radius: 12px;
-  backdrop-filter: blur(8px);
+  background: rgba(239, 68, 68, 0.08);
+  border: 1px solid rgba(239, 68, 68, 0.2);
+  border-radius: 14px;
+  box-shadow: var(--shadow-sm);
+  backdrop-filter: blur(6px);
   animation: slideDown 0.3s ease-out;
 }
-.offline-banner-icon { font-size: 24px; }
+.offline-banner-icon { font-size: 20px; }
 .offline-banner-content { flex: 1; }
-.offline-banner-title { font-weight: 600; font-size: 14px; color: #ef4444; }
+.offline-banner-title { font-weight: 600; font-size: 13px; color: #ef4444; }
 .offline-banner-meta { font-size: 12px; opacity: 0.7; margin-top: 2px; }
 `;
   document.head.appendChild(style);
@@ -257,15 +259,18 @@ function Header() {
             ? html`<div class="app-header-hint">${navHint}</div>`
             : null}
         </div>
+        <${WorkspaceSwitcher} />
       </div>
       <div class="header-actions">
-        <div class="connection-pill ${connClass}">
-          <span class="connection-dot"></span>
-          ${connLabel}
+        <div class="header-status">
+          <div class="connection-pill ${connClass}">
+            <span class="connection-dot"></span>
+            ${connLabel}
+          </div>
+          ${freshnessLabel
+            ? html`<div class="header-freshness">${freshnessLabel}</div>`
+            : null}
         </div>
-        ${freshnessLabel
-          ? html`<div class="header-freshness" style="font-size:11px;opacity:0.55;margin-top:2px">${freshnessLabel}</div>`
-          : null}
         ${user
           ? html`<div class="app-header-user">@${user.username || user.first_name}</div>`
           : null}