Skip to content

Commit 5128f80

Browse files
Merge remote-tracking branch 'origin/main' into pr-32576
2 parents 73598a6 + 20c3dd3 commit 5128f80

29 files changed

Lines changed: 1234 additions & 276 deletions

‎apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,8 @@ function AdaptiveWorkspaceLayoutContent(
362362
floatingTabs.row,
363363
floatingTabsEnabled,
364364
]);
365-
// A floating sidebar brings the rail with it.
366-
const width = viewportWidth - (sidebarFloats ? 0 : navigationRailWidth);
365+
// The rail keeps its room even while the sidebar floats; only the list pane overlays the page.
366+
const width = viewportWidth - navigationRailWidth;
367367
// The sidebar stays mounted under a workspace page, so its list is ready on the way back.
368368
const shouldRenderPrimarySidebar = layout.usesSplitView;
369369
const fileInspector = useMemo(
@@ -721,7 +721,7 @@ function AdaptiveWorkspaceLayoutContent(
721721
// panes land. A sliding sidebar uncovers the strip it is about to fill, or covers the content
722722
// until it is gone.
723723
const contentLeftTarget = sidebarFloats
724-
? 0
724+
? navigationRailWidth
725725
: navigationRailWidth +
726726
(shouldRenderPrimarySidebar && !workspacePage && panes.primarySidebarVisible
727727
? (layout.listPaneWidth ?? 0) + (layout.listPaneGap ?? 0)
@@ -794,7 +794,9 @@ function AdaptiveWorkspaceLayoutContent(
794794
workspacePage,
795795
]);
796796
const railAnimatedStyle = useAnimatedStyle(() => ({ width: renderedRailWidth.value }));
797-
const floatingSidebarAnimatedStyle = useAnimatedStyle(() => ({ left: renderedRailWidth.value }));
797+
const floatingSidebarAnimatedStyle = useAnimatedStyle(() => ({
798+
left: sidebarFloats ? renderedRailWidth.value : 0,
799+
}));
798800
const floatingSidebarOpen = sidebarFloats && panes.primarySidebarVisible;
799801
// Its own value, so a sidebar that was beside a list doesn't dim the page as it leaves.
800802
const scrimOpacity = useSharedValue(0);
@@ -850,7 +852,7 @@ function AdaptiveWorkspaceLayoutContent(
850852
Math.max(
851853
0,
852854
viewportWidth -
853-
(sidebarFloats ? 0 : renderedRailWidth.value) -
855+
renderedRailWidth.value -
854856
(workspacePage || sidebarFloats ? 0 : renderedSidebarWidth.value) -
855857
renderedInspectorWidth.value,
856858
),
@@ -974,10 +976,7 @@ function AdaptiveWorkspaceLayoutContent(
974976
>
975977
<AndroidHingeObserver onChange={handleHingeChange} />
976978
{shouldRenderNavigationRail ? (
977-
<Animated.View
978-
className={sidebarFloats ? "absolute inset-y-0 left-0" : "shrink self-stretch"}
979-
style={railAnimatedStyle}
980-
/>
979+
<Animated.View className="shrink self-stretch" style={railAnimatedStyle} />
981980
) : null}
982981
{shouldRenderPrimarySidebar && layout.listPaneWidth !== null ? (
983982
<Animated.View
@@ -994,11 +993,9 @@ function AdaptiveWorkspaceLayoutContent(
994993
style={[
995994
workspacePage ? { position: "absolute", top: 0, bottom: 0, left: 0 } : null,
996995
sidebarFloats
997-
? [
998-
{ position: "absolute", top: 0, bottom: 0, zIndex: 2, elevation: 8 },
999-
floatingSidebarAnimatedStyle,
1000-
]
996+
? { position: "absolute", top: 0, bottom: 0, zIndex: 2, elevation: 8 }
1001997
: null,
998+
floatingSidebarAnimatedStyle,
1002999
sidebarAnimatedStyle,
10031000
]}
10041001
>

‎apps/server/src/mcp/OrchestratorMcpService.test.ts‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,6 @@ describe("OrchestratorMcpService", () => {
9191
const parentProjection = {
9292
thread: { id: parentThreadId },
9393
runs: [],
94-
contextTransfers: [
95-
{
96-
id: resultTransferId,
97-
type: "subagent_result",
98-
sourceThreadId: childThreadId,
99-
targetThreadId: parentThreadId,
100-
sourcePoint: { runId: childRunId },
101-
},
102-
],
10394
subagents: [
10495
{
10596
id: taskId,
@@ -131,7 +122,15 @@ describe("OrchestratorMcpService", () => {
131122
completedAt: DateTime.makeUnsafe("2026-10-03T10:05:00Z"),
132123
},
133124
],
134-
contextTransfers: [],
125+
contextTransfers: [
126+
{
127+
id: resultTransferId,
128+
type: "subagent_result",
129+
sourceThreadId: childThreadId,
130+
targetThreadId: parentThreadId,
131+
sourcePoint: { runId: childRunId },
132+
},
133+
],
135134
messages: [
136135
{
137136
id: MessageId.make("message:mcp-ack-result"),
@@ -160,6 +159,7 @@ describe("OrchestratorMcpService", () => {
160159
return hasNestedWork
161160
? {
162161
...childProjection,
162+
contextTransfers: [],
163163
subagents: [
164164
{ ...parentProjection.subagents[0]!, status: "running" as const },
165165
],
@@ -169,7 +169,6 @@ describe("OrchestratorMcpService", () => {
169169
const snapshot = hasNestedWork
170170
? {
171171
...parentProjection,
172-
contextTransfers: [],
173172
subagents: parentProjection.subagents.map((task) => ({
174173
...task,
175174
result: null,

0 commit comments

Comments
 (0)