Hold the add-project intent until an environment exists

apps/web/src/components/ChatView.browser.tsx

@@ -1461,21 +1461,24 @@ async function waitForProductionStyles(): Promise<void> {
 
 async function waitForElement<T extends Element>(
   query: () => T | null,
-  errorMessage: string,
+  errorMessage: string | (() => string),
 ): Promise<T> {
+  // Lazy messages read the DOM at failure time, so a timeout reports what
+  // actually rendered instead of only what was expected.
+  const resolveMessage = () => (typeof errorMessage === "string" ? errorMessage : errorMessage());
   let element: T | null = null;
   await vi.waitFor(
     () => {
       element = query();
-      expect(element, errorMessage).toBeTruthy();
+      expect(element, resolveMessage()).toBeTruthy();
     },
     {
       timeout: 8_000,
       interval: 16,
     },
   );
   if (!element) {
-    throw new Error(errorMessage);
+    throw new Error(resolveMessage());
   }
   return element;
 }
@@ -1928,7 +1931,12 @@ async function waitForCommandPaletteShortcutLabel(): Promise<void> {
 async function waitForCommandPaletteInput(placeholder: string): Promise<HTMLInputElement> {
   return waitForElement(
     () => document.querySelector(`input[placeholder="${placeholder}"]`) as HTMLInputElement | null,
-    `Command palette input with placeholder "${placeholder}" did not render.`,
+    () => {
+      const palette = document.querySelector('[data-testid="command-palette"]');
+      const actual = palette?.querySelector("input")?.getAttribute("placeholder") ?? "<no input>";
+      const paletteState = palette ? "open" : "closed";
+      return `Command palette input with placeholder "${placeholder}" did not render (palette ${paletteState}, actual placeholder: "${actual}").`;
+    },
   );
 }
 

apps/web/src/components/CommandPalette.tsx

@@ -842,13 +842,13 @@
       buildProjectActionItems({
         projects,
         valuePrefix: "project",
         icon: (project) => (
           <ProjectFavicon
             environmentId={project.environmentId}
             cwd={project.cwd}
             className={ITEM_ICON_CLASS}
           />
         ),
         runProject: openProjectFromSearch,
       }),
     [openProjectFromSearch, projects],
@@ -859,13 +859,13 @@
       buildProjectActionItems({
         projects,
         valuePrefix: "new-thread-in",
         icon: (project) => (
           <ProjectFavicon
             environmentId={project.environmentId}
             cwd={project.cwd}
             className={ITEM_ICON_CLASS}
           />
         ),
         runProject: async (project) => {
           await startNewThreadInProjectFromContext(
             {
@@ -896,24 +896,24 @@
         ...(activeThreadId ? { activeThreadId } : {}),
         projectTitleById,
         sortOrder: settings.sidebarThreadSortOrder,
         icon: (thread) => {
           const project = projectByScopedKey.get(
             scopedProjectKey(scopeProjectRef(thread.environmentId, thread.projectId)),
           );
           if (!project) {
             return <MessageSquareIcon className={ITEM_ICON_CLASS} />;
           }
           if (project.kind === "general-chat") {
             return <MessagesSquareIcon className={ITEM_ICON_CLASS} />;
           }
           return (
             <ProjectFavicon
               environmentId={project.environmentId}
               cwd={project.cwd}
               className={ITEM_ICON_CLASS}
             />
           );
         },
         renderLeadingContent: (thread) => <ThreadRowLeadingStatus thread={thread} />,
         renderTrailingContent: (thread) => <ThreadRowTrailingStatus thread={thread} />,
         runThread: async (thread) => {
@@ -1312,9 +1312,19 @@
     if (openIntent?.kind !== "add-project") {
       return;
     }
+    // Environments hydrate a beat after the palette can open, and this
+    // intent is one-shot: consuming it against an empty environment list
+    // turned an add-project click during startup into a dead end. Hold the
+    // intent until an environment exists (closing the palette clears it);
+    // this effect re-runs when the options arrive. Hosted-static tabs know
+    // immediately that no local environment is coming, so they proceed
+    // straight to the pairing guidance.
+    if (addProjectEnvironmentOptions.length === 0 && !isHostedStaticApp()) {
+      return;
+    }
     clearOpenIntent();
     openAddProjectFlow();
-  }, [clearOpenIntent, openAddProjectFlow, openIntent]);
+  }, [addProjectEnvironmentOptions.length, clearOpenIntent, openAddProjectFlow, openIntent]);
 
   // Sidebar "Search all N threads" hands off here: a submenu view scoped to
   // one logical project's threads, searchable with the usual palette ranking.