Merge remote-tracking branch 'upstream/v0.12.0rc' into fix/light-mode-agent-output

apps/ui/src/components/views/analysis-view.tsx

@@ -20,7 +20,7 @@ import {
   AlertCircle,
   ListChecks,
 } from 'lucide-react';
-import { cn } from '@/lib/utils';
+import { cn, generateUUID } from '@/lib/utils';
 
 const logger = createLogger('AnalysisView');
 
@@ -638,7 +638,7 @@ ${Object.entries(projectAnalysis.filesByExtension)
 
       for (const detectedFeature of detectedFeatures) {
         await api.features.create(currentProject.path, {
-          id: crypto.randomUUID(),
+          id: generateUUID(),
           category: detectedFeature.category,
           description: detectedFeature.description,
           status: 'backlog',

apps/ui/src/components/views/board-view/worktree-panel/hooks/use-worktrees.ts

@@ -39,7 +39,10 @@ export function useWorktrees({
           logger.warn('Worktree API not available');
           return;
         }
-        const result = await api.worktree.listAll(projectPath, true);
+        // Pass forceRefreshGitHub when this is a manual refresh (not silent polling)
+        // This clears the GitHub remote cache so users can re-detect after adding a remote
+        const forceRefreshGitHub = !silent;
+        const result = await api.worktree.listAll(projectPath, true, forceRefreshGitHub);
         if (result.success && result.worktrees) {
           setWorktrees(result.worktrees);
           setWorktreesInStore(projectPath, result.worktrees);

apps/ui/src/components/views/github-issues-view.tsx

@@ -8,7 +8,7 @@ import { Button } from '@/components/ui/button';
 import { ConfirmDialog } from '@/components/ui/confirm-dialog';
 import { LoadingState } from '@/components/ui/loading-state';
 import { ErrorState } from '@/components/ui/error-state';
-import { cn, pathsEqual } from '@/lib/utils';
+import { cn, pathsEqual, generateUUID } from '@/lib/utils';
 import { toast } from 'sonner';
 import { useGithubIssues, useIssueValidation, useIssuesFilter } from './github-issues-view/hooks';
 import { IssueRow, IssueDetailPanel, IssuesListHeader } from './github-issues-view/components';
@@ -137,7 +137,7 @@ export function GitHubIssuesView() {
             .join('\n');
 
           const feature = {
-            id: `issue-${issue.number}-${crypto.randomUUID()}`,
+            id: `issue-${issue.number}-${generateUUID()}`,
             title: issue.title,
             description,
             category: 'From GitHub',

apps/ui/src/components/views/interview-view.tsx

@@ -6,7 +6,7 @@ import { Card, CardContent } from '@/components/ui/card';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Bot, Send, User, Loader2, Sparkles, FileText, ArrowLeft, CheckCircle } from 'lucide-react';
-import { cn } from '@/lib/utils';
+import { cn, generateUUID } from '@/lib/utils';
 import { getElectronAPI } from '@/lib/electron';
 import { Markdown } from '@/components/ui/markdown';
 import { useFileBrowser } from '@/contexts/file-browser-context';
@@ -345,7 +345,7 @@ export function InterviewView() {
 
       // Create initial feature in the features folder
       const initialFeature: Feature = {
-        id: crypto.randomUUID(),
+        id: generateUUID(),
         category: 'Core',
         description: 'Initial project setup',
         status: 'backlog' as const,

apps/ui/src/components/views/settings-view/event-hooks/event-hook-dialog.tsx

@@ -28,6 +28,7 @@ import type {
   EventHookHttpAction,
 } from '@automaker/types';
 import { EVENT_HOOK_TRIGGER_LABELS } from '@automaker/types';
+import { generateUUID } from '@/lib/utils';
 
 interface EventHookDialogProps {
   open: boolean;
@@ -109,7 +110,7 @@ export function EventHookDialog({ open, onOpenChange, editingHook, onSave }: Eve
 
   const handleSave = () => {
     const hook: EventHook = {
-      id: editingHook?.id || crypto.randomUUID(),
+      id: editingHook?.id || generateUUID(),
       name: name.trim() || undefined,
       trigger,
       enabled: editingHook?.enabled ?? true,

apps/ui/src/components/views/settings-view/model-defaults/phase-model-selector.tsx

@@ -166,6 +166,7 @@ export function PhaseModelSelector({
     codexModelsLoading,
     fetchCodexModels,
     dynamicOpencodeModels,
+    enabledDynamicModelIds,
     opencodeModelsLoading,
     fetchOpencodeModels,
     disabledProviders,
@@ -383,13 +384,16 @@ export function PhaseModelSelector({
     const staticModels = [...OPENCODE_MODELS];
 
     // Add dynamic models (convert ModelDefinition to ModelOption)
-    const dynamicModelOptions: ModelOption[] = dynamicOpencodeModels.map((model) => ({
-      id: model.id,
-      label: model.name,
-      description: model.description,
-      badge: model.tier === 'premium' ? 'Premium' : model.tier === 'basic' ? 'Free' : undefined,
-      provider: 'opencode' as const,
-    }));
+    // Only include dynamic models that are enabled by the user
+    const dynamicModelOptions: ModelOption[] = dynamicOpencodeModels
+      .filter((model) => enabledDynamicModelIds.includes(model.id))
+      .map((model) => ({
+        id: model.id,
+        label: model.name,
+        description: model.description,
+        badge: model.tier === 'premium' ? 'Premium' : model.tier === 'basic' ? 'Free' : undefined,
+        provider: 'opencode' as const,
+      }));
 
     // Merge, avoiding duplicates (static models take precedence for same ID)
     // In practice, static and dynamic IDs don't overlap
@@ -397,7 +401,7 @@ export function PhaseModelSelector({
     const uniqueDynamic = dynamicModelOptions.filter((m) => !staticIds.has(m.id));
 
     return [...staticModels, ...uniqueDynamic];
-  }, [dynamicOpencodeModels]);
+  }, [dynamicOpencodeModels, enabledDynamicModelIds]);
 
   // Group models (filtering out disabled providers)
   const { favorites, claude, cursor, codex, opencode } = useMemo(() => {

apps/ui/src/components/views/settings-view/providers/opencode-model-configuration.tsx

@@ -611,16 +611,16 @@ export function OpencodeModelConfiguration({
                           Dynamic
                         </Badge>
                       </div>
-                      {models.length > 0 && (
+                      {filteredModels.length > 0 && (
                         <div className={OPENCODE_SELECT_ALL_CONTAINER_CLASS}>
                           <Checkbox
                             checked={getSelectionState(
-                              models.map((model) => model.id),
+                              filteredModels.map((model) => model.id),
                               enabledDynamicModelIds
                             )}
                             onCheckedChange={(checked) =>
                               toggleProviderDynamicModels(
-                                models.map((model) => model.id),
+                                filteredModels.map((model) => model.id),
                                 checked
                               )
                             }