@@ -24,6 +24,7 @@ import {
 import { BranchToolbarBranchSelector } from "./BranchToolbarBranchSelector";
 import { BranchToolbarEnvironmentSelector } from "./BranchToolbarEnvironmentSelector";
 import { BranchToolbarEnvModeSelector } from "./BranchToolbarEnvModeSelector";
+import { ProjectFavicon } from "./ProjectFavicon";
 import { Button } from "./ui/button";
 import {
   Menu,
@@ -240,6 +241,21 @@ export const BranchToolbar = memo(function BranchToolbar({
 
   return (
     <div className="mx-auto flex w-full max-w-3xl items-center gap-2 px-2.5 pb-3 pt-1 sm:px-3">
+      {/* The submit target leads the run-context strip: this is the one
+          surface where "which project am I about to send this to" must be
+          answered before the first keystroke, especially on drafts.
+          Mirrors the sidebar cards' title bar — favicon + mono name. */}
+      <span className="inline-flex shrink-0 items-center gap-1.5 border border-black/12 py-0.5 pl-1.5 pr-2 dark:border-white/12">
+        <ProjectFavicon
+          environmentId={activeProject.environmentId}
+          cwd={activeProject.workspaceRoot}
+          className="size-3"
+        />
+        <span className="max-w-32 truncate font-mono text-[10px] font-semibold uppercase tracking-[0.08em] text-muted-foreground">
+          {activeProject.title}
+        </span>
+      </span>
+      <Separator orientation="vertical" className="mx-0.5 h-3.5!" />
       {isMobile ? (
         <MobileRunContextSelector
           envLocked={envLocked}
 
@@ -5040,6 +5040,7 @@ function ChatViewContent(props: ChatViewProps) {
             {...(routeKind === "draft" && draftId ? { draftId } : {})}
             activeThreadTitle={activeThread.title}
             activeProjectName={activeProject?.title}
+            activeProjectCwd={activeProject?.workspaceRoot ?? null}
             openInCwd={gitCwd}
             activeProjectScripts={activeProject?.scripts}
             preferredScriptId={
 
@@ -619,44 +619,28 @@ describe("resolveSidebarV2Status", () => {
 });
 
 describe("sortThreadsForSidebarV2", () => {
-  const sortable = (input: {
-    id: string;
-    hasPendingApprovals?: boolean;
-    latestUserMessageAt: string;
-    updatedAt?: string;
-  }) => ({
+  const sortable = (input: { id: string; createdAt: string }) => ({
     id: input.id,
-    hasPendingApprovals: input.hasPendingApprovals ?? false,
-    session: null,
-    createdAt: "2026-03-09T10:00:00.000Z",
-    updatedAt: input.updatedAt ?? input.latestUserMessageAt,
-    latestUserMessageAt: input.latestUserMessageAt,
+    createdAt: input.createdAt,
   });
 
-  it("pins approval-blocked threads above the recency flow, longest wait first", () => {
+  it("orders by creation time, newest first, ignoring activity", () => {
     const sorted = sortThreadsForSidebarV2([
-      sortable({ id: "fresh", latestUserMessageAt: "2026-03-09T12:00:00.000Z" }),
-      sortable({
-        id: "approval-new",
-        hasPendingApprovals: true,
-        latestUserMessageAt: "2026-03-09T08:00:00.000Z",
-        updatedAt: "2026-03-09T11:00:00.000Z",
-      }),
-      sortable({
-        id: "approval-old",
-        hasPendingApprovals: true,
-        latestUserMessageAt: "2026-03-09T11:30:00.000Z",
-        updatedAt: "2026-03-09T09:00:00.000Z",
-      }),
-      sortable({ id: "stale", latestUserMessageAt: "2026-03-09T08:00:00.000Z" }),
+      sortable({ id: "oldest", createdAt: "2026-03-09T08:00:00.000Z" }),
+      sortable({ id: "newest", createdAt: "2026-03-09T12:00:00.000Z" }),
+      sortable({ id: "middle", createdAt: "2026-03-09T10:00:00.000Z" }),
     ]);
 
-    expect(sorted.map((thread) => thread.id)).toEqual([
-      "approval-old",
-      "approval-new",
-      "fresh",
-      "stale",
+    expect(sorted.map((thread) => thread.id)).toEqual(["newest", "middle", "oldest"]);
+  });
+
+  it("breaks creation-time ties by id so the order is stable", () => {
+    const sorted = sortThreadsForSidebarV2([
+      sortable({ id: "b", createdAt: "2026-03-09T10:00:00.000Z" }),
+      sortable({ id: "a", createdAt: "2026-03-09T10:00:00.000Z" }),
     ]);
+
+    expect(sorted.map((thread) => thread.id)).toEqual(["a", "b"]);
   });
 });
 
 
@@ -379,29 +379,17 @@ export function resolveSidebarV2Status(thread: SidebarV2StatusInput): SidebarV2S
   return "ready";
 }
 
-// v2 sort: approval-blocked threads pin above the recency flow, longest wait
-// first, so nothing actionable can scroll away. Everything else is recency.
+// v2 sort: static creation order, newest thread on top. Activity NEVER
+// reorders the list — a row holds its position from open until settled, so
+// the screen only moves at lifecycle transitions. Status (including pending
+// approval) is carried by each card's edge strip, not by position.
 export function sortThreadsForSidebarV2<
-  T extends SidebarV2StatusInput & ThreadSortInput & { readonly id: string },
+  T extends { readonly id: string; readonly createdAt: string },
 >(threads: readonly T[]): T[] {
-  return [...threads].toSorted((left, right) => {
-    const leftApproval = resolveSidebarV2Status(left) === "approval";
-    const rightApproval = resolveSidebarV2Status(right) === "approval";
-    if (leftApproval !== rightApproval) {
-      return leftApproval ? -1 : 1;
-    }
-    // Approval activities update the shell's updatedAt in the projection
-    // pipeline, making it the best available request-time proxy. Oldest waits
-    // pin first. (The shell does not expose the approval request timestamp.)
-    if (leftApproval && rightApproval) {
-      return (
-        Date.parse(left.updatedAt) - Date.parse(right.updatedAt) || left.id.localeCompare(right.id)
-      );
-    }
-    const byRecency =
-      getThreadSortTimestamp(right, "updated_at") - getThreadSortTimestamp(left, "updated_at");
-    return byRecency || left.id.localeCompare(right.id);
-  });
+  return [...threads].toSorted(
+    (left, right) =>
+      Date.parse(right.createdAt) - Date.parse(left.createdAt) || left.id.localeCompare(right.id),
+  );
 }
 
 export function resolveThreadStatusPill(input: {