Skip to content

Commit e745e24

Browse files
authored
Merge branch 'main' into t3code/ssh-host-autocomplete
2 parents 6b69128 + 9f9359b commit e745e24

101 files changed

Lines changed: 4515 additions & 439 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/desktop/src/settings/DesktopClientSettings.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ const clientSettings: ClientSettings = {
1818
browserDefaultZoomFactor: 1.25,
1919
browserDefaultAppearance: "dark",
2020
browserRecordingFrameRate: 60,
21+
browserLinkTarget: "app",
2122
browserAutoShowFloatingPreview: false,
2223
browserProfiles: [{ id: "work", name: "Work", kind: "persistent" }],
2324
browserDefaultProfileId: "work",

‎apps/mobile/src/components/AppSymbol.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ const ANDROID_ICON_BY_MATERIAL_NAME: Record<string, Icon> = {
185185
close: IconX,
186186
construction: IconHammer,
187187
content_copy: IconCopy,
188+
desktop_windows: IconDeviceDesktop,
188189
edit: IconEdit,
189190
error: IconAlertCircle,
190191
folder: IconFolder,

‎apps/mobile/src/features/threads/ThreadFeed.tsx‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1501,6 +1501,7 @@ function renderFeedEntry(
15011501
readonly markdownStyles: MarkdownStyleSets;
15021502
readonly reviewCommentColors: ReviewCommentColors;
15031503
readonly reviewCommentBubbleWidth: number;
1504+
readonly themeAppearance: "light" | "dark";
15041505
readonly userBubbleMaxWidth: number;
15051506
},
15061507
) {
@@ -1538,12 +1539,16 @@ function renderFeedEntry(
15381539
if (entry.type === "work-toggle") {
15391540
return (
15401541
<ThreadWorkGroupToggle
1542+
environmentId={props.environmentId}
15411543
rowSizing={props.workRowSizing}
15421544
expanded={entry.expanded}
15431545
hiddenCount={entry.hiddenCount}
15441546
iconSubtleColor={iconSubtleColor}
15451547
summary={entry.summary}
15461548
summaryKind={entry.summaryKind}
1549+
themeAppearance={props.themeAppearance}
1550+
toolSurface={entry.toolSurface}
1551+
toolIcon={entry.toolIcon}
15471552
summaryToolIcon={entry.summaryToolIcon}
15481553
hasFailure={entry.hasFailure}
15491554
shimmer={entry.shimmer}
@@ -1716,12 +1721,14 @@ function renderFeedEntry(
17161721
// Anchors/details live in ThreadFeed and survive this group-only remount.
17171722
key={`${entry.id}:${props.workRowSizing.textSizeKey}`}
17181723
activities={entry.activities}
1724+
environmentId={props.environmentId}
17191725
anchorKey={entry.id}
17201726
copiedRowId={props.copiedRowId}
17211727
expandedRows={props.expandedWorkRows}
17221728
rowSizing={props.workRowSizing}
17231729
scrollPositions={props.workGroupScrollPositions}
17241730
iconSubtleColor={iconSubtleColor}
1731+
themeAppearance={props.themeAppearance}
17251732
onCopyRow={props.onCopyWorkRow}
17261733
onToggleRow={props.onToggleWorkRow}
17271734
renderImage={props.renderViewedImage}
@@ -2001,6 +2008,7 @@ function ThreadFeedPlaceholder(props: {
20012008

20022009
export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
20032010
const navigation = useNavigation();
2011+
const { themeAppearance } = useAppearancePreferences();
20042012
const copyFeedbackTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
20052013
const disclosureSettleFrameRef = useRef<number | null>(null);
20062014
const disclosureSettleSecondFrameRef = useRef<number | null>(null);
@@ -2319,6 +2327,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
23192327
iconSubtleColor,
23202328
markdownStyles,
23212329
reviewCommentColors,
2330+
themeAppearance,
23222331
userBubbleColor,
23232332
viewportWidth,
23242333
}),
@@ -2329,6 +2338,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
23292338
iconSubtleColor,
23302339
markdownStyles,
23312340
reviewCommentColors,
2341+
themeAppearance,
23322342
userBubbleColor,
23332343
viewportWidth,
23342344
],
@@ -2754,6 +2764,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
27542764
markdownStyles,
27552765
reviewCommentColors,
27562766
reviewCommentBubbleWidth,
2767+
themeAppearance,
27572768
userBubbleMaxWidth,
27582769
skills: props.skills,
27592770
onUseArtifactTemplate: props.onUseArtifactTemplate,
@@ -2774,6 +2785,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
27742785
markdownStyles,
27752786
reviewCommentColors,
27762787
reviewCommentBubbleWidth,
2788+
themeAppearance,
27772789
userBubbleMaxWidth,
27782790
onCopyWorkRow,
27792791
markdownLinkHandlers,

0 commit comments

Comments
 (0)