diff --git a/apps/web/src/components/v2/terminal-input.tsx b/apps/web/src/components/v2/terminal-input.tsx
index 92d0b7d0..6d149f48 100644
--- a/apps/web/src/components/v2/terminal-input.tsx
+++ b/apps/web/src/components/v2/terminal-input.tsx
@@ -136,13 +136,13 @@ export function TerminalInput({
           onKeyDown={handleKeyPress}
           placeholder={placeholder}
           disabled={disabled}
-          className="text-foreground placeholder:text-muted-foreground min-h-[40px] flex-1 resize-none border-none bg-transparent p-0 font-mono text-xs focus-visible:ring-0 focus-visible:ring-offset-0"
+          className="text-foreground placeholder:text-muted-foreground min-h-[40px] flex-1 resize-none border-none bg-transparent p-0 font-mono text-xs shadow-none focus-visible:ring-0 focus-visible:ring-offset-0"
           rows={3}
           onPaste={onPaste}
         />
         <Button
           onClick={handleSend}
-          disabled={disabled || !message.trim()}
+          disabled={disabled || !message.trim() || !selectedRepository}
           size="sm"
           className="bg-muted-foreground/20 hover:bg-muted-foreground/30 h-7 w-7 self-end p-0 dark:bg-gray-700 hover:dark:bg-gray-600"
         >
diff --git a/apps/web/src/components/v2/thread-view.tsx b/apps/web/src/components/v2/thread-view.tsx
index fb3e31dc..d683dd95 100644
--- a/apps/web/src/components/v2/thread-view.tsx
+++ b/apps/web/src/components/v2/thread-view.tsx
@@ -88,7 +88,7 @@ export function ThreadView({
           </Button>
           <div className="flex min-w-0 flex-1 items-center gap-2">
             <div
-              className={`h-2 w-2 rounded-full ${
+              className={`size-2 flex-shrink-0 rounded-full ${
                 displayThread.status === "running"
                   ? "bg-blue-500"
                   : displayThread.status === "completed"
@@ -96,14 +96,18 @@ export function ThreadView({
                     : "bg-red-500"
               }`}
             ></div>
-            <span className="text-muted-foreground truncate font-mono text-sm">
+            <span className="text-muted-foreground max-w-[500px] truncate font-mono text-sm">
               {displayThread.title}
             </span>
-            <span className="text-muted-foreground text-xs">•</span>
-            <GitBranch className="text-muted-foreground h-3 w-3" />
-            <span className="text-muted-foreground truncate text-xs">
-              {displayThread.repository}
-            </span>
+            {displayThread.repository && (
+              <>
+                <span className="text-muted-foreground text-xs">•</span>
+                <GitBranch className="text-muted-foreground h-3 w-3" />
+                <span className="text-muted-foreground truncate text-xs">
+                  {displayThread.repository}
+                </span>
+              </>
+            )}
           </div>
           <ThreadSwitcher
             currentThread={displayThread}
@@ -222,6 +226,11 @@ export function ThreadView({
                         runId={programmerSession.runId}
                       />
                     )}
+                    {!programmerSession && (
+                      <div className="text-muted-foreground text-xs">
+                        No programmer session
+                      </div>
+                    )}
                   </CardContent>
                 </Card>
               </TabsContent>
diff --git a/apps/web/src/components/v2/types.ts b/apps/web/src/components/v2/types.ts
index 08a2b83b..da6305e0 100644
--- a/apps/web/src/components/v2/types.ts
+++ b/apps/web/src/components/v2/types.ts
@@ -77,7 +77,9 @@ export function threadToDisplayInfo(
     status: uiStatus,
     lastActivity,
     taskCount: values?.taskPlan?.tasks.length ?? 0,
-    repository: `${values?.targetRepository.owner}/${values?.targetRepository.repo}`,
+    repository: values?.targetRepository
+      ? `${values.targetRepository.owner}/${values.targetRepository.repo}`
+      : "",
     branch: values?.targetRepository.branch || "main",
     githubIssue: values?.githubIssueId
       ? {