Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
Extract project favicon route and tighten turn-settled logic
Julius Marmingeffbf541ff88c
diff --git a/apps/server/src/projectFaviconRoute.test.ts b/apps/server/src/projectFaviconRoute.test.tsnew file mode 100644index 000000000..b0f0273cf--- /dev/null+++ b/apps/server/src/projectFaviconRoute.test.ts@@ -0,0 +1,118 @@+import fs from "node:fs";+import http from "node:http";+import os from "node:os";+import path from "node:path";++import { afterEach, describe, expect, it } from "vitest";+import { tryHandleProjectFaviconRequest } from "./projectFaviconRoute";++interface HttpResponse {+ statusCode: number;+ contentType: string | null;+ body: string;+}++const tempDirs: string[] = [];++function makeTempDir(prefix: string): string {+ const dir = fs.mkdtempSync(path.join(os.tmpdir(), prefix));+ tempDirs.push(dir);+ return dir;+}++async function withRouteServer(+ run: (baseUrl: string) => Promise<void>,+): Promise<void> {+ const server = http.createServer((req, res) => {+ const url = new URL(req.url ?? "/", "http://127.0.0.1");+ if (tryHandleProjectFaviconRequest(url, res)) {+ return;+ }+ res.writeHead(404, { "Content-Type": "text/plain" });+ res.end("Not Found");+ });++ await new Promise<void>((resolve, reject) => {+ server.listen(0, "127.0.0.1", (error?: Error) => {+ if (error) {+ reject(error);+ return;+ }+ resolve();+ });+ });++ const address = server.address();+ if (typeof address !== "object" || address === null) {+ throw new Error("Expected server address to be an object");+ }+ const baseUrl = `http://127.0.0.1:${address.port}`;++ try {+ await run(baseUrl);+ } finally {+ await new Promise<void>((resolve, reject) => {+ server.close((error?: Error) => {+ if (error) {+ reject(error);+ return;+ }+ resolve();+ });+ });+ }+}++async function request(baseUrl: string, pathname: string): Promise<HttpResponse> {+ const response = await fetch(`${baseUrl}${pathname}`);+ return {+ statusCode: response.status,+ contentType: response.headers.get("content-type"),+ body: await response.text(),+ };+}++describe("tryHandleProjectFaviconRequest", () => {+ afterEach(() => {+ for (const dir of tempDirs.splice(0, tempDirs.length)) {+ fs.rmSync(dir, { recursive: true, force: true });+ }+ });++ it("returns 400 when cwd is missing", async () => {+ await withRouteServer(async (baseUrl) => {+ const response = await request(baseUrl, "/api/project-favicon");+ expect(response.statusCode).toBe(400);+ expect(response.body).toBe("Missing cwd parameter");+ });+ });++ it("serves a well-known favicon file from the project root", async () => {+ const projectDir = makeTempDir("t3code-favicon-route-root-");+ fs.writeFileSync(path.join(projectDir, "favicon.svg"), "<svg>favicon</svg>", "utf8");++ await withRouteServer(async (baseUrl) => {+ const pathname = `/api/project-favicon?cwd=${encodeURIComponent(projectDir)}`;+ const response = await request(baseUrl, pathname);+ expect(response.statusCode).toBe(200);+ expect(response.contentType).toContain("image/svg+xml");+ expect(response.body).toBe("<svg>favicon</svg>");+ });+ });++ it("resolves icon href from source files when no well-known favicon exists", async () => {+ const projectDir = makeTempDir("t3code-favicon-route-source-");+ const iconPath = path.join(projectDir, "public", "brand", "logo.svg");+ fs.mkdirSync(path.dirname(iconPath), { recursive: true });+ fs.writeFileSync(path.join(projectDir, "index.html"), '<link rel="icon" href="/brand/logo.svg">');+ fs.writeFileSync(iconPath, "<svg>brand</svg>", "utf8");++ await withRouteServer(async (baseUrl) => {+ const pathname = `/api/project-favicon?cwd=${encodeURIComponent(projectDir)}`;+ const response = await request(baseUrl, pathname);+ expect(response.statusCode).toBe(200);+ expect(response.contentType).toContain("image/svg+xml");+ expect(response.body).toBe("<svg>brand</svg>");+ });+ });+});diff --git a/apps/server/src/projectFaviconRoute.ts b/apps/server/src/projectFaviconRoute.tsnew file mode 100644index 000000000..2db12fdeb--- /dev/null+++ b/apps/server/src/projectFaviconRoute.ts@@ -0,0 +1,160 @@+import fs from "node:fs";+import http from "node:http";+import path from "node:path";++const FAVICON_MIME_TYPES: Record<string, string> = {+ ".png": "image/png",+ ".jpg": "image/jpeg",+ ".svg": "image/svg+xml",+ ".ico": "image/x-icon",+};++// Well-known favicon paths checked in order.+const FAVICON_CANDIDATES = [+ "favicon.svg",+ "favicon.ico",+ "favicon.png",+ "public/favicon.svg",+ "public/favicon.ico",+ "public/favicon.png",+ "app/favicon.ico",+ "app/favicon.png",+ "app/icon.svg",+ "app/icon.png",+ "app/icon.ico",+ "src/favicon.ico",+ "src/favicon.svg",+ "src/app/favicon.ico",+ "src/app/icon.svg",+ "src/app/icon.png",+];++// Files that may contain a <link rel="icon"> or icon metadata declaration.+const ICON_SOURCE_FILES = [+ "index.html",+ "public/index.html",+ "app/routes/__root.tsx",+ "src/routes/__root.tsx",+ "app/root.tsx",+ "src/root.tsx",+ "src/index.html",+];++// Matches <link rel="icon" href="..."> or { rel: "icon", href: "..." } patterns.+const LINK_ICON_HTML_RE = /<link[^>]*rel=["'](?:icon|shortcut icon)["'][^>]*href=["']([^"'?]+)/i;+const LINK_ICON_OBJ_RE = /rel:\s*["'](?:icon|shortcut icon)["'][^}]*href:\s*["']([^"'?]+)/i;++function extractIconHref(source: string): string | null {+ const htmlMatch = source.match(LINK_ICON_HTML_RE);+ if (htmlMatch?.[1]) return htmlMatch[1];+ const objMatch = source.match(LINK_ICON_OBJ_RE);+ if (objMatch?.[1]) return objMatch[1];+ return null;+}++function resolveIconHref(projectCwd: string, href: string): string[] {+ const clean = href.replace(/^\//, "");+ return [path.join(projectCwd, "public", clean), path.join(projectCwd, clean)];+}++function isPathWithinProject(projectCwd: string, candidatePath: string): boolean {+ const relative = path.relative(path.resolve(projectCwd), path.resolve(candidatePath));+ return relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative));+}++function serveFaviconFile(filePath: string, res: http.ServerResponse): void {+ const ext = path.extname(filePath).toLowerCase();+ const contentType = FAVICON_MIME_TYPES[ext] ?? "application/octet-stream";+ fs.readFile(filePath, (readErr, data) => {+ if (readErr) {+ res.writeHead(500, { "Content-Type": "text/plain" });+ res.end("Read error");+ return;+ }+ res.writeHead(200, {+ "Content-Type": contentType,+ "Cache-Control": "public, max-age=3600",+ });+ res.end(data);+ });+}++export function tryHandleProjectFaviconRequest(url: URL, res: http.ServerResponse): boolean {+ if (url.pathname !== "/api/project-favicon") {+ return false;+ }++ const projectCwd = url.searchParams.get("cwd");+ if (!projectCwd) {+ res.writeHead(400, { "Content-Type": "text/plain" });+ res.end("Missing cwd parameter");+ return true;+ }++ const tryResolvedPaths = (+ paths: string[],+ index: number,+ onExhausted: () => void,+ ): void => {+ if (index >= paths.length) {+ onExhausted();+ return;+ }+ const candidate = paths[index]!;+ if (!isPathWithinProject(projectCwd, candidate)) {+ tryResolvedPaths(paths, index + 1, onExhausted);+ return;+ }+ fs.stat(candidate, (err, stats) => {+ if (err || !stats?.isFile()) {+ tryResolvedPaths(paths, index + 1, onExhausted);+ return;+ }+ serveFaviconFile(candidate, res);+ });+ };++ const trySourceFiles = (index: number): void => {+ if (index >= ICON_SOURCE_FILES.length) {+ res.writeHead(404, { "Content-Type": "text/plain" });+ res.end("No favicon found");+ return;+ }+ const sourceFile = path.join(projectCwd, ICON_SOURCE_FILES[index]!);+ fs.readFile(sourceFile, "utf8", (err, content) => {+ if (err) {+ trySourceFiles(index + 1);+ return;+ }+ const href = extractIconHref(content);+ if (!href) {+ trySourceFiles(index + 1);+ return;+ }+ const candidates = resolveIconHref(projectCwd, href);+ tryResolvedPaths(candidates, 0, () => trySourceFiles(index + 1));+ });+ };++ const tryCandidates = (index: number): void => {+ if (index >= FAVICON_CANDIDATES.length) {+ trySourceFiles(0);+ return;+ }+ const candidate = path.join(projectCwd, FAVICON_CANDIDATES[index]!);+ if (!isPathWithinProject(projectCwd, candidate)) {+ tryCandidates(index + 1);+ return;+ }+ fs.stat(candidate, (err, stats) => {+ if (err || !stats?.isFile()) {+ tryCandidates(index + 1);+ return;+ }+ serveFaviconFile(candidate, res);+ });+ };++ tryCandidates(0);+ return true;+}diff --git a/apps/server/src/wsServer.ts b/apps/server/src/wsServer.tsindex 9918627e9..ceb370ab6 100644--- a/apps/server/src/wsServer.ts+++ b/apps/server/src/wsServer.ts@@ -42,6 +42,7 @@ import { clamp } from "effect/Number";import { Open } from "./open";import { ServerConfig } from "./config";import { GitCore } from "./git/Services/GitCore.ts";+import { tryHandleProjectFaviconRequest } from "./projectFaviconRoute";const MIME_TYPES: Record<string, string> = {".html": "text/html; charset=utf-8",@@ -230,163 +231,11 @@ export const createServer = Effect.fn(function* (): Effect.fn.Return<});});- // Well-known favicon paths checked in order.- const FAVICON_CANDIDATES = [- "favicon.svg",- "favicon.ico",- "favicon.png",- "public/favicon.svg",- "public/favicon.ico",- "public/favicon.png",- "app/favicon.ico",- "app/favicon.png",- "app/icon.svg",- "app/icon.png",- "app/icon.ico",- "src/favicon.ico",- "src/favicon.svg",- "src/app/favicon.ico",- "src/app/icon.svg",- "src/app/icon.png",- ];-- // Files that may contain a <link rel="icon"> or icon metadata declaration.- const ICON_SOURCE_FILES = [- "index.html",- "public/index.html",- "app/routes/__root.tsx",- "src/routes/__root.tsx",- "app/root.tsx",- "src/root.tsx",- "src/index.html",- ];-- // Extract icon href from HTML/TSX source content.- // Matches <link rel="icon" href="…"> or { rel: "icon", href: "…" } patterns.- const LINK_ICON_HTML_RE = /<link[^>]*rel=["'](?:icon|shortcut icon)["'][^>]*href=["']([^"'?]+)/i;- const LINK_ICON_OBJ_RE = /rel:\s*["'](?:icon|shortcut icon)["'][^}]*href:\s*["']([^"'?]+)/i;- function extractIconHref(source: string): string | null {- const htmlMatch = source.match(LINK_ICON_HTML_RE);- if (htmlMatch?.[1]) return htmlMatch[1];- const objMatch = source.match(LINK_ICON_OBJ_RE);- if (objMatch?.[1]) return objMatch[1];- return null;- }-- /**- * Resolve an icon href (e.g. "/grass-logo.svg") to a file on disk.- * For href starting with "/" we look in public/ first, then project root.- */- function resolveIconHref(projectCwd: string, href: string): string[] {- const clean = href.replace(/^\//, "");- return [- path.join(projectCwd, "public", clean),- path.join(projectCwd, clean),- ];- }-- function serveFaviconFile(- filePath: string,- res: http.ServerResponse,- ): void {- const ext = path.extname(filePath);- const contentType = MIME_TYPES[ext] ?? "application/octet-stream";- fs.readFile(filePath, (readErr, data) => {- if (readErr) {- res.writeHead(500, { "Content-Type": "text/plain" });- res.end("Read error");- return;- }- res.writeHead(200, {- "Content-Type": contentType,- "Cache-Control": "public, max-age=3600",- });- res.end(data);- });- }-// HTTP server — serves static files or redirects to Vite dev serverconst httpServer = http.createServer((req, res) => {const url = new URL(req.url ?? "/", `http://localhost:${port}`);- // Serve project favicons from their working directories.- // Handled before the dev redirect so it works in both modes.- if (url.pathname === "/api/project-favicon") {- const projectCwd = url.searchParams.get("cwd");- if (!projectCwd) {- res.writeHead(400, { "Content-Type": "text/plain" });- res.end("Missing cwd parameter");- return;- }-- // Phase 1: Check well-known favicon paths.- const tryCandidates = (index: number) => {- if (index >= FAVICON_CANDIDATES.length) {- // Phase 2: Parse source files for icon link declarations.- trySourceFiles(0);- return;- }- const candidate = path.join(projectCwd, FAVICON_CANDIDATES[index]!);- if (!candidate.startsWith(projectCwd + path.sep)) {- tryCandidates(index + 1);- return;- }- fs.stat(candidate, (err, stats) => {- if (err || !stats?.isFile()) {- tryCandidates(index + 1);- return;- }- serveFaviconFile(candidate, res);- });- };-- // Phase 2: Read source/HTML files and extract icon href references.- const trySourceFiles = (index: number) => {- if (index >= ICON_SOURCE_FILES.length) {- res.writeHead(404, { "Content-Type": "text/plain" });- res.end("No favicon found");- return;- }- const sourceFile = path.join(projectCwd, ICON_SOURCE_FILES[index]!);- fs.readFile(sourceFile, "utf8", (err, content) => {- if (err) {- trySourceFiles(index + 1);- return;- }- const href = extractIconHref(content);- if (!href) {- trySourceFiles(index + 1);- return;- }- const candidates = resolveIconHref(projectCwd, href);- tryResolvedPaths(candidates, 0, () => trySourceFiles(index + 1));- });- };-- const tryResolvedPaths = (- paths: string[],- index: number,- onExhausted: () => void,- ) => {- if (index >= paths.length) {- onExhausted();- return;- }- const candidate = paths[index]!;- if (!candidate.startsWith(projectCwd + path.sep)) {- tryResolvedPaths(paths, index + 1, onExhausted);- return;- }- fs.stat(candidate, (err, stats) => {- if (err || !stats?.isFile()) {- tryResolvedPaths(paths, index + 1, onExhausted);- return;- }- serveFaviconFile(candidate, res);- });- };-- tryCandidates(0);+ if (tryHandleProjectFaviconRequest(url, res)) {return;}diff --git a/apps/web/src/session-logic.test.ts b/apps/web/src/session-logic.test.tsindex dc74adc67..26ff6221a 100644--- a/apps/web/src/session-logic.test.ts+++ b/apps/web/src/session-logic.test.ts@@ -169,6 +169,15 @@ describe("isLatestTurnSettled", () => {).toBe(false);});+ it("returns false while any turn is running to avoid stale latest-turn banners", () => {+ expect(+ isLatestTurnSettled(latestTurn, {+ orchestrationStatus: "running",+ activeTurnId: TurnId.makeUnsafe("turn-2"),+ }),+ ).toBe(false);+ });+it("returns true once the session is no longer running that turn", () => {expect(isLatestTurnSettled(latestTurn, {diff --git a/apps/web/src/session-logic.ts b/apps/web/src/session-logic.tsindex 27d75ef6d..a44c12e79 100644--- a/apps/web/src/session-logic.ts+++ b/apps/web/src/session-logic.ts@@ -83,9 +83,8 @@ export function isLatestTurnSettled(if (!latestTurn?.startedAt) return false;if (!latestTurn.completedAt) return false;if (!session) return true;- return !(- session.orchestrationStatus === "running" && session.activeTurnId === latestTurn.turnId- );+ if (session.orchestrationStatus === "running") return false;+ return true;}export function derivePendingApprovals(