@lightupai/polaris 0.0.2 → 0.0.3

package/.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
           --health-retries 5
 
     env:
-      DATABASE_URL: postgres://polaris:polaris@localhost:5432/polaris
+      DATABASE_URL: postgres://polaris:polaris@localhost:5432/polaris_test
 
     steps:
       - uses: actions/checkout@v4
@@ -35,4 +35,7 @@ jobs:
 
       - run: bun install
 
+      - name: Create test database
+        run: PGPASSWORD=polaris psql -h localhost -U polaris -d polaris -c "CREATE DATABASE polaris_test OWNER polaris;"
+
       - run: bun test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightupai/polaris",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "type": "module",
   "bin": {
     "polaris": "bin/polaris"

package/src/cli/cli.ts

@@ -63,7 +63,8 @@ async function login() {
   // 2. Wait for the token
   console.log("Waiting for authentication...");
   const token = await tokenPromise;
-  callbackServer.stop(true);
+  // Keep server alive briefly so the browser can render the success page
+  setTimeout(() => callbackServer.stop(true), 3000);
 
   // 3. Validate the token and get user info
   const res = await fetch(`${SERVICE_URL}/auth/token?token=${token}`);
@@ -79,8 +80,20 @@ async function login() {
     participant_id: string;
   };
 
+  // Fetch org name
+  let orgName = userInfo.org_id;
+  try {
+    const orgRes = await fetch(`${SERVICE_URL}/auth/token?token=${token}`);
+    if (orgRes.ok) {
+      const orgData = (await orgRes.json()) as { org_id: string };
+      // The org name isn't in the token — use the email domain as display
+      orgName = userInfo.email.split("@")[1].split(".")[0];
+      orgName = orgName.charAt(0).toUpperCase() + orgName.slice(1);
+    }
+  } catch { /* use org_id as fallback */ }
+
   console.log(`\nAuthenticated as ${userInfo.name} (${userInfo.email})`);
-  console.log(`Organization: ${userInfo.org_id}`);
+  console.log(`Organization: ${orgName}`);
   console.log(`Participant ID: ${userInfo.participant_id}\n`);
 
   // 4. Store credentials
@@ -202,9 +215,34 @@ Based on the arguments provided, do ONE of the following:
   await writeFile(settingsPath, JSON.stringify(mergedSettingsWithStatusLine, null, 2));
   console.log(`Status line config written to ${settingsPath}`);
 
+  // 9. Post system event (device connected)
+  const hostname = (await import("node:os")).hostname();
+  try {
+    await fetch(`${SERVICE_URL.replace(":3000", ":4321")}/projects/_system/sessions/_system/events`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${token}`,
+      },
+      body: JSON.stringify({
+        sender: userInfo.participant_id,
+        payload: {
+          hook_event_name: "Stop",
+          session_id: "_system",
+          stop_response: `Device connected: ${hostname} (${process.platform})`,
+        },
+      }),
+    });
+    // Notify web app dashboard to refresh
+    await fetch(`${SERVICE_URL}/api/notify-dashboard`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json", Authorization: `Bearer ${token}` },
+    });
+  } catch { /* non-fatal */ }
+
   console.log("\n✓ Polaris is set up on this machine!");
   console.log("\nNext steps:");
-  console.log("  1. Start the daemon:  bun run src/daemon/daemon.ts");
+  console.log("  1. Start the daemon:  polaris daemon");
   console.log("  2. Open your AI agent and run:  /polaris join <project> <session>");
 }
 

package/src/service/db.ts

@@ -8,6 +8,7 @@ export type Sql = postgres.Sql;
 export interface Org {
   id: string;
   name: string;
+  slug: string | null;
   domain: string | null;
   slack_team_id: string | null;
   slack_bot_token: string | null;
@@ -33,6 +34,7 @@ export async function createDb(connectionString?: string): Promise<Sql> {
     CREATE TABLE IF NOT EXISTS orgs (
       id TEXT PRIMARY KEY,
       name TEXT NOT NULL,
+      slug TEXT UNIQUE,
       domain TEXT,
       slack_team_id TEXT,
       slack_bot_token TEXT,
@@ -119,8 +121,18 @@ export async function getOrgByDomain(sql: Sql, domain: string): Promise<Org | nu
   return { ...row, created_at: row.created_at.toISOString() } as Org;
 }
 
-export async function setOrgSlack(sql: Sql, orgId: string, teamId: string, botToken: string, systemChannelId?: string): Promise<void> {
-  await sql`UPDATE orgs SET slack_team_id = ${teamId}, slack_bot_token = ${botToken}, slack_system_channel_id = ${systemChannelId ?? null} WHERE id = ${orgId}`;
+export async function setOrgSlack(sql: Sql, orgId: string, teamId: string, botToken: string, systemChannelId?: string, slug?: string): Promise<void> {
+  if (slug) {
+    await sql`UPDATE orgs SET slack_team_id = ${teamId}, slack_bot_token = ${botToken}, slack_system_channel_id = ${systemChannelId ?? null}, slug = ${slug} WHERE id = ${orgId}`;
+  } else {
+    await sql`UPDATE orgs SET slack_team_id = ${teamId}, slack_bot_token = ${botToken}, slack_system_channel_id = ${systemChannelId ?? null} WHERE id = ${orgId}`;
+  }
+}
+
+export async function getOrgBySlug(sql: Sql, slug: string): Promise<Org | null> {
+  const [row] = await sql`SELECT * FROM orgs WHERE slug = ${slug}`;
+  if (!row) return null;
+  return { ...row, created_at: row.created_at.toISOString() } as Org;
 }
 
 // --- Users ---

package/src/service/server.ts

@@ -1,8 +1,10 @@
 import { type Server, type ServerWebSocket } from "bun";
 import { z } from "zod";
+import { postToSlackSystemChannel } from "../slack/system";
 import {
   createDb,
   createOrg,
+  getOrg,
   createProject,
   getProject,
   createSession,
@@ -285,7 +287,12 @@ export async function startServer(opts: {
 
       params = matchRoute(method, pathname, "/projects/:proj/sessions/:sess/events", "POST");
       if (params) {
-        const session = await getSession(sql, orgId, params.proj, params.sess);
+        let session = await getSession(sql, orgId, params.proj, params.sess);
+        if (!session && params.proj === "_system") {
+          // Auto-create _system project and session
+          try { await createProject(sql, orgId, "_system"); } catch { /* exists */ }
+          try { session = await createSession(sql, orgId, "_system", "_system", null); } catch { session = await getSession(sql, orgId, "_system", "_system"); }
+        }
         if (!session) return error("Session not found", 404);
         const body = await jsonBody(req);
         const parsed = z
@@ -304,6 +311,15 @@ export async function startServer(opts: {
         await pushEvent(sql, orgId, event);
         broadcastEvent(event);
         broadcastSse(event);
+
+        // Forward _system events to Slack
+        if (params.proj === "_system") {
+          const text = (parsed.data.payload as { stop_response?: string; prompt?: string }).stop_response
+            ?? (parsed.data.payload as { prompt?: string }).prompt
+            ?? "System event";
+          await postToSlackSystemChannel(sql, orgId, `:computer: *${parsed.data.sender}*: ${text}`);
+        }
+
         return json(event, 201);
       }
 

package/src/slack/system.ts

@@ -1,4 +1,7 @@
-// --- Slack system channel: create, post events ---
+// --- Slack system channel: create, post events, persist to DB ---
+
+import { pushEvent, createProject, getProject, getOrg, type Sql } from "../service/db";
+import type { PolarisEvent } from "../types";
 
 const SYSTEM_CHANNEL_NAME = "polaris-system";
 
@@ -78,30 +81,84 @@ export async function createSystemChannel(botToken: string, inviteEmail?: string
   throw new Error(`Failed to create or find #${SYSTEM_CHANNEL_NAME} channel: ${createRes.error}`);
 }
 
-// Post a system event to the #polaris channel.
-export async function postSystemEvent(
-  botToken: string,
-  channelId: string,
-  text: string,
-  context?: string
-): Promise<void> {
-  const blocks: Array<Record<string, unknown>> = [
-    {
-      type: "section",
-      text: { type: "mrkdwn", text },
+// Ensure the _system project exists for an org.
+async function ensureSystemProject(sql: Sql, orgId: string): Promise<void> {
+  const existing = await getProject(sql, orgId, "_system");
+  if (!existing) {
+    try {
+      await createProject(sql, orgId, "_system");
+    } catch {
+      // Already exists (race condition)
+    }
+  }
+}
+
+// Post a system event — persists to DB and optionally posts to Slack.
+export async function postSystemEvent(opts: {
+  sql: Sql;
+  orgId: string;
+  sender: string;
+  text: string;
+  context?: string;
+  botToken?: string;
+  channelId?: string;
+}): Promise<void> {
+  const { sql, orgId, sender, text, context, botToken, channelId } = opts;
+
+  // Persist to DB under _system project and _system session
+  await ensureSystemProject(sql, orgId);
+  const event: PolarisEvent = {
+    id: crypto.randomUUID(),
+    project: "_system",
+    session: "_system",
+    timestamp: new Date().toISOString(),
+    source: "inject",
+    sender: sender as PolarisEvent["sender"],
+    payload: {
+      type: "inject" as const,
+      content: context ? `${text}\n${context}` : text,
+      sender: sender as PolarisEvent["sender"],
+      target: "_system",
     },
-  ];
+  };
+  await pushEvent(sql, orgId, event);
 
-  if (context) {
-    blocks.push({
-      type: "context",
-      elements: [{ type: "mrkdwn", text: context }],
+  // Post to Slack if connected
+  if (botToken && channelId) {
+    const blocks: Array<Record<string, unknown>> = [
+      {
+        type: "section",
+        text: { type: "mrkdwn", text },
+      },
+    ];
+
+    if (context) {
+      blocks.push({
+        type: "context",
+        elements: [{ type: "mrkdwn", text: context }],
+      });
+    }
+
+    await slackApi(botToken, "chat.postMessage", {
+      channel: channelId,
+      text,
+      blocks,
     });
   }
+}
 
-  await slackApi(botToken, "chat.postMessage", {
-    channel: channelId,
-    text, // fallback for notifications
-    blocks,
-  });
+// Post a _system event to Slack if the org has credentials.
+// Called by the cloud service when it receives a _system project event.
+export async function postToSlackSystemChannel(sql: Sql, orgId: string, text: string): Promise<void> {
+  try {
+    const org = await getOrg(sql, orgId);
+    if (!org?.slack_bot_token || !org?.slack_system_channel_id) return;
+
+    await slackApi(org.slack_bot_token, "chat.postMessage", {
+      channel: org.slack_system_channel_id,
+      text,
+    });
+  } catch {
+    // Non-fatal
+  }
 }

package/src/web/app.ts

@@ -9,6 +9,7 @@ import {
   getUserByEmail,
   upsertUser,
   setOrgSlack,
+  getSessionEvents,
   type Sql,
 } from "../service/db";
 import { layout, nav } from "./layout";
@@ -155,15 +156,33 @@ export function createApp(sql: Sql) {
     const org = await getOrg(sql, payload.org_id);
     if (!org) return c.redirect("/login");
 
-    // TODO: detect cliInstalled (check if user has ever hit /auth/token from CLI)
-    // TODO: detect hasConnectedSession (check if user has any sessions as driver in DB)
+    // Detect setup status from system events
+    let cliInstalled = false;
+    const devices: Array<{ name: string; lastSeen: string; os: string; activeSession?: string }> = [];
+    try {
+      const systemEvents = await getSessionEvents(sql, payload.org_id, "_system", "_system");
+      for (const e of systemEvents) {
+        const text = (e.payload as { stop_response?: string }).stop_response ?? "";
+        const match = text.match(/^Device connected: (.+) \((.+)\)$/);
+        if (match) {
+          cliInstalled = true;
+          // Deduplicate by device name, keep latest
+          const existing = devices.findIndex((d) => d.name === match[1]);
+          const device = { name: match[1], os: match[2], lastSeen: e.timestamp };
+          if (existing >= 0) devices[existing] = device;
+          else devices.push(device);
+        }
+      }
+    } catch { /* _system project may not exist yet */ }
+
     const ctx = {
       token,
       userName: payload.name,
       orgName: org.name,
+      orgSlug: org.slug,
       email: payload.email,
       slackConnected: !!org.slack_team_id,
-      cliInstalled: false,
+      cliInstalled,
       hasConnectedSession: false,
     };
 
@@ -171,9 +190,9 @@ export function createApp(sql: Sql) {
     const activeSessions: unknown[] = [];
 
     if (activeSessions.length > 0) {
-      return layout(renderActiveView(ctx, [], []), "Polaris");
+      return layout(renderActiveView(ctx, [], [], devices), "Polaris");
     }
-    return layout(renderSetupView(ctx), "Polaris");
+    return layout(renderSetupView(ctx, devices), "Polaris");
   });
 
   // --- Profile ---
@@ -192,6 +211,7 @@ export function createApp(sql: Sql) {
       token,
       userName: payload.name,
       orgName: org.name,
+      orgSlug: org.slug,
       email: payload.email,
       slackConnected: !!org.slack_team_id,
       cliInstalled: false,
@@ -205,9 +225,9 @@ export function createApp(sql: Sql) {
 
   app.get("/preview", (c) => {
     const mockToken = "preview-token";
-    const base = { token: mockToken, userName: mockUser.name, orgName: mockOrg.name, email: mockUser.email };
+    const base = { token: mockToken, userName: mockUser.name, orgName: mockOrg.name, orgSlug: "lightup-data" as string | null, email: mockUser.email };
 
-    const fresh       = { ...base, slackConnected: false, cliInstalled: false, hasConnectedSession: false };
+    const fresh       = { ...base, orgSlug: null, slackConnected: false, cliInstalled: false, hasConnectedSession: false };
     const slackDone   = { ...base, slackConnected: true,  cliInstalled: false, hasConnectedSession: false };
     const cliDone     = { ...base, slackConnected: true,  cliInstalled: true,  hasConnectedSession: false };
     const allDone     = { ...base, slackConnected: true,  cliInstalled: true,  hasConnectedSession: true };
@@ -333,7 +353,7 @@ export function createApp(sql: Sql) {
         redirect_uri: process.env.SLACK_REDIRECT_URI ?? "http://localhost:3000/slack/callback",
       }),
     });
-    const slackData = (await slackRes.json()) as { ok: boolean; team?: { id: string }; access_token?: string; error?: string };
+    const slackData = (await slackRes.json()) as { ok: boolean; team?: { id: string; name?: string }; access_token?: string; error?: string };
 
     if (!slackData.ok) {
       // Check if Slack is already connected (e.g., stale callback reload)
@@ -348,20 +368,99 @@ export function createApp(sql: Sql) {
     let systemChannelId: string | undefined;
     try {
       systemChannelId = await createSystemChannel(slackData.access_token!, payload.email);
-      await postSystemEvent(
-        slackData.access_token!,
-        systemChannelId,
-        `:star: *${payload.name}* connected this Slack workspace to Polaris`,
-        `Organization: ${payload.org_id}`
-      );
+      await postSystemEvent({
+        sql,
+        orgId: payload.org_id,
+        sender: payload.participant_id,
+        text: `:star: *${payload.name}* connected this Slack workspace to Polaris`,
+        context: `Organization: ${payload.org_id}`,
+        botToken: slackData.access_token!,
+        channelId: systemChannelId,
+      });
     } catch {
       // Non-fatal — Slack is connected even if channel creation fails
     }
 
-    await setOrgSlack(sql, payload.org_id, slackData.team!.id, slackData.access_token!, systemChannelId);
+    // Set org slug from Slack workspace name if not already set
+    const currentOrg = await getOrg(sql, payload.org_id);
+    const slug = currentOrg?.slug ? undefined : (slackData.team?.name?.toLowerCase().replace(/\s+/g, "-") ?? undefined);
+    await setOrgSlack(sql, payload.org_id, slackData.team!.id, slackData.access_token!, systemChannelId, slug);
+    notifyDashboard(payload.org_id);
     return c.redirect(`/dashboard?token=${state}`);
   });
 
+  // --- Dashboard SSE (real-time status updates) ---
+
+  const dashboardListeners = new Map<string, Set<ReadableStreamDefaultController<Uint8Array>>>(); // orgId → controllers
+
+  function notifyDashboard(orgId: string) {
+    const controllers = dashboardListeners.get(orgId);
+    if (!controllers) return;
+    const data = `data: refresh\n\n`;
+    const bytes = new TextEncoder().encode(data);
+    for (const ctrl of controllers) {
+      try { ctrl.enqueue(bytes); } catch { controllers.delete(ctrl); }
+    }
+  }
+
+  // Expose notifyDashboard so other parts of the app can trigger it
+  (app as unknown as { notifyDashboard: typeof notifyDashboard }).notifyDashboard = notifyDashboard;
+
+  app.get("/api/dashboard-events", async (c) => {
+    const token = c.req.query("token");
+    if (!token) return c.json({ error: "No token" }, 400);
+    const payload = await verifyToken(token);
+    if (!payload) return c.json({ error: "Invalid token" }, 401);
+
+    const orgId = payload.org_id;
+    let controller: ReadableStreamDefaultController<Uint8Array>;
+    const stream = new ReadableStream<Uint8Array>({
+      start(ctrl) {
+        controller = ctrl;
+        if (!dashboardListeners.has(orgId)) dashboardListeners.set(orgId, new Set());
+        dashboardListeners.get(orgId)!.add(controller);
+      },
+      cancel() {
+        dashboardListeners.get(orgId)?.delete(controller);
+      },
+    });
+
+    return new Response(stream, {
+      headers: { "Content-Type": "text/event-stream", "Cache-Control": "no-cache", Connection: "keep-alive" },
+    });
+  });
+
+  app.post("/api/notify-dashboard", async (c) => {
+    const auth = c.req.header("Authorization");
+    if (!auth?.startsWith("Bearer ")) return c.json({ error: "Unauthorized" }, 401);
+    const payload = await verifyToken(auth.slice(7));
+    if (!payload) return c.json({ error: "Invalid token" }, 401);
+    notifyDashboard(payload.org_id);
+    return c.json({ ok: true });
+  });
+
+  app.get("/api/dashboard-status", async (c) => {
+    const token = c.req.query("token");
+    if (!token) return c.json({ error: "No token" }, 400);
+    const payload = await verifyToken(token);
+    if (!payload) return c.json({ error: "Invalid token" }, 401);
+
+    const org = await getOrg(sql, payload.org_id);
+    const slackConnected = !!org?.slack_team_id;
+
+    let cliInstalled = false;
+    try {
+      const systemEvents = await getSessionEvents(sql, payload.org_id, "_system", "_system");
+      cliInstalled = systemEvents.some((e) =>
+        (e.payload as { stop_response?: string }).stop_response?.startsWith("Device connected:")
+      );
+    } catch { /* _system may not exist */ }
+
+    const hasConnectedSession = false; // TODO
+
+    return c.json({ slackConnected, cliInstalled, hasConnectedSession });
+  });
+
   // --- CLI auth flow ---
 
   // CLI calls this with a local callback port. We redirect to Google SSO

package/src/web/views.ts

@@ -8,6 +8,7 @@ interface ViewContext {
   token: string;
   userName: string;
   orgName: string;
+  orgSlug: string | null;
   email: string;
   slackConnected: boolean;
   cliInstalled: boolean;
@@ -77,39 +78,56 @@ function renderFloorSection(ctx: ViewContext, compact = false, state: StepState
   }
 
   if (ctx.slackConnected) {
+    const slugRow = ctx.orgSlug
+      ? `<div class="mt-3 pt-3 border-t border-gray-100 flex items-center justify-between">
+           <div>
+             <p class="text-xs text-gray-400">Org identifier</p>
+             <p class="text-sm font-mono text-gray-700">${ctx.orgSlug}</p>
+           </div>
+           <form action="/settings/slug" method="POST" class="flex items-center gap-2">
+             <input type="hidden" name="token" value="${ctx.token}">
+             <input type="text" name="slug" value="${ctx.orgSlug}" class="px-2 py-1 border border-gray-200 rounded text-xs font-mono w-40 focus:ring-polaris-500 focus:border-polaris-500 outline-none hidden" id="slug-edit-${ctx.token.slice(-6)}">
+             <button type="button" onclick="const i=this.previousElementSibling;i.classList.toggle('hidden');if(!i.classList.contains('hidden'))i.focus()" class="text-xs text-gray-400 hover:text-gray-600">Edit</button>
+           </form>
+         </div>`
+      : `<div class="mt-3 pt-3 border-t border-gray-100">
+           <p class="text-xs text-gray-400">Org identifier: <span class="text-gray-500">not set (will be set from first floor connection)</span></p>
+         </div>`;
+
     return `
       <div>
-        ${sectionHeader("Floor")}
+        <div class="flex items-baseline gap-2 mb-3">
+          <h2 class="text-xs font-semibold text-gray-400 uppercase tracking-wider">Floor</h2>
+          ${statusBadge("Connected", true)}
+        </div>
         <div class="bg-white border border-gray-200 rounded-lg p-5">
           <div class="flex items-center gap-3">
             <div class="w-10 h-10 rounded-lg bg-[#4A154B] flex items-center justify-center shrink-0">
               ${slackIcon.replace('class="w-4 h-4"', 'class="w-5 h-5 text-white"')}
             </div>
             <div>
-              <div class="flex items-center gap-2">
-                <p class="text-sm font-semibold text-gray-900">Slack</p>
-                ${statusBadge("Connected", true)}
-              </div>
+              <p class="text-sm font-semibold text-gray-900">Slack</p>
               <p class="text-sm text-gray-500 mt-0.5">Workspace linked. Channels are auto-created for your projects.</p>
             </div>
           </div>
+          ${slugRow}
         </div>
       </div>`;
   }
 
   return sectionWrap(state, `
     <div>
-      ${sectionHeader("Floor")}
+      <div class="flex items-baseline gap-2 mb-3">
+        <h2 class="text-xs font-semibold text-gray-400 uppercase tracking-wider">Floor</h2>
+        ${statusBadge("Not connected", false)}
+      </div>
       <div class="bg-white border ${state === "active" ? cardClass("active") : "border-amber-200"} rounded-lg p-5">
         <div class="flex items-center gap-3">
           <div class="w-10 h-10 rounded-lg bg-gray-100 flex items-center justify-center shrink-0">
             <svg class="w-5 h-5 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.828 10.172a4 4 0 00-5.656 0l-4 4a4 4 0 105.656 5.656l1.102-1.101m-.758-4.899a4 4 0 005.656 0l4-4a4 4 0 00-5.656-5.656l-1.1 1.1"/></svg>
           </div>
           <div>
-            <div class="flex items-center gap-2">
-              <p class="text-sm font-semibold text-gray-900">Slack</p>
-              ${statusBadge("Not connected", false)}
-            </div>
+            <p class="text-sm font-semibold text-gray-900">Slack</p>
             <p class="text-sm text-gray-500 mt-0.5">Connect your Slack workspace to enable the floor for your team.</p>
           </div>
         </div>
@@ -127,7 +145,17 @@ function renderDevicesSection(ctx: ViewContext, devices: DeviceFixture[], state:
   if (devices.length > 0) {
     return `
       <div>
-        ${sectionHeader("Devices")}
+        <div class="flex items-baseline gap-2 mb-3">
+          <h2 class="text-xs font-semibold text-gray-400 uppercase tracking-wider">Devices</h2>
+          ${statusBadge(`${devices.length} connected`, true)}
+        </div>
+        <details class="mb-3">
+          <summary class="text-xs text-polaris-700 hover:text-polaris-800 font-medium cursor-pointer select-none">+ Add another device</summary>
+          <div class="mt-2 bg-white border border-gray-200 rounded-lg p-4">
+            <p class="text-sm text-gray-500">Run on any new machine:</p>
+            ${copyBlock("npx @lightupai/polaris login")}
+          </div>
+        </details>
         <div class="bg-white border border-gray-200 rounded-lg divide-y divide-gray-100">
           ${devices.map((d) => renderDeviceRow(d)).join("")}
         </div>
@@ -137,24 +165,21 @@ function renderDevicesSection(ctx: ViewContext, devices: DeviceFixture[], state:
   // Setup state — no devices yet
   return sectionWrap(state, `
     <div>
-      ${sectionHeader("Devices")}
+      <div class="flex items-baseline gap-2 mb-3">
+        <h2 class="text-xs font-semibold text-gray-400 uppercase tracking-wider">Devices</h2>
+        ${ctx.cliInstalled ? statusBadge("Installed", true) : statusBadge("Not installed", false)}
+      </div>
       <div class="bg-white border ${state === "active" ? cardClass("active") : "border-gray-200"} rounded-lg p-5">
-        <div class="flex items-center gap-2">
-          <p class="text-sm font-semibold text-gray-900">Install the CLI on your first device</p>
-          ${ctx.cliInstalled ? statusBadge("Installed", true) : statusBadge("Not installed", false)}
-        </div>
-        <p class="text-sm text-gray-500 mt-1">${ctx.cliInstalled
-          ? "Polaris is set up. Run the same command on other machines to add them."
-          : "Run this in your terminal. Repeat on each machine you work from."}</p>
-        ${ctx.cliInstalled
-          ? ""
-          : copyBlock("npx @lightup/polaris login")}
+        <p class="text-sm font-semibold text-gray-900">${ctx.cliInstalled ? "Add another device" : "Set up Polaris on your first device"}</p>
+        <p class="text-sm text-gray-500 mt-1">Run this in your terminal${ctx.cliInstalled ? " on any new machine" : ". Repeat on each machine you work from"}.</p>
+        ${copyBlock("npx @lightupai/polaris login")}
       </div>
     </div>`);
 }
 
 function renderDeviceRow(device: DeviceFixture): string {
-  const isOnline = device.activeSession;
+  const recentThreshold = Date.now() - 60 * 60 * 1000; // 1 hour
+  const isOnline = device.activeSession || new Date(device.lastSeen).getTime() > recentThreshold;
   return `
     <div class="p-4 flex items-center justify-between">
       <div class="flex items-center gap-3">
@@ -172,10 +197,8 @@ function renderDeviceRow(device: DeviceFixture): string {
         </div>
       </div>
       <div class="text-right">
-        ${isOnline
-          ? `<p class="text-xs font-medium text-gray-700">${device.activeSession}</p>
-             <p class="text-xs text-gray-400">Active now</p>`
-          : `<p class="text-xs text-gray-400">Last seen ${new Date(device.lastSeen).toLocaleDateString()}</p>`}
+        ${device.activeSession ? `<p class="text-xs font-medium text-gray-700">${device.activeSession}</p>` : ""}
+        <p class="text-xs text-gray-400">${isOnline ? "Online" : "Offline"} · ${new Date(device.lastSeen).toLocaleString()}</p>
       </div>
     </div>`;
 }
@@ -187,6 +210,13 @@ function renderProjectsSessionsSection(ctx: ViewContext, sessions: SessionFixtur
     return `
       <div>
         ${sectionHeader("Projects & Sessions")}
+        <details class="mb-3">
+          <summary class="text-xs text-polaris-700 hover:text-polaris-800 font-medium cursor-pointer select-none">+ Join another session</summary>
+          <div class="mt-2 bg-white border border-gray-200 rounded-lg p-4">
+            <p class="text-sm text-gray-500">Inside your AI agent, run:</p>
+            ${copyBlock("/polaris join &lt;project&gt; &lt;session&gt;")}
+          </div>
+        </details>
         <div class="space-y-3">
           ${sessions.map((s) => renderSessionCard(s, ctx.userName)).join("")}
         </div>
@@ -200,12 +230,12 @@ function renderProjectsSessionsSection(ctx: ViewContext, sessions: SessionFixtur
   // Setup state — no sessions yet
   return sectionWrap(state, `
     <div>
-      ${sectionHeader("Projects & Sessions")}
+      <div class="flex items-baseline gap-2 mb-3">
+        <h2 class="text-xs font-semibold text-gray-400 uppercase tracking-wider">Projects & Sessions</h2>
+        ${ctx.hasConnectedSession ? statusBadge("Connected", true) : statusBadge("Waiting", false)}
+      </div>
       <div class="bg-white border ${state === "active" ? cardClass("active") : "border-gray-200"} rounded-lg p-5">
-        <div class="flex items-center gap-2">
-          <p class="text-sm font-semibold text-gray-900">Connect your first session</p>
-          ${ctx.hasConnectedSession ? statusBadge("Connected", true) : statusBadge("Waiting", false)}
-        </div>
+        <p class="text-sm font-semibold text-gray-900">Connect your first session</p>
         <p class="text-sm text-gray-500 mt-1">${ctx.hasConnectedSession
           ? "You've connected a session. You're ready to collaborate."
           : "Inside your AI agent (Claude Code, Cursor, etc.), run:"}</p>
@@ -264,6 +294,20 @@ function renderProjectCard(project: ProjectFixture): string {
     </div>`;
 }
 
+// --- Auto-refresh script ---
+
+function autoRefreshScript(token: string): string {
+  return `
+    <script>
+    (function() {
+      const evtSource = new EventSource('/api/dashboard-events?token=${token}');
+      evtSource.onmessage = function(e) {
+        if (e.data === 'refresh') window.location.reload();
+      };
+    })();
+    </script>`;
+}
+
 // --- Setup view (zero state) ---
 // Same three sections, but each shows its setup prompt instead of live data.
 
@@ -284,7 +328,8 @@ export function renderSetupView(ctx: ViewContext, devices: DeviceFixture[] = [])
       ${renderFloorSection(ctx, false, stepState("floor"))}
       ${renderDevicesSection(ctx, ctx.cliInstalled ? devices : [], stepState("devices"))}
       ${renderProjectsSessionsSection(ctx, [], [], stepState("sessions"))}
-    </div>`;
+    </div>
+    ${autoRefreshScript(ctx.token)}`;
 }
 
 // --- Error view ---
@@ -313,7 +358,8 @@ export function renderActiveView(ctx: ViewContext, sessions: SessionFixture[], p
       ${renderFloorSection(ctx, true)}
       ${renderDevicesSection(ctx, devices)}
       ${renderProjectsSessionsSection(ctx, sessions, projects)}
-    </div>`;
+    </div>
+    ${autoRefreshScript(ctx.token)}`;
 }
 
 // --- Profile view ---

package/tests/client.test.ts

@@ -3,7 +3,7 @@ import { startServer } from "../src/service/server";
 import { startDaemon } from "../src/daemon/daemon";
 import type { Sql } from "../src/service/db";
 
-const DATABASE_URL = process.env.DATABASE_URL ?? "postgres://polaris:polaris@localhost:5432/polaris";
+const DATABASE_URL = process.env.DATABASE_URL ?? "postgres://polaris:polaris@localhost:5432/polaris_test";
 
 let serviceUrl: string;
 let daemonUrl: string;
@@ -34,7 +34,7 @@ beforeEach(async () => {
   await sql`DROP TABLE IF EXISTS projects`;
   await sql`DROP TABLE IF EXISTS users`;
   await sql`DROP TABLE IF EXISTS orgs`;
-  await sql`CREATE TABLE IF NOT EXISTS orgs (id TEXT PRIMARY KEY, name TEXT NOT NULL, domain TEXT, slack_team_id TEXT, slack_bot_token TEXT, slack_system_channel_id TEXT, created_at TIMESTAMPTZ NOT NULL DEFAULT now())`;
+  await sql`CREATE TABLE IF NOT EXISTS orgs (id TEXT PRIMARY KEY, name TEXT NOT NULL, slug TEXT UNIQUE, domain TEXT, slack_team_id TEXT, slack_bot_token TEXT, slack_system_channel_id TEXT, created_at TIMESTAMPTZ NOT NULL DEFAULT now())`;
   await sql`CREATE TABLE IF NOT EXISTS users (id TEXT PRIMARY KEY, email TEXT NOT NULL UNIQUE, name TEXT NOT NULL, org_id TEXT NOT NULL REFERENCES orgs(id), participant_id TEXT NOT NULL, created_at TIMESTAMPTZ NOT NULL DEFAULT now())`;
   await sql`CREATE TABLE IF NOT EXISTS projects (name TEXT NOT NULL, org_id TEXT NOT NULL REFERENCES orgs(id), created_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (org_id, name))`;
   await sql`CREATE TABLE IF NOT EXISTS sessions (name TEXT NOT NULL, project TEXT NOT NULL, org_id TEXT NOT NULL, driver TEXT, created_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (org_id, project, name), FOREIGN KEY (org_id, project) REFERENCES projects(org_id, name))`;

package/tests/daemon.test.ts

@@ -3,7 +3,7 @@ import { startDaemon } from "../src/daemon/daemon";
 import { startServer } from "../src/service/server";
 import type { Sql } from "../src/service/db";
 
-const DATABASE_URL = process.env.DATABASE_URL ?? "postgres://polaris:polaris@localhost:5432/polaris";
+const DATABASE_URL = process.env.DATABASE_URL ?? "postgres://polaris:polaris@localhost:5432/polaris_test";
 
 let daemonUrl: string;
 let serviceUrl: string;
@@ -36,7 +36,7 @@ beforeEach(async () => {
   await sql`DROP TABLE IF EXISTS projects`;
   await sql`DROP TABLE IF EXISTS users`;
   await sql`DROP TABLE IF EXISTS orgs`;
-  await sql`CREATE TABLE IF NOT EXISTS orgs (id TEXT PRIMARY KEY, name TEXT NOT NULL, domain TEXT, slack_team_id TEXT, slack_bot_token TEXT, slack_system_channel_id TEXT, created_at TIMESTAMPTZ NOT NULL DEFAULT now())`;
+  await sql`CREATE TABLE IF NOT EXISTS orgs (id TEXT PRIMARY KEY, name TEXT NOT NULL, slug TEXT UNIQUE, domain TEXT, slack_team_id TEXT, slack_bot_token TEXT, slack_system_channel_id TEXT, created_at TIMESTAMPTZ NOT NULL DEFAULT now())`;
   await sql`CREATE TABLE IF NOT EXISTS users (id TEXT PRIMARY KEY, email TEXT NOT NULL UNIQUE, name TEXT NOT NULL, org_id TEXT NOT NULL REFERENCES orgs(id), participant_id TEXT NOT NULL, created_at TIMESTAMPTZ NOT NULL DEFAULT now())`;
   await sql`CREATE TABLE IF NOT EXISTS projects (name TEXT NOT NULL, org_id TEXT NOT NULL REFERENCES orgs(id), created_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (org_id, name))`;
   await sql`CREATE TABLE IF NOT EXISTS sessions (name TEXT NOT NULL, project TEXT NOT NULL, org_id TEXT NOT NULL, driver TEXT, created_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (org_id, project, name), FOREIGN KEY (org_id, project) REFERENCES projects(org_id, name))`;

package/tests/db.test.ts

@@ -23,7 +23,7 @@ import {
 } from "../src/service/db";
 import type { PolarisEvent } from "../src/types";
 
-const DATABASE_URL = process.env.DATABASE_URL ?? "postgres://polaris:polaris@localhost:5432/polaris";
+const DATABASE_URL = process.env.DATABASE_URL ?? "postgres://polaris:polaris@localhost:5432/polaris_test";
 
 let sql: Sql;
 

package/tests/e2e.test.ts

@@ -3,7 +3,7 @@ import { startServer } from "../src/service/server";
 import { startDaemon } from "../src/daemon/daemon";
 import type { Sql } from "../src/service/db";
 
-const DATABASE_URL = process.env.DATABASE_URL ?? "postgres://polaris:polaris@localhost:5432/polaris";
+const DATABASE_URL = process.env.DATABASE_URL ?? "postgres://polaris:polaris@localhost:5432/polaris_test";
 
 let serviceUrl: string;
 let daemonUrl: string;
@@ -34,7 +34,7 @@ beforeEach(async () => {
   await sql`DROP TABLE IF EXISTS projects`;
   await sql`DROP TABLE IF EXISTS users`;
   await sql`DROP TABLE IF EXISTS orgs`;
-  await sql`CREATE TABLE IF NOT EXISTS orgs (id TEXT PRIMARY KEY, name TEXT NOT NULL, domain TEXT, slack_team_id TEXT, slack_bot_token TEXT, slack_system_channel_id TEXT, created_at TIMESTAMPTZ NOT NULL DEFAULT now())`;
+  await sql`CREATE TABLE IF NOT EXISTS orgs (id TEXT PRIMARY KEY, name TEXT NOT NULL, slug TEXT UNIQUE, domain TEXT, slack_team_id TEXT, slack_bot_token TEXT, slack_system_channel_id TEXT, created_at TIMESTAMPTZ NOT NULL DEFAULT now())`;
   await sql`CREATE TABLE IF NOT EXISTS users (id TEXT PRIMARY KEY, email TEXT NOT NULL UNIQUE, name TEXT NOT NULL, org_id TEXT NOT NULL REFERENCES orgs(id), participant_id TEXT NOT NULL, created_at TIMESTAMPTZ NOT NULL DEFAULT now())`;
   await sql`CREATE TABLE IF NOT EXISTS projects (name TEXT NOT NULL, org_id TEXT NOT NULL REFERENCES orgs(id), created_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (org_id, name))`;
   await sql`CREATE TABLE IF NOT EXISTS sessions (name TEXT NOT NULL, project TEXT NOT NULL, org_id TEXT NOT NULL, driver TEXT, created_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (org_id, project, name), FOREIGN KEY (org_id, project) REFERENCES projects(org_id, name))`;

package/tests/service.test.ts

@@ -3,7 +3,7 @@ import { startServer } from "../src/service/server";
 import type { Sql } from "../src/service/db";
 import type { Server } from "bun";
 
-const DATABASE_URL = process.env.DATABASE_URL ?? "postgres://polaris:polaris@localhost:5432/polaris";
+const DATABASE_URL = process.env.DATABASE_URL ?? "postgres://polaris:polaris@localhost:5432/polaris_test";
 
 let base: string;
 let sql: Sql;
@@ -26,7 +26,7 @@ beforeEach(async () => {
   await sql`DROP TABLE IF EXISTS projects`;
   await sql`DROP TABLE IF EXISTS users`;
   await sql`DROP TABLE IF EXISTS orgs`;
-  await sql`CREATE TABLE IF NOT EXISTS orgs (id TEXT PRIMARY KEY, name TEXT NOT NULL, domain TEXT, slack_team_id TEXT, slack_bot_token TEXT, slack_system_channel_id TEXT, created_at TIMESTAMPTZ NOT NULL DEFAULT now())`;
+  await sql`CREATE TABLE IF NOT EXISTS orgs (id TEXT PRIMARY KEY, name TEXT NOT NULL, slug TEXT UNIQUE, domain TEXT, slack_team_id TEXT, slack_bot_token TEXT, slack_system_channel_id TEXT, created_at TIMESTAMPTZ NOT NULL DEFAULT now())`;
   await sql`CREATE TABLE IF NOT EXISTS users (id TEXT PRIMARY KEY, email TEXT NOT NULL UNIQUE, name TEXT NOT NULL, org_id TEXT NOT NULL REFERENCES orgs(id), participant_id TEXT NOT NULL, created_at TIMESTAMPTZ NOT NULL DEFAULT now())`;
   await sql`CREATE TABLE IF NOT EXISTS projects (name TEXT NOT NULL, org_id TEXT NOT NULL REFERENCES orgs(id), created_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (org_id, name))`;
   await sql`CREATE TABLE IF NOT EXISTS sessions (name TEXT NOT NULL, project TEXT NOT NULL, org_id TEXT NOT NULL, driver TEXT, created_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (org_id, project, name), FOREIGN KEY (org_id, project) REFERENCES projects(org_id, name))`;

package/tests/web.test.ts

@@ -13,12 +13,12 @@ import { createApp } from "../src/web/app";
 import { createDb, createOrg, createUser, type Sql } from "../src/service/db";
 import { createToken } from "../src/service/auth";
 
-const DATABASE_URL = process.env.DATABASE_URL ?? "postgres://polaris:polaris@localhost:5432/polaris";
+const DATABASE_URL = process.env.DATABASE_URL ?? "postgres://polaris:polaris@localhost:5432/polaris_test";
 
 // --- View context helpers ---
 
-const base = { token: "test-token", userName: "Manu Bansal", orgName: "Lightup", email: "manu@lightup.ai" };
-const fresh = { ...base, slackConnected: false, cliInstalled: false, hasConnectedSession: false };
+const base = { token: "test-token", userName: "Manu Bansal", orgName: "Lightup", orgSlug: "lightup-data" as string | null, email: "manu@lightup.ai" };
+const fresh = { ...base, orgSlug: null, slackConnected: false, cliInstalled: false, hasConnectedSession: false };
 const slackDone = { ...base, slackConnected: true, cliInstalled: false, hasConnectedSession: false };
 const cliDone = { ...base, slackConnected: true, cliInstalled: true, hasConnectedSession: false };
 const allDone = { ...base, slackConnected: true, cliInstalled: true, hasConnectedSession: true };
@@ -35,7 +35,7 @@ describe("renderSetupView", () => {
     // Connect Slack button is present
     expect(html).toContain("Connect Slack");
     // Install CLI command is present
-    expect(html).toContain("npx @lightup/polaris login");
+    expect(html).toContain("npx @lightupai/polaris login");
     // Connect session command is present
     expect(html).toContain("/polaris join my-project my-session");
   });
@@ -52,15 +52,14 @@ describe("renderSetupView", () => {
     const highlightIdx = html.indexOf("border-polaris-300");
     expect(highlightIdx).toBeGreaterThan(devicesIdx);
     // Install CLI command present
-    expect(html).toContain("npx @lightup/polaris login");
+    expect(html).toContain("npx @lightupai/polaris login");
   });
 
   test("cli done: floor and devices done, sessions is highlighted", () => {
     const html = renderSetupView(cliDone, mockDevices);
-    // Device list is shown (not install prompt)
+    // Device list is shown with "add another" tray
     expect(html).toContain("Manu's MacBook Pro");
-    // No install CLI command
-    expect(html).not.toContain("npx @lightup/polaris login");
+    expect(html).toContain("Add another device");
     // Session section has highlight
     const sessIdx = html.indexOf("Projects & Sessions");
     const lastHighlight = html.lastIndexOf("border-polaris-300");
@@ -119,9 +118,9 @@ describe("renderActiveView", () => {
     const html = renderActiveView(allDone, mockActiveSessions, mockProjects, mockDevices);
     expect(html).toContain("Manu's MacBook Pro");
     expect(html).toContain("Manu's iMac");
-    expect(html).toContain("Active now");
+    expect(html).toContain("Online");
     expect(html).toContain("polaris/auth");
-    expect(html).toContain("Last seen");
+    expect(html).toContain("Offline");
   });
 
   test("hides devices section when no devices", () => {
@@ -269,7 +268,7 @@ describe("routes", () => {
     await sql`DROP TABLE IF EXISTS projects`;
     await sql`DROP TABLE IF EXISTS users`;
     await sql`DROP TABLE IF EXISTS orgs`;
-    await sql`CREATE TABLE IF NOT EXISTS orgs (id TEXT PRIMARY KEY, name TEXT NOT NULL, domain TEXT, slack_team_id TEXT, slack_bot_token TEXT, slack_system_channel_id TEXT, created_at TIMESTAMPTZ NOT NULL DEFAULT now())`;
+    await sql`CREATE TABLE IF NOT EXISTS orgs (id TEXT PRIMARY KEY, name TEXT NOT NULL, slug TEXT UNIQUE, domain TEXT, slack_team_id TEXT, slack_bot_token TEXT, slack_system_channel_id TEXT, created_at TIMESTAMPTZ NOT NULL DEFAULT now())`;
     await sql`CREATE TABLE IF NOT EXISTS users (id TEXT PRIMARY KEY, email TEXT NOT NULL UNIQUE, name TEXT NOT NULL, org_id TEXT NOT NULL REFERENCES orgs(id), participant_id TEXT NOT NULL, created_at TIMESTAMPTZ NOT NULL DEFAULT now())`;
     await sql`CREATE TABLE IF NOT EXISTS projects (name TEXT NOT NULL, org_id TEXT NOT NULL REFERENCES orgs(id), created_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (org_id, name))`;
     await sql`CREATE TABLE IF NOT EXISTS sessions (name TEXT NOT NULL, project TEXT NOT NULL, org_id TEXT NOT NULL, driver TEXT, created_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (org_id, project, name), FOREIGN KEY (org_id, project) REFERENCES projects(org_id, name))`;