Commit 01f894e23e031ef32c25a15b518a94f20defea6f | the-knife

1 files changed, 9 insertions(+), 5 deletions(-)

apps/mobile/src/features/threads/thread-subagent-group.tsx+9-5

 @@ -1,5 +1,5 @@
 import { useAtomValue } from "@effect/atom-react";
-import { useIsFocused, useNavigation } from "@react-navigation/native";
+import { StackActions, useIsFocused, useNavigation } from "@react-navigation/native";
 import { scopeThreadRef } from "@t3tools/client-runtime/environment";
 import { summarizeSubagentStatuses } from "@t3tools/client-runtime/state/subagent-display";
 import { isActiveSubagentStatus } from "@t3tools/client-runtime/state/subagentRuntime";
 @@ -158,11 +158,15 @@ export function ThreadSubagentGroup(props: {
                 }
                 disabled={threadId === null}
                 onPress={() => {
+                  // Push, not navigate: navigate reuses this Thread route, so back
+                  // would skip the parent thread.
                   if (threadId !== null)
-                    navigation.navigate("Thread", {
+                    navigation.dispatch(
-                      environmentId: String(props.environmentId),
+                      StackActions.push("Thread", {
-                      threadId: String(threadId),
+                        environmentId: String(props.environmentId),
-                    });
+                        threadId: String(threadId),
+                      }),
+                    );
                 }}
                 className="rounded-lg px-3 py-3 active:bg-subtle"
               >