@@ -5,6 +5,10 @@
 /* ─── Theme tokens ──────────────────────────────────────────────────── */
 @layer theme {
   :root {
+    /* Native text takes one family name, not Tailwind's font stack. */
+    @variant ios {
+      --font-mono: "ui-monospace";
+    }
     @variant android {
       --font-mono: "monospace";
     }
 
@@ -38,9 +38,9 @@ export function useBarOverlap(): number {
 }
 
 /**
- * The content's top safe area under the AppBar: a translucent bar's height, zero under a solid
- * one or on Android, where the bar sits in flow. For scroll content insets, which must not
- * double-count a solid bar.
+ * The content's top safe area under the AppBar: the height of the iOS bar its column lays content
+ * under, glass or solid, and zero on Android, where the bar sits in flow. For manual scroll
+ * content insets.
  */
 export function useContentTopInset(): number {
   const insets = useSafeAreaInsets();
 
@@ -2,12 +2,6 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../../native/native-glass";
 
-/** A workspace list scrolls under its bar where the bar is glass; under a solid bar it starts below. */
-export const WORKSPACE_LIST_SCROLL_INSETS = {
-  automaticallyAdjustsScrollIndicatorInsets: NATIVE_LIQUID_GLASS_SUPPORTED,
-  contentInsetAdjustmentBehavior: NATIVE_LIQUID_GLASS_SUPPORTED ? "automatic" : "never",
-} as const;
-
 /** How far an empty workspace list keeps its message below a glass bar and its search. */
 export function useWorkspaceListEmptyTopInset(): number {
   const insets = useSafeAreaInsets();
 
@@ -1496,7 +1496,6 @@ function ThreadDetailBody(
                   keyboardOffset={composerKeyboardOffset}
                   sendingWithKeyboard={sendingWithKeyboard}
                   fitShortFeedToViewport={questionInFlow && !isKeyboardVisible}
-                  contentTopInset={0}
                   contentBottomInset={
                     questionInFlow
                       ? 0
 
@@ -170,7 +170,7 @@ import { getReviewSectionIdForCheckpoint } from "../review/reviewModel";
 import { setReviewSelectedSectionId } from "../review/reviewState";
 import { Menu } from "../../components/ui/Menu";
 import { useAndroidControlSizing } from "../../components/ui/useAndroidControlSizing";
-import { useBarInset } from "../../components/ui/useBarInset";
+import { useBarInset, useContentTopInset } from "../../components/ui/useBarInset";
 import { copyPromptLink } from "../prompt-links/prompt-link-actions";
 import { parseReviewCommentMessageSegments } from "../review/reviewCommentSelection";
 import {
@@ -236,8 +236,9 @@ import { readEnvironmentScope, usePreparedConnection } from "../../state/session
 import { projectEnvironment } from "../../state/projects";
 import {
   needsWorkspaceBasenameLookup,
-  pickWorkspaceBasenameMatch,
+  pickWorkspaceLinkMatch,
   WORKSPACE_BASENAME_LOOKUP_LIMIT,
+  workspaceLinkLookupQuery,
 } from "@t3tools/client-runtime/workspace-basename-lookup";
 import {
   resolveThreadLink,
@@ -332,7 +333,6 @@ export interface ThreadFeedProps {
   readonly keyboardOffset: number;
   readonly sendingWithKeyboard?: boolean;
   readonly fitShortFeedToViewport?: boolean;
-  readonly contentTopInset?: number;
   readonly contentBottomInset?: number;
   readonly historyControls?: ThreadFeedHistoryControls;
   readonly contentMaxWidth?: number;
@@ -1914,7 +1914,10 @@ function renderFeedEntry(
       const bubbleBodyVisible = foldRowId === null || foldExpanded;
       const intentBadge = props.userMessageGrouping.continuesSteer
         ? null
-        : resolveUserMessageIntentBadge(message.inputIntent);
+        : resolveUserMessageIntentBadge(
+            message.inputIntent,
+            message.projectedItem?.item.status === "pending",
+          );
       const referenceIds = new Set(
         collectComposerContextReferences(message.text).map((reference) => reference.contextId),
       );
@@ -2772,10 +2775,12 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
   const markdownContentWidth = Math.max(0, contentWidth - ASSISTANT_ROW_HORIZONTAL_PADDING * 2);
   const reviewCommentBubbleWidth = Math.min(Math.max(280, contentWidth * 0.85), contentWidth);
   const barInset = useBarInset();
-  const topContentInset = props.contentTopInset ?? barInset;
+  const columnTopInset = useContentTopInset();
   const bottomContentInset = props.contentBottomInset ?? 18;
   const usesNativeAutomaticInsets =
     props.usesAutomaticContentInsets === true && Platform.OS === "ios";
+  // Without the native contentInset, a list-header spacer clears the bar the column lays content under.
+  const topContentInset = usesNativeAutomaticInsets ? 0 : columnTopInset;
   const anchorTopInset = usesNativeAutomaticInsets ? barInset : topContentInset;
 
   const theme = useUniwindTheme();
@@ -2893,17 +2898,18 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
         props.workspaceRoot &&
         relativePath &&
         !/[\\/]$/.test(presentation.path) &&
-        needsWorkspaceBasenameLookup(relativePath) &&
+        workspaceLinkLookupQuery(presentation.path, props.workspaceRoot) !== null &&
         readEnvironmentScope(props.environmentId, AuthFilesystemReadScope)
       ) {
+        const workspaceRoot = props.workspaceRoot;
         const originalPath = resolveWorkspaceFilePath(props.workspaceRoot, relativePath);
         void executeAtomQuery(
           appAtomRegistry,
           projectEnvironment.searchEntries({
             environmentId: props.environmentId,
             input: {
-              cwd: props.workspaceRoot,
-              query: relativePath,
+              cwd: workspaceRoot,
+              query: workspaceLinkLookupQuery(relativePath, workspaceRoot) ?? relativePath,
               kind: "file",
               limit: WORKSPACE_BASENAME_LOOKUP_LIMIT,
             },
@@ -2913,7 +2919,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
           (result) => {
             const match =
               result._tag === "Success"
-                ? pickWorkspaceBasenameMatch(relativePath, result.value.entries)
+                ? pickWorkspaceLinkMatch(relativePath, workspaceRoot, result.value.entries)
                 : null;
             if (!match || match === relativePath) {
               openAt(relativePath);
@@ -2930,7 +2936,10 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
             ).then(
               (metadata) =>
                 openAt(
-                  metadata._tag === "Success" && metadata.value?.kind !== "directory"
+                  metadata._tag === "Success" &&
+                    (needsWorkspaceBasenameLookup(relativePath)
+                      ? metadata.value?.kind !== "directory"
+                      : metadata.value === null)
                     ? match
                     : relativePath,
                 ),
@@ -3200,7 +3209,9 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
     if (state) onIsAtEndChange?.(state.isAtEnd);
   };
   const handleScroll = (event: NativeSyntheticEvent<NativeScrollEvent>) => {
-    reportHeaderMaterialVisibility(event.nativeEvent.contentOffset.y + anchorTopInset > 6);
+    reportHeaderMaterialVisibility(
+      event.nativeEvent.contentOffset.y + (usesNativeAutomaticInsets ? barInset : 0) > 6,
+    );
     handleMetricsChange();
   };
   // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- subscribes to the list's end state to report it to the parent
 
@@ -48,7 +48,6 @@ import { usePendingTaskListActions } from "../home/usePendingTaskListActions";
 import { useThreadListActions } from "../home/useThreadListActions";
 import { useFabScroll } from "../home/FabScrollContext";
 import { WorkspaceListHeader } from "../layout/workspace/WorkspaceListHeader";
-import { WORKSPACE_LIST_SCROLL_INSETS } from "../layout/workspace/workspace-list-insets";
 import { WorkspaceSidebarColumn } from "../layout/workspace/WorkspaceSidebarColumn";
 import {
   ThreadListV2PendingRow,
@@ -592,7 +591,9 @@ function ThreadNavigationSidebarPane(props: ThreadNavigationSidebarProps) {
                 itemsAreEqual={sidebarItemsAreEqual}
                 keyExtractor={(item) => item.key}
                 renderItem={renderListItem}
-                {...WORKSPACE_LIST_SCROLL_INSETS}
+                automaticallyAdjustsScrollIndicatorInsets
+                // The column lays the list under its bar, glass or solid; UIKit insets it past both.
+                contentInsetAdjustmentBehavior="automatic"
                 contentContainerStyle={[
                   styles.threadListContent,
                   {
 
@@ -22,7 +22,7 @@ describe("subagent card", () => {
     expect(subagentCardElapsed([unfinished], DateTime.toEpochMillis(later))).toBeNull();
     expect(
       subagentCardElapsed([{ ...unfinished, status: "running" }], DateTime.toEpochMillis(later)),
-    ).toBe("2m");
+    ).toBe("2m 0s");
     expect(
       subagentCardElapsed([{ ...unfinished, status: "idle" }], DateTime.toEpochMillis(later)),
     ).toBeNull();
 
@@ -53,9 +53,6 @@ export function ThreadCommandOutput(props: {
   }
   return (
     <View className="pt-1.5">
-      {data?.output.truncated ? (
-        <Text className="pb-0.5 text-3xs text-foreground-subtle">Earlier output not shown</Text>
-      ) : null}
       <ScrollView
         ref={scrollRef}
         nestedScrollEnabled
@@ -73,6 +70,9 @@ export function ThreadCommandOutput(props: {
           if (followRef.current) scrollRef.current?.scrollToEnd({ animated: false });
         }}
       >
+        {data?.output.truncated ? (
+          <Text className="pb-0.5 text-3xs text-foreground-subtle">Earlier output not shown</Text>
+        ) : null}
         <Text selectable className="font-mono text-2xs leading-normal text-foreground-muted">
           {spans.map((span, index) =>
             span.style === null ? (
 
@@ -25,6 +25,7 @@ import {
   useEffect,
   useId,
   useLayoutEffect,
+  useMemo,
   useRef,
   useState,
   type ComponentProps,
@@ -36,6 +37,7 @@ import {
   Pressable,
   ScrollView,
   StyleSheet,
+  Text as RNText,
   useAnimatedValue,
   View,
 } from "react-native";
@@ -54,6 +56,11 @@ import { useAtomCommand } from "../../state/use-atom-command";
 import { toolActivityFaviconUrl } from "@t3tools/shared/favicon";
 import { isJavaScriptReplTool } from "@t3tools/shared/toolActivity";
 import { useMarkdownCodeHighlight } from "./markdownCodeHighlightState";
+import { highlightCommand, type HighlightedLines } from "../../lib/highlights";
+import {
+  commandHighlightLanguage,
+  withVisibleControlCharacters,
+} from "@t3tools/client-runtime/work-log/command-label";
 
 import { AppText as Text } from "../../components/ui/AppText";
 import { T3Wordmark } from "../../components/T3Wordmark";
@@ -807,6 +814,31 @@ function ToolCodeText({
   readonly theme: "light" | "dark";
 }) {
   const lines = useMarkdownCodeHighlight({ code, language, theme, enabled: true });
+  return <HighlightedCodeText code={code} lines={lines} />;
+}
+
+function CommandCodeText({
+  command,
+  theme,
+}: {
+  readonly command: string;
+  readonly theme: "light" | "dark";
+}) {
+  const code = withVisibleControlCharacters(command.trim());
+  const lines = useMemo(
+    () => highlightCommand(code, commandHighlightLanguage(code), theme),
+    [code, theme],
+  );
+  return <HighlightedCodeText code={code} lines={lines} />;
+}
+
+function HighlightedCodeText({
+  code,
+  lines,
+}: {
+  readonly code: string;
+  readonly lines: HighlightedLines | null;
+}) {
   let offset = 0;
   const highlighted = lines?.flatMap((line, lineIndex) => {
     const separator = lineIndex > 0 ? "\n" : "";
@@ -816,10 +848,11 @@ function ToolCodeText({
       ...line.map((token) => {
         const start = offset;
         offset += token.content.length;
+        // Plain RN Text inherits the mono font; AppText would reset it to sans.
         return (
-          <Text key={start} style={token.color ? { color: token.color } : undefined}>
+          <RNText key={start} style={token.color ? { color: token.color } : undefined}>
             {token.content}
-          </Text>
+          </RNText>
         );
       }),
     ];
@@ -1179,7 +1212,13 @@ const ThreadWorkLogRow = function ThreadWorkLogRow(
               props.renderReasoning(reasoning.text)
             ) : call ? (
               [
-                call.command,
+                call.command ? (
+                  <CommandCodeText
+                    key="command"
+                    command={call.command}
+                    theme={props.themeAppearance}
+                  />
+                ) : null,
                 ...(call.args ?? []).map(([key, value]) => {
                   const language =
                     key === "html"
 
@@ -7,7 +7,15 @@ export interface UserMessageIntentBadgePresentation {
 
 export function resolveUserMessageIntentBadge(
   intent: OrchestrationV2UserMessageInputIntent | undefined,
+  unread = false,
 ): UserMessageIntentBadgePresentation | null {
+  if (unread && (intent === "steer" || intent === "promoted_queued_to_steer")) {
+    return {
+      label: "Steer · waiting to be read",
+      accessibilityLabel:
+        "Steer waiting for the agent to read it after the running command finishes",
+    };
+  }
   switch (intent) {
     case "steer":
       return {