[fix] Session tabs on /m stay put, follow renames and revisions, and close cleanly

web/mobile/src/components/ContentRail.tsx

@@ -1,4 +1,4 @@
-import type {ReactNode} from "react"
+import type {ComponentProps} from "react"
 
 import {CHAT_COLUMN} from "@agenta/chat/assets"
 
@@ -15,6 +15,6 @@ import {cn} from "@/lib/utils"
  * — a local literal drifted a step narrower. Screens with a wider composition (Home's two-column
  * grid) pass their own cap via className.
  */
-export const ContentRail = ({className, children}: {className?: string; children: ReactNode}) => (
-    <div className={cn(CHAT_COLUMN, className)}>{children}</div>
+export const ContentRail = ({className, ...props}: ComponentProps<"div">) => (
+    <div className={cn(CHAT_COLUMN, className)} {...props} />
 )

web/mobile/src/features/chat/AssistantMarkdown.tsx

@@ -60,3 +60,17 @@ export const AssistantMarkdown = ({
         />
     )
 }
+
+/**
+ * The user's own turn, through the same pipeline — no typewriter, nothing streams. The composer
+ * serialises a draft as markdown, escapes and all, so a literal render showed `hi\_name` for a
+ * typed `hi_name`; the desktop bubble has always rendered markdown, and this matches it.
+ */
+export const UserMarkdown = ({text}: {text: string}) => (
+    <ChatMarkdown
+        baseClassName={proseClassName}
+        content={text}
+        streaming={false}
+        useLinkResolver={useDriveLinkResolver}
+    />
+)

web/mobile/src/features/chat/ChatScreen.tsx

@@ -6,7 +6,6 @@
     createTurnViewModelCache,
     getPendingApprovals,
 } from "@agenta/chat/model"
-import {ChatJumpToLatest} from "@agenta/ui/components/presentational"
 import {useAtomValue} from "jotai"
 
 import {ContentRail} from "@/components/ContentRail"
@@ -184,10 +183,10 @@
     // Both factories take no argument, so the linter reads `sessionId` as unused. It is the point:
     // the dep is what discards the previous session's cache on a screen that never remounts.
 
     const executedFor = useMemo(() => createExecutedToolIdentityCache(), [sessionId])
     // Without this every view model is a fresh object per poll, so TurnRow's memo never hits.
 
     const turnCache = useMemo(() => createTurnViewModelCache(), [sessionId])
     const turns = useMemo(
         () => buildTurnViewModels(messages, {busy: false, executedFor, cache: turnCache}),
         [messages, executedFor, turnCache],
@@ -206,7 +205,7 @@
         body = <ChatEmpty />
     } else {
         body = (
-            <ContentRail className="flex grow flex-col gap-3 p-4 pb-[calc(1rem+env(safe-area-inset-bottom))]">
+            <ContentRail className="flex grow flex-col gap-3 p-4 pt-6 pb-[calc(1rem+env(safe-area-inset-bottom))]">
                 <TranscriptTurns
                     turns={visibleTurns}
                     sessionId={sessionId}
@@ -222,9 +221,8 @@
         <ScreenScaffold
             scrollRef={autoScroll.ref}
             onScroll={autoScroll.onScroll}
-            scrollOverlay={
-                <ChatJumpToLatest show={autoScroll.showJump} onClick={autoScroll.jumpToLatest} />
-            }
+            // Same edge fades the live conversation wears.
+            scrollStyle={{maskImage: autoScroll.edgeMask, WebkitMaskImage: autoScroll.edgeMask}}
             embedded={embedded}
             header={
                 <>

web/mobile/src/features/chat/LiveConversation.tsx

@@ -1,8 +1,6 @@
 import {useCallback, useEffect, useMemo, useRef, useState} from "react"
 
 import {
-    EDGE_FADE_MASK,
-    jumpGateOpen,
     latestTurnId,
     resolveStopExecution,
     shouldShowStopControl,
@@ -32,11 +30,12 @@
 } from "@agenta/chat/model"
 import {getSessionTurnId} from "@agenta/chat/state"
 import {cancelSessionExecution} from "@agenta/entities/session"
+import {invalidateAgentCommittedRevisionCache} from "@agenta/entities/workflow"
 import {AgentIntroCard} from "@agenta/entity-ui/agent"
 import {SecretRequestDock} from "@agenta/entity-ui/clientTools"
 import {isOnScreen, isOverlayOpen} from "@agenta/shared/utils"
 import {message, modal} from "@agenta/ui/app-message"
-import {ChatBubble, ChatJumpToLatest} from "@agenta/ui/components/presentational"
+import {ChatBubble} from "@agenta/ui/components/presentational"
 import type {RichChatInputHandle} from "@agenta/ui/rich-chat-input"
 import {isAltChord} from "@agenta/ui/shortcuts"
 import {Button} from "@agenta/ui/ui"
@@ -52,6 +51,7 @@
 import {livenessQueryKey, useLivenessUpdatedAt} from "../sessions/useLivenessPoll"
 
 import {ApprovalDock} from "./ApprovalDock"
+import {committedRevisionIds} from "./committedRevisionIds"
 import {Composer} from "./Composer"
 import {ConnectModelStrip} from "./ConnectModelStrip"
 import {MODEL_KEY_WAIT_LIMIT_MS, pendingTaskDecision} from "./pendingTaskPolicy"
@@ -78,6 +78,12 @@
  * mobile's detached resume path; after it fires, the records change and the watch relay's
  * `revalidate()` folds the resumed turn in.
  */
+/** The caret is in a field that is not ours — leave it there. */
+const isTypingElsewhere = (active: Element | null): boolean =>
+    active instanceof HTMLElement &&
+    active !== document.body &&
+    (active.isContentEditable || active.tagName === "INPUT" || active.tagName === "TEXTAREA")
+
 export const LiveConversation = ({
     entityId,
     sessionId,
@@ -152,13 +158,27 @@
             conversation.adoptRevision(next)
             pinRevision(next)
         },
         [conversation.adoptRevision, pinRevision],
     )
     const pendingSecret = useMemo(
         () => getPendingSecretInteractions(conversation.messages)[0],
         [conversation.messages],
     )
 
+    // The agent committing itself: the stream carries a one-way `data-committed-revision` part.
+    // Follow it — pin the workspace and retarget the next send — and drop the latest-revision
+    // caches, or the config pane and the version chip keep showing the revision it replaced.
+    // The desktop does the same in its own host hook; the shared engine leaves it to the skin.
+    const committedSeenRef = useRef<Set<string>>(new Set())
+    useEffect(() => {
+        for (const revisionId of committedRevisionIds(conversation.messages)) {
+            if (committedSeenRef.current.has(revisionId)) continue
+            committedSeenRef.current.add(revisionId)
+            invalidateAgentCommittedRevisionCache()
+            if (revisionId !== entityId) adoptSecretRevision(revisionId)
+        }
+    }, [adoptSecretRevision, conversation.messages, entityId])
+
     // The connect-model gate — desktop parity. The engine deliberately leaves this to the skin
     // (`useAgentConversation` says so): a keyless project must be told to add a key BEFORE the
     // send, not shown a raw 422 after it. Blocks the composer, holds the parked task, and raises
@@ -203,6 +223,19 @@
         input?.focus()
     }, [cancelEdit])
 
+    // Landing on a session — a new one from `+` or the shortcut, or a switch to an existing one —
+    // puts the caret in the composer, once it can take input. Not while the caret is already in
+    // some other field: a self-commit remounts this screen mid-edit in the config pane.
+    const disabled = conversation.isHydrating || modelBlocked
+    useEffect(() => {
+        if (disabled) return
+        const frame = requestAnimationFrame(() => {
+            if (isTypingElsewhere(document.activeElement)) return
+            composerRef.current?.focus()
+        })
+        return () => cancelAnimationFrame(frame)
+    }, [disabled, sessionId])
+
     // Keep Home tasks session-scoped until admission; failures require an explicit retry.
     const pendingTasks = useAtomValue(pendingTasksAtom)
     const pendingTask = pendingTasks[sessionId]
@@ -525,15 +558,6 @@
     })
     const secretDockOpen =
         !streamingHere && !stopping && !conversation.stopped && Boolean(pendingSecret)
-    // A docked gate holds the jump pill back — same rule, same reasons, as the desktop. This
-    // surface has no question-form dock yet, so approvals, connect, and secret cards gate it.
-    const gateOpen =
-        jumpGateOpen({
-            approvals: pendingApprovals.length,
-            elicitationOpen: false,
-            connectionOpen: connects.open,
-        }) || secretDockOpen
-
     // Rewind: re-run the conversation from a turn. The hook only SCANS (it never opens dialogs),
     // so the warning about tools that already ran, and putting a rewound user message back into
     // the composer, are this surface's job — same division the desktop uses. `composerRef` is
@@ -602,7 +626,7 @@
         body = <ChatLoading />
     } else {
         body = (
-            <ContentRail className="flex grow flex-col gap-3 p-4 pb-[calc(1rem+env(safe-area-inset-bottom))]">
+            <ContentRail className="flex grow flex-col gap-3 p-4 pt-6 pb-[calc(1rem+env(safe-area-inset-bottom))]">
                 {/* A held or failed Home task stays visible until accepted. */}
                 {heldTaskText ? (
                     <div className={`${mobileTurnRowClass} justify-end`}>
@@ -656,16 +680,13 @@
             <ScreenScaffold
                 scrollRef={autoScroll.ref}
                 onScroll={autoScroll.onScroll}
-                scrollOverlay={
-                    <ChatJumpToLatest
-                        show={autoScroll.showJump && !gateOpen}
-                        onClick={autoScroll.jumpToLatest}
-                    />
-                }
                 embedded={embedded}
-                // The top edge fades as a MASK, exactly as the desktop transcript does — content
-                // dissolves under the tab bar instead of being cut by a hard line.
-                scrollStyle={{maskImage: EDGE_FADE_MASK, WebkitMaskImage: EDGE_FADE_MASK}}
+                // Edge fades as a MASK, only where content is clipped — the Home list's rule, so
+                // the first message reads crisp at the top and the bottom says there is more.
+                scrollStyle={{
+                    maskImage: autoScroll.edgeMask,
+                    WebkitMaskImage: autoScroll.edgeMask,
+                }}
                 footer={
                     <div className="relative">
                         {/* What you have lined up stays visible while a gate is open: the queued
@@ -808,7 +829,7 @@
                             onSteer={({text, parts, stagedFiles}) =>
                                 conversation.steer({text, parts, stagedFiles})
                             }
-                            disabled={conversation.isHydrating || modelBlocked}
+                            disabled={disabled}
                             placeholder={
                                 modelBlocked ? "Connect a model to start chatting…" : undefined
                             }

web/mobile/src/features/chat/SessionHistoryMenu.tsx

@@ -3,7 +3,7 @@ import {useState} from "react"
 import type {SessionRowVm} from "@agenta/sessions/row"
 import {SessionCardList} from "@agenta/sessions-ui"
 import {Button, Popover, PopoverContent, PopoverTrigger, SimpleTooltip} from "@agenta/ui/ui"
-import {History} from "lucide-react"
+import {ChatsCircleIcon} from "@phosphor-icons/react"
 import {useRouter} from "next/router"
 
 import {useSessionRowMenu} from "../sessions/useSessionRowMenu"
@@ -49,12 +49,13 @@ export const SessionHistoryMenu = ({
                         aria-label="Session history"
                         className="h-7 w-7 shrink-0 p-0"
                     >
-                        <History size={14} />
+                        {/* The rail's own Sessions glyph, so the button reads as that list. */}
+                        <ChatsCircleIcon size={14} />
                     </Button>
                 </PopoverTrigger>
             </SimpleTooltip>
             <PopoverContent align="end" className="flex w-[320px] flex-col gap-1 p-2">
-                <span className="px-2 pt-1 text-xs font-medium">Session history</span>
+                <span className="px-3 pt-1 text-xs font-medium">Session history</span>
                 {/* Capped and scrolled: the strip already shows the recent ones, so this is the
                     tail, and an agent with a hundred sessions must not grow the popover. */}
                 {/* The surface is restated here, not left to PopoverContent, because the sticky
@@ -66,7 +67,10 @@ export const SessionHistoryMenu = ({
                         policy={{origin: "exclude-trigger", expansions: []}}
                         limit={30}
                         withPinned
-                        alwaysShowPin
+                        // The rail's one-line rows, so the popover reads as the sidebar does —
+                        // the time kept, the subtitle dropped, the pin on hover beside the name.
+                        density="compact"
+                        activeRowId={activeSessionId}
                         emptyText="No sessions with this agent yet."
                         onOpenRow={openRow}
                         menuFor={menu.menuFor}

web/mobile/src/features/chat/TurnRow.tsx

@@ -34,7 +34,7 @@ import {useAtomValue, useSetAtom} from "jotai"
 import {cn} from "@/lib/utils"
 
 import {AnswerReveal} from "./AnswerReveal"
-import {AssistantMarkdown} from "./AssistantMarkdown"
+import {AssistantMarkdown, UserMarkdown} from "./AssistantMarkdown"
 import {continuationRetryAction} from "./continuationRetry"
 import {isLiveTextItem} from "./markdownStream"
 import {RunErrorCallout} from "./RunErrorCallout"
@@ -165,12 +165,8 @@ const TurnRowInner = ({
             {turn.items.map((item) => {
                 if (item.kind !== "part" || item.part.type !== "text") return null
                 if (!(item.part.text ?? "").trim()) return null
-                // What the user typed renders literally (desktop parity).
-                return (
-                    <p key={item.index} className="m-0 whitespace-pre-wrap break-words text-xs">
-                        {item.part.text}
-                    </p>
-                )
+                // Markdown, as the desktop bubble renders it: the composer's export is markdown.
+                return <UserMarkdown key={item.index} text={item.part.text ?? ""} />
             })}
         </div>
     ) : (

web/mobile/src/features/chat/committedRevisionIds.ts

@@ -0,0 +1,17 @@
+/**
+ * Revision ids the agent committed in this transcript, in stream order, one per part. The
+ * backend emits a one-way `data-committed-revision` part on the stream whenever the agent
+ * commits itself, whether the tool asked first or ran directly.
+ */
+export const committedRevisionIds = (messages: {parts: unknown[]}[]): string[] => {
+    const ids: string[] = []
+    for (const message of messages) {
+        for (const part of message.parts) {
+            const candidate = part as {type?: string; data?: {revisionId?: string}}
+            if (candidate.type !== "data-committed-revision") continue
+            const revisionId = candidate.data?.revisionId
+            if (revisionId && !ids.includes(revisionId)) ids.push(revisionId)
+        }
+    }
+    return ids
+}