Skip to content

Commit e38d81f

Browse files
committed
Merge commit '0a4a881f5993754d6b6096972be2c6f373c5c63f' into takeover-30000
2 parents faeb847 + 0a4a881 commit e38d81f

2 files changed

Lines changed: 9 additions & 8 deletions

File tree

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
import { AsyncResult, Atom } from "effect/reactivity";
1111
import * as Dialog from "../../components/ui/Dialog";
1212
import { useAtomMount, useAtomValue } from "@effect/atom-react";
13+
import { mobilePreferencesAtom } from "../../state/preferences";
1314
import { parseThreadKey, threadKey } from "@t3tools/client-runtime/state/entities";
1415
import { createThreadVisitTracker } from "@t3tools/client-runtime/state/thread-visits";
1516
import { useChildThreadInputs, useThreadReportedModelSelection } from "../../state/entities";
@@ -479,6 +480,10 @@ function ThreadDetailBody(
479480
threadId: props.selectedThread.id,
480481
});
481482
const composerError = useAtomValue(threadComposerErrorsAtom)[selectedThreadKey]?.message ?? null;
483+
const preferences = useAtomValue(mobilePreferencesAtom);
484+
const toolCallVisibility = AsyncResult.isSuccess(preferences)
485+
? (preferences.value.toolCallVisibility ?? "showAll")
486+
: "showAll";
482487
const queuedCount = useThreadQueuedCount(props.selectedThreadDetailRef);
483488
const turnSubagents = useThreadTurnSubagents(props.selectedThreadDetailRef);
484489
const agentsSegment = resolveSubagentPillSegment(turnSubagents);
@@ -1440,6 +1445,7 @@ function ThreadDetailBody(
14401445
>
14411446
<WorkspaceMutationIdProvider threadRef={props.selectedThreadDetailRef}>
14421447
<ThreadFeed
1448+
toolCallVisibility={toolCallVisibility}
14431449
environmentId={props.environmentId}
14441450
threadId={props.selectedThread.id}
14451451
detailRef={props.selectedThreadDetailRef}

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ import {
5959
type ScheduledTaskId,
6060
type ScopedThreadRef,
6161
} from "@t3tools/contracts";
62+
import type { ToolCallVisibility } from "@t3tools/contracts/settings";
6263
import { renderAssistantCitationsAsText } from "@t3tools/shared/assistantCitations";
6364
import { encodeComposerContextFragment } from "@t3tools/shared/composerContextClipboard";
6465
import { hostedThreadLink, parseThreadLinkHref } from "@t3tools/shared/threadLinks";
@@ -268,9 +269,6 @@ import { appAtomRegistry } from "../../state/atom-registry";
268269
import { environmentThreadShells, threadEnvironment } from "../../state/threads";
269270
import { ThreadWorkflowOpening, useWorkflowOpening } from "./thread-workflow-opening";
270271
import { useAtomCommand } from "../../state/use-atom-command";
271-
import { mobilePreferencesAtom } from "../../state/preferences";
272-
import { useAtomValue } from "@effect/atom-react";
273-
import { AsyncResult } from "effect/reactivity";
274272
import { useV2ItemSupport } from "../../state/v2-item-support";
275273
import {
276274
fileRoutePathSegments,
@@ -344,6 +342,7 @@ export interface ThreadFeedHandle {
344342
}
345343

346344
export interface ThreadFeedProps {
345+
readonly toolCallVisibility?: ToolCallVisibility;
347346
readonly worktreeSetup?: WorktreeSetupCardProps | null;
348347
readonly setupWorkingStartedAt?: string | null;
349348
readonly queuedMessages: ReadonlyArray<QueuedThreadMessage>;
@@ -2587,10 +2586,6 @@ function useThreadFeedPresentation(
25872586
revealedMessageId: MessageId | null,
25882587
) {
25892588
const [feedCache] = useState(createThreadFeedCache);
2590-
const preferences = useAtomValue(mobilePreferencesAtom);
2591-
const toolCallVisibility = AsyncResult.isSuccess(preferences)
2592-
? (preferences.value.toolCallVisibility ?? "showAll")
2593-
: "showAll";
25942589
return appendPendingThreadMessages(
25952590
deriveThreadFeedPresentation(
25962591
props.feed,
@@ -2604,7 +2599,7 @@ function useThreadFeedPresentation(
26042599
props.activeWorkStartedAt,
26052600
props.runlessWorkActive ?? false,
26062601
feedCache,
2607-
{ toolCallVisibility, revealedMessageId },
2602+
{ toolCallVisibility: props.toolCallVisibility ?? "showAll", revealedMessageId },
26082603
),
26092604
props.feed,
26102605
props.queuedMessages,

0 commit comments

Comments
 (0)