Merge branch 'main' into mux-server-docker-image

Author: kylecarbs

README.md

@@ -33,21 +33,21 @@ Here are some specific use cases we enable:
 
 ## Features
 
-- **Isolated workspaces** with central view on git divergence ([docs](https://cmux.io/runtime.html))
-  - **[Local](https://cmux.io/runtime/local.html)**: run directly in your project directory
-  - **[Worktree](https://cmux.io/runtime/worktree.html)**: git worktrees on your local machine
-  - **[SSH](https://cmux.io/runtime/ssh.html)**: remote execution on a server over SSH
+- **Isolated workspaces** with central view on git divergence ([docs](https://mux.coder.com/runtime.html))
+  - **[Local](https://mux.coder.com/runtime/local.html)**: run directly in your project directory
+  - **[Worktree](https://mux.coder.com/runtime/worktree.html)**: git worktrees on your local machine
+  - **[SSH](https://mux.coder.com/runtime/ssh.html)**: remote execution on a server over SSH
 - **Multi-model** (`sonnet-4-*`, `grok-*`, `gpt-5-*`, `opus-4-*`)
-  - Ollama supported for local LLMs ([docs](https://cmux.io/models.html#ollama-local))
-  - OpenRouter supported for long-tail of LLMs ([docs](https://cmux.io/models.html#openrouter-cloud))
-- **VS Code Extension**: Jump into mux workspaces directly from VS Code ([docs](https://cmux.io/vscode-extension.html))
+  - Ollama supported for local LLMs ([docs](https://mux.coder.com/models.html#ollama-local))
+  - OpenRouter supported for long-tail of LLMs ([docs](https://mux.coder.com/models.html#openrouter-cloud))
+- **VS Code Extension**: Jump into mux workspaces directly from VS Code ([docs](https://mux.coder.com/vscode-extension.html))
 - Supporting UI and keybinds for efficiently managing a suite of agents
 - Rich markdown outputs (mermaid diagrams, LaTeX, etc.)
 
 mux has a custom agent loop but much of the core UX is inspired by Claude Code. You'll find familiar features like Plan/Exec mode, vim inputs, `/compact` and new ones
-like [opportunistic compaction](https://cmux.io/context-management.html) and [mode prompts](https://cmux.io/instruction-files.html#mode-prompts).
+like [opportunistic compaction](https://mux.coder.com/context-management.html) and [mode prompts](https://mux.coder.com/instruction-files.html#mode-prompts).
 
-**[Read the full documentation →](https://cmux.io)**
+**[Read the full documentation →](https://mux.coder.com)**
 
 ## Install
 
@@ -58,7 +58,7 @@ like [opportunistic compaction](https://cmux.io/context-management.html) and [mo
 Download pre-built binaries from [the releases page](https://github.com/coder/mux/releases) for
 macOS and Linux.
 
-[More on installation →](https://cmux.io/install.html)
+[More on installation →](https://mux.coder.com/install.html)
 
 ## Screenshots
 
@@ -99,7 +99,7 @@ macOS and Linux.
 
 ## More reading
 
-See [the documentation](https://cmux.io) for more details.
+See [the documentation](https://mux.coder.com) for more details.
 
 ## Development
 

docs/CNAME

@@ -1 +1 @@
-cmux.io
+mux.coder.com

docs/models.md

@@ -13,7 +13,8 @@ mux supports multiple AI providers through its flexible provider architecture.
 Best supported provider with full feature support:
 
 - `anthropic:claude-sonnet-4-5`
-- `anthropic:claude-opus-4-1`
+- `anthropic:claude-opus-4-5`
+- `anthropic:claude-haiku-4-5`
 
 **Setup:**
 
@@ -40,8 +41,10 @@ Or set environment variables:
 
 GPT-5 family of models:
 
-- `openai:gpt-5`
+- `openai:gpt-5.1`
 - `openai:gpt-5-pro`
+- `openai:gpt-5.1-codex`
+- `openai:gpt-5.1-codex-mini`
 
 #### Google (Cloud)
 
@@ -64,8 +67,6 @@ Access Gemini models directly via Google's generative AI API:
 }
 ```
 
-- `openai:gpt-5-codex`
-
 **Note:** Anthropic models are better supported than GPT-5 class models due to an outstanding issue in the Vercel AI SDK.
 
 TODO: add issue link here.
@@ -74,8 +75,8 @@ TODO: add issue link here.
 
 Frontier reasoning models from xAI with built-in search orchestration:
 
-- `xai:grok-4-1` — Fast unified model (switches between reasoning/non-reasoning based on thinking toggle)
-- `xai:grok-code` — Optimized for coding tasks
+- `xai:grok-4-1-fast` — Fast unified model (switches between reasoning/non-reasoning based on thinking toggle)
+- `xai:grok-code-fast-1` — Optimized for coding tasks
 
 **Setup:**
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mux",
-  "version": "0.8.1",
+  "version": "0.8.4",
   "description": "mux - coder multiplexer",
   "author": "Coder",
   "main": "dist/cli/index.js",

scripts/bump_tag.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Bump version in package.json, commit, and create a git tag.
+# Usage: ./scripts/bump_tag.sh [--minor]
+#   --minor  Bump minor version (0.8.x -> 0.9.0), otherwise bumps patch (0.8.3 -> 0.8.4)
+
+MINOR=false
+if [[ "${1:-}" == "--minor" ]]; then
+  MINOR=true
+fi
+
+# Get current version from package.json
+CURRENT_VERSION=$(jq -r '.version' package.json)
+if [[ -z "$CURRENT_VERSION" || "$CURRENT_VERSION" == "null" ]]; then
+  echo "Error: Could not read version from package.json" >&2
+  exit 1
+fi
+
+# Parse semver components
+IFS='.' read -r MAJOR MINOR_V PATCH <<< "$CURRENT_VERSION"
+
+# Calculate new version
+if [[ "$MINOR" == "true" ]]; then
+  NEW_VERSION="${MAJOR}.$((MINOR_V + 1)).0"
+else
+  NEW_VERSION="${MAJOR}.${MINOR_V}.$((PATCH + 1))"
+fi
+
+echo "Bumping version: $CURRENT_VERSION -> $NEW_VERSION"
+
+# Update package.json
+jq --arg v "$NEW_VERSION" '.version = $v' package.json > package.json.tmp
+mv package.json.tmp package.json
+
+# Commit and tag
+git add package.json
+git commit -m "release: v${NEW_VERSION}"
+git tag "v${NEW_VERSION}"
+
+echo "Created tag v${NEW_VERSION}"
+echo "Run 'git push && git push --tags' to publish"

scripts/check_codex_comments.sh

@@ -55,8 +55,10 @@ RESULT=$(gh api graphql \
   -F repo="$REPO" \
   -F pr="$PR_NUMBER")
 
-# Filter regular comments from bot that aren't minimized and don't say "Didn't find any major issues"
-REGULAR_COMMENTS=$(echo "$RESULT" | jq "[.data.repository.pullRequest.comments.nodes[] | select(.author.login == \"${BOT_LOGIN_GRAPHQL}\" and .isMinimized == false and (.body | test(\"Didn't find any major issues\") | not))]")
+# Filter regular comments from bot that aren't minimized, excluding:
+# - "Didn't find any major issues" (no issues found)
+# - "usage limits have been reached" (rate limit error, not a real review)
+REGULAR_COMMENTS=$(echo "$RESULT" | jq "[.data.repository.pullRequest.comments.nodes[] | select(.author.login == \"${BOT_LOGIN_GRAPHQL}\" and .isMinimized == false and (.body | test(\"Didn't find any major issues|usage limits have been reached\") | not))]")
 REGULAR_COUNT=$(echo "$REGULAR_COMMENTS" | jq 'length')
 
 # Filter unresolved review threads from bot

src/browser/App.tsx

@@ -3,13 +3,13 @@ import "./styles/globals.css";
 import { useWorkspaceContext } from "./contexts/WorkspaceContext";
 import { useProjectContext } from "./contexts/ProjectContext";
 import type { WorkspaceSelection } from "./components/ProjectSidebar";
-import type { FrontendWorkspaceMetadata } from "@/common/types/workspace";
 import { LeftSidebar } from "./components/LeftSidebar";
 import { ProjectCreateModal } from "./components/ProjectCreateModal";
 import { AIView } from "./components/AIView";
 import { ErrorBoundary } from "./components/ErrorBoundary";
 import { usePersistedState, updatePersistedState } from "./hooks/usePersistedState";
 import { matchesKeybind, KEYBINDS } from "./utils/ui/keybinds";
+import { buildSortedWorkspacesByProject } from "./utils/ui/workspaceFiltering";
 import { useResumeManager } from "./hooks/useResumeManager";
 import { useUnreadTracking } from "./hooks/useUnreadTracking";
 import { useWorkspaceStoreRaw, useWorkspaceRecency } from "./stores/WorkspaceStore";
@@ -198,46 +198,24 @@ function AppInner() {
   // NEW: Get workspace recency from store
   const workspaceRecency = useWorkspaceRecency();
 
-  // Sort workspaces by recency (most recent first)
-  // Returns Map<projectPath, FrontendWorkspaceMetadata[]> for direct component use
+  // Build sorted workspaces map including pending workspaces
   // Use stable reference to prevent sidebar re-renders when sort order hasn't changed
   const sortedWorkspacesByProject = useStableReference(
-    () => {
-      const result = new Map<string, FrontendWorkspaceMetadata[]>();
-      for (const [projectPath, config] of projects) {
-        // Transform Workspace[] to FrontendWorkspaceMetadata[] using workspace ID
-        const metadataList = config.workspaces
-          .map((ws) => (ws.id ? workspaceMetadata.get(ws.id) : undefined))
-          .filter((meta): meta is FrontendWorkspaceMetadata => meta !== undefined && meta !== null);
-
-        // Sort by recency
-        metadataList.sort((a, b) => {
-          const aTimestamp = workspaceRecency[a.id] ?? 0;
-          const bTimestamp = workspaceRecency[b.id] ?? 0;
-          return bTimestamp - aTimestamp;
+    () => buildSortedWorkspacesByProject(projects, workspaceMetadata, workspaceRecency),
+    (prev, next) =>
+      compareMaps(prev, next, (a, b) => {
+        if (a.length !== b.length) return false;
+        // Check ID, name, and status to detect changes
+        return a.every((meta, i) => {
+          const other = b[i];
+          return (
+            other &&
+            meta.id === other.id &&
+            meta.name === other.name &&
+            meta.status === other.status
+          );
         });
-
-        result.set(projectPath, metadataList);
-      }
-      return result;
-    },
-    (prev, next) => {
-      // Compare Maps: check if size, workspace order, and metadata content are the same
-      if (
-        !compareMaps(prev, next, (a, b) => {
-          if (a.length !== b.length) return false;
-          // Check both ID and name to detect renames
-          return a.every((metadata, i) => {
-            const bMeta = b[i];
-            if (!bMeta || !metadata) return false; // Null-safe
-            return metadata.id === bMeta.id && metadata.name === bMeta.name;
-          });
-        })
-      ) {
-        return false;
-      }
-      return true;
-    },
+      }),
     [projects, workspaceMetadata, workspaceRecency]
   );
 
@@ -605,12 +583,19 @@ function AppInner() {
                               new Map(prev).set(metadata.id, metadata)
                             );
 
-                            // Switch to new workspace
-                            setSelectedWorkspace({
-                              workspaceId: metadata.id,
-                              projectPath: metadata.projectPath,
-                              projectName: metadata.projectName,
-                              namedWorkspacePath: metadata.namedWorkspacePath,
+                            // Only switch to new workspace if user hasn't selected another one
+                            // during the creation process (selectedWorkspace was null when creation started)
+                            setSelectedWorkspace((current) => {
+                              if (current !== null) {
+                                // User has already selected another workspace - don't override
+                                return current;
+                              }
+                              return {
+                                workspaceId: metadata.id,
+                                projectPath: metadata.projectPath,
+                                projectName: metadata.projectName,
+                                namedWorkspacePath: metadata.namedWorkspacePath,
+                              };
                             });
 
                             // Track telemetry

src/browser/components/AIView.tsx

@@ -245,6 +245,12 @@ const AIViewInner: React.FC<AIViewProps> = ({
     }
   }, [workspaceId, workspaceState?.queuedMessage, chatInputAPI]);
 
+  // Handler for sending queued message immediately (interrupt + send)
+  const handleSendQueuedImmediately = useCallback(async () => {
+    if (!workspaceState?.queuedMessage || !workspaceState.canInterrupt) return;
+    await window.api.workspace.interruptStream(workspaceId, { sendQueuedImmediately: true });
+  }, [workspaceId, workspaceState?.queuedMessage, workspaceState?.canInterrupt]);
+
   const handleEditLastUserMessage = useCallback(async () => {
     if (!workspaceState) return;
 
@@ -562,6 +568,9 @@ const AIViewInner: React.FC<AIViewProps> = ({
                 <QueuedMessage
                   message={workspaceState.queuedMessage}
                   onEdit={() => void handleEditQueuedMessage()}
+                  onSendImmediately={
+                    workspaceState.canInterrupt ? handleSendQueuedImmediately : undefined
+                  }
                 />
               )}
               <ConcurrentLocalWarning

src/browser/components/ChatInput/CreationControls.tsx

@@ -41,8 +41,8 @@ export function CreationControls(props: CreationControlsProps) {
           ]}
           onChange={(newMode) => {
             const mode = newMode as RuntimeMode;
-            // Clear SSH host when switching away from SSH
-            props.onRuntimeChange(mode, mode === RUNTIME_MODE.SSH ? props.sshHost : "");
+            // Preserve SSH host across mode switches so it's remembered when returning to SSH
+            props.onRuntimeChange(mode, props.sshHost);
           }}
           disabled={props.disabled}
           aria-label="Runtime mode"

src/browser/components/ChatInput/index.tsx

@@ -173,6 +173,7 @@ export const ChatInput: React.FC<ChatInputProps> = (props) => {
     },
     onSend: () => void handleSend(),
     openAIKeySet,
+    useRecordingKeybinds: true,
   });
 
   // Start creation tutorial when entering creation mode
@@ -496,23 +497,9 @@ export const ChatInput: React.FC<ChatInputProps> = (props) => {
       voiceInput.toggle();
     };
 
-    // Global keybinds only active during recording
-    const handleKeyDown = (e: KeyboardEvent) => {
-      if (voiceInput.state !== "recording") return;
-      if (e.key === " ") {
-        e.preventDefault();
-        voiceInput.stop({ send: true });
-      } else if (e.key === "Escape") {
-        e.preventDefault();
-        voiceInput.cancel();
-      }
-    };
-
     window.addEventListener(CUSTOM_EVENTS.TOGGLE_VOICE_INPUT, handleToggle as EventListener);
-    window.addEventListener("keydown", handleKeyDown);
     return () => {
       window.removeEventListener(CUSTOM_EVENTS.TOGGLE_VOICE_INPUT, handleToggle as EventListener);
-      window.removeEventListener("keydown", handleKeyDown);
     };
   }, [voiceInput, setToast]);
 
@@ -862,9 +849,10 @@ export const ChatInput: React.FC<ChatInputProps> = (props) => {
       return;
     }
 
-    // Space on empty input starts voice recording
+    // Space on empty input starts voice recording (ignore key repeat from holding)
     if (
       e.key === " " &&
+      !e.repeat &&
       input.trim() === "" &&
       voiceInput.shouldShowUI &&
       voiceInput.isApiKeySet &&