fix: branch reset on workdir change and Codex MCP server config merge

- Reset git branch to current when user changes working directory in create-agent modal
- Fix Codex MCP servers not being passed from extra.codex.mcp_servers config
- Remove macbook host from default daemons
- Update test expectations and structure

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

packages/app/src/components/git-diff-pane.tsx

@@ -119,6 +119,7 @@ function DiffLineView({ line }: { line: DiffLine }) {
 function DiffFileSection({ file, defaultExpanded = true, testID }: DiffFileSectionProps) {
   const { theme } = useUnistyles();
   const [isExpanded, setIsExpanded] = useState(defaultExpanded);
+  const [scrollViewWidth, setScrollViewWidth] = useState(0);
   const horizontalScroll = useHorizontalScrollOptional();
   const scrollId = useId();
 
@@ -190,8 +191,9 @@ function DiffFileSection({ file, defaultExpanded = true, testID }: DiffFileSecti
           contentContainerStyle={styles.diffContentInner}
           onScroll={handleScroll}
           scrollEventThrottle={16}
+          onLayout={(e) => setScrollViewWidth(e.nativeEvent.layout.width)}
         >
-          <View style={styles.linesContainer}>
+          <View style={[styles.linesContainer, scrollViewWidth > 0 && { minWidth: scrollViewWidth }]}>
             {file.hunks.map((hunk, hunkIndex) =>
               hunk.lines.map((line, lineIndex) => (
                 <DiffLineView key={`${hunkIndex}-${lineIndex}`} line={line} />
@@ -388,8 +390,6 @@ const styles = StyleSheet.create((theme) => ({
     flexDirection: "column",
   },
   linesContainer: {
-    alignSelf: "flex-start",
-    minWidth: "100%",
     backgroundColor: "#0d1117",
   },
   diffLineContainer: {