Release v0.0.34

## What's New

### Features
- **Simplified Plan Mode** — New compact plan card and improved sidebar display
- **Always Expand To-Do List** — New option to keep to-do list expanded (Settings → Preferences)
- **Unified Analytics** — Improved PostHog tracking for desktop and web

### Improvements & Fixes
- Fixed Claude SDK spawn errors and handle expired sessions — thanks @nicholasoxford!
- Fixed Windows compatibility for git worktree operations — thanks @nicholasoxford!
- Only show traffic light spacer on macOS — thanks @nicholasoxford!
- Improved plan collapsing and removed redundant "Build plan" button
- Skip Ollama checks when offline mode is disabled
- GitHub avatar loading placeholder in settings
- Fixed custom headers in MCP auth

Author: serafimcloud

bun.lock

@@ -1,6 +1,6 @@
 {
   "name": "21st-desktop",
-  "version": "0.0.33",
+  "version": "0.0.34",
   "private": true,
   "description": "1Code - UI for parallel work with AI agents",
   "author": {

package.json

@@ -250,4 +250,29 @@ export class AuthManager {
     // Update locally
     return this.store.updateUser({ name: updates.name ?? null })
   }
+
+  /**
+   * Fetch user's subscription plan from web backend
+   * Used for PostHog analytics enrichment
+   */
+  async fetchUserPlan(): Promise<{ email: string; plan: string; status: string | null } | null> {
+    const token = await this.getValidToken()
+    if (!token) return null
+
+    try {
+      const response = await fetch(`${this.getApiUrl()}/api/desktop/user/plan`, {
+        headers: { "X-Desktop-Token": token },
+      })
+
+      if (!response.ok) {
+        console.error("[AuthManager] Failed to fetch user plan:", response.status)
+        return null
+      }
+
+      return response.json()
+    } catch (error) {
+      console.error("[AuthManager] Failed to fetch user plan:", error)
+      return null
+    }
+  }
 }

src/main/auth-manager.ts

@@ -7,6 +7,7 @@ import { AuthManager } from "./auth-manager"
 import {
   identify,
   initAnalytics,
+  setSubscriptionPlan,
   shutdown as shutdownAnalytics,
   trackAppOpened,
   trackAuthCompleted,
@@ -89,6 +90,16 @@ export async function handleAuthCode(code: string): Promise<void> {
     // Track successful authentication
     trackAuthCompleted(authData.user.id, authData.user.email)
 
+    // Fetch and set subscription plan for analytics
+    try {
+      const planData = await authManager.fetchUserPlan()
+      if (planData) {
+        setSubscriptionPlan(planData.plan)
+      }
+    } catch (e) {
+      console.warn("[Auth] Failed to fetch user plan for analytics:", e)
+    }
+
     // Set desktop token cookie using persist:main partition
     const ses = session.fromPartition("persist:main")
     try {

src/main/index.ts

@@ -6,14 +6,19 @@
 import { PostHog } from "posthog-node"
 import { app } from "electron"
 
-// PostHog configuration from environment
-const POSTHOG_DESKTOP_KEY = import.meta.env.MAIN_VITE_POSTHOG_KEY
+// PostHog configuration - hardcoded key for opensource users, env var override for internal builds
+// This enables analytics for all users including those building from source
+const POSTHOG_DESKTOP_KEY = import.meta.env.MAIN_VITE_POSTHOG_KEY || "phc_wM7gbrJhOLTvynyhnhPkrVGDc5mKRSXsLGQHqM3T3vq"
 const POSTHOG_HOST = import.meta.env.MAIN_VITE_POSTHOG_HOST || "https://us.i.posthog.com"
 
 let posthog: PostHog | null = null
 let currentUserId: string | null = null
 let userOptedOut = false // Synced from renderer
 
+// Cached user properties for analytics enrichment
+let cachedSubscriptionPlan: string | null = null
+let cachedConnectionMethod: string | null = null
+
 // Check if we're in development mode
 // Set FORCE_ANALYTICS=true to test analytics in development
 // Use a function to check lazily after app is ready
@@ -31,12 +36,15 @@ function isDev(): boolean {
  */
 function getCommonProperties() {
   return {
-    source: "desktop_main",
+    source: "desktop", // Unified source for desktop vs web analytics
     app_version: app.getVersion(),
     platform: process.platform,
     arch: process.arch,
     electron_version: process.versions.electron,
     node_version: process.versions.node,
+    // Analytics enrichment properties
+    subscription_plan: cachedSubscriptionPlan,
+    connection_method: cachedConnectionMethod,
   }
 }
 
@@ -47,6 +55,21 @@ export function setOptOut(optedOut: boolean) {
   userOptedOut = optedOut
 }
 
+/**
+ * Set subscription plan (called after fetching from API)
+ */
+export function setSubscriptionPlan(plan: string) {
+  cachedSubscriptionPlan = plan
+}
+
+/**
+ * Set connection method (called from renderer via IPC)
+ * Values: "claude-subscription" | "api-key" | "custom-model"
+ */
+export function setConnectionMethod(method: string) {
+  cachedConnectionMethod = method
+}
+
 /**
  * Initialize PostHog for main process
  */
@@ -135,6 +158,9 @@ export function getCurrentUserId(): string | null {
  */
 export function reset() {
   currentUserId = null
+  // Reset cached analytics properties
+  cachedSubscriptionPlan = null
+  cachedConnectionMethod = null
   // PostHog Node.js SDK doesn't have a reset method
   // Events will be sent as anonymous until next identify
 }
@@ -192,11 +218,13 @@ export function trackWorkspaceCreated(workspace: {
   id: string
   projectId: string
   useWorktree: boolean
+  repository?: string
 }) {
   capture("workspace_created", {
     workspace_id: workspace.id,
     project_id: workspace.projectId,
     use_worktree: workspace.useWorktree,
+    repository: workspace.repository,
   })
 }
 
@@ -223,12 +251,12 @@ export function trackWorkspaceDeleted(workspaceId: string) {
  */
 export function trackMessageSent(data: {
   workspaceId: string
-  messageLength: number
+  subChatId?: string
   mode: "plan" | "agent"
 }) {
   capture("message_sent", {
     workspace_id: data.workspaceId,
-    message_length: data.messageLength,
+    sub_chat_id: data.subChatId,
     mode: data.mode,
   })
 }
@@ -239,9 +267,41 @@ export function trackMessageSent(data: {
 export function trackPRCreated(data: {
   workspaceId: string
   prNumber: number
+  repository?: string
+  mode?: "worktree" | "local"
 }) {
   capture("pr_created", {
     workspace_id: data.workspaceId,
     pr_number: data.prNumber,
+    repository: data.repository,
+    mode: data.mode,
+  })
+}
+
+/**
+ * Track commit created
+ */
+export function trackCommitCreated(data: {
+  workspaceId: string
+  filesChanged: number
+  mode: "worktree" | "local"
+}) {
+  capture("commit_created", {
+    workspace_id: data.workspaceId,
+    files_changed: data.filesChanged,
+    mode: data.mode,
+  })
+}
+
+/**
+ * Track sub-chat created
+ */
+export function trackSubChatCreated(data: {
+  workspaceId: string
+  subChatId: string
+}) {
+  capture("sub_chat_created", {
+    workspace_id: data.workspaceId,
+    sub_chat_id: data.subChatId,
   })
 }

src/main/lib/analytics.ts

@@ -20,17 +20,19 @@ export type OfflineCheckResult = {
  * Check if we should use Ollama as fallback
  * Priority:
  * 1. If customConfig provided → use it
- * 2. If OFFLINE → use Ollama (ignore auth token)
+ * 2. If offline mode enabled AND no internet → use Ollama
  * 3. If online + auth → use Claude API
  *
  * @param customConfig - Custom config from user settings
  * @param claudeCodeToken - Claude Code auth token
  * @param selectedOllamaModel - User-selected Ollama model (optional)
+ * @param offlineModeEnabled - Whether offline mode is enabled in settings
  */
 export async function checkOfflineFallback(
   customConfig: CustomClaudeConfig | undefined,
   claudeCodeToken: string | null,
   selectedOllamaModel?: string | null,
+  offlineModeEnabled: boolean = false,
 ): Promise<OfflineCheckResult> {
   // If custom config is provided, use it (highest priority)
   if (customConfig) {
@@ -41,6 +43,15 @@ export async function checkOfflineFallback(
     }
   }
 
+  // If offline mode is disabled in settings, skip all Ollama checks
+  // and just use Claude API (will fail with auth error if no token)
+  if (!offlineModeEnabled) {
+    return {
+      config: undefined,
+      isUsingOllama: false,
+    }
+  }
+
   // Check internet FIRST - if offline, use Ollama regardless of auth
   console.log('[Offline] Checking internet connectivity...')
   const hasInternet = await checkInternetConnection()

src/main/lib/claude/offline-handler.ts

@@ -75,14 +75,6 @@ export function createTransformer(options?: { emitSdkMessageUuid?: boolean; isUs
   }
 
   return function* transform(msg: any): Generator<UIMessageChunk> {
-    // Emit UUID early for rollback support (before abort can happen)
-    // This ensures frontend has sdkMessageUuid even if streaming is interrupted
-    if (emitSdkMessageUuid && msg.type === "assistant" && msg.uuid) {
-      yield {
-        type: "message-metadata",
-        messageMetadata: { sdkMessageUuid: msg.uuid }
-      }
-    }
 
     // Debug: log ALL message types to understand what SDK sends
     if (isUsingOllama) {

src/main/lib/claude/transform.ts

@@ -21,7 +21,7 @@ import { bringToFront } from './window';
  */
 export async function fetchMcpTools(
   serverUrl: string,
-  accessToken?: string
+  headers?: Record<string, string>
 ): Promise<string[]> {
   let client: Client | null = null;
   let transport: StreamableHTTPClientTransport | null = null;
@@ -33,10 +33,8 @@ export async function fetchMcpTools(
     });
 
     const requestInit: RequestInit = {};
-    if (accessToken) {
-      requestInit.headers = {
-        'Authorization': `Bearer ${accessToken}`,
-      };
+    if (headers && Object.keys(headers).length > 0) {
+      requestInit.headers = { ...headers };
     }
 
     transport = new StreamableHTTPClientTransport(new URL(serverUrl), {

src/main/lib/mcp-auth.ts

@@ -50,23 +50,21 @@ export async function checkOllamaStatus(): Promise<OllamaStatus> {
 
     // If no exact match, try to find any qwen-coder, deepseek-coder, or codestral variant
     if (!recommendedModel) {
-      recommendedModel = models.find(m =>
+      recommendedModel = models.find((m: string) =>
         m.includes('qwen') && m.includes('coder') ||
         m.includes('deepseek') && m.includes('coder') ||
         m.includes('codestral')
       )
     }
 
-    console.log(`[Ollama] Available: ${models.length} models found`, models)
-
     return {
       available: true,
       models,
       recommendedModel: recommendedModel || models[0], // Fallback to any model
       version: data.version,
     }
-  } catch (error) {
-    console.log('[Ollama] Not available:', error)
+  } catch {
+    // Ollama not available - no need to log, this is expected when offline mode is disabled
     return { available: false, models: [] }
   }
 }

src/main/lib/ollama/detector.ts

@@ -711,7 +711,19 @@ export const chatsRouter = router({
       }
 
       // 5. Truncate messages to include up to and including the target message
-      const truncatedMessages = messages.slice(0, targetIndex + 1)
+      let truncatedMessages = messages.slice(0, targetIndex + 1)
+
+      // 5.5. Clear any old shouldResume flags, then set on the target message
+      truncatedMessages = truncatedMessages.map((m: any, i: number) => {
+        const { shouldResume, ...restMeta } = m.metadata || {}
+        return {
+          ...m,
+          metadata: {
+            ...restMeta,
+            ...(i === truncatedMessages.length - 1 && { shouldResume: true }),
+          },
+        }
+      })
 
       // 6. Update the sub-chat with truncated messages
       db.update(subChats)