@lightupai/polaris 0.0.24 → 0.0.26

package/package.json

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

package/src/daemon/daemon.ts

@@ -13,6 +13,7 @@ interface SessionMapping {
   agent: string;
   slackChannel?: string;
   ws: WebSocket | null;
+  pendingMapping?: boolean; // true until a hook event maps the real CC session ID
 }
 
 function generateSessionName(): string {
@@ -232,6 +233,7 @@ export function startDaemon(port = Number(process.env.POLARIS_DAEMON_PORT ?? 432
             user: body.user,
             agent: agentId,
             ws: null,
+            pendingMapping: true, // waiting for hook event to map the real CC session ID
           };
           sessions.set(body.ccSessionId, mapping);
 
@@ -346,43 +348,26 @@ export function startDaemon(port = Number(process.env.POLARIS_DAEMON_PORT ?? 432
           let mapping = sessions.get(ccSessionId);
           if (!mapping || !mapping.project) {
             // CC session_id doesn't match any registered MCP client.
-            // This CC session hasn't been /polaris join'd yet.
-            // Auto-create a new Polaris session in the same project as an existing session.
-            const connectedSessions = Array.from(sessions.values()).filter((m) => m.project);
-            if (connectedSessions.length === 0) {
-              return json({ status: "not_connected" });
-            }
-
-            // Use the first connected session as a template for project/user/agent
-            const template = connectedSessions[0];
-            const newSession = generateSessionName();
-
-            // Create the session on the API
-            const serviceUrl = getServiceUrl();
-            try {
-              const createRes = await fetch(`${serviceUrl}/projects/${template.project}/sessions`, {
-                method: "POST",
-                headers: await authHeaders(),
-                body: JSON.stringify({ name: newSession, driver: template.user }),
-              });
-              if (!createRes.ok && createRes.status !== 409) {
-                return json({ status: "session_create_failed" });
+            // The MCP server uses a different UUID than CC's session_id.
+            // Match to a session with pendingMapping (most recent first).
+            const pending = Array.from(sessions.values()).filter((m) => m.project && m.pendingMapping);
+            if (pending.length > 0) {
+              // Map the CC session ID to the most recently connected pending session
+              mapping = pending[pending.length - 1];
+              mapping.pendingMapping = false;
+              // Register under the real CC session ID for future events
+              sessions.set(ccSessionId, { ...mapping, ccSessionId });
+              console.error(`[daemon] Mapped CC session ${ccSessionId.slice(0, 8)} → ${mapping.project}/${mapping.session}`);
+            } else {
+              // No pending sessions — try single-session fallback
+              const connectedSessions = Array.from(sessions.values()).filter((m) => m.project);
+              if (connectedSessions.length === 1) {
+                mapping = connectedSessions[0];
+                sessions.set(ccSessionId, { ...mapping, ccSessionId });
+              } else {
+                return json({ status: connectedSessions.length > 0 ? "ambiguous" : "not_connected" });
               }
-            } catch {
-              return json({ status: "api_unreachable" });
             }
-
-            mapping = {
-              ccSessionId,
-              project: template.project,
-              session: newSession,
-              user: template.user,
-              agent: template.agent,
-              slackChannel: template.slackChannel,
-              ws: null,
-            };
-            sessions.set(ccSessionId, mapping);
-            console.error(`[daemon] Auto-created session ${template.project}/${newSession} for CC session ${ccSessionId.slice(0, 8)}`);
           }
 
           // Determine sender: human for prompts, agent for everything else