@epiphytic/claudecodeui 1.1.0 → 1.2.1

package/server/index.js

@@ -379,6 +379,70 @@ const wss = new WebSocketServer({
 app.locals.wss = wss;
 
 app.use(cors());
+
+// Request/Response logging middleware for debugging
+app.use((req, res, next) => {
+  const startTime = Date.now();
+  const originalSend = res.send;
+  const originalJson = res.json;
+
+  // Capture response for logging
+  res.send = function (body) {
+    const duration = Date.now() - startTime;
+    const statusCode = res.statusCode;
+
+    // Log 4xx errors with headers
+    if (statusCode >= 400 && statusCode < 500) {
+      console.log(
+        `[HTTP ${statusCode}] ${req.method} ${req.originalUrl} (${duration}ms)`,
+      );
+      console.log(`  Request Headers:`, JSON.stringify(req.headers, null, 2));
+      console.log(
+        `  Response:`,
+        typeof body === "string" ? body.slice(0, 500) : body,
+      );
+    }
+    // Log 5xx errors with full details
+    else if (statusCode >= 500) {
+      console.error(
+        `[HTTP ${statusCode}] ${req.method} ${req.originalUrl} (${duration}ms)`,
+      );
+      console.error(`  Request Headers:`, JSON.stringify(req.headers, null, 2));
+      console.error(`  Request Body:`, req.body);
+      console.error(`  Response:`, body);
+    }
+
+    return originalSend.call(this, body);
+  };
+
+  res.json = function (body) {
+    const duration = Date.now() - startTime;
+    const statusCode = res.statusCode;
+
+    // Log 4xx errors with headers
+    if (statusCode >= 400 && statusCode < 500) {
+      console.log(
+        `[HTTP ${statusCode}] ${req.method} ${req.originalUrl} (${duration}ms)`,
+      );
+      console.log(`  Request Headers:`, JSON.stringify(req.headers, null, 2));
+      console.log(`  Response:`, JSON.stringify(body, null, 2).slice(0, 500));
+    }
+    // Log 5xx errors with full details
+    else if (statusCode >= 500) {
+      console.error(
+        `[HTTP ${statusCode}] ${req.method} ${req.originalUrl} (${duration}ms)`,
+      );
+      console.error(`  Request Headers:`, JSON.stringify(req.headers, null, 2));
+      console.error(`  Request Body:`, req.body);
+      console.error(`  Response:`, JSON.stringify(body, null, 2));
+    }
+
+    return originalJson.call(this, body);
+  };
+
+  next();
+});
+
 app.use(
   express.json({
     limit: "50mb",
@@ -402,6 +466,56 @@ app.get("/health", (req, res) => {
   });
 });
 
+// Explicit route for manifest.json (PWA manifest)
+app.get("/manifest.json", (req, res) => {
+  const manifestPath = path.join(__dirname, "../public/manifest.json");
+  const distManifestPath = path.join(__dirname, "../dist/manifest.json");
+
+  console.log("[manifest.json] Request received");
+  console.log("[manifest.json] __dirname:", __dirname);
+  console.log("[manifest.json] Checking paths:");
+  console.log(
+    "  - public:",
+    manifestPath,
+    "exists:",
+    fs.existsSync(manifestPath),
+  );
+  console.log(
+    "  - dist:",
+    distManifestPath,
+    "exists:",
+    fs.existsSync(distManifestPath),
+  );
+
+  // Try public first, then dist
+  if (fs.existsSync(manifestPath)) {
+    console.log("[manifest.json] Serving from public");
+    res.setHeader("Content-Type", "application/manifest+json");
+    res.setHeader("Cache-Control", "public, max-age=3600, must-revalidate");
+    res.sendFile(manifestPath, (err) => {
+      if (err) {
+        console.error("[manifest.json] sendFile error:", err);
+        res.status(500).json({ error: "Failed to send manifest.json" });
+      }
+    });
+  } else if (fs.existsSync(distManifestPath)) {
+    console.log("[manifest.json] Serving from dist");
+    res.setHeader("Content-Type", "application/manifest+json");
+    res.setHeader("Cache-Control", "public, max-age=3600, must-revalidate");
+    res.sendFile(distManifestPath, (err) => {
+      if (err) {
+        console.error("[manifest.json] sendFile error:", err);
+        res.status(500).json({ error: "Failed to send manifest.json" });
+      }
+    });
+  } else {
+    console.error("[ERROR] manifest.json not found in public or dist");
+    console.error("  Checked:", manifestPath);
+    console.error("  Checked:", distManifestPath);
+    res.status(404).json({ error: "manifest.json not found" });
+  }
+});
+
 // Optional API key validation (if configured)
 app.use("/api", validateApiKey);
 
@@ -447,7 +561,7 @@ app.use("/api/sessions", authenticateToken, sessionsRoutes);
 // Agent API Routes (uses API key authentication)
 app.use("/api/agent", agentRoutes);
 
-// Serve public files (like api-docs.html, icons)
+// Serve public files (like api-docs.html, icons, manifest.json)
 // Enable ETag generation for conditional requests (304 support)
 app.use(
   express.static(path.join(__dirname, "../public"), {
@@ -461,6 +575,9 @@ app.use(
           "Cache-Control",
           "public, max-age=604800, must-revalidate",
         );
+      } else if (filePath.endsWith(".json")) {
+        // JSON files (like manifest.json) - short cache with revalidation
+        res.setHeader("Cache-Control", "public, max-age=3600, must-revalidate");
       } else if (filePath.endsWith(".html")) {
         // HTML files should not be cached
         res.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
@@ -483,6 +600,9 @@ app.use(
         res.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
         res.setHeader("Pragma", "no-cache");
         res.setHeader("Expires", "0");
+      } else if (filePath.endsWith(".json")) {
+        // JSON files (like manifest.json) - short cache with revalidation
+        res.setHeader("Cache-Control", "public, max-age=3600, must-revalidate");
       } else if (
         filePath.match(/\.(js|css|woff2?|ttf|eot|svg|png|jpg|jpeg|gif|ico)$/)
       ) {
@@ -589,7 +709,7 @@ app.get(
   },
 );
 
-// Get messages for a specific session
+// Get messages for a specific session with ETag caching support
 app.get(
   "/api/projects/:projectName/sessions/:sessionId/messages",
   authenticateToken,
@@ -609,6 +729,27 @@ app.get(
         parsedOffset,
       );
 
+      // Generate ETag based on message count and last timestamp
+      const messages = Array.isArray(result) ? result : result.messages || [];
+      const total = Array.isArray(result) ? messages.length : result.total || 0;
+      const lastTimestamp =
+        messages.length > 0
+          ? messages[messages.length - 1]?.timestamp || ""
+          : "";
+      const currentETag = `"${sessionId}-${total}-${Buffer.from(lastTimestamp).toString("base64").slice(0, 16)}"`;
+
+      // Check If-None-Match header for conditional request
+      const clientETag = req.headers["if-none-match"];
+      if (clientETag && clientETag === currentETag) {
+        return res.status(304).end();
+      }
+
+      // Set caching headers
+      res.set({
+        "Cache-Control": "private, max-age=5",
+        ETag: currentETag,
+      });
+
       // Handle both old and new response formats
       if (Array.isArray(result)) {
         // Backward compatibility: no pagination parameters were provided
@@ -1126,6 +1267,48 @@ async function handleChatMessage(ws, writer, messageData) {
     const sessionIdForTracking =
       data.options?.sessionId || data.sessionId || `session-${Date.now()}`;
 
+    // Handle proactive external session check (before user submits a prompt)
+    if (data.type === "check-external-session") {
+      const projectPath = data.projectPath;
+      console.log(
+        "[ExternalSessionCheck] Checking for external sessions:",
+        projectPath,
+      );
+      if (projectPath) {
+        const externalCheck = detectExternalClaude(projectPath);
+        console.log("[ExternalSessionCheck] Result:", {
+          hasExternalSession: externalCheck.hasExternalSession,
+          detectionAvailable: externalCheck.detectionAvailable,
+          detectionError: externalCheck.detectionError,
+          processCount: externalCheck.processes.length,
+          tmuxCount: externalCheck.tmuxSessions.length,
+          hasLockFile: externalCheck.lockFile.exists,
+        });
+        writer.send({
+          type: "external-session-check-result",
+          projectPath,
+          hasExternalSession: externalCheck.hasExternalSession,
+          detectionAvailable: externalCheck.detectionAvailable,
+          detectionError: externalCheck.detectionError,
+          details: externalCheck.hasExternalSession
+            ? {
+                processIds: externalCheck.processes.map((p) => p.pid),
+                commands: externalCheck.processes.map((p) => p.command),
+                tmuxSessions: externalCheck.tmuxSessions.map(
+                  (s) => s.sessionName,
+                ),
+                lockFile: externalCheck.lockFile.exists
+                  ? externalCheck.lockFile.lockFile
+                  : null,
+              }
+            : null,
+        });
+      } else {
+        console.log("[ExternalSessionCheck] No projectPath provided");
+      }
+      return;
+    }
+
     if (data.type === "claude-command") {
       console.log("[DEBUG] User message:", data.command || "[Continue/Resume]");
       console.log("📁 Project:", data.options?.projectPath || "Unknown");
@@ -1161,6 +1344,7 @@ async function handleChatMessage(ws, writer, messageData) {
           writer.send({
             type: "external-session-detected",
             projectPath,
+            detectionAvailable: externalCheck.detectionAvailable,
             details: {
               processIds: externalCheck.processes.map((p) => p.pid),
               tmuxSessions: externalCheck.tmuxSessions.map(
@@ -2389,6 +2573,9 @@ app.get(
     try {
       const { projectName, sessionId } = req.params;
       const { provider = "claude" } = req.query;
+      console.log(
+        `[TOKEN-USAGE] Request for project: ${projectName}, session: ${sessionId}, provider: ${provider}`,
+      );
       const homeDir = os.homedir();
 
       // Allow only safe characters in sessionId
@@ -2507,8 +2694,8 @@ app.get(
 
       // Construct the JSONL file path
       // Claude stores session files in ~/.claude/projects/[encoded-project-path]/[session-id].jsonl
-      // The encoding replaces /, spaces, ~, and _ with -
-      const encodedPath = projectPath.replace(/[\\/:\s~_]/g, "-");
+      // The encoding replaces /, spaces, ~, _, and . with -
+      const encodedPath = projectPath.replace(/[\\/:\s~_.]/g, "-");
       const projectDir = path.join(homeDir, ".claude", "projects", encodedPath);
 
       const jsonlPath = path.join(projectDir, `${safeSessionId}.jsonl`);
@@ -2528,9 +2715,22 @@ app.get(
         fileContent = await fsPromises.readFile(jsonlPath, "utf8");
       } catch (error) {
         if (error.code === "ENOENT") {
-          return res
-            .status(404)
-            .json({ error: "Session file not found", path: jsonlPath });
+          // Session file doesn't exist yet (new session with no messages)
+          // Return zero token usage instead of 404
+          const parsedContextWindow = parseInt(process.env.CONTEXT_WINDOW, 10);
+          const contextWindow = Number.isFinite(parsedContextWindow)
+            ? parsedContextWindow
+            : 160000;
+          return res.json({
+            used: 0,
+            total: contextWindow,
+            breakdown: {
+              input: 0,
+              cacheCreation: 0,
+              cacheRead: 0,
+            },
+            newSession: true,
+          });
         }
         throw error; // Re-throw other errors to be caught by outer try-catch
       }
@@ -2589,6 +2789,9 @@ app.get(
 app.get("*", (req, res) => {
   // Skip requests for static assets (files with extensions)
   if (path.extname(req.path)) {
+    console.log(
+      `[404] Static file not found: ${req.path} (not served by express.static)`,
+    );
     return res.status(404).send("Not found");
   }