feat: Add GPT-5 model variants and improve Codex execution logic. Addressed code review comments

apps/ui/src/components/views/board-view/dialogs/commit-worktree-dialog.tsx

@@ -27,6 +27,7 @@ import { getElectronAPI } from '@/lib/electron';
 import { toast } from 'sonner';
 import { useAppStore } from '@/store/app-store';
 import { cn } from '@/lib/utils';
+import { TruncatedFilePath } from '@/components/ui/truncated-file-path';
 import type { FileStatus } from '@/types/electron';
 
 interface WorktreeInfo {
@@ -566,9 +567,10 @@ export function CommitWorktreeDialog({
                             <ChevronRight className="w-3 h-3 text-muted-foreground flex-shrink-0" />
                           )}
                           {getFileIcon(file.status)}
-                          <span className="text-xs font-mono truncate flex-1 text-foreground">
-                            {file.path}
-                          </span>
+                          <TruncatedFilePath
+                            path={file.path}
+                            className="text-xs font-mono flex-1 text-foreground"
+                          />
                           <span
                             className={cn(
                               'text-[10px] px-1.5 py-0.5 rounded border font-medium flex-shrink-0',

apps/ui/src/components/views/board-view/dialogs/discard-worktree-changes-dialog.tsx

@@ -26,6 +26,7 @@ import { getElectronAPI } from '@/lib/electron';
 import { getHttpApiClient } from '@/lib/http-api-client';
 import { toast } from 'sonner';
 import { cn } from '@/lib/utils';
+import { TruncatedFilePath } from '@/components/ui/truncated-file-path';
 import type { FileStatus } from '@/types/electron';
 
 interface WorktreeInfo {
@@ -313,9 +314,12 @@ export function DiscardWorktreeChangesDialog({
             const result = await api.git.getDiffs(worktree.path);
             if (result.success) {
               const fileList = result.files ?? [];
+              if (!cancelled) setError(null);
               if (!cancelled) setFiles(fileList);
               if (!cancelled) setDiffContent(result.diff ?? '');
               if (!cancelled) setSelectedFiles(new Set());
+            } else {
+              if (!cancelled) setError(result.error || 'Failed to fetch diffs');
             }
           }
         } catch (err) {
@@ -495,9 +499,10 @@ export function DiscardWorktreeChangesDialog({
                             <ChevronRight className="w-3 h-3 text-muted-foreground flex-shrink-0" />
                           )}
                           {getFileIcon(file.status)}
-                          <span className="text-xs font-mono truncate flex-1 text-foreground">
-                            {file.path}
-                          </span>
+                          <TruncatedFilePath
+                            path={file.path}
+                            className="text-xs font-mono flex-1 text-foreground"
+                          />
                           <span
                             className={cn(
                               'text-[10px] px-1.5 py-0.5 rounded border font-medium flex-shrink-0',

apps/ui/src/components/views/board-view/dialogs/git-pull-dialog.tsx

@@ -42,6 +42,7 @@ type PullPhase =
 
 interface PullResult {
   branch: string;
+  remote?: string;
   pulled: boolean;
   message: string;
   hasLocalChanges?: boolean;
@@ -115,6 +116,11 @@ export function GitPullDialog({
         setPullResult(result.result);
         setPhase('success');
         onPulled?.();
+      } else {
+        // Unexpected response: success but no recognizable fields
+        setPullResult(result.result ?? null);
+        setErrorMessage('Unexpected pull response');
+        setPhase('error');
       }
     } catch (err) {
       setErrorMessage(err instanceof Error ? err.message : 'Failed to check for changes');
@@ -160,8 +166,9 @@ export function GitPullDialog({
   const handleResolveWithAI = useCallback(() => {
     if (!worktree || !pullResult || !onCreateConflictResolutionFeature) return;
 
+    const effectiveRemote = pullResult.remote || remote;
     const conflictInfo: MergeConflictInfo = {
-      sourceBranch: `${remote || 'origin'}/${pullResult.branch}`,
+      sourceBranch: effectiveRemote ? `${effectiveRemote}/${pullResult.branch}` : pullResult.branch,
       targetBranch: pullResult.branch,
       targetWorktreePath: worktree.path,
       conflictFiles: pullResult.conflictFiles || [],

apps/ui/src/components/views/board-view/dialogs/stash-changes-dialog.tsx

@@ -25,6 +25,7 @@ import { Spinner } from '@/components/ui/spinner';
 import { getHttpApiClient } from '@/lib/http-api-client';
 import { toast } from 'sonner';
 import { cn } from '@/lib/utils';
+import { TruncatedFilePath } from '@/components/ui/truncated-file-path';
 import type { FileStatus } from '@/types/electron';
 
 interface WorktreeInfo {
@@ -514,9 +515,10 @@ export function StashChangesDialog({
                             <ChevronRight className="w-3 h-3 text-muted-foreground flex-shrink-0" />
                           )}
                           {getFileIcon(file.status)}
-                          <span className="text-xs font-mono truncate flex-1 text-foreground">
-                            {file.path}
-                          </span>
+                          <TruncatedFilePath
+                            path={file.path}
+                            className="text-xs font-mono flex-1 text-foreground"
+                          />
                           <span
                             className={cn(
                               'text-[10px] px-1.5 py-0.5 rounded border font-medium flex-shrink-0',