diff --git a/Packages/Sources/RxCodeCore/Hooks/HookController.swift b/Packages/Sources/RxCodeCore/Hooks/HookController.swift
index b41e49cb..adfe5ff8 100644
--- a/Packages/Sources/RxCodeCore/Hooks/HookController.swift
+++ b/Packages/Sources/RxCodeCore/Hooks/HookController.swift
@@ -37,6 +37,45 @@ public protocol HookController: AnyObject {
     func project(for id: UUID) -> Project?
     /// The display title of a session (from its summary), if known.
     func sessionTitle(sessionId: String) -> String?
+
+    // MARK: Thread linkage / cross-thread sends (code-review & commit hooks)
+
+    /// Whether the thread should skip all lifecycle hooks (e.g. a review thread).
+    func threadSkipsHooks(sessionId: String) -> Bool
+    /// The model id stored on a thread, if any (used as the review thread's
+    /// default model).
+    func threadModel(sessionId: String) -> String?
+    /// Distinct paths of files edited during the thread.
+    func changedFilePaths(sessionId: String) -> [String]
+    /// The first user prompt text of a thread, if any.
+    func firstUserPrompt(sessionId: String) -> String?
+    /// A readable transcript of a thread's assistant activity (text + tool-call
+    /// summaries), used to fold a review thread's full content into a card on the
+    /// parent thread. Excludes the injected instruction prompt.
+    func threadTranscript(sessionId: String) -> String
+    /// Spawn a new linked thread (e.g. `[Code Review]`) that runs no hooks, and
+    /// wait for its first response. Returns the resolved thread id + assistant
+    /// text, or `nil` if it could not be sent.
+    func spawnLinkedThread(
+        projectId: UUID,
+        parentThreadId: String,
+        label: String,
+        model: String?,
+        prompt: String,
+        timeoutSeconds: TimeInterval
+    ) async -> HookLinkedThreadResult?
+    /// Send a follow-up prompt into an existing thread without waiting.
+    func sendThreadMessage(sessionId: String, prompt: String)
+    /// Record the latest review verdict for a session (shared between the
+    /// code-review and commit hooks within one stop cycle).
+    func setReviewPassed(_ passed: Bool, sessionId: String)
+    /// The latest recorded review verdict for a session, or `nil` if none.
+    func reviewPassed(sessionId: String) -> Bool?
+    /// Number of failed-review re-prompt rounds so far for a session (bounds the
+    /// review→fix→review loop).
+    func reviewRound(sessionId: String) -> Int
+    /// Set the failed-review round counter for a session.
+    func setReviewRound(_ round: Int, sessionId: String)
     /// First-sentence fallback body for a response-complete notification.
     func responseNotificationFallback(from responseText: String) -> String
     /// Optionally generate an AI summary of the response for a notification body.
@@ -191,6 +230,25 @@ public protocol HookController: AnyObject {
 public enum HookSetupKind {
     public static let release = "release"
     public static let docs = "docs"
+    /// Marks the follow-up turn the Commit & Push hook itself triggered, so the
+    /// hook short-circuits on that turn instead of looping forever.
+    public static let commitPush = "commitPush"
+}
+
+/// Result of spawning a linked thread via `spawnLinkedThread`.
+public struct HookLinkedThreadResult: Sendable {
+    /// The resolved (non-`pending-`) thread id of the spawned thread.
+    public let threadId: String
+    /// The reviewer/agent's first response text (empty on timeout).
+    public let assistantText: String
+    /// A transport/agent error, if any.
+    public let error: String?
+
+    public init(threadId: String, assistantText: String, error: String?) {
+        self.threadId = threadId
+        self.assistantText = assistantText
+        self.error = error
+    }
 }
 
 // MARK: - Banner surfaces
diff --git a/Packages/Sources/RxCodeCore/Models/ChatSession.swift b/Packages/Sources/RxCodeCore/Models/ChatSession.swift
index 70fdc696..36e19e27 100644
--- a/Packages/Sources/RxCodeCore/Models/ChatSession.swift
+++ b/Packages/Sources/RxCodeCore/Models/ChatSession.swift
@@ -20,6 +20,17 @@ public struct ChatSession: Identifiable, Codable, Sendable {
     public var isArchived: Bool
     public var archivedAt: Date?
 
+    /// Id of the thread this thread was spawned from (e.g. a `[Code Review]`
+    /// thread links back to the thread whose change it reviews). `nil` for
+    /// ordinary user-started threads.
+    public var parentThreadId: String?
+    /// Short label shown as a chip in the UI (e.g. `"Code Review"`). `nil` for
+    /// ordinary threads.
+    public var threadLabel: String?
+    /// When true, lifecycle hooks are skipped for this thread (review threads
+    /// must not themselves trigger reviews/commits and loop).
+    public var skipHooks: Bool
+
     public init(
         id: String,
         projectId: UUID,
@@ -36,7 +47,10 @@ public struct ChatSession: Identifiable, Codable, Sendable {
         worktreePath: String? = nil,
         worktreeBranch: String? = nil,
         isArchived: Bool = false,
-        archivedAt: Date? = nil
+        archivedAt: Date? = nil,
+        parentThreadId: String? = nil,
+        threadLabel: String? = nil,
+        skipHooks: Bool = false
     ) {
         self.id = id
         self.projectId = projectId
@@ -54,10 +68,13 @@ public struct ChatSession: Identifiable, Codable, Sendable {
         self.worktreeBranch = worktreeBranch
         self.isArchived = isArchived
         self.archivedAt = archivedAt
+        self.parentThreadId = parentThreadId
+        self.threadLabel = threadLabel
+        self.skipHooks = skipHooks
     }
 
     private enum CodingKeys: String, CodingKey {
-        case id, projectId, title, messages, createdAt, updatedAt, isPinned, agentProvider, model, effort, permissionMode, origin, worktreePath, worktreeBranch, isArchived, archivedAt
+        case id, projectId, title, messages, createdAt, updatedAt, isPinned, agentProvider, model, effort, permissionMode, origin, worktreePath, worktreeBranch, isArchived, archivedAt, parentThreadId, threadLabel, skipHooks
     }
 
     public init(from decoder: Decoder) throws {
@@ -78,6 +95,9 @@ public struct ChatSession: Identifiable, Codable, Sendable {
         worktreeBranch = try container.decodeIfPresent(String.self, forKey: .worktreeBranch)
         isArchived = try container.decodeIfPresent(Bool.self, forKey: .isArchived) ?? false
         archivedAt = try container.decodeIfPresent(Date.self, forKey: .archivedAt)
+        parentThreadId = try container.decodeIfPresent(String.self, forKey: .parentThreadId)
+        threadLabel = try container.decodeIfPresent(String.self, forKey: .threadLabel)
+        skipHooks = try container.decodeIfPresent(Bool.self, forKey: .skipHooks) ?? false
     }
 
     public struct Summary: Identifiable, Codable, Sendable, Equatable {
@@ -96,6 +116,9 @@ public struct ChatSession: Identifiable, Codable, Sendable {
         public var worktreeBranch: String?
         public var isArchived: Bool
         public var archivedAt: Date?
+        public var parentThreadId: String?
+        public var threadLabel: String?
+        public var skipHooks: Bool
 
         public init(
             id: String,
@@ -112,7 +135,10 @@ public struct ChatSession: Identifiable, Codable, Sendable {
             worktreePath: String? = nil,
             worktreeBranch: String? = nil,
             isArchived: Bool = false,
-            archivedAt: Date? = nil
+            archivedAt: Date? = nil,
+            parentThreadId: String? = nil,
+            threadLabel: String? = nil,
+            skipHooks: Bool = false
         ) {
             self.id = id
             self.projectId = projectId
@@ -129,10 +155,13 @@ public struct ChatSession: Identifiable, Codable, Sendable {
             self.worktreeBranch = worktreeBranch
             self.isArchived = isArchived
             self.archivedAt = archivedAt
+            self.parentThreadId = parentThreadId
+            self.threadLabel = threadLabel
+            self.skipHooks = skipHooks
         }
 
         private enum CodingKeys: String, CodingKey {
-            case id, projectId, title, createdAt, updatedAt, isPinned, agentProvider, model, effort, permissionMode, origin, worktreePath, worktreeBranch, isArchived, archivedAt
+            case id, projectId, title, createdAt, updatedAt, isPinned, agentProvider, model, effort, permissionMode, origin, worktreePath, worktreeBranch, isArchived, archivedAt, parentThreadId, threadLabel, skipHooks
         }
 
         public init(from decoder: Decoder) throws {
@@ -152,6 +181,9 @@ public struct ChatSession: Identifiable, Codable, Sendable {
             worktreeBranch = try container.decodeIfPresent(String.self, forKey: .worktreeBranch)
             isArchived = try container.decodeIfPresent(Bool.self, forKey: .isArchived) ?? false
             archivedAt = try container.decodeIfPresent(Date.self, forKey: .archivedAt)
+            parentThreadId = try container.decodeIfPresent(String.self, forKey: .parentThreadId)
+            threadLabel = try container.decodeIfPresent(String.self, forKey: .threadLabel)
+            skipHooks = try container.decodeIfPresent(Bool.self, forKey: .skipHooks) ?? false
         }
     }
 
@@ -171,7 +203,10 @@ public struct ChatSession: Identifiable, Codable, Sendable {
             worktreePath: worktreePath,
             worktreeBranch: worktreeBranch,
             isArchived: isArchived,
-            archivedAt: archivedAt
+            archivedAt: archivedAt,
+            parentThreadId: parentThreadId,
+            threadLabel: threadLabel,
+            skipHooks: skipHooks
         )
     }
 
diff --git a/Packages/Sources/RxCodeCore/Models/ChatThread.swift b/Packages/Sources/RxCodeCore/Models/ChatThread.swift
index 6bf47f56..afec8d88 100644
--- a/Packages/Sources/RxCodeCore/Models/ChatThread.swift
+++ b/Packages/Sources/RxCodeCore/Models/ChatThread.swift
@@ -23,6 +23,14 @@ public final class ChatThread {
     public var isArchived: Bool = false
     public var archivedAt: Date?
 
+    /// Id of the thread this thread was spawned from (e.g. a `[Code Review]`
+    /// thread links back to the reviewed thread). Defaulted for clean migration.
+    public var parentThreadId: String? = nil
+    /// Short label chip shown in the UI (e.g. `"Code Review"`).
+    public var threadLabel: String? = nil
+    /// When true, lifecycle hooks are skipped for this thread.
+    public var skipHooks: Bool = false
+
     public init(
         id: String,
         projectId: UUID,
@@ -39,7 +47,10 @@ public final class ChatThread {
         worktreePath: String? = nil,
         worktreeBranch: String? = nil,
         isArchived: Bool = false,
-        archivedAt: Date? = nil
+        archivedAt: Date? = nil,
+        parentThreadId: String? = nil,
+        threadLabel: String? = nil,
+        skipHooks: Bool = false
     ) {
         self.id = id
         self.projectId = projectId
@@ -57,6 +68,9 @@ public final class ChatThread {
         self.worktreeBranch = worktreeBranch
         self.isArchived = isArchived
         self.archivedAt = archivedAt
+        self.parentThreadId = parentThreadId
+        self.threadLabel = threadLabel
+        self.skipHooks = skipHooks
     }
 }
 
@@ -81,7 +95,10 @@ extension ChatThread {
             worktreePath: worktreePath,
             worktreeBranch: worktreeBranch,
             isArchived: isArchived,
-            archivedAt: archivedAt
+            archivedAt: archivedAt,
+            parentThreadId: parentThreadId,
+            threadLabel: threadLabel,
+            skipHooks: skipHooks
         )
     }
 
@@ -98,6 +115,9 @@ extension ChatThread {
         worktreeBranch = summary.worktreeBranch
         isArchived = summary.isArchived
         archivedAt = summary.archivedAt
+        parentThreadId = summary.parentThreadId
+        threadLabel = summary.threadLabel
+        skipHooks = summary.skipHooks
     }
 
     public static func from(_ summary: ChatSession.Summary, cliSessionId: String? = nil) -> ChatThread {
@@ -117,7 +137,10 @@ extension ChatThread {
             worktreePath: summary.worktreePath,
             worktreeBranch: summary.worktreeBranch,
             isArchived: summary.isArchived,
-            archivedAt: summary.archivedAt
+            archivedAt: summary.archivedAt,
+            parentThreadId: summary.parentThreadId,
+            threadLabel: summary.threadLabel,
+            skipHooks: summary.skipHooks
         )
     }
 }
diff --git a/Packages/Sources/RxCodeCore/Models/HookProfile.swift b/Packages/Sources/RxCodeCore/Models/HookProfile.swift
index 2d485404..8d831a88 100644
--- a/Packages/Sources/RxCodeCore/Models/HookProfile.swift
+++ b/Packages/Sources/RxCodeCore/Models/HookProfile.swift
@@ -21,22 +21,78 @@ public enum HookTrigger: String, Codable, Sendable, CaseIterable, Hashable {
     }
 }
 
-/// What a hook runs. Bash-only today; typed so other kinds can be added later.
-public enum HookType: String, Codable, Sendable, CaseIterable, Hashable {
-    case bash
+/// What a hook *does* when it fires. `command` is the original behavior — run a
+/// shell/build command (`type` + the per-type configs below). The other cases
+/// are built-in automations that don't run a command at all and are restricted
+/// to the session-stop lifecycle.
+public enum HookAction: String, Codable, Sendable, CaseIterable, Hashable {
+    /// Run a `RunProfileType` command (bash / xcode / make / package).
+    case command
+    /// Send the change to a linked `[Code Review]` thread for review; a failing
+    /// review feeds its notes back to the agent. Pairs with `.afterSessionStop`.
+    case codeReview
+    /// Instruct the agent to commit the changed files and push. Pairs with
+    /// `.afterSessionStop`.
+    case commitPush
+
+    public var displayName: String {
+        switch self {
+        case .command: return "Command"
+        case .codeReview: return "Code Review"
+        case .commitPush: return "Commit & Push"
+        }
+    }
+
+    /// The single lifecycle a built-in action is allowed to run at, or `nil`
+    /// for `.command` (which supports every trigger).
+    public var fixedTrigger: HookTrigger? {
+        switch self {
+        case .command: return nil
+        case .codeReview: return .afterSessionStop
+        case .commitPush: return .afterSessionStop
+        }
+    }
+}
+
+/// Per-hook configuration for the `.codeReview` action.
+public struct CodeReviewConfig: Codable, Sendable, Hashable {
+    /// Model id for the review thread. Empty/`nil` ⇒ inherit the reviewed
+    /// thread's model.
+    public var model: String?
+    /// Optional extra guidance appended to the reviewer's prompt.
+    public var instructions: String?
+
+    public init(model: String? = nil, instructions: String? = nil) {
+        self.model = model
+        self.instructions = instructions
+    }
 }
 
 /// A single project-scoped automation that runs a command at a session
-/// lifecycle point. Modeled on `RunProfile`; reuses `BashRunConfig` for the
-/// command, working directory, and environment presets.
+/// lifecycle point. Mirrors `RunProfile` one-to-one: it carries the same
+/// `RunProfileType` and per-type config structs so a hook can run a bash
+/// command, an `xcodebuild` invocation, a `make` target, or a package script.
+/// The only hook-specific fields are `enabled` and the lifecycle `trigger`.
 public struct HookProfile: Identifiable, Codable, Sendable, Hashable {
     public var id: UUID
     public var projectId: UUID
     public var name: String
     public var enabled: Bool
     public var trigger: HookTrigger
-    public var type: HookType
+    /// What the hook does. Defaults to `.command` so hooks persisted before this
+    /// field existed decode unchanged.
+    public var action: HookAction
+    public var type: RunProfileType
     public var bash: BashRunConfig
+    /// Populated when `type == .xcode`. Optional so hooks written before the
+    /// typed configs existed (bash-only) decode cleanly.
+    public var xcode: XcodeRunConfig?
+    /// Populated when `type == .make`. Optional for backward-compatible decode.
+    public var make: MakeRunConfig?
+    /// Populated when `type == .packageScript`. Optional for backward-compatible decode.
+    public var package: PackageRunConfig?
+    /// Populated when `action == .codeReview`. Optional for backward-compatible decode.
+    public var codeReview: CodeReviewConfig?
     public var createdAt: Date
     public var updatedAt: Date
 
@@ -46,8 +102,13 @@ public struct HookProfile: Identifiable, Codable, Sendable, Hashable {
         name: String,
         enabled: Bool = true,
         trigger: HookTrigger = .beforeSessionStart,
-        type: HookType = .bash,
+        action: HookAction = .command,
+        type: RunProfileType = .bash,
         bash: BashRunConfig = BashRunConfig(),
+        xcode: XcodeRunConfig? = nil,
+        make: MakeRunConfig? = nil,
+        package: PackageRunConfig? = nil,
+        codeReview: CodeReviewConfig? = nil,
         createdAt: Date = Date(),
         updatedAt: Date = Date()
     ) {
@@ -56,9 +117,54 @@ public struct HookProfile: Identifiable, Codable, Sendable, Hashable {
         self.name = name
         self.enabled = enabled
         self.trigger = trigger
+        self.action = action
         self.type = type
         self.bash = bash
+        self.xcode = xcode
+        self.make = make
+        self.package = package
+        self.codeReview = codeReview
         self.createdAt = createdAt
         self.updatedAt = updatedAt
     }
+
+    private enum CodingKeys: String, CodingKey {
+        case id, projectId, name, enabled, trigger, action, type, bash, xcode, make, package, codeReview, createdAt, updatedAt
+    }
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        id = try container.decode(UUID.self, forKey: .id)
+        projectId = try container.decode(UUID.self, forKey: .projectId)
+        name = try container.decode(String.self, forKey: .name)
+        enabled = try container.decodeIfPresent(Bool.self, forKey: .enabled) ?? true
+        trigger = try container.decodeIfPresent(HookTrigger.self, forKey: .trigger) ?? .beforeSessionStart
+        action = try container.decodeIfPresent(HookAction.self, forKey: .action) ?? .command
+        type = try container.decodeIfPresent(RunProfileType.self, forKey: .type) ?? .bash
+        bash = try container.decodeIfPresent(BashRunConfig.self, forKey: .bash) ?? BashRunConfig()
+        xcode = try container.decodeIfPresent(XcodeRunConfig.self, forKey: .xcode)
+        make = try container.decodeIfPresent(MakeRunConfig.self, forKey: .make)
+        package = try container.decodeIfPresent(PackageRunConfig.self, forKey: .package)
+        codeReview = try container.decodeIfPresent(CodeReviewConfig.self, forKey: .codeReview)
+        createdAt = try container.decodeIfPresent(Date.self, forKey: .createdAt) ?? Date()
+        updatedAt = try container.decodeIfPresent(Date.self, forKey: .updatedAt) ?? Date()
+    }
+
+    /// Bridge to `RunProfile` so a hook can reuse the run-profile command
+    /// synthesis (`RunTaskExecutor.mainCommandLines`). Hooks have no
+    /// before/after steps, so those are left empty.
+    public var asRunProfile: RunProfile {
+        RunProfile(
+            id: id,
+            projectId: projectId,
+            name: name,
+            type: type,
+            bash: bash,
+            xcode: xcode,
+            make: make,
+            package: package,
+            createdAt: createdAt,
+            updatedAt: updatedAt
+        )
+    }
 }
diff --git a/Packages/Sources/RxCodeCore/Models/RunProfile.swift b/Packages/Sources/RxCodeCore/Models/RunProfile.swift
index 9cef8dc1..bc58d67f 100644
--- a/Packages/Sources/RxCodeCore/Models/RunProfile.swift
+++ b/Packages/Sources/RxCodeCore/Models/RunProfile.swift
@@ -6,8 +6,20 @@ public enum RunProfileType: String, Codable, Sendable, CaseIterable, Hashable {
     case make
     /// Runs a `package.json` / `deno.json` script through a selected package
     /// manager. Named `packageScript` to avoid the `package` access-control
-    /// keyword; the rawValue stays `"package"` so it renders as "Package".
+    /// keyword; the rawValue stays `"package"` for backward-compatible
+    /// persistence and mobile/Android sync. User-facing label is "Node.js".
     case packageScript = "package"
+
+    /// User-facing label. `packageScript` shows as "Node.js" (the old
+    /// "Package" label was too broad); the rest are their capitalized names.
+    public var displayName: String {
+        switch self {
+        case .bash: return "Bash"
+        case .xcode: return "Xcode"
+        case .make: return "Make"
+        case .packageScript: return "Node.js"
+        }
+    }
 }
 
 public struct RunProfile: Identifiable, Codable, Sendable, Hashable {
diff --git a/Packages/Sources/RxCodeCore/RunProfile/RunTaskExecutor.swift b/Packages/Sources/RxCodeCore/RunProfile/RunTaskExecutor.swift
index ce7fd457..546f01ca 100644
--- a/Packages/Sources/RxCodeCore/RunProfile/RunTaskExecutor.swift
+++ b/Packages/Sources/RxCodeCore/RunProfile/RunTaskExecutor.swift
@@ -136,7 +136,7 @@ public enum RunTaskExecutor {
     /// appropriate `xcodebuild` invocation (and, for `.run`, locate the built
     /// `.app` from build settings and `open` it); for `.make` we synthesize
     /// a `make` invocation against the configured Makefile and target.
-    static func mainCommandLines(for profile: RunProfile, projectPath: String) -> [String] {
+    public static func mainCommandLines(for profile: RunProfile, projectPath: String) -> [String] {
         switch profile.type {
         case .bash:
             let cmd = profile.bash.command.trimmingCharacters(in: .whitespaces)
diff --git a/Packages/Sources/RxCodeSync/Protocol/Payload+Autopilot.swift b/Packages/Sources/RxCodeSync/Protocol/Payload+Autopilot.swift
index a5d8069d..0b22c692 100644
--- a/Packages/Sources/RxCodeSync/Protocol/Payload+Autopilot.swift
+++ b/Packages/Sources/RxCodeSync/Protocol/Payload+Autopilot.swift
@@ -40,6 +40,8 @@ public enum AutopilotOp: String, Codable, Sendable {
     // by every "add repository" flow — mirrors the desktop add sheets which all
     // source `secrets.listManagedRepositories`).
     case listManagedRepos
+    case cloneManagedRepo
+    case installGitHubAppUrl
 
     // Automation settings (schema-driven form)
     case automationSchema
@@ -208,6 +210,16 @@ public struct AutopilotRepoIDBody: Codable, Sendable {
     public init(repoId: String) { self.repoId = repoId }
 }
 
+public struct AutopilotCloneRepoBody: Codable, Sendable {
+    public let fullName: String
+    public init(fullName: String) { self.fullName = fullName }
+}
+
+public struct AutopilotCloneRepoResult: Codable, Sendable {
+    public let project: Project
+    public init(project: Project) { self.project = project }
+}
+
 // MARK: - Repo setup bodies
 
 public struct AutopilotRepoSetupUpdateBody: Codable, Sendable {
diff --git a/Packages/Sources/RxCodeSync/Protocol/Payload+Sessions.swift b/Packages/Sources/RxCodeSync/Protocol/Payload+Sessions.swift
index 95d2f7ee..3dfa079c 100644
--- a/Packages/Sources/RxCodeSync/Protocol/Payload+Sessions.swift
+++ b/Packages/Sources/RxCodeSync/Protocol/Payload+Sessions.swift
@@ -45,6 +45,11 @@ public struct SessionSummary: Codable, Sendable, Identifiable {
     /// "finished, unread" indicator. Defaults to `false` for summaries from
     /// an older desktop that predates this field.
     public let hasUncheckedCompletion: Bool
+    /// Id of the thread this thread was spawned from (e.g. a `[Code Review]`
+    /// thread links back to the reviewed thread). `nil` for ordinary threads.
+    public let parentThreadId: String?
+    /// Short label chip (e.g. `"Code Review"`). `nil` for ordinary threads.
+    public let threadLabel: String?
 
     public init(
         id: String,
@@ -58,7 +63,9 @@ public struct SessionSummary: Codable, Sendable, Identifiable {
         progress: SessionProgressSnapshot? = nil,
         todos: [TodoItem]? = nil,
         queuedMessages: [QueuedUserMessage]? = nil,
-        hasUncheckedCompletion: Bool = false
+        hasUncheckedCompletion: Bool = false,
+        parentThreadId: String? = nil,
+        threadLabel: String? = nil
     ) {
         self.id = id
         self.projectId = projectId
@@ -72,10 +79,12 @@ public struct SessionSummary: Codable, Sendable, Identifiable {
         self.todos = todos
         self.queuedMessages = queuedMessages
         self.hasUncheckedCompletion = hasUncheckedCompletion
+        self.parentThreadId = parentThreadId
+        self.threadLabel = threadLabel
     }
 
     private enum CodingKeys: String, CodingKey {
-        case id, projectId, title, updatedAt, isPinned, isArchived, isStreaming, attention, progress, todos, queuedMessages, hasUncheckedCompletion
+        case id, projectId, title, updatedAt, isPinned, isArchived, isStreaming, attention, progress, todos, queuedMessages, hasUncheckedCompletion, parentThreadId, threadLabel
     }
 
     public init(from decoder: Decoder) throws {
@@ -92,6 +101,8 @@ public struct SessionSummary: Codable, Sendable, Identifiable {
         todos = try container.decodeIfPresent([TodoItem].self, forKey: .todos)
         queuedMessages = try container.decodeIfPresent([QueuedUserMessage].self, forKey: .queuedMessages)
         hasUncheckedCompletion = try container.decodeIfPresent(Bool.self, forKey: .hasUncheckedCompletion) ?? false
+        parentThreadId = try container.decodeIfPresent(String.self, forKey: .parentThreadId)
+        threadLabel = try container.decodeIfPresent(String.self, forKey: .threadLabel)
     }
 }
 
diff --git a/RxCode.xcodeproj/project.pbxproj b/RxCode.xcodeproj/project.pbxproj
index 56011fa2..f04adfb5 100644
--- a/RxCode.xcodeproj/project.pbxproj
+++ b/RxCode.xcodeproj/project.pbxproj
@@ -12,6 +12,7 @@
 		33993F0F87CF4DB09F2813A8 /* AppStateProjectSwitchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4381E755142272EB2DAA9C96 /* AppStateProjectSwitchTests.swift */; };
 		5C2222222FCB200000000002 /* BriefingThreadRowTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C2222222FCB200000000001 /* BriefingThreadRowTests.swift */; };
 		5C3333332FCB400000000002 /* ThreadStoreThreadSummaryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3333332FCB400000000001 /* ThreadStoreThreadSummaryTests.swift */; };
+		5C4444442FCE100000000002 /* GeneratedTextSanitizerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C4444442FCE100000000001 /* GeneratedTextSanitizerTests.swift */; };
 		6E17B0012FC8000100A10001 /* LocalAIProviderAcceptanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E17B0002FC8000100A10001 /* LocalAIProviderAcceptanceTests.swift */; };
 		7A5C0001000000000000A002 /* MockAgentBackend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A5C0001000000000000A001 /* MockAgentBackend.swift */; };
 		7A5C0002000000000000A002 /* CrossProjectSendConcurrencyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A5C0002000000000000A001 /* CrossProjectSendConcurrencyTests.swift */; };
@@ -129,6 +130,7 @@
 		4381E755142272EB2DAA9C96 /* AppStateProjectSwitchTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AppStateProjectSwitchTests.swift; sourceTree = "<group>"; };
 		5C2222222FCB200000000001 /* BriefingThreadRowTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BriefingThreadRowTests.swift; sourceTree = "<group>"; };
 		5C3333332FCB400000000001 /* ThreadStoreThreadSummaryTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ThreadStoreThreadSummaryTests.swift; sourceTree = "<group>"; };
+		5C4444442FCE100000000001 /* GeneratedTextSanitizerTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = GeneratedTextSanitizerTests.swift; sourceTree = "<group>"; };
 		6E17B0002FC8000100A10001 /* LocalAIProviderAcceptanceTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LocalAIProviderAcceptanceTests.swift; sourceTree = "<group>"; };
 		6E17B0032FC8000100A10001 /* RxCodeUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RxCodeUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		6E17B00D2FC8000100A10001 /* UITestplan.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = UITestplan.xctestplan; sourceTree = "<group>"; };
@@ -340,6 +342,7 @@
 				DFA0CCD52FB4CC02005991E1 /* HistoryListArchiveFilterTests.swift */,
 				5C2222222FCB200000000001 /* BriefingThreadRowTests.swift */,
 				5C3333332FCB400000000001 /* ThreadStoreThreadSummaryTests.swift */,
+				5C4444442FCE100000000001 /* GeneratedTextSanitizerTests.swift */,
 				E62000002FCB000100000001 /* MemoryIntentTests.swift */,
 			);
 			path = RxCodeTests;
@@ -792,6 +795,7 @@
 				DFA0CCE12FB4CC02005991E1 /* HistoryListArchiveFilterTests.swift in Sources */,
 				5C2222222FCB200000000002 /* BriefingThreadRowTests.swift in Sources */,
 				5C3333332FCB400000000002 /* ThreadStoreThreadSummaryTests.swift in Sources */,
+				5C4444442FCE100000000002 /* GeneratedTextSanitizerTests.swift in Sources */,
 				E62000012FCB000100000001 /* MemoryIntentTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/RxCode.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/RxCode.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index efe23aba..cfa3af20 100644
--- a/RxCode.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/RxCode.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "037027ac785e88eafec21a5d2ded918dff49adb8ca86008f1fff4211c09b1c39",
+  "originHash" : "4e57c3e72b3783f86f3921d55aadf023d63038ca5bc9265e34900dc7724ab193",
   "pins" : [
     {
       "identity" : "abseil-cpp-binary",
diff --git a/RxCode/App/AppState+CrossProjectSend.swift b/RxCode/App/AppState+CrossProjectSend.swift
index 8450b4c0..15f635ce 100644
--- a/RxCode/App/AppState+CrossProjectSend.swift
+++ b/RxCode/App/AppState+CrossProjectSend.swift
@@ -38,7 +38,10 @@ extension AppState {
         effort: String? = nil,
         permissionMode: PermissionMode? = nil,
         waitForResponse: Bool = true,
-        timeoutSeconds: TimeInterval = 120
+        timeoutSeconds: TimeInterval = 120,
+        parentThreadId: String? = nil,
+        threadLabel: String? = nil,
+        skipHooks: Bool = false
     ) async throws -> CrossProjectSendResult {
         // Resolve target project + thread.
         let resolvedProject: Project
@@ -119,6 +122,25 @@ extension AppState {
             resolvedThreadIdForReturn = postSendKey
         }
 
+        // Stamp linkage (parent thread / label / skip-hooks) onto the freshly
+        // created thread now that its real id is known. Only for new threads —
+        // existing-thread sends (e.g. the commit message) leave linkage alone.
+        if resolvedThreadId == nil,
+           parentThreadId != nil || threadLabel != nil || skipHooks {
+            threadStore.setThreadLinkage(
+                sessionId: resolvedThreadIdForReturn,
+                parentThreadId: parentThreadId,
+                threadLabel: threadLabel,
+                skipHooks: skipHooks
+            )
+            // Mirror onto the in-memory summary so the UI reflects it immediately.
+            if let idx = allSessionSummaries.firstIndex(where: { $0.id == resolvedThreadIdForReturn }) {
+                allSessionSummaries[idx].parentThreadId = parentThreadId
+                allSessionSummaries[idx].threadLabel = threadLabel
+                allSessionSummaries[idx].skipHooks = skipHooks
+            }
+        }
+
         if !waitForResponse {
             // Don't leak the result in the dictionary; the caller is
             // fire-and-forget. Drop it once it lands.
diff --git a/RxCode/App/AppState+MobileAutopilot.swift b/RxCode/App/AppState+MobileAutopilot.swift
index 7c43c6c1..5eb0fb07 100644
--- a/RxCode/App/AppState+MobileAutopilot.swift
+++ b/RxCode/App/AppState+MobileAutopilot.swift
@@ -83,6 +83,32 @@ extension AppState {
             let q = optionalAutopilotBody(request, as: AutopilotReposQuery.self)
             let page = try await secrets.listManagedRepositories(search: q?.search, cursor: q?.cursor)
             return try encoder.encode(page)
+        case .cloneManagedRepo:
+            let body = try decodeAutopilotBody(request, as: AutopilotCloneRepoBody.self)
+            let target = body.fullName.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+            guard !target.isEmpty else {
+                throw MobileRemoteConfigError.invalidRequest("Repository name is required.")
+            }
+            guard isSignedIn else {
+                throw MobileRemoteConfigError.invalidRequest("Sign in with rxlab on your Mac before importing GitHub repositories.")
+            }
+            if let existing = projects.first(where: { $0.gitHubRepo?.lowercased() == target }) {
+                return try encoder.encode(AutopilotCloneRepoResult(project: existing))
+            }
+            let page = try await autopilot.listRepositories(search: body.fullName, cursor: nil)
+            guard let repo = page.items.first(where: { $0.fullName.lowercased() == target }) else {
+                throw MobileRemoteConfigError.invalidRequest("Repository is not available from the signed-in rxlab account.")
+            }
+            guard let project = try await cloneAndAddProjectForMobile(repo) else {
+                throw MobileRemoteConfigError.invalidRequest("Failed to add cloned repository.")
+            }
+            scheduleMobileSnapshotBroadcast()
+            return try encoder.encode(AutopilotCloneRepoResult(project: project))
+        case .installGitHubAppUrl:
+            guard isSignedIn else {
+                throw MobileRemoteConfigError.invalidRequest("Sign in with rxlab on your Mac before installing the GitHub App.")
+            }
+            return try encoder.encode(try await autopilot.installUrl())
 
         // MARK: Automation settings
         case .automationSchema:
diff --git a/RxCode/App/AppState+MobileSnapshots.swift b/RxCode/App/AppState+MobileSnapshots.swift
index 68d00fa2..328cd32e 100644
--- a/RxCode/App/AppState+MobileSnapshots.swift
+++ b/RxCode/App/AppState+MobileSnapshots.swift
@@ -294,7 +294,9 @@ extension AppState {
             progress: progress,
             todos: todos,
             queuedMessages: queued,
-            hasUncheckedCompletion: sessionStates[summary.id]?.hasUncheckedCompletion ?? false
+            hasUncheckedCompletion: sessionStates[summary.id]?.hasUncheckedCompletion ?? false,
+            parentThreadId: summary.parentThreadId,
+            threadLabel: summary.threadLabel
         )
     }
 
diff --git a/RxCode/App/AppState+Project.swift b/RxCode/App/AppState+Project.swift
index 25b18fb5..bf9296ba 100644
--- a/RxCode/App/AppState+Project.swift
+++ b/RxCode/App/AppState+Project.swift
@@ -385,7 +385,20 @@ extension AppState {
         }
     }
 
+    @discardableResult
+    func cloneAndAddProjectForMobile(_ repo: AutopilotRepo) async throws -> Project? {
+        if let existing = projects.first(where: { $0.gitHubRepo?.lowercased() == repo.fullName.lowercased() }) {
+            return existing
+        }
+        return try await cloneAndRegisterProject(repo, selectingIn: nil)
+    }
+
     func cloneAndAddProject(_ repo: AutopilotRepo, in window: WindowState) async throws {
+        _ = try await cloneAndRegisterProject(repo, selectingIn: window)
+    }
+
+    @discardableResult
+    private func cloneAndRegisterProject(_ repo: AutopilotRepo, selectingIn window: WindowState?) async throws -> Project? {
         let home = FileManager.default.homeDirectoryForCurrentUser.path
         let clonePath = "\(home)/RxCode/\(repo.name)"
         let parentDir = "\(home)/RxCode"
@@ -399,12 +412,16 @@ extension AppState {
         // auto-download run for clones too) and the more specific
         // `onRepositoryCloned`. No built-in hook handles both, so there is no
         // double-processing.
-        let project = await addAndSelectProject(
-            name: repo.name, path: clonePath, gitHubRepo: repo.fullName, in: window
-        )
+        let project: Project?
+        if let window {
+            project = await addAndSelectProject(name: repo.name, path: clonePath, gitHubRepo: repo.fullName, in: window)
+        } else {
+            project = await addProject(name: repo.name, path: clonePath, gitHubRepo: repo.fullName)
+        }
         if let project {
             await hookManager.dispatchRepositoryCloned(RepositoryPayload(project: project, wasCloned: true))
         }
+        return project
     }
 
     private func gitClone(from url: String, to path: String) async throws {
diff --git a/RxCode/App/AppState.swift b/RxCode/App/AppState.swift
index 0c0f807b..a6b922a4 100644
--- a/RxCode/App/AppState.swift
+++ b/RxCode/App/AppState.swift
@@ -917,6 +917,51 @@ final class AppState {
     var codexInstalled = false
     var onboardingCompleted = UserDefaults.standard.bool(forKey: "onboardingCompleted")
 
+    // MARK: - What's New
+
+    private static let seenWhatsNewKey = "seenWhatsNewSlugs"
+
+    /// Whether onboarding had already been completed when this launch started.
+    /// Distinguishes an existing user (who should see "What's New" for newly
+    /// added features) from a brand-new install (for whom nothing is "new").
+    let wasOnboardedAtLaunch = UserDefaults.standard.bool(forKey: "onboardingCompleted")
+
+    /// Slugs of "What's New" feature cards the user has already seen.
+    private(set) var seenWhatsNewSlugs: Set<String> =
+        Set(UserDefaults.standard.stringArray(forKey: AppState.seenWhatsNewKey) ?? [])
+
+    /// Controls presentation of the What's New sheet.
+    var showWhatsNewSheet = false
+
+    /// The batch of features being presented. Captured once when the sheet is
+    /// triggered so it stays stable while cards are marked seen mid-flow (which
+    /// would otherwise shrink `unseenWhatsNewFeatures` underneath the sheet).
+    var whatsNewBatch: [WhatsNewFeature] = []
+
+    /// Shipped feature cards the user has not yet seen, in display order.
+    var unseenWhatsNewFeatures: [WhatsNewFeature] {
+        WhatsNewFeature.all.filter { !seenWhatsNewSlugs.contains($0.slug) }
+    }
+
+    func markWhatsNewSeen(_ slug: String) {
+        markWhatsNewSeen([slug])
+    }
+
+    func markWhatsNewSeen<S: Sequence>(_ slugs: S) where S.Element == String {
+        var changed = false
+        for slug in slugs where seenWhatsNewSlugs.insert(slug).inserted {
+            changed = true
+        }
+        guard changed else { return }
+        UserDefaults.standard.set(Array(seenWhatsNewSlugs), forKey: Self.seenWhatsNewKey)
+    }
+
+    /// Marks every shipped feature as seen. Used for brand-new installs so the
+    /// "What's New" sheet never greets a first-time user.
+    func markAllWhatsNewSeen() {
+        markWhatsNewSeen(WhatsNewFeature.all.map(\.slug))
+    }
+
     // MARK: - App Initialization
 
     /// True once `initialize()` has finished its first run. UI shows a loading
@@ -1065,6 +1110,15 @@ final class AppState {
     /// hook passes or the user sends a real message. Keyed by session id.
     var stopHookRepromptCounts: [String: Int] = [:]
 
+    /// Latest code-review verdict per session, set by `CodeReviewHook` and read
+    /// by `CommitPushHook` during the after-stop dispatch so a commit only
+    /// happens once review passed. Keyed by session id.
+    var reviewPassedBySession: [String: Bool] = [:]
+
+    /// Number of failed-review re-prompt rounds per session, bounding the
+    /// review→fix→review loop (see `CodeReviewHook`). Keyed by session id.
+    var reviewRoundBySession: [String: Int] = [:]
+
     func runProfiles(for projectId: UUID) -> [RunProfile] {
         runProfilesByProject[projectId] ?? []
     }
@@ -1200,6 +1254,11 @@ final class AppState {
         hookManager.register(AutopilotReleaseHook())
         hookManager.register(CIUpdateHook())
         #endif
+        // Registered last so their (potentially long) after-stop work runs after
+        // the response-complete notification has already fired. CodeReviewHook
+        // must come before CommitPushHook so the commit gate sees the verdict.
+        hookManager.register(CodeReviewHook())
+        hookManager.register(CommitPushHook())
     }
 
 
diff --git a/RxCode/Resources/Localizable.xcstrings b/RxCode/Resources/Localizable.xcstrings
index 8d7d9d0a..1fbb5875 100644
--- a/RxCode/Resources/Localizable.xcstrings
+++ b/RxCode/Resources/Localizable.xcstrings
@@ -1369,6 +1369,12 @@
           }
         }
       }
+    },
+    "Add project from remote repositories" : {
+
+    },
+    "Add project locally" : {
+
     },
     "Add Relay Server" : {
       "localizations" : {
@@ -1573,6 +1579,9 @@
           }
         }
       }
+    },
+    "After a successful session, the agent is asked to commit the changed files and push them (choosing a new or existing branch). The commit turn itself won't re-trigger this hook. If a Code Review hook is also enabled, the commit only happens after the review passes." : {
+
     },
     "After Session Stop" : {
       "extractionState" : "stale",
@@ -3262,6 +3271,9 @@
           }
         }
       }
+    },
+    "Code Review" : {
+
     },
     "Collapse chats" : {
       "localizations" : {
@@ -3332,6 +3344,9 @@
           }
         }
       }
+    },
+    "Commit & Push" : {
+
     },
     "Commit %@" : {
       "localizations" : {
@@ -5421,8 +5436,12 @@
           }
         }
       }
+    },
+    "Empty Node.js Configuration" : {
+
     },
     "Empty Package Configuration" : {
+      "extractionState" : "stale",
       "localizations" : {
         "ko" : {
           "stringUnit" : {
@@ -5840,6 +5859,9 @@
           }
         }
       }
+    },
+    "Extra instructions (optional)" : {
+
     },
     "Fact" : {
       "localizations" : {
@@ -6579,46 +6601,46 @@
         }
       }
     },
-    "hook.secrets.checking" : {
+    "hook.pullRequest.creating" : {
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Checking for secrets…"
+            "value" : "Creating pull request…"
           }
         },
         "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "시크릿 확인 중…"
+            "value" : "풀 리퀘스트 생성 중…"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "正在检查密钥…"
+            "value" : "正在创建拉取请求…"
           }
         }
       }
     },
-    "hook.pullRequest.creating" : {
+    "hook.secrets.checking" : {
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Creating pull request…"
+            "value" : "Checking for secrets…"
           }
         },
         "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "풀 리퀘스트 생성 중…"
+            "value" : "시크릿 확인 중…"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "正在创建拉取请求…"
+            "value" : "正在检查密钥…"
           }
         }
       }
@@ -9468,6 +9490,9 @@
           }
         }
       }
+    },
+    "Node.js" : {
+
     },
     "Non-zero → agent continues" : {
       "extractionState" : "stale",
@@ -9701,6 +9726,9 @@
           }
         }
       }
+    },
+    "On a clean session stop, the change is sent to a linked [Code Review] thread that runs no hooks. If the review requests changes, its notes are fed back to the agent to keep fixing (up to 3 times)." : {
+
     },
     "On failure the hook output is sent back to the agent, which keeps fixing until the hook passes (max 3 retries)." : {
       "localizations" : {
@@ -10191,6 +10219,7 @@
       }
     },
     "Package" : {
+      "extractionState" : "stale",
       "localizations" : {
         "ko" : {
           "stringUnit" : {
@@ -11868,6 +11897,9 @@
           }
         }
       }
+    },
+    "Review model" : {
+
     },
     "Review the CLI setup check" : {
       "localizations" : {
@@ -12097,6 +12129,7 @@
       }
     },
     "Runs with `/bin/zsh -lc`. Absolute or project-relative working directory; leave empty to use the project root." : {
+      "extractionState" : "stale",
       "localizations" : {
         "ko" : {
           "stringUnit" : {
@@ -12208,6 +12241,9 @@
           }
         }
       }
+    },
+    "Same as thread" : {
+
     },
     "Save" : {
       "localizations" : {
@@ -13594,6 +13630,7 @@
       }
     },
     "Sign in to rxlab" : {
+      "extractionState" : "stale",
       "localizations" : {
         "ko" : {
           "stringUnit" : {
@@ -15527,4 +15564,4 @@
     }
   },
   "version" : "1.1"
-}
+}
\ No newline at end of file
diff --git a/RxCode/Services/ClaudeService+Summaries.swift b/RxCode/Services/ClaudeService+Summaries.swift
index 62d0e748..f36f8f51 100644
--- a/RxCode/Services/ClaudeService+Summaries.swift
+++ b/RxCode/Services/ClaudeService+Summaries.swift
@@ -187,14 +187,8 @@ extension ClaudeCodeServer {
     }
 
     func cleanGeneratedSummary(_ raw: String, limit: Int) -> String? {
-        let cleaned = raw
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-            .trimmingCharacters(in: CharacterSet(charactersIn: "\"'`"))
-        guard !cleaned.isEmpty else { return nil }
-        let lower = cleaned.lowercased()
         let errorPrefixes = ["api error", "error:", "execution error", "request failed", "claude error"]
-        guard !errorPrefixes.contains(where: { lower.hasPrefix($0) }) else { return nil }
-        return String(cleaned.prefix(limit))
+        return GeneratedTextSanitizer.cleanSummary(raw, limit: limit, errorPrefixes: errorPrefixes)
     }
 
     /// Write a one-off MCP config file (with no servers) used by the title-generation
diff --git a/RxCode/Services/CodexAppServer+Summaries.swift b/RxCode/Services/CodexAppServer+Summaries.swift
index 54501dec..f2b135ea 100644
--- a/RxCode/Services/CodexAppServer+Summaries.swift
+++ b/RxCode/Services/CodexAppServer+Summaries.swift
@@ -265,14 +265,7 @@ extension CodexAppServer {
     }
 
     func cleanSummary(_ raw: String, limit: Int) -> String? {
-        let cleaned = raw
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-            .trimmingCharacters(in: CharacterSet(charactersIn: "\"'`"))
-        guard !cleaned.isEmpty else { return nil }
-
-        let lower = cleaned.lowercased()
         let errorPrefixes = ["api error", "error:", "execution error", "request failed", "codex error"]
-        guard !errorPrefixes.contains(where: { lower.hasPrefix($0) }) else { return nil }
-        return String(cleaned.prefix(limit))
+        return GeneratedTextSanitizer.cleanSummary(raw, limit: limit, errorPrefixes: errorPrefixes)
     }
 }
diff --git a/RxCode/Services/FoundationModelSummarizationService.swift b/RxCode/Services/FoundationModelSummarizationService.swift
index 515fb47b..de5fa84f 100644
--- a/RxCode/Services/FoundationModelSummarizationService.swift
+++ b/RxCode/Services/FoundationModelSummarizationService.swift
@@ -324,11 +324,6 @@ actor FoundationModelSummarizationService {
     }
 
     private func cleanSummary(_ raw: String?, limit: Int) -> String? {
-        guard let raw else { return nil }
-        let cleaned = raw
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-            .trimmingCharacters(in: CharacterSet(charactersIn: "\"'`"))
-        guard !cleaned.isEmpty else { return nil }
-        return String(cleaned.prefix(limit))
+        GeneratedTextSanitizer.cleanSummary(raw, limit: limit, errorPrefixes: [])
     }
 }
diff --git a/RxCode/Services/GeneratedTextSanitizer.swift b/RxCode/Services/GeneratedTextSanitizer.swift
new file mode 100644
index 00000000..5d943113
--- /dev/null
+++ b/RxCode/Services/GeneratedTextSanitizer.swift
@@ -0,0 +1,74 @@
+import Foundation
+
+enum GeneratedTextSanitizer {
+    static func cleanSummary(_ raw: String?, limit: Int, errorPrefixes: [String]) -> String? {
+        guard let raw else { return nil }
+        let cleaned = cleanMarkdownDocument(raw)
+        guard !cleaned.isEmpty else { return nil }
+
+        let lower = cleaned.lowercased()
+        guard !errorPrefixes.contains(where: { lower.hasPrefix($0) }) else { return nil }
+        return String(cleaned.prefix(limit))
+    }
+
+    static func cleanMarkdownDocument(_ raw: String) -> String {
+        var text = raw.trimmingCharacters(in: .whitespacesAndNewlines)
+        text = stripSurroundingQuotes(text, includingBackticks: false)
+        text = unwrapWholeDocumentFence(text)
+        text = stripSurroundingQuotes(text, includingBackticks: true)
+        text = unwrapWholeDocumentFence(text)
+        text = dropLeadingMarkdownLanguageLabel(text)
+        return text.trimmingCharacters(in: .whitespacesAndNewlines)
+    }
+
+    private static func unwrapWholeDocumentFence(_ raw: String) -> String {
+        let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard let fence = openingFence(in: trimmed) else { return trimmed }
+
+        var lines = trimmed.components(separatedBy: "\n")
+        guard !lines.isEmpty else { return trimmed }
+        lines.removeFirst()
+
+        if let last = lines.last,
+           last.trimmingCharacters(in: .whitespaces).hasPrefix(fence) {
+            lines.removeLast()
+        }
+
+        return lines.joined(separator: "\n").trimmingCharacters(in: .whitespacesAndNewlines)
+    }
+
+    private static func openingFence(in text: String) -> String? {
+        let firstLine = text.components(separatedBy: "\n").first?
+            .trimmingCharacters(in: .whitespaces) ?? ""
+        if firstLine.hasPrefix("```") { return "```" }
+        if firstLine.hasPrefix("~~~") { return "~~~" }
+        return nil
+    }
+
+    private static func stripSurroundingQuotes(_ raw: String, includingBackticks: Bool) -> String {
+        var text = raw.trimmingCharacters(in: .whitespacesAndNewlines)
+        let wrappers = includingBackticks ? "\"'`" : "\"'"
+        if let first = text.first, let last = text.last,
+           wrappers.contains(first), first == last, text.count > 1 {
+            text = String(text.dropFirst().dropLast())
+                .trimmingCharacters(in: .whitespacesAndNewlines)
+        }
+        return text
+    }
+
+    private static func dropLeadingMarkdownLanguageLabel(_ raw: String) -> String {
+        var lines = raw.components(separatedBy: "\n")
+        while let first = lines.first {
+            let trimmed = first.trimmingCharacters(in: .whitespacesAndNewlines)
+            if trimmed.isEmpty {
+                lines.removeFirst()
+                continue
+            }
+            if trimmed.lowercased() == "markdown" {
+                lines.removeFirst()
+            }
+            break
+        }
+        return lines.joined(separator: "\n")
+    }
+}
diff --git a/RxCode/Services/Hooks/AppStateHookController.swift b/RxCode/Services/Hooks/AppStateHookController.swift
index a9e3db9d..5149cb60 100644
--- a/RxCode/Services/Hooks/AppStateHookController.swift
+++ b/RxCode/Services/Hooks/AppStateHookController.swift
@@ -78,6 +78,138 @@ final class AppStateHookController: HookController {
         app?.allSessionSummaries.first(where: { $0.id == sessionId })?.title
     }
 
+    // MARK: Thread linkage / cross-thread sends
+
+    func threadSkipsHooks(sessionId: String) -> Bool {
+        guard let app else { return false }
+        if let summary = app.allSessionSummaries.first(where: { $0.id == sessionId }) {
+            return summary.skipHooks
+        }
+        return app.threadStore.fetch(id: sessionId)?.skipHooks ?? false
+    }
+
+    func threadModel(sessionId: String) -> String? {
+        guard let app else { return nil }
+        if let model = app.allSessionSummaries.first(where: { $0.id == sessionId })?.model {
+            return model
+        }
+        return app.threadStore.fetch(id: sessionId)?.model
+    }
+
+    func changedFilePaths(sessionId: String) -> [String] {
+        guard let app else { return [] }
+        var seen = Set<String>()
+        var ordered: [String] = []
+        for edit in app.threadStore.fetchFileEdits(sessionId: sessionId) where seen.insert(edit.path).inserted {
+            ordered.append(edit.path)
+        }
+        return ordered
+    }
+
+    func firstUserPrompt(sessionId: String) -> String? {
+        guard let app else { return nil }
+        let messages = app.stateForSession(sessionId).messages
+        for message in messages where message.role == .user {
+            let text = message.content.trimmingCharacters(in: .whitespacesAndNewlines)
+            if !text.isEmpty { return text }
+        }
+        return nil
+    }
+
+    func threadTranscript(sessionId: String) -> String {
+        guard let app else { return "" }
+        let messages = app.stateForSession(sessionId).messages
+        var lines: [String] = []
+        for message in messages {
+            switch message.role {
+            case .user:
+                // Skip the injected review instruction (the only user message).
+                continue
+            case .assistant:
+                for toolCall in message.toolCalls {
+                    // Hook/auto-continue synthetic cards aren't part of the
+                    // reviewer's own work — skip them.
+                    if toolCall.name.lowercased().hasPrefix("hook:") { continue }
+                    lines.append("• \(toolCall.name)")
+                }
+                let text = message.content.trimmingCharacters(in: .whitespacesAndNewlines)
+                if !text.isEmpty { lines.append(text) }
+            default:
+                let text = message.content.trimmingCharacters(in: .whitespacesAndNewlines)
+                if !text.isEmpty { lines.append(text) }
+            }
+        }
+        return lines.joined(separator: "\n\n")
+    }
+
+    func spawnLinkedThread(
+        projectId: UUID,
+        parentThreadId: String,
+        label: String,
+        model: String?,
+        prompt: String,
+        timeoutSeconds: TimeInterval
+    ) async -> HookLinkedThreadResult? {
+        guard let app else { return nil }
+        do {
+            let result = try await app.sendCrossProject(
+                projectId: projectId,
+                threadId: nil,
+                prompt: prompt,
+                model: model,
+                // Plan mode keeps the reviewer read-only (no edits) and runs
+                // unattended without permission prompts.
+                permissionMode: .plan,
+                waitForResponse: true,
+                timeoutSeconds: timeoutSeconds,
+                parentThreadId: parentThreadId,
+                threadLabel: label,
+                skipHooks: true
+            )
+            return HookLinkedThreadResult(
+                threadId: result.threadId,
+                assistantText: result.assistantText,
+                error: result.error
+            )
+        } catch {
+            logger.error("spawnLinkedThread failed: \(error.localizedDescription)")
+            return nil
+        }
+    }
+
+    func sendThreadMessage(sessionId: String, prompt: String) {
+        guard let app else { return }
+        Task { [weak app] in
+            _ = try? await app?.sendCrossProject(
+                projectId: nil,
+                threadId: sessionId,
+                prompt: prompt,
+                waitForResponse: false
+            )
+        }
+    }
+
+    func setReviewPassed(_ passed: Bool, sessionId: String) {
+        app?.reviewPassedBySession[sessionId] = passed
+    }
+
+    func reviewPassed(sessionId: String) -> Bool? {
+        app?.reviewPassedBySession[sessionId]
+    }
+
+    func reviewRound(sessionId: String) -> Int {
+        app?.reviewRoundBySession[sessionId] ?? 0
+    }
+
+    func setReviewRound(_ round: Int, sessionId: String) {
+        guard let app else { return }
+        if round == 0 {
+            app.reviewRoundBySession[sessionId] = nil
+        } else {
+            app.reviewRoundBySession[sessionId] = round
+        }
+    }
+
     func responseNotificationFallback(from responseText: String) -> String {
         app?.responseNotificationFallback(from: responseText) ?? ""
     }
diff --git a/RxCode/Services/Hooks/HookManager.swift b/RxCode/Services/Hooks/HookManager.swift
index a9c01681..7633f36a 100644
--- a/RxCode/Services/Hooks/HookManager.swift
+++ b/RxCode/Services/Hooks/HookManager.swift
@@ -24,6 +24,13 @@ final class HookManager {
 
     private var enabledHooks: [any Hook] { hooks.filter(\.isEnabled) }
 
+    /// Whether a thread opts out of all lifecycle hooks (e.g. a `[Code Review]`
+    /// thread, so it can't itself trigger a review/commit and loop). Checks both
+    /// the in-memory key and the resolved session id since the CLI rotates ids.
+    private func threadSkipsHooks(_ keys: String...) -> Bool {
+        keys.contains { controller.threadSkipsHooks(sessionId: $0) }
+    }
+
     // MARK: - Session lifecycle
 
     func dispatchProjectNewChatStart(_ payload: NewChatStartPayload) async {
@@ -49,6 +56,7 @@ final class HookManager {
     }
 
     func dispatchSessionStart(_ payload: SessionStartPayload) async -> HookAggregateResult {
+        guard !threadSkipsHooks(payload.sessionKey) else { return HookAggregateResult.fold([]) }
         var outcomes: [HookOutcome] = []
         for hook in enabledHooks {
             outcomes.append(await hook.onSessionStart(payload, controller: controller))
@@ -57,6 +65,7 @@ final class HookManager {
     }
 
     func dispatchBeforeSessionEnd(_ payload: SessionEndPayload) async -> HookAggregateResult {
+        guard !threadSkipsHooks(payload.sessionKey, payload.sessionId) else { return HookAggregateResult.fold([]) }
         var outcomes: [HookOutcome] = []
         for hook in enabledHooks {
             outcomes.append(await hook.beforeSessionEnd(payload, controller: controller))
@@ -65,6 +74,7 @@ final class HookManager {
     }
 
     func dispatchAfterSessionEnd(_ payload: SessionEndPayload) async -> HookAggregateResult {
+        guard !threadSkipsHooks(payload.sessionKey, payload.sessionId) else { return HookAggregateResult.fold([]) }
         var outcomes: [HookOutcome] = []
         for hook in enabledHooks {
             outcomes.append(await hook.afterSessionEnd(payload, controller: controller))
diff --git a/RxCode/Services/Hooks/HookService.swift b/RxCode/Services/Hooks/HookService.swift
index b6875a57..b5fdebaf 100644
--- a/RxCode/Services/Hooks/HookService.swift
+++ b/RxCode/Services/Hooks/HookService.swift
@@ -21,12 +21,18 @@ enum HookService {
     /// store or the injected system prompt.
     private static let maxOutputBytes = 64 * 1024
 
-    /// Run a bash hook. Resolves working directory and environment with the same
-    /// helpers `RunService` uses, then executes the command under a login zsh so
-    /// the user's PATH (bun, pnpm, pyenv, …) is available — matching how
-    /// `RunTaskExecutor` and the interactive terminal source PATH.
+    /// Run a hook. Synthesizes the command from the hook's type with the same
+    /// builder run profiles use (`RunTaskExecutor.mainCommandLines`), so a hook
+    /// can be bash, `xcodebuild`, `make`, or a package script. Resolves working
+    /// directory and environment with the same helpers `RunService` uses, then
+    /// executes under a login zsh so the user's PATH (bun, pnpm, pyenv, …) is
+    /// available — matching how `RunTaskExecutor` and the interactive terminal
+    /// source PATH.
     static func run(_ profile: HookProfile, project: Project) async -> HookRunResult {
-        let command = profile.bash.command.trimmingCharacters(in: .whitespacesAndNewlines)
+        let command = RunTaskExecutor
+            .mainCommandLines(for: profile.asRunProfile, projectPath: project.path)
+            .joined(separator: "\n")
+            .trimmingCharacters(in: .whitespacesAndNewlines)
         guard !command.isEmpty else {
             return HookRunResult(output: "", exitCode: 0)
         }
diff --git a/RxCode/Services/Hooks/hooks/CodeReviewHook.swift b/RxCode/Services/Hooks/hooks/CodeReviewHook.swift
new file mode 100644
index 00000000..b8398286
--- /dev/null
+++ b/RxCode/Services/Hooks/hooks/CodeReviewHook.swift
@@ -0,0 +1,219 @@
+import Foundation
+import os
+import RxCodeCore
+
+/// Built-in `.codeReview` hook. On a clean session stop, if the project has an
+/// enabled Code Review hook, it spawns a linked `[Code Review]` thread (running
+/// no hooks, using the configured or inherited model) and feeds it the changed
+/// files, the user's task, and the agent's final response. The reviewer ends its
+/// reply with `REVIEW_RESULT: PASS` or `REVIEW_RESULT: FAIL`:
+///   - PASS → records the verdict so `CommitPushHook` may proceed.
+///   - FAIL (or no verdict) → sends the review notes back into the original
+///     thread as a follow-up prompt so the agent fixes the issues and is then
+///     re-reviewed. Bounded by `maxReviewRounds` to stop a fix→fail→fix loop.
+///
+/// Runs on `.afterSessionStop` (after the thread is finalized/saved). Registered
+/// last so its (possibly long) work doesn't delay the response notification.
+@MainActor
+final class CodeReviewHook: Hook {
+    let hookID = "builtin.codeReview"
+    private let logger = Logger(subsystem: "com.claudework", category: "CodeReviewHook")
+
+    /// Verdict marker the reviewer must end its reply with.
+    private static let marker = "REVIEW_RESULT:"
+    /// Upper bound on how long to wait for the review thread's first response.
+    private static let reviewTimeout: TimeInterval = 600
+    /// Max failed-review re-prompts per session before giving up.
+    private static let maxReviewRounds = 3
+
+    func afterSessionEnd(_ payload: SessionEndPayload, controller: any HookController) async -> HookOutcome {
+        // Only review clean completions; errored/cancelled turns aren't reviewable.
+        guard payload.reason == .completed, !payload.turnDidError else { return .ignored }
+
+        // Don't review the follow-up commit turn the Commit & Push hook triggered
+        // (file edits are thread-cumulative, so the original change would look
+        // "changed" again and spawn a redundant review). The marker is still set
+        // here because CommitPushHook clears it later in this same dispatch (it is
+        // registered after this hook).
+        if controller.isSetupSession(kind: HookSetupKind.commitPush, sessionKey: payload.sessionKey) {
+            return .ignored
+        }
+
+        let hooks = await controller.enabledHookProfiles(projectId: payload.project.id, trigger: .afterSessionStop)
+            .filter { $0.action == .codeReview }
+        guard let hook = hooks.first else { return .ignored }
+
+        let changedFiles = controller.changedFilePaths(sessionId: payload.sessionId)
+        guard !changedFiles.isEmpty else {
+            // Nothing changed — treat as passed so a paired commit hook can no-op
+            // cleanly rather than waiting on a review that has nothing to review.
+            recordVerdict(true, payload: payload, controller: controller)
+            return .ignored
+        }
+
+        let task = controller.firstUserPrompt(sessionId: payload.sessionKey) ?? "(task unknown)"
+        let model = hook.codeReview?.model?.trimmingCharacters(in: .whitespacesAndNewlines)
+        let resolvedModel = (model?.isEmpty == false) ? model : controller.threadModel(sessionId: payload.sessionId)
+        let prompt = reviewPrompt(
+            task: task,
+            changedFiles: changedFiles,
+            finalResponse: payload.lastAssistantText,
+            extraInstructions: hook.codeReview?.instructions
+        )
+
+        let card = controller.insertCard(
+            sessionKey: payload.sessionKey,
+            toolName: AppState.hookToolName(for: hook),
+            input: [
+                "name": .string(hook.name),
+                "trigger": .string(hook.trigger.displayName),
+                "summary": .string("Code review · \(changedFiles.count) changed file(s)"),
+            ]
+        )
+
+        logger.debug("[Hook] spawning code-review thread for session \(payload.sessionId, privacy: .public) files=\(changedFiles.count)")
+        let result = await controller.spawnLinkedThread(
+            projectId: payload.project.id,
+            parentThreadId: payload.sessionId,
+            label: "Code Review",
+            model: resolvedModel,
+            prompt: prompt,
+            timeoutSeconds: Self.reviewTimeout
+        )
+
+        guard let result, result.error == nil else {
+            // Couldn't run the review (transport/agent error or timeout). Don't
+            // punish the agent for our own failure — record as not-passed (so a
+            // commit hook holds off) but don't re-prompt.
+            let detail = result?.error ?? "The review thread did not respond in time."
+            finishCard(card, hook: hook, payload: payload, controller: controller,
+                       result: "Code review could not complete: \(detail)", isError: true)
+            recordVerdict(false, payload: payload, controller: controller)
+            return .ignored
+        }
+
+        let verdict = parseVerdict(result.assistantText)
+        // Fold the review thread's full activity into the card so it can be
+        // expanded inline on the parent thread (and on paired mobile devices,
+        // since hook cards sync automatically).
+        let transcript = controller.threadTranscript(sessionId: result.threadId)
+        let body = transcript.isEmpty ? result.assistantText : transcript
+        let reviewLink = "Review thread: \(result.threadId)"
+
+        switch verdict {
+        case .pass:
+            finishCard(card, hook: hook, payload: payload, controller: controller,
+                       result: "✅ Code review passed.\n\(reviewLink)\n\n\(body)", isError: false)
+            recordVerdict(true, payload: payload, controller: controller)
+            controller.setReviewRound(0, sessionId: payload.sessionId)
+            return .proceed
+
+        case .fail(let notes), .unknown(let notes):
+            recordVerdict(false, payload: payload, controller: controller)
+            let round = controller.reviewRound(sessionId: payload.sessionId)
+            if round + 1 >= Self.maxReviewRounds {
+                // Give up re-prompting after the cap so a perpetually-failing
+                // review can't loop the agent forever.
+                controller.setReviewRound(0, sessionId: payload.sessionId)
+                finishCard(card, hook: hook, payload: payload, controller: controller,
+                           result: "⚠️ Code review still requesting changes after \(Self.maxReviewRounds) attempts — stopping.\n\(reviewLink)\n\n\(body)",
+                           isError: true)
+                return .proceed
+            }
+
+            controller.setReviewRound(round + 1, sessionId: payload.sessionId)
+            finishCard(card, hook: hook, payload: payload, controller: controller,
+                       result: "⚠️ Code review requested changes (sent back to the agent, attempt \(round + 1) of \(Self.maxReviewRounds)).\n\(reviewLink)\n\n\(body)",
+                       isError: true)
+            // After-stop can't auto-continue, so re-prompt the thread directly.
+            controller.sendThreadMessage(
+                sessionId: payload.sessionId,
+                prompt: """
+                A Code Review of your change requested changes. Address the feedback below, then finish.
+
+                \(notes)
+                """
+            )
+            return .proceed
+        }
+    }
+
+    /// Complete the card and persist it as the session's "last hook" so the
+    /// folded review survives an app reload (hook cards never reach the transcript).
+    private func finishCard(
+        _ card: HookCardHandle,
+        hook: HookProfile,
+        payload: SessionEndPayload,
+        controller: any HookController,
+        result: String,
+        isError: Bool
+    ) {
+        controller.completeCard(card, sessionKey: payload.sessionKey, result: result, isError: isError)
+        controller.persistHookStatus(
+            sessionKey: payload.sessionKey,
+            toolId: card.toolId,
+            name: hook.name,
+            trigger: hook.trigger.displayName,
+            output: result,
+            isError: isError
+        )
+    }
+
+    // MARK: - Helpers
+
+    private func recordVerdict(_ passed: Bool, payload: SessionEndPayload, controller: any HookController) {
+        // Store under both the in-memory key and the resolved id; the commit hook
+        // reads whichever it sees first.
+        controller.setReviewPassed(passed, sessionId: payload.sessionId)
+        controller.setReviewPassed(passed, sessionId: payload.sessionKey)
+    }
+
+    private enum Verdict {
+        case pass
+        case fail(notes: String)
+        case unknown(notes: String)
+    }
+
+    private func parseVerdict(_ text: String) -> Verdict {
+        // Scan from the end so a trailing verdict line wins over any earlier
+        // mention of the marker in the body.
+        let lines = text.split(separator: "\n", omittingEmptySubsequences: false).map(String.init)
+        for line in lines.reversed() {
+            guard let range = line.range(of: Self.marker, options: [.caseInsensitive]) else { continue }
+            let value = line[range.upperBound...].trimmingCharacters(in: .whitespacesAndNewlines).uppercased()
+            if value.hasPrefix("PASS") { return .pass }
+            if value.hasPrefix("FAIL") { return .fail(notes: text) }
+        }
+        // No verdict marker — be conservative and treat as needing attention.
+        return .unknown(notes: text)
+    }
+
+    private func reviewPrompt(task: String, changedFiles: [String], finalResponse: String, extraInstructions: String?) -> String {
+        let fileList = changedFiles.map { "- \($0)" }.joined(separator: "\n")
+        var prompt = """
+        You are reviewing another agent's code change in this repository. Do not edit any files — only review.
+
+        ## The user's task
+        \(task)
+
+        ## Files the agent changed
+        \(fileList)
+
+        ## The agent's final response
+        \(finalResponse)
+
+        ## What to do
+        Inspect the changed files and judge whether the change correctly and safely accomplishes the task. Look for bugs, missed requirements, regressions, and obvious quality problems.
+
+        End your reply with a single line — exactly one of:
+        `\(Self.marker) PASS`  (the change is good as-is)
+        `\(Self.marker) FAIL`  (changes are needed)
+
+        If you FAIL the review, list the specific, actionable issues to fix above that line.
+        """
+        if let extra = extraInstructions?.trimmingCharacters(in: .whitespacesAndNewlines), !extra.isEmpty {
+            prompt += "\n\n## Additional instructions\n\(extra)"
+        }
+        return prompt
+    }
+}
diff --git a/RxCode/Services/Hooks/hooks/CommitPushHook.swift b/RxCode/Services/Hooks/hooks/CommitPushHook.swift
new file mode 100644
index 00000000..bbd8c8f0
--- /dev/null
+++ b/RxCode/Services/Hooks/hooks/CommitPushHook.swift
@@ -0,0 +1,90 @@
+import Foundation
+import os
+import RxCodeCore
+
+/// Built-in `.commitPush` hook. On a clean session stop, if the project has an
+/// enabled Commit & Push hook, it sends a follow-up message into the same thread
+/// instructing the agent to commit the changed files and push (the agent decides
+/// new vs. existing branch).
+///
+/// Loop prevention: the follow-up commit turn ends and re-enters this hook. The
+/// hook marks the session via `markSetupSession(.commitPush)` before sending, and
+/// short-circuits (consuming the marker) whenever it sees that mark — so the
+/// commit turn never triggers another commit. It also runs only on clean
+/// completions and, when a Code Review hook is also enabled, only after review
+/// passed.
+///
+/// Runs on `.afterSessionStop`.
+@MainActor
+final class CommitPushHook: Hook {
+    let hookID = "builtin.commitPush"
+    private let logger = Logger(subsystem: "com.claudework", category: "CommitPushHook")
+
+    func afterSessionEnd(_ payload: SessionEndPayload, controller: any HookController) async -> HookOutcome {
+        let hooks = await controller.enabledHookProfiles(projectId: payload.project.id, trigger: .afterSessionStop)
+            .filter { $0.action == .commitPush }
+        guard let hook = hooks.first else { return .ignored }
+
+        // Loop guard FIRST, so the commit turn always consumes its marker even if
+        // that turn errored — otherwise a stale marker would skip the next real
+        // turn's commit.
+        if controller.isSetupSession(kind: HookSetupKind.commitPush, sessionKey: payload.sessionKey) {
+            controller.clearSetupSession(kind: HookSetupKind.commitPush, sessionKey: payload.sessionKey)
+            logger.debug("[Hook] commit turn detected for session \(payload.sessionId, privacy: .public) — not re-triggering")
+            return .ignored
+        }
+
+        guard payload.reason == .completed, !payload.turnDidError else { return .ignored }
+
+        // Review gate: when a Code Review hook is also configured, only commit if
+        // the latest review passed.
+        let reviewConfigured = await controller.enabledHookProfiles(projectId: payload.project.id, trigger: .afterSessionStop)
+            .contains { $0.action == .codeReview }
+        if reviewConfigured {
+            let passed = controller.reviewPassed(sessionId: payload.sessionId)
+                ?? controller.reviewPassed(sessionId: payload.sessionKey)
+            guard passed == true else {
+                logger.debug("[Hook] skipping commit for session \(payload.sessionId, privacy: .public) — review not passed (\(String(describing: passed), privacy: .public))")
+                return .ignored
+            }
+        }
+
+        let changedFiles = controller.changedFilePaths(sessionId: payload.sessionId)
+        guard !changedFiles.isEmpty else { return .ignored }
+
+        // Mark BEFORE sending so the resulting commit turn short-circuits above.
+        controller.markSetupSession(kind: HookSetupKind.commitPush, sessionKey: payload.sessionKey)
+
+        let card = controller.insertCard(
+            sessionKey: payload.sessionKey,
+            toolName: AppState.hookToolName(for: hook),
+            input: [
+                "name": .string(hook.name),
+                "trigger": .string(hook.trigger.displayName),
+                "summary": .string("Asking the agent to commit & push the changes…"),
+            ]
+        )
+        controller.completeCard(card, sessionKey: payload.sessionKey, result: "Requested commit & push of \(changedFiles.count) changed file(s).", isError: false)
+
+        logger.debug("[Hook] requesting commit & push for session \(payload.sessionId, privacy: .public) files=\(changedFiles.count)")
+        controller.sendThreadMessage(sessionId: payload.sessionId, prompt: commitPrompt(changedFiles: changedFiles))
+        return .proceed
+    }
+
+    private func commitPrompt(changedFiles: [String]) -> String {
+        let fileList = changedFiles.map { "- \($0)" }.joined(separator: "\n")
+        return """
+        Commit the changes from this session and push them to the remote.
+
+        Files changed this session:
+        \(fileList)
+
+        Steps:
+        1. Stage the changed files and create a commit with a clear, conventional commit message describing the change.
+        2. Choose an appropriate branch — reuse the current branch if suitable, or create a new branch if that is more appropriate — and push it to the remote (set upstream if needed).
+        3. Report the branch name and the pushed commit.
+
+        Do not make further code changes beyond what is needed to commit and push.
+        """
+    }
+}
diff --git a/RxCode/Services/Hooks/hooks/UserAddedHook.swift b/RxCode/Services/Hooks/hooks/UserAddedHook.swift
index 49ab3969..0b285cdd 100644
--- a/RxCode/Services/Hooks/hooks/UserAddedHook.swift
+++ b/RxCode/Services/Hooks/hooks/UserAddedHook.swift
@@ -34,7 +34,10 @@ final class UserAddedHook: Hook {
         sessionKey: String,
         controller: any HookController
     ) async -> HookOutcome {
+        // Only command hooks run here; built-in actions (code review, commit &
+        // push) are handled by their own dedicated hooks.
         let hooks = await controller.enabledHookProfiles(projectId: project.id, trigger: trigger)
+            .filter { $0.action == .command }
         guard !hooks.isEmpty else { return .ignored }
 
         var combined: [String] = []
diff --git a/RxCode/Services/OpenAISummarizationService.swift b/RxCode/Services/OpenAISummarizationService.swift
index 70aafcb5..751f284e 100644
--- a/RxCode/Services/OpenAISummarizationService.swift
+++ b/RxCode/Services/OpenAISummarizationService.swift
@@ -445,15 +445,7 @@ actor OpenAISummarizationService {
     }
 
     private func cleanSummary(_ raw: String?, limit: Int) -> String? {
-        guard let raw else { return nil }
-        let cleaned = raw
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-            .trimmingCharacters(in: CharacterSet(charactersIn: "\"'`"))
-        guard !cleaned.isEmpty else { return nil }
-
-        let lower = cleaned.lowercased()
         let errorPrefixes = ["api error", "error:", "execution error", "request failed", "openai error"]
-        guard !errorPrefixes.contains(where: { lower.hasPrefix($0) }) else { return nil }
-        return String(cleaned.prefix(limit))
+        return GeneratedTextSanitizer.cleanSummary(raw, limit: limit, errorPrefixes: errorPrefixes)
     }
 }
diff --git a/RxCode/Services/ThreadStore.swift b/RxCode/Services/ThreadStore.swift
index 7e8ba34d..ac2ad9e6 100644
--- a/RxCode/Services/ThreadStore.swift
+++ b/RxCode/Services/ThreadStore.swift
@@ -587,6 +587,21 @@ final class ThreadStore {
         save()
     }
 
+    /// Stamp linkage metadata (parent thread / label / skip-hooks) onto a thread
+    /// row. Used right after a linked `[Code Review]` thread's real id resolves.
+    func setThreadLinkage(
+        sessionId: String,
+        parentThreadId: String?,
+        threadLabel: String?,
+        skipHooks: Bool
+    ) {
+        guard let thread = fetch(id: sessionId) else { return }
+        thread.parentThreadId = parentThreadId
+        thread.threadLabel = threadLabel
+        thread.skipHooks = skipHooks
+        save()
+    }
+
     private func renameHookStatus(from oldId: String, to newId: String) {
         guard oldId != newId else { return }
         guard let row = fetchHookStatus(sessionId: oldId) else { return }
diff --git a/RxCode/Views/Hooks/HookConfigurationsView.swift b/RxCode/Views/Hooks/HookConfigurationsView.swift
index 4f5db9a2..45623193 100644
--- a/RxCode/Views/Hooks/HookConfigurationsView.swift
+++ b/RxCode/Views/Hooks/HookConfigurationsView.swift
@@ -129,7 +129,7 @@ struct HookConfigurationsView: View {
     @ViewBuilder
     private func hookRow(_ hook: HookProfile) -> some View {
         HStack {
-            Image(systemName: "bolt.horizontal.circle")
+            Image(systemName: iconName(for: hook))
                 .foregroundStyle(hook.enabled ? ClaudeTheme.accent : ClaudeTheme.textTertiary)
             Text(hook.name.isEmpty ? "Untitled" : hook.name)
                 .foregroundStyle(hook.enabled ? ClaudeTheme.textPrimary : ClaudeTheme.textTertiary)
@@ -137,15 +137,43 @@ struct HookConfigurationsView: View {
         .tag(hook.id)
     }
 
+    /// SF Symbol per hook — built-in actions get their own glyph; command hooks
+    /// fall back to the per-type icon (matches `RunConfigurationsView`).
+    private func iconName(for hook: HookProfile) -> String {
+        switch hook.action {
+        case .codeReview: return "checkmark.seal.fill"
+        case .commitPush: return "arrow.up.circle.fill"
+        case .command:
+            switch hook.type {
+            case .xcode: return "hammer.fill"
+            case .make: return "wrench.and.screwdriver.fill"
+            case .bash: return "terminal"
+            case .packageScript: return "shippingbox.fill"
+            }
+        }
+    }
+
     private var addMenu: some View {
         Menu {
-            ForEach(HookTrigger.allCases, id: \.self) { trigger in
-                Button {
-                    addHook(trigger: trigger)
-                } label: {
-                    Label(trigger.displayName, systemImage: "bolt.horizontal.circle")
+            Menu("Command") {
+                ForEach(HookTrigger.allCases, id: \.self) { trigger in
+                    Button {
+                        addHook(action: .command, trigger: trigger)
+                    } label: {
+                        Label(trigger.displayName, systemImage: "bolt.horizontal.circle")
+                    }
                 }
             }
+            Button {
+                addHook(action: .codeReview, trigger: HookAction.codeReview.fixedTrigger ?? .beforeSessionStop)
+            } label: {
+                Label("Code Review", systemImage: "checkmark.seal.fill")
+            }
+            Button {
+                addHook(action: .commitPush, trigger: HookAction.commitPush.fixedTrigger ?? .afterSessionStop)
+            } label: {
+                Label("Commit & Push", systemImage: "arrow.up.circle.fill")
+            }
         } label: {
             Image(systemName: "plus")
         }
@@ -157,11 +185,19 @@ struct HookConfigurationsView: View {
 
     // MARK: - Actions
 
-    private func addHook(trigger: HookTrigger) {
+    private func addHook(action: HookAction, trigger: HookTrigger) {
+        let defaultName: String
+        switch action {
+        case .command: defaultName = "New Hook"
+        case .codeReview: defaultName = "Code Review"
+        case .commitPush: defaultName = "Commit & Push"
+        }
         let new = HookProfile(
             projectId: project.id,
-            name: "New Hook",
-            trigger: trigger
+            name: defaultName,
+            trigger: action.fixedTrigger ?? trigger,
+            action: action,
+            codeReview: action == .codeReview ? CodeReviewConfig() : nil
         )
         draft.append(new)
         selectedId = new.id
diff --git a/RxCode/Views/Hooks/HookProfileDetailForm.swift b/RxCode/Views/Hooks/HookProfileDetailForm.swift
index 20c438b5..b91f9392 100644
--- a/RxCode/Views/Hooks/HookProfileDetailForm.swift
+++ b/RxCode/Views/Hooks/HookProfileDetailForm.swift
@@ -6,6 +6,7 @@ import SwiftUI
 /// bash-only and adds an enabled toggle + trigger picker. Reuses
 /// `BashEnvironmentEditor` for environment presets.
 struct HookProfileDetailForm: View {
+    @Environment(AppState.self) private var appState
     @Binding var hook: HookProfile
     let project: Project
 
@@ -14,11 +15,24 @@ struct HookProfileDetailForm: View {
             Section {
                 TextField("Name", text: $hook.name)
                 Toggle("Enabled", isOn: $hook.enabled)
+                Picker("Action", selection: $hook.action) {
+                    ForEach(HookAction.allCases, id: \.self) { action in
+                        Text(action.displayName).tag(action)
+                    }
+                }
+                .onChange(of: hook.action) { _, newAction in
+                    // Built-in actions only run at a fixed lifecycle.
+                    if let fixed = newAction.fixedTrigger { hook.trigger = fixed }
+                    if newAction == .codeReview, hook.codeReview == nil {
+                        hook.codeReview = CodeReviewConfig()
+                    }
+                }
                 Picker("Trigger", selection: $hook.trigger) {
                     ForEach(HookTrigger.allCases, id: \.self) { trigger in
                         Text(trigger.displayName).tag(trigger)
                     }
                 }
+                .disabled(hook.action.fixedTrigger != nil)
             } header: {
                 Text("Configuration")
             } footer: {
@@ -33,69 +47,106 @@ struct HookProfileDetailForm: View {
                 Text("Lifecycle")
             }
 
-            Section {
-                TextEditor(text: $hook.bash.command)
-                    .font(.system(.body, design: .monospaced))
-                    .frame(minHeight: 60, maxHeight: 120)
-                    .overlay(
-                        RoundedRectangle(cornerRadius: 6)
-                            .strokeBorder(ClaudeTheme.borderSubtle, lineWidth: 0.5)
-                    )
-                HStack {
-                    TextField("Working Directory", text: $hook.bash.workingDirectory, prompt: Text(project.path))
-                    Button("Browse…") {
-                        pickDirectory { picked in
-                            hook.bash.workingDirectory = picked
+            switch hook.action {
+            case .command:
+                ProfileCommandSections(
+                    profileID: hook.id,
+                    project: project,
+                    type: $hook.type,
+                    bash: $hook.bash,
+                    xcode: $hook.xcode,
+                    make: $hook.make,
+                    package: $hook.package
+                )
+                BashEnvironmentEditor(bash: $hook.bash, projectPath: project.path)
+            case .codeReview:
+                codeReviewSection
+            case .commitPush:
+                commitPushSection
+            }
+        }
+        .formStyle(.grouped)
+    }
+
+    // MARK: - Built-in action sections
+
+    private var codeReviewSection: some View {
+        Section {
+            Picker("Review model", selection: codeReviewModelBinding) {
+                Text("Same as thread").tag("")
+                ForEach(appState.availableAgentModelSections(), id: \.id) { section in
+                    Section(section.title) {
+                        ForEach(section.models, id: \.id) { model in
+                            Text(model.displayName).tag(model.id)
                         }
                     }
-                    Button {
-                        hook.bash.workingDirectory = ""
-                    } label: {
-                        Image(systemName: "arrow.uturn.backward")
-                    }
-                    .help("Reset to project root")
                 }
-            } header: {
-                Text("Command")
-            } footer: {
-                Text("Runs with `/bin/zsh -lc`. Absolute or project-relative working directory; leave empty to use the project root.")
             }
-
-            BashEnvironmentEditor(bash: $hook.bash, projectPath: project.path)
+            VStack(alignment: .leading, spacing: 4) {
+                Text("Extra instructions (optional)")
+                    .font(.system(size: 11))
+                    .foregroundStyle(.secondary)
+                TextEditor(text: codeReviewInstructionsBinding)
+                    .font(.system(size: 12, design: .monospaced))
+                    .frame(minHeight: 70)
+            }
+        } header: {
+            Text("Code Review")
+        } footer: {
+            Text("After the session is finalized, the change is sent to a linked [Code Review] thread that runs no hooks. If the review requests changes, its notes are sent back into this thread so the agent keeps fixing and is re-reviewed (up to 3 times).")
         }
-        .formStyle(.grouped)
     }
 
-    private var triggerHelp: String {
-        switch hook.trigger {
-        case .beforeSessionStart:
-            return "Runs once when a new thread starts. Its output is added to the agent's context for that turn."
-        case .beforeSessionStop:
-            return "Runs when streaming stops. Its output is shown and saved with the thread. If the command exits non-zero, its output is sent back to the agent to continue (up to 3 times)."
-        case .afterSessionStop:
-            return "Runs after streaming stops. Its output is shown only — nothing is passed back to the session."
+    private var commitPushSection: some View {
+        Section {
+            Text("After a successful session, the agent is asked to commit the changed files and push them (choosing a new or existing branch). The commit turn itself won't re-trigger this hook. If a Code Review hook is also enabled, the commit only happens after the review passes.")
+                .font(.system(size: 12))
+                .foregroundStyle(.secondary)
+        } header: {
+            Text("Commit & Push")
         }
     }
 
-    // MARK: - Directory picker
-
-    private func pickDirectory(onPick: @escaping (String) -> Void) {
-        let panel = NSOpenPanel()
-        panel.canChooseDirectories = true
-        panel.canChooseFiles = false
-        panel.allowsMultipleSelection = false
-        panel.directoryURL = URL(fileURLWithPath: project.path)
-        guard panel.runModal() == .OK, let url = panel.url else { return }
-        let root = (project.path as NSString).standardizingPath
-        let std = (url.path as NSString).standardizingPath
-        if std.hasPrefix(root + "/") {
-            onPick(String(std.dropFirst(root.count + 1)))
-        } else if std == root {
-            onPick("")
-        } else {
-            onPick(std)
+    private var codeReviewModelBinding: Binding<String> {
+        Binding(
+            get: { hook.codeReview?.model ?? "" },
+            set: { newValue in
+                var cfg = hook.codeReview ?? CodeReviewConfig()
+                cfg.model = newValue.isEmpty ? nil : newValue
+                hook.codeReview = cfg
+            }
+        )
+    }
+
+    private var codeReviewInstructionsBinding: Binding<String> {
+        Binding(
+            get: { hook.codeReview?.instructions ?? "" },
+            set: { newValue in
+                var cfg = hook.codeReview ?? CodeReviewConfig()
+                cfg.instructions = newValue.isEmpty ? nil : newValue
+                hook.codeReview = cfg
+            }
+        )
+    }
+
+    private var triggerHelp: String {
+        switch hook.action {
+        case .codeReview:
+            return "Code Review runs after the session is finalized; a failing review sends the agent back to work and re-reviews."
+        case .commitPush:
+            return "Commit & Push runs after the session is finalized and saved."
+        case .command:
+            switch hook.trigger {
+            case .beforeSessionStart:
+                return "Runs once when a new thread starts. Its output is added to the agent's context for that turn."
+            case .beforeSessionStop:
+                return "Runs when streaming stops. Its output is shown and saved with the thread. If the command exits non-zero, its output is sent back to the agent to continue (up to 3 times)."
+            case .afterSessionStop:
+                return "Runs after streaming stops. Its output is shown only — nothing is passed back to the session."
+            }
         }
     }
+
 }
 
 // MARK: - Lifecycle diagram
diff --git a/RxCode/Views/MainView.swift b/RxCode/Views/MainView.swift
index d127b8e6..f1e23d2a 100644
--- a/RxCode/Views/MainView.swift
+++ b/RxCode/Views/MainView.swift
@@ -112,6 +112,27 @@ struct MainView: View {
                 }
             }
             .hookUI()
+            .task(id: appState.isInitialized) {
+                guard appState.isInitialized else { return }
+                if appState.wasOnboardedAtLaunch {
+                    // Existing user: surface any feature cards they haven't seen.
+                    let unseen = appState.unseenWhatsNewFeatures
+                    if !unseen.isEmpty {
+                        appState.whatsNewBatch = unseen
+                        appState.showWhatsNewSheet = true
+                    }
+                } else {
+                    // Brand-new install this session — these features aren't
+                    // "new" to them, so record them all as seen up front.
+                    appState.markAllWhatsNewSeen()
+                }
+            }
+            .sheet(isPresented: Bindable(appState).showWhatsNewSheet) {
+                WhatsNewSheet(features: appState.whatsNewBatch) {
+                    appState.showWhatsNewSheet = false
+                }
+                .environment(appState)
+            }
         }
     }
 
@@ -196,18 +217,19 @@ struct MainView: View {
     @ToolbarContentBuilder
     private var toolbarContent: some ToolbarContent {
         if columnVisibility != .detailOnly {
-            ToolbarItem(placement: .navigation) {
-                Button {
-                    showGitHubSheet = true
-                } label: {
-                    Image(systemName: "square.and.arrow.down")
-                }
-                .help(appState.isSignedIn ? "Import Repository" : "Sign in to rxlab")
-            }
+            ToolbarItemGroup(placement: .navigation) {
+                Menu {
+                    Button {
+                        showFilePicker = true
+                    } label: {
+                        Label("Add project locally", systemImage: "folder.badge.plus")
+                    }
 
-            ToolbarItem(placement: .navigation) {
-                Button {
-                    showFilePicker = true
+                    Button {
+                        showGitHubSheet = true
+                    } label: {
+                        Label("Add project from remote repositories", systemImage: "square.and.arrow.down")
+                    }
                 } label: {
                     Image(systemName: "plus")
                 }
@@ -219,9 +241,7 @@ struct MainView: View {
                 ) { result in
                     handleFolderSelection(result)
                 }
-            }
 
-            ToolbarItem(placement: .navigation) {
                 Button {
                     windowState.showGlobalSearch = true
                 } label: {
@@ -229,9 +249,7 @@ struct MainView: View {
                 }
                 .help(String(localized: "Search Threads and Docs (⌘K)"))
                 .popoverTip(RxCodeTips.GlobalSearchTip(), arrowEdge: .top)
-            }
 
-            ToolbarItem(placement: .navigation) {
                 ThreadTitlePopoverButton(title: navigationTitleText)
             }
         }
diff --git a/RxCode/Views/RunProfile/ProfileCommandSections.swift b/RxCode/Views/RunProfile/ProfileCommandSections.swift
new file mode 100644
index 00000000..bda4b33f
--- /dev/null
+++ b/RxCode/Views/RunProfile/ProfileCommandSections.swift
@@ -0,0 +1,493 @@
+import AppKit
+import RxCodeCore
+import SwiftUI
+import UniformTypeIdentifiers
+
+/// Shared command-configuration form sections — the Type picker plus the
+/// per-type command editors (bash / xcode / make / package) with their
+/// auto-detection. Reused by both `RunProfileDetailForm` and
+/// `HookProfileDetailForm` so the typed editors live in exactly one place.
+///
+/// Operates on bindings to the individual config structs rather than a whole
+/// `RunProfile`/`HookProfile`, so it is agnostic to which model it edits.
+struct ProfileCommandSections: View {
+    /// Used only to scope detection cache keys to the edited profile/hook.
+    let profileID: UUID
+    let project: Project
+    @Binding var type: RunProfileType
+    @Binding var bash: BashRunConfig
+    @Binding var xcode: XcodeRunConfig?
+    @Binding var make: MakeRunConfig?
+    @Binding var package: PackageRunConfig?
+
+    @State private var detectedMakeTargets: [String] = []
+    @State private var detectedPackageScripts: [String] = []
+    @State private var installedPackageManagers: [PackageManager] = []
+    static let customTargetSentinel = "__rxcode_custom_target__"
+    static let customScriptSentinel = "__rxcode_custom_script__"
+
+    var body: some View {
+        Group {
+            typeSection
+
+            switch type {
+            case .bash:
+                bashCommandSection
+            case .xcode:
+                xcodeCommandSection
+            case .make:
+                makeCommandSection
+            case .packageScript:
+                packageCommandSection
+            }
+        }
+    }
+
+    // MARK: - Type
+
+    @ViewBuilder
+    private var typeSection: some View {
+        Section {
+            Picker("Type", selection: Binding(
+                get: { type },
+                set: { newValue in
+                    type = newValue
+                    if newValue == .xcode, xcode == nil {
+                        xcode = XcodeRunConfig()
+                    }
+                    if newValue == .make, make == nil {
+                        make = MakeRunConfig()
+                    }
+                    if newValue == .packageScript, package == nil {
+                        package = PackageRunConfig()
+                    }
+                }
+            )) {
+                ForEach(RunProfileType.allCases, id: \.self) { t in
+                    Text(t.displayName).tag(t)
+                }
+            }
+        } header: {
+            Text("Type")
+        }
+    }
+
+    // MARK: - Command sections
+
+    @ViewBuilder
+    var bashCommandSection: some View {
+        Section {
+            TextEditor(text: $bash.command)
+                .font(.system(.body, design: .monospaced))
+                .frame(minHeight: 60, maxHeight: 100)
+                .overlay(
+                    RoundedRectangle(cornerRadius: 6)
+                        .strokeBorder(ClaudeTheme.borderSubtle, lineWidth: 0.5)
+                )
+            HStack {
+                TextField("Working Directory", text: $bash.workingDirectory, prompt: Text(project.path))
+                Button("Browse…") {
+                    pickDirectory { picked in
+                        bash.workingDirectory = picked
+                    }
+                }
+                Button {
+                    bash.workingDirectory = ""
+                } label: {
+                    Image(systemName: "arrow.uturn.backward")
+                }
+                .help("Reset to project root")
+            }
+        } header: {
+            Text("Command")
+        } footer: {
+            Text("Absolute or project-relative path. Leave empty to use the project root.")
+        }
+    }
+
+    @ViewBuilder
+    var xcodeCommandSection: some View {
+        Section {
+            let xcode = Binding(
+                get: { self.xcode ?? XcodeRunConfig() },
+                set: { self.xcode = $0 }
+            )
+            HStack {
+                TextField(
+                    "Project / Workspace",
+                    text: xcode.container,
+                    prompt: Text("RxCode.xcodeproj")
+                )
+                .font(.system(.body, design: .monospaced))
+                Button("Browse…") {
+                    pickXcodeContainer { name, isWorkspace in
+                        var c = xcode.wrappedValue
+                        c.container = name
+                        c.isWorkspace = isWorkspace
+                        xcode.wrappedValue = c
+                    }
+                }
+            }
+            Toggle("Use Workspace (.xcworkspace)", isOn: xcode.isWorkspace)
+            TextField("Scheme", text: xcode.scheme, prompt: Text("RxCode"))
+                .font(.system(.body, design: .monospaced))
+            TextField("Configuration", text: xcode.configuration, prompt: Text("Debug"))
+                .font(.system(.body, design: .monospaced))
+            Picker("Action", selection: xcode.action) {
+                ForEach(XcodeAction.allCases, id: \.self) { action in
+                    Text(action.rawValue.capitalized).tag(action)
+                }
+            }
+            LabeledContent("Destination") {
+                HStack(spacing: 6) {
+                    Text(xcode.wrappedValue.selectedDestination?.displayName ?? "Any Mac (default)")
+                        .foregroundStyle(.secondary)
+                    if xcode.wrappedValue.selectedDestination != nil {
+                        Button {
+                            var c = xcode.wrappedValue
+                            c.selectedDestination = nil
+                            xcode.wrappedValue = c
+                        } label: {
+                            Image(systemName: "xmark.circle.fill")
+                                .foregroundStyle(.tertiary)
+                        }
+                        .buttonStyle(.plain)
+                        .help("Clear destination — pick again from the toolbar")
+                    }
+                }
+            }
+        } header: {
+            Text("Xcode")
+        } footer: {
+            Text("Build runs `xcodebuild build`. Run builds, then launches the produced .app (macOS) or installs + launches on the selected simulator. Pick the destination from the Run toolbar.")
+        }
+    }
+
+    @ViewBuilder
+    var makeCommandSection: some View {
+        Section {
+            let make = Binding(
+                get: { self.make ?? MakeRunConfig() },
+                set: { self.make = $0 }
+            )
+            HStack {
+                TextField(
+                    "Makefile (optional)",
+                    text: make.makefile,
+                    prompt: Text("Makefile")
+                )
+                .font(.system(.body, design: .monospaced))
+                Button("Browse…") {
+                    pickFile { picked in
+                        var c = make.wrappedValue
+                        c.makefile = picked
+                        make.wrappedValue = c
+                    }
+                }
+                Button {
+                    var c = make.wrappedValue
+                    c.makefile = ""
+                    make.wrappedValue = c
+                } label: {
+                    Image(systemName: "arrow.uturn.backward")
+                }
+                .help("Use default Makefile lookup")
+            }
+            targetField(make: make)
+            TextField(
+                "Arguments (optional)",
+                text: make.arguments,
+                prompt: Text("VAR=value -j8")
+            )
+            .font(.system(.body, design: .monospaced))
+            HStack {
+                TextField("Working Directory", text: $bash.workingDirectory, prompt: Text(project.path))
+                Button("Browse…") {
+                    pickDirectory { picked in
+                        bash.workingDirectory = picked
+                    }
+                }
+                Button {
+                    bash.workingDirectory = ""
+                } label: {
+                    Image(systemName: "arrow.uturn.backward")
+                }
+                .help("Reset to project root")
+            }
+        } header: {
+            Text("Make")
+        } footer: {
+            Text("Runs `make [-f <Makefile>] <target> [arguments]`. Leave Makefile empty to use the default lookup (Makefile / makefile / GNUmakefile).")
+        }
+        .task(id: makeDetectionKey) {
+            detectedMakeTargets = await refreshMakeTargets()
+        }
+    }
+
+    /// Cache key for re-parsing the Makefile when its path or the working
+    /// directory changes.
+    var makeDetectionKey: String {
+        "\(profileID.uuidString)|\(make?.makefile ?? "")|\(bash.workingDirectory)"
+    }
+
+    func refreshMakeTargets() async -> [String] {
+        let projectRoot = project.path
+        let makefile = make?.makefile ?? ""
+        let workingDirRaw = bash.workingDirectory
+        return await Task.detached { () -> [String] in
+            let fm = FileManager.default
+            func resolve(_ p: String, against base: String) -> String {
+                if p.isEmpty { return base }
+                if p.hasPrefix("/") { return p }
+                return (base as NSString).appendingPathComponent(p)
+            }
+            let workingDir = workingDirRaw.isEmpty
+                ? projectRoot
+                : resolve(workingDirRaw, against: projectRoot)
+
+            if !makefile.isEmpty {
+                // Picker produces project-relative paths; the executor resolves
+                // relative to working dir. Try both so the dropdown works
+                // regardless of which the user typed.
+                let candidates = [
+                    resolve(makefile, against: projectRoot),
+                    resolve(makefile, against: workingDir),
+                ]
+                for path in candidates where fm.fileExists(atPath: path) {
+                    return RunProfileDetector.makeTargets(atPath: path)
+                }
+                return []
+            }
+            if let result = RunProfileDetector.defaultMakeTargets(inDirectory: workingDir) {
+                return result.targets
+            }
+            return RunProfileDetector.defaultMakeTargets(inDirectory: projectRoot)?.targets ?? []
+        }.value
+    }
+
+    @ViewBuilder
+    func targetField(make: Binding<MakeRunConfig>) -> some View {
+        let current = make.wrappedValue.target
+        let targets = detectedMakeTargets
+        let isCustom = !targets.isEmpty && !current.isEmpty && !targets.contains(current)
+
+        if targets.isEmpty {
+            TextField("Target", text: make.target, prompt: Text("build"))
+                .font(.system(.body, design: .monospaced))
+        } else {
+            Picker("Target", selection: Binding(
+                get: {
+                    if current.isEmpty { return "" }
+                    return isCustom ? Self.customTargetSentinel : current
+                },
+                set: { newValue in
+                    var c = make.wrappedValue
+                    if newValue == Self.customTargetSentinel {
+                        if targets.contains(c.target) { c.target = "" }
+                    } else {
+                        c.target = newValue
+                    }
+                    make.wrappedValue = c
+                }
+            )) {
+                if current.isEmpty {
+                    Text("Select a target…").tag("")
+                }
+                ForEach(targets, id: \.self) { t in
+                    Text(t).tag(t)
+                }
+                Divider()
+                Text("Custom…").tag(Self.customTargetSentinel)
+            }
+            .font(.system(.body, design: .monospaced))
+
+            if isCustom {
+                TextField("Custom target", text: make.target, prompt: Text("build"))
+                    .font(.system(.body, design: .monospaced))
+            }
+        }
+    }
+
+    // MARK: - Package
+
+    @ViewBuilder
+    var packageCommandSection: some View {
+        Section {
+            let pkg = Binding(
+                get: { self.package ?? PackageRunConfig() },
+                set: { self.package = $0 }
+            )
+            Picker("Package Manager", selection: pkg.packageManager) {
+                ForEach(PackageManager.allCases, id: \.self) { manager in
+                    let installed = installedPackageManagers.isEmpty
+                        || installedPackageManagers.contains(manager)
+                    Text(installed ? manager.displayName : "\(manager.displayName) (not installed)")
+                        .tag(manager)
+                        .disabled(!installed)
+                }
+            }
+            scriptField(pkg: pkg)
+            TextField(
+                "Arguments (optional)",
+                text: pkg.arguments,
+                prompt: Text("-- --port 3000")
+            )
+            .font(.system(.body, design: .monospaced))
+            HStack {
+                TextField("Working Directory", text: $bash.workingDirectory, prompt: Text(project.path))
+                Button("Browse…") {
+                    pickDirectory { picked in
+                        bash.workingDirectory = picked
+                    }
+                }
+                Button {
+                    bash.workingDirectory = ""
+                } label: {
+                    Image(systemName: "arrow.uturn.backward")
+                }
+                .help("Reset to project root")
+            }
+        } header: {
+            Text("Node.js")
+        } footer: {
+            Text("Runs `\(packageCommandPreview)`. Arguments are appended after the script — use `-- <flags>` to forward flags through npm/pnpm.")
+        }
+        .task(id: packageDetectionKey) {
+            detectedPackageScripts = await refreshPackageScripts()
+            installedPackageManagers = await RunProfileDetector.detectInstalledPackageManagers()
+        }
+    }
+
+    /// `<manager> run <script> [args]` shown in the footer for clarity.
+    var packageCommandPreview: String {
+        let pkg = package ?? PackageRunConfig()
+        let script = pkg.script.isEmpty ? "<script>" : pkg.script
+        var preview = "\(pkg.packageManager.runPrefix) \(script)"
+        let args = pkg.arguments.trimmingCharacters(in: .whitespaces)
+        if !args.isEmpty { preview += " \(args)" }
+        return preview
+    }
+
+    /// Cache key for re-reading package.json scripts when the working directory
+    /// changes.
+    var packageDetectionKey: String {
+        "\(profileID.uuidString)|\(bash.workingDirectory)"
+    }
+
+    func refreshPackageScripts() async -> [String] {
+        let projectRoot = project.path
+        let workingDirRaw = bash.workingDirectory
+        return await Task.detached { () -> [String] in
+            func resolve(_ p: String, against base: String) -> String {
+                if p.isEmpty { return base }
+                if p.hasPrefix("/") { return p }
+                return (base as NSString).appendingPathComponent(p)
+            }
+            let dir = workingDirRaw.isEmpty
+                ? projectRoot
+                : resolve(workingDirRaw, against: projectRoot)
+            return RunProfileDetector.packageScriptNames(inDirectory: dir)
+        }.value
+    }
+
+    @ViewBuilder
+    func scriptField(pkg: Binding<PackageRunConfig>) -> some View {
+        let current = pkg.wrappedValue.script
+        let scripts = detectedPackageScripts
+        let isCustom = !scripts.isEmpty && !current.isEmpty && !scripts.contains(current)
+
+        if scripts.isEmpty {
+            TextField("Script", text: pkg.script, prompt: Text("dev"))
+                .font(.system(.body, design: .monospaced))
+        } else {
+            Picker("Script", selection: Binding(
+                get: {
+                    if current.isEmpty { return "" }
+                    return isCustom ? Self.customScriptSentinel : current
+                },
+                set: { newValue in
+                    var c = pkg.wrappedValue
+                    if newValue == Self.customScriptSentinel {
+                        if scripts.contains(c.script) { c.script = "" }
+                    } else {
+                        c.script = newValue
+                    }
+                    pkg.wrappedValue = c
+                }
+            )) {
+                if current.isEmpty {
+                    Text("Select a script…").tag("")
+                }
+                ForEach(scripts, id: \.self) { s in
+                    Text(s).tag(s)
+                }
+                Divider()
+                Text("Custom…").tag(Self.customScriptSentinel)
+            }
+            .font(.system(.body, design: .monospaced))
+
+            if isCustom {
+                TextField("Custom script", text: pkg.script, prompt: Text("dev"))
+                    .font(.system(.body, design: .monospaced))
+            }
+        }
+    }
+
+    // MARK: - File pickers
+
+    private func pickDirectory(onPick: @escaping (String) -> Void) {
+        let panel = NSOpenPanel()
+        panel.canChooseDirectories = true
+        panel.canChooseFiles = false
+        panel.allowsMultipleSelection = false
+        panel.directoryURL = URL(fileURLWithPath: project.path)
+        if panel.runModal() == .OK, let url = panel.url {
+            onPick(displayPath(for: url))
+        }
+    }
+
+    private func pickFile(onPick: @escaping (String) -> Void) {
+        let panel = NSOpenPanel()
+        panel.canChooseDirectories = false
+        panel.canChooseFiles = true
+        panel.allowsMultipleSelection = false
+        panel.directoryURL = URL(fileURLWithPath: project.path)
+        if panel.runModal() == .OK, let url = panel.url {
+            onPick(displayPath(for: url))
+        }
+    }
+
+    private func pickXcodeContainer(onPick: @escaping (String, Bool) -> Void) {
+        let panel = NSOpenPanel()
+        panel.canChooseDirectories = true
+        panel.canChooseFiles = true
+        panel.allowsMultipleSelection = false
+        panel.directoryURL = URL(fileURLWithPath: project.path)
+        panel.allowedContentTypes = [
+            UTType(filenameExtension: "xcodeproj") ?? .package,
+            UTType(filenameExtension: "xcworkspace") ?? .package,
+        ]
+        guard panel.runModal() == .OK, let url = panel.url else { return }
+        let name: String
+        let root = (project.path as NSString).standardizingPath
+        let std = (url.path as NSString).standardizingPath
+        if std.hasPrefix(root + "/") {
+            name = String(std.dropFirst(root.count + 1))
+        } else {
+            name = std
+        }
+        onPick(name, url.pathExtension == "xcworkspace")
+    }
+
+    /// If the picked URL is inside the project root, return a project-relative
+    /// path; otherwise return the absolute path.
+    private func displayPath(for url: URL) -> String {
+        let absolute = url.path
+        let root = (project.path as NSString).standardizingPath
+        let std = (absolute as NSString).standardizingPath
+        if std.hasPrefix(root + "/") {
+            return "./" + String(std.dropFirst(root.count + 1))
+        }
+        return std
+    }
+}
diff --git a/RxCode/Views/RunProfile/RunConfigurationsView.swift b/RxCode/Views/RunProfile/RunConfigurationsView.swift
index dbf52554..815d2636 100644
--- a/RxCode/Views/RunProfile/RunConfigurationsView.swift
+++ b/RxCode/Views/RunProfile/RunConfigurationsView.swift
@@ -115,7 +115,7 @@ struct RunConfigurationsView: View {
                         }
                     }
                     if !packageProfiles.isEmpty {
-                        Section("Package") {
+                        Section("Node.js") {
                             ForEach(packageProfiles) { profile in
                                 profileRow(profile)
                             }
@@ -221,11 +221,11 @@ struct RunConfigurationsView: View {
                 }
             }
 
-            Section("Package") {
+            Section("Node.js") {
                 Button {
                     addPackageProfile()
                 } label: {
-                    Label("Empty Package Configuration", systemImage: "shippingbox.fill")
+                    Label("Empty Node.js Configuration", systemImage: "shippingbox.fill")
                 }
                 ForEach(detected.npm) { runnable in
                     Button {
@@ -285,7 +285,7 @@ struct RunConfigurationsView: View {
         if let package = runnable?.package {
             let new = RunProfile(
                 projectId: project.id,
-                name: runnable?.displayName ?? "New Package Configuration",
+                name: runnable?.displayName ?? "New Node.js Configuration",
                 type: .packageScript,
                 package: package,
                 createdAt: now,
@@ -341,7 +341,7 @@ struct RunConfigurationsView: View {
         let firstDetected = detected.npm.first?.package
         let new = RunProfile(
             projectId: project.id,
-            name: "New Package Configuration",
+            name: "New Node.js Configuration",
             type: .packageScript,
             package: firstDetected ?? PackageRunConfig(),
             createdAt: now,
diff --git a/RxCode/Views/RunProfile/RunProfileDetailForm+Environments.swift b/RxCode/Views/RunProfile/RunProfileDetailForm+Environments.swift
index a6d3f896..653c2d44 100644
--- a/RxCode/Views/RunProfile/RunProfileDetailForm+Environments.swift
+++ b/RxCode/Views/RunProfile/RunProfileDetailForm+Environments.swift
@@ -6,28 +6,6 @@ import UniformTypeIdentifiers
 // MARK: - Environments
 
 extension RunProfileDetailForm {
-    func pickXcodeContainer(onPick: @escaping (String, Bool) -> Void) {
-        let panel = NSOpenPanel()
-        panel.canChooseDirectories = true
-        panel.canChooseFiles = true
-        panel.allowsMultipleSelection = false
-        panel.directoryURL = URL(fileURLWithPath: project.path)
-        panel.allowedContentTypes = [
-            UTType(filenameExtension: "xcodeproj") ?? .package,
-            UTType(filenameExtension: "xcworkspace") ?? .package,
-        ]
-        guard panel.runModal() == .OK, let url = panel.url else { return }
-        let name: String
-        let root = (project.path as NSString).standardizingPath
-        let std = (url.path as NSString).standardizingPath
-        if std.hasPrefix(root + "/") {
-            name = String(std.dropFirst(root.count + 1))
-        } else {
-            name = std
-        }
-        onPick(name, url.pathExtension == "xcworkspace")
-    }
-
     var activePresetIndex: Int? {
         guard let id = profile.bash.activePresetId ?? profile.bash.environments.first?.id else { return nil }
         return profile.bash.environments.firstIndex { $0.id == id }
diff --git a/RxCode/Views/RunProfile/RunProfileDetailForm+Steps.swift b/RxCode/Views/RunProfile/RunProfileDetailForm+Steps.swift
index dcfc9e47..88a11f05 100644
--- a/RxCode/Views/RunProfile/RunProfileDetailForm+Steps.swift
+++ b/RxCode/Views/RunProfile/RunProfileDetailForm+Steps.swift
@@ -64,17 +64,6 @@ extension RunProfileDetailForm {
 
     // MARK: - File pickers
 
-    func pickDirectory(onPick: @escaping (String) -> Void) {
-        let panel = NSOpenPanel()
-        panel.canChooseDirectories = true
-        panel.canChooseFiles = false
-        panel.allowsMultipleSelection = false
-        panel.directoryURL = URL(fileURLWithPath: project.path)
-        if panel.runModal() == .OK, let url = panel.url {
-            onPick(displayPath(for: url))
-        }
-    }
-
     func pickFile(onPick: @escaping (String) -> Void) {
         let panel = NSOpenPanel()
         panel.canChooseDirectories = false
diff --git a/RxCode/Views/RunProfile/RunProfileDetailForm.swift b/RxCode/Views/RunProfile/RunProfileDetailForm.swift
index 20d0d9ea..7fc6b00b 100644
--- a/RxCode/Views/RunProfile/RunProfileDetailForm.swift
+++ b/RxCode/Views/RunProfile/RunProfileDetailForm.swift
@@ -9,50 +9,23 @@ struct RunProfileDetailForm: View {
     @Binding var profile: RunProfile
     let project: Project
 
-    @State var detectedMakeTargets: [String] = []
-    @State var detectedPackageScripts: [String] = []
-    @State var installedPackageManagers: [PackageManager] = []
-    @State var newPresetName: String = ""
-    static let customTargetSentinel = "__rxcode_custom_target__"
-    static let customScriptSentinel = "__rxcode_custom_script__"
-
     var body: some View {
         Form {
             Section {
                 TextField("Name", text: $profile.name)
-                Picker("Type", selection: Binding(
-                    get: { profile.type },
-                    set: { newValue in
-                        profile.type = newValue
-                        if newValue == .xcode, profile.xcode == nil {
-                            profile.xcode = XcodeRunConfig()
-                        }
-                        if newValue == .make, profile.make == nil {
-                            profile.make = MakeRunConfig()
-                        }
-                        if newValue == .packageScript, profile.package == nil {
-                            profile.package = PackageRunConfig()
-                        }
-                    }
-                )) {
-                    ForEach(RunProfileType.allCases, id: \.self) { type in
-                        Text(type.rawValue.capitalized).tag(type)
-                    }
-                }
             } header: {
                 Text("Configuration")
             }
 
-            switch profile.type {
-            case .bash:
-                bashCommandSection
-            case .xcode:
-                xcodeCommandSection
-            case .make:
-                makeCommandSection
-            case .packageScript:
-                packageCommandSection
-            }
+            ProfileCommandSections(
+                profileID: profile.id,
+                project: project,
+                type: $profile.type,
+                bash: $profile.bash,
+                xcode: $profile.xcode,
+                make: $profile.make,
+                package: $profile.package
+            )
 
             environmentsSection
 
@@ -74,365 +47,4 @@ struct RunProfileDetailForm: View {
             ])
         }
     }
-
-    // MARK: - Command sections
-
-    @ViewBuilder
-    var bashCommandSection: some View {
-        Section {
-            TextEditor(text: $profile.bash.command)
-                .font(.system(.body, design: .monospaced))
-                .frame(minHeight: 60, maxHeight: 100)
-                .overlay(
-                    RoundedRectangle(cornerRadius: 6)
-                        .strokeBorder(ClaudeTheme.borderSubtle, lineWidth: 0.5)
-                )
-            HStack {
-                TextField("Working Directory", text: $profile.bash.workingDirectory, prompt: Text(project.path))
-                Button("Browse…") {
-                    pickDirectory { picked in
-                        profile.bash.workingDirectory = picked
-                    }
-                }
-                Button {
-                    profile.bash.workingDirectory = ""
-                } label: {
-                    Image(systemName: "arrow.uturn.backward")
-                }
-                .help("Reset to project root")
-            }
-        } header: {
-            Text("Command")
-        } footer: {
-            Text("Absolute or project-relative path. Leave empty to use the project root.")
-        }
-    }
-
-    @ViewBuilder
-    var xcodeCommandSection: some View {
-        Section {
-            let xcode = Binding(
-                get: { profile.xcode ?? XcodeRunConfig() },
-                set: { profile.xcode = $0 }
-            )
-            HStack {
-                TextField(
-                    "Project / Workspace",
-                    text: xcode.container,
-                    prompt: Text("RxCode.xcodeproj")
-                )
-                .font(.system(.body, design: .monospaced))
-                Button("Browse…") {
-                    pickXcodeContainer { name, isWorkspace in
-                        var c = xcode.wrappedValue
-                        c.container = name
-                        c.isWorkspace = isWorkspace
-                        xcode.wrappedValue = c
-                    }
-                }
-            }
-            Toggle("Use Workspace (.xcworkspace)", isOn: xcode.isWorkspace)
-            TextField("Scheme", text: xcode.scheme, prompt: Text("RxCode"))
-                .font(.system(.body, design: .monospaced))
-            TextField("Configuration", text: xcode.configuration, prompt: Text("Debug"))
-                .font(.system(.body, design: .monospaced))
-            Picker("Action", selection: xcode.action) {
-                ForEach(XcodeAction.allCases, id: \.self) { action in
-                    Text(action.rawValue.capitalized).tag(action)
-                }
-            }
-            LabeledContent("Destination") {
-                HStack(spacing: 6) {
-                    Text(xcode.wrappedValue.selectedDestination?.displayName ?? "Any Mac (default)")
-                        .foregroundStyle(.secondary)
-                    if xcode.wrappedValue.selectedDestination != nil {
-                        Button {
-                            var c = xcode.wrappedValue
-                            c.selectedDestination = nil
-                            xcode.wrappedValue = c
-                        } label: {
-                            Image(systemName: "xmark.circle.fill")
-                                .foregroundStyle(.tertiary)
-                        }
-                        .buttonStyle(.plain)
-                        .help("Clear destination — pick again from the toolbar")
-                    }
-                }
-            }
-        } header: {
-            Text("Xcode")
-        } footer: {
-            Text("Build runs `xcodebuild build`. Run builds, then launches the produced .app (macOS) or installs + launches on the selected simulator. Pick the destination from the Run toolbar.")
-        }
-    }
-
-    @ViewBuilder
-    var makeCommandSection: some View {
-        Section {
-            let make = Binding(
-                get: { profile.make ?? MakeRunConfig() },
-                set: { profile.make = $0 }
-            )
-            HStack {
-                TextField(
-                    "Makefile (optional)",
-                    text: make.makefile,
-                    prompt: Text("Makefile")
-                )
-                .font(.system(.body, design: .monospaced))
-                Button("Browse…") {
-                    pickFile { picked in
-                        var c = make.wrappedValue
-                        c.makefile = picked
-                        make.wrappedValue = c
-                    }
-                }
-                Button {
-                    var c = make.wrappedValue
-                    c.makefile = ""
-                    make.wrappedValue = c
-                } label: {
-                    Image(systemName: "arrow.uturn.backward")
-                }
-                .help("Use default Makefile lookup")
-            }
-            targetField(make: make)
-            TextField(
-                "Arguments (optional)",
-                text: make.arguments,
-                prompt: Text("VAR=value -j8")
-            )
-            .font(.system(.body, design: .monospaced))
-            HStack {
-                TextField("Working Directory", text: $profile.bash.workingDirectory, prompt: Text(project.path))
-                Button("Browse…") {
-                    pickDirectory { picked in
-                        profile.bash.workingDirectory = picked
-                    }
-                }
-                Button {
-                    profile.bash.workingDirectory = ""
-                } label: {
-                    Image(systemName: "arrow.uturn.backward")
-                }
-                .help("Reset to project root")
-            }
-        } header: {
-            Text("Make")
-        } footer: {
-            Text("Runs `make [-f <Makefile>] <target> [arguments]`. Leave Makefile empty to use the default lookup (Makefile / makefile / GNUmakefile).")
-        }
-        .task(id: makeDetectionKey) {
-            detectedMakeTargets = await refreshMakeTargets()
-        }
-    }
-
-    /// Cache key for re-parsing the Makefile when its path or the working
-    /// directory changes.
-    var makeDetectionKey: String {
-        "\(profile.id.uuidString)|\(profile.make?.makefile ?? "")|\(profile.bash.workingDirectory)"
-    }
-
-    func refreshMakeTargets() async -> [String] {
-        let projectRoot = project.path
-        let makefile = profile.make?.makefile ?? ""
-        let workingDirRaw = profile.bash.workingDirectory
-        return await Task.detached { () -> [String] in
-            let fm = FileManager.default
-            func resolve(_ p: String, against base: String) -> String {
-                if p.isEmpty { return base }
-                if p.hasPrefix("/") { return p }
-                return (base as NSString).appendingPathComponent(p)
-            }
-            let workingDir = workingDirRaw.isEmpty
-                ? projectRoot
-                : resolve(workingDirRaw, against: projectRoot)
-
-            if !makefile.isEmpty {
-                // Picker produces project-relative paths; the executor resolves
-                // relative to working dir. Try both so the dropdown works
-                // regardless of which the user typed.
-                let candidates = [
-                    resolve(makefile, against: projectRoot),
-                    resolve(makefile, against: workingDir),
-                ]
-                for path in candidates where fm.fileExists(atPath: path) {
-                    return RunProfileDetector.makeTargets(atPath: path)
-                }
-                return []
-            }
-            if let result = RunProfileDetector.defaultMakeTargets(inDirectory: workingDir) {
-                return result.targets
-            }
-            return RunProfileDetector.defaultMakeTargets(inDirectory: projectRoot)?.targets ?? []
-        }.value
-    }
-
-    @ViewBuilder
-    func targetField(make: Binding<MakeRunConfig>) -> some View {
-        let current = make.wrappedValue.target
-        let targets = detectedMakeTargets
-        let isCustom = !targets.isEmpty && !current.isEmpty && !targets.contains(current)
-
-        if targets.isEmpty {
-            TextField("Target", text: make.target, prompt: Text("build"))
-                .font(.system(.body, design: .monospaced))
-        } else {
-            Picker("Target", selection: Binding(
-                get: {
-                    if current.isEmpty { return "" }
-                    return isCustom ? Self.customTargetSentinel : current
-                },
-                set: { newValue in
-                    var c = make.wrappedValue
-                    if newValue == Self.customTargetSentinel {
-                        if targets.contains(c.target) { c.target = "" }
-                    } else {
-                        c.target = newValue
-                    }
-                    make.wrappedValue = c
-                }
-            )) {
-                if current.isEmpty {
-                    Text("Select a target…").tag("")
-                }
-                ForEach(targets, id: \.self) { t in
-                    Text(t).tag(t)
-                }
-                Divider()
-                Text("Custom…").tag(Self.customTargetSentinel)
-            }
-            .font(.system(.body, design: .monospaced))
-
-            if isCustom {
-                TextField("Custom target", text: make.target, prompt: Text("build"))
-                    .font(.system(.body, design: .monospaced))
-            }
-        }
-    }
-
-    // MARK: - Package
-
-    @ViewBuilder
-    var packageCommandSection: some View {
-        Section {
-            let pkg = Binding(
-                get: { profile.package ?? PackageRunConfig() },
-                set: { profile.package = $0 }
-            )
-            Picker("Package Manager", selection: pkg.packageManager) {
-                ForEach(PackageManager.allCases, id: \.self) { manager in
-                    let installed = installedPackageManagers.isEmpty
-                        || installedPackageManagers.contains(manager)
-                    Text(installed ? manager.displayName : "\(manager.displayName) (not installed)")
-                        .tag(manager)
-                        .disabled(!installed)
-                }
-            }
-            scriptField(pkg: pkg)
-            TextField(
-                "Arguments (optional)",
-                text: pkg.arguments,
-                prompt: Text("-- --port 3000")
-            )
-            .font(.system(.body, design: .monospaced))
-            HStack {
-                TextField("Working Directory", text: $profile.bash.workingDirectory, prompt: Text(project.path))
-                Button("Browse…") {
-                    pickDirectory { picked in
-                        profile.bash.workingDirectory = picked
-                    }
-                }
-                Button {
-                    profile.bash.workingDirectory = ""
-                } label: {
-                    Image(systemName: "arrow.uturn.backward")
-                }
-                .help("Reset to project root")
-            }
-        } header: {
-            Text("Package")
-        } footer: {
-            Text("Runs `\(packageCommandPreview)`. Arguments are appended after the script — use `-- <flags>` to forward flags through npm/pnpm.")
-        }
-        .task(id: packageDetectionKey) {
-            detectedPackageScripts = await refreshPackageScripts()
-            installedPackageManagers = await RunProfileDetector.detectInstalledPackageManagers()
-        }
-    }
-
-    /// `<manager> run <script> [args]` shown in the footer for clarity.
-    var packageCommandPreview: String {
-        let pkg = profile.package ?? PackageRunConfig()
-        let script = pkg.script.isEmpty ? "<script>" : pkg.script
-        var preview = "\(pkg.packageManager.runPrefix) \(script)"
-        let args = pkg.arguments.trimmingCharacters(in: .whitespaces)
-        if !args.isEmpty { preview += " \(args)" }
-        return preview
-    }
-
-    /// Cache key for re-reading package.json scripts when the working directory
-    /// changes.
-    var packageDetectionKey: String {
-        "\(profile.id.uuidString)|\(profile.bash.workingDirectory)"
-    }
-
-    func refreshPackageScripts() async -> [String] {
-        let projectRoot = project.path
-        let workingDirRaw = profile.bash.workingDirectory
-        return await Task.detached { () -> [String] in
-            func resolve(_ p: String, against base: String) -> String {
-                if p.isEmpty { return base }
-                if p.hasPrefix("/") { return p }
-                return (base as NSString).appendingPathComponent(p)
-            }
-            let dir = workingDirRaw.isEmpty
-                ? projectRoot
-                : resolve(workingDirRaw, against: projectRoot)
-            return RunProfileDetector.packageScriptNames(inDirectory: dir)
-        }.value
-    }
-
-    @ViewBuilder
-    func scriptField(pkg: Binding<PackageRunConfig>) -> some View {
-        let current = pkg.wrappedValue.script
-        let scripts = detectedPackageScripts
-        let isCustom = !scripts.isEmpty && !current.isEmpty && !scripts.contains(current)
-
-        if scripts.isEmpty {
-            TextField("Script", text: pkg.script, prompt: Text("dev"))
-                .font(.system(.body, design: .monospaced))
-        } else {
-            Picker("Script", selection: Binding(
-                get: {
-                    if current.isEmpty { return "" }
-                    return isCustom ? Self.customScriptSentinel : current
-                },
-                set: { newValue in
-                    var c = pkg.wrappedValue
-                    if newValue == Self.customScriptSentinel {
-                        if scripts.contains(c.script) { c.script = "" }
-                    } else {
-                        c.script = newValue
-                    }
-                    pkg.wrappedValue = c
-                }
-            )) {
-                if current.isEmpty {
-                    Text("Select a script…").tag("")
-                }
-                ForEach(scripts, id: \.self) { s in
-                    Text(s).tag(s)
-                }
-                Divider()
-                Text("Custom…").tag(Self.customScriptSentinel)
-            }
-            .font(.system(.body, design: .monospaced))
-
-            if isCustom {
-                TextField("Custom script", text: pkg.script, prompt: Text("dev"))
-                    .font(.system(.body, design: .monospaced))
-            }
-        }
-    }
 }
diff --git a/RxCode/Views/Sidebar/BriefingMarkdownView.swift b/RxCode/Views/Sidebar/BriefingMarkdownView.swift
index 6a9e1524..91917b36 100644
--- a/RxCode/Views/Sidebar/BriefingMarkdownView.swift
+++ b/RxCode/Views/Sidebar/BriefingMarkdownView.swift
@@ -10,7 +10,7 @@ struct BriefingMarkdownView: View {
     var fontSize: CGFloat = 13.5
 
     private var blocks: [Block] {
-        Self.parse(text)
+        Self.parse(GeneratedTextSanitizer.cleanMarkdownDocument(text))
     }
 
     var body: some View {
diff --git a/RxCode/Views/Sidebar/ProjectChatRow.swift b/RxCode/Views/Sidebar/ProjectChatRow.swift
index c1a09840..45dc2f1c 100644
--- a/RxCode/Views/Sidebar/ProjectChatRow.swift
+++ b/RxCode/Views/Sidebar/ProjectChatRow.swift
@@ -114,6 +114,16 @@ struct ProjectChatRow: View {
                 .lineLimit(1)
                 .truncationMode(.tail)
 
+            if let label = summary.threadLabel, !label.isEmpty {
+                Text(label)
+                    .font(.system(size: ClaudeTheme.size(9), weight: .semibold))
+                    .foregroundStyle(ClaudeTheme.accent)
+                    .padding(.horizontal, 5)
+                    .padding(.vertical, 1)
+                    .background(ClaudeTheme.accentSubtle, in: Capsule())
+                    .fixedSize()
+            }
+
             Spacer(minLength: 4)
 
             if summary.isPinned {
diff --git a/RxCode/Views/WhatsNew/WhatsNewFeature.swift b/RxCode/Views/WhatsNew/WhatsNewFeature.swift
new file mode 100644
index 00000000..2a337035
--- /dev/null
+++ b/RxCode/Views/WhatsNew/WhatsNewFeature.swift
@@ -0,0 +1,52 @@
+import SwiftUI
+
+/// A single "What's New" feature card.
+///
+/// `slug` is a stable, hand-authored identifier (never random) used to track
+/// whether the user has already seen this card. Once a slug is recorded as
+/// seen it is never surfaced again, even across app updates — so adding a new
+/// card with a new slug in a later version only shows that new card.
+struct WhatsNewFeature: Identifiable {
+    /// Stable, hand-authored identifier. Changing it re-shows the card.
+    let slug: String
+    let title: LocalizedStringKey
+    let subtitle: LocalizedStringKey
+    /// SF Symbol shown in the card's icon tile.
+    let icon: String
+    /// Short bullet points describing what the feature does.
+    let highlights: [Highlight]
+
+    var id: String { slug }
+
+    struct Highlight {
+        let icon: String
+        let text: LocalizedStringKey
+    }
+
+    /// All shipped feature cards, oldest first. Append new cards to the end
+    /// with a fresh, unique `slug`. Order here is the order users page through.
+    static let all: [WhatsNewFeature] = [
+        WhatsNewFeature(
+            slug: "code-review-hook",
+            title: "Automatic code review",
+            subtitle: "Add a Code Review hook and a second agent reviews every change before you ship it.",
+            icon: "checkmark.seal.fill",
+            highlights: [
+                Highlight(icon: "arrow.triangle.branch", text: "Runs after a session finishes and reviews the modified files in a linked thread."),
+                Highlight(icon: "arrow.uturn.left", text: "Failed reviews are sent back to the original thread so the agent can fix and get re-reviewed."),
+                Highlight(icon: "cpu", text: "Pick which model performs the review — defaults to the same model as the thread.")
+            ]
+        ),
+        WhatsNewFeature(
+            slug: "commit-push-hook",
+            title: "Commit when a session finishes",
+            subtitle: "The new Commit & Push hook commits — and optionally pushes — your work the moment an agent session completes.",
+            icon: "arrow.up.circle.fill",
+            highlights: [
+                Highlight(icon: "checkmark.circle", text: "Triggers automatically once an agent session finishes."),
+                Highlight(icon: "checkmark.seal", text: "When a Code Review hook is configured, commits only happen after the review passes."),
+                Highlight(icon: "arrow.up.doc", text: "Push to the remote automatically, or keep the commit local.")
+            ]
+        )
+    ]
+}
diff --git a/RxCode/Views/WhatsNew/WhatsNewSheet.swift b/RxCode/Views/WhatsNew/WhatsNewSheet.swift
new file mode 100644
index 00000000..eeb1b562
--- /dev/null
+++ b/RxCode/Views/WhatsNew/WhatsNewSheet.swift
@@ -0,0 +1,202 @@
+import RxCodeCore
+import SwiftUI
+
+/// A carousel of "What's New" feature cards, presented as a sheet the first
+/// time an existing user launches a build that introduces new features.
+///
+/// Each card is marked as seen (by `slug`) the moment it appears, and the whole
+/// presented batch is marked on dismiss — so cards never re-appear on a later
+/// launch. Mirrors the onboarding card visual language.
+struct WhatsNewSheet: View {
+    @Environment(AppState.self) private var appState
+
+    /// The unseen features to present. Captured once by the caller so the list
+    /// does not shrink underneath us as cards are marked seen.
+    let features: [WhatsNewFeature]
+    var onDismiss: () -> Void
+
+    @State private var selectedIndex = 0
+
+    private var isLastSlide: Bool {
+        selectedIndex >= features.count - 1
+    }
+
+    var body: some View {
+        VStack(spacing: 0) {
+            header
+            cardStack
+            pageIndicator
+                .padding(.top, 18)
+            primaryButton
+                .padding(.top, 20)
+                .padding(.bottom, 28)
+        }
+        .frame(width: 520, height: 600)
+        .background(ClaudeTheme.background)
+        .onAppear {
+            // Defensive: an empty batch should never present, but if it does we
+            // just dismiss instead of indexing into an empty array.
+            if features.isEmpty { onDismiss() }
+        }
+    }
+
+    private var header: some View {
+        HStack {
+            VStack(alignment: .leading, spacing: 2) {
+                Text("What's New")
+                    .font(.system(size: ClaudeTheme.size(13), weight: .semibold))
+                    .foregroundStyle(ClaudeTheme.textSecondary)
+                Text("New in RxCode")
+                    .font(.system(size: ClaudeTheme.size(20), weight: .bold))
+                    .foregroundStyle(ClaudeTheme.textPrimary)
+            }
+            Spacer()
+            Button {
+                dismiss()
+            } label: {
+                Image(systemName: "xmark")
+                    .font(.system(size: ClaudeTheme.size(13), weight: .semibold))
+                    .frame(width: 28, height: 28)
+                    .foregroundStyle(ClaudeTheme.textSecondary)
+                    .background(ClaudeTheme.surfaceSecondary, in: Circle())
+            }
+            .buttonStyle(.plain)
+            .help(LocalizedStringKey("Close"))
+        }
+        .padding(.horizontal, 28)
+        .padding(.top, 24)
+        .padding(.bottom, 8)
+    }
+
+    private var cardStack: some View {
+        ZStack {
+            ForEach(Array(features.enumerated()), id: \.element.id) { index, feature in
+                featureCard(feature)
+                    .opacity(selectedIndex == index ? 1 : 0)
+                    .scaleEffect(selectedIndex == index ? 1 : 0.96)
+                    .offset(x: CGFloat(index - selectedIndex) * 60)
+                    .allowsHitTesting(selectedIndex == index)
+                    .onAppear {
+                        // Mark seen as soon as the card is reachable so it never
+                        // shows again, matching "viewed → read".
+                        if selectedIndex == index {
+                            appState.markWhatsNewSeen(feature.slug)
+                        }
+                    }
+            }
+        }
+        .animation(.snappy(duration: 0.42), value: selectedIndex)
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .onChange(of: selectedIndex) { _, newValue in
+            if features.indices.contains(newValue) {
+                appState.markWhatsNewSeen(features[newValue].slug)
+            }
+        }
+    }
+
+    private func featureCard(_ feature: WhatsNewFeature) -> some View {
+        VStack(spacing: 18) {
+            iconTile(feature.icon)
+
+            VStack(spacing: 8) {
+                Text(feature.title)
+                    .font(.system(size: ClaudeTheme.size(24), weight: .semibold))
+                    .foregroundStyle(ClaudeTheme.textPrimary)
+                    .multilineTextAlignment(.center)
+                    .fixedSize(horizontal: false, vertical: true)
+
+                Text(feature.subtitle)
+                    .font(.system(size: ClaudeTheme.size(14)))
+                    .foregroundStyle(ClaudeTheme.textSecondary)
+                    .multilineTextAlignment(.center)
+                    .fixedSize(horizontal: false, vertical: true)
+            }
+
+            VStack(alignment: .leading, spacing: 12) {
+                ForEach(Array(feature.highlights.enumerated()), id: \.offset) { _, highlight in
+                    HStack(alignment: .top, spacing: 10) {
+                        Image(systemName: highlight.icon)
+                            .font(.system(size: ClaudeTheme.size(14), weight: .semibold))
+                            .foregroundStyle(ClaudeTheme.accent)
+                            .frame(width: 22, alignment: .center)
+                        Text(highlight.text)
+                            .font(.system(size: ClaudeTheme.size(13)))
+                            .foregroundStyle(ClaudeTheme.textPrimary)
+                            .fixedSize(horizontal: false, vertical: true)
+                        Spacer(minLength: 0)
+                    }
+                }
+            }
+            .padding(16)
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .background(ClaudeTheme.surfacePrimary, in: RoundedRectangle(cornerRadius: ClaudeTheme.cornerRadiusMedium, style: .continuous))
+        }
+        .padding(.horizontal, 32)
+        .frame(maxWidth: .infinity)
+    }
+
+    private func iconTile(_ systemImage: String) -> some View {
+        Image(systemName: systemImage)
+            .font(.system(size: ClaudeTheme.size(34), weight: .semibold))
+            .foregroundStyle(.white)
+            .frame(width: 76, height: 76)
+            .background(
+                LinearGradient(
+                    colors: [ClaudeTheme.accent, ClaudeTheme.accent.opacity(0.78)],
+                    startPoint: .topLeading,
+                    endPoint: .bottomTrailing
+                ),
+                in: RoundedRectangle(cornerRadius: ClaudeTheme.cornerRadiusLarge, style: .continuous)
+            )
+            .shadow(color: ClaudeTheme.accent.opacity(0.28), radius: 14, y: 8)
+    }
+
+    private var pageIndicator: some View {
+        HStack(spacing: 8) {
+            ForEach(features.indices, id: \.self) { index in
+                Capsule()
+                    .fill(index == selectedIndex ? ClaudeTheme.textPrimary : ClaudeTheme.textTertiary.opacity(0.36))
+                    .frame(width: index == selectedIndex ? 24 : 8, height: 8)
+                    .animation(.snappy(duration: 0.28), value: selectedIndex)
+            }
+        }
+        .accessibilityHidden(true)
+        .opacity(features.count > 1 ? 1 : 0)
+    }
+
+    private var primaryButton: some View {
+        Button {
+            advance()
+        } label: {
+            Text(isLastSlide ? LocalizedStringKey("Got it") : LocalizedStringKey("Next"))
+                .font(.system(size: ClaudeTheme.size(15), weight: .semibold))
+                .frame(width: 230, height: 44)
+        }
+        .buttonStyle(.plain)
+        .foregroundStyle(.white)
+        .background(ClaudeTheme.accent, in: Capsule())
+        .shadow(color: ClaudeTheme.accent.opacity(0.24), radius: 12, y: 6)
+    }
+
+    private func advance() {
+        if isLastSlide {
+            dismiss()
+        } else {
+            withAnimation(.snappy(duration: 0.42)) {
+                selectedIndex += 1
+            }
+        }
+    }
+
+    private func dismiss() {
+        // Mark the entire presented batch as seen so nothing re-appears even if
+        // the user closed before paging through every card.
+        appState.markWhatsNewSeen(features.map(\.slug))
+        onDismiss()
+    }
+}
+
+#Preview {
+    WhatsNewSheet(features: WhatsNewFeature.all) {}
+        .environment(AppState())
+}
diff --git a/RxCodeAndroid/.kotlin/errors/errors-1780574988119.log b/RxCodeAndroid/.kotlin/errors/errors-1780574988119.log
new file mode 100644
index 00000000..33822be3
--- /dev/null
+++ b/RxCodeAndroid/.kotlin/errors/errors-1780574988119.log
@@ -0,0 +1,48 @@
+kotlin version: 2.0.21
+error message: java.nio.file.NoSuchFileException: /Users/qiweili/Desktop/rxlab/RxCode/RxCodeAndroid/app/build/generated/ksp/debug/java/byRounds/1/dagger/hilt/internal/aggregatedroot/codegen/_app_rxlab_rxcode_RxCodeApplication.java
+	at java.base/sun.nio.fs.UnixException.translateToIOException(UnixException.java:92)
+	at java.base/sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:106)
+	at java.base/sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:111)
+	at java.base/sun.nio.fs.UnixCopyFile.copy(UnixCopyFile.java:548)
+	at java.base/sun.nio.fs.UnixFileSystemProvider.copy(UnixFileSystemProvider.java:257)
+	at java.base/java.nio.file.Files.copy(Files.java:1305)
+	at com.google.devtools.ksp.common.IncrementalUtilKt.copyWithTimestamp(IncrementalUtil.kt:73)
+	at com.google.devtools.ksp.common.IncrementalContextBase.updateOutputs(IncrementalContextBase.kt:349)
+	at com.google.devtools.ksp.common.IncrementalContextBase.access$updateOutputs(IncrementalContextBase.kt:62)
+	at com.google.devtools.ksp.common.IncrementalContextBase$updateCachesAndOutputs$1.invoke(IncrementalContextBase.kt:484)
+	at com.google.devtools.ksp.common.IncrementalContextBase$updateCachesAndOutputs$1.invoke(IncrementalContextBase.kt:428)
+	at com.google.devtools.ksp.common.IncrementalContextBase.closeFilesOnException(IncrementalContextBase.kt:408)
+	at com.google.devtools.ksp.common.IncrementalContextBase.updateCachesAndOutputs(IncrementalContextBase.kt:428)
+	at com.google.devtools.ksp.AbstractKotlinSymbolProcessingExtension.doAnalysis(KotlinSymbolProcessingExtension.kt:376)
+	at org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(TopDownAnalyzerFacadeForJVM.kt:112)
+	at org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration$default(TopDownAnalyzerFacadeForJVM.kt:75)
+	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.analyze$lambda$12(KotlinToJVMBytecodeCompiler.kt:373)
+	at org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport.analyzeAndReport(AnalyzerWithCompilerReport.kt:112)
+	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.analyze(KotlinToJVMBytecodeCompiler.kt:364)
+	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.repeatAnalysisIfNeeded(KotlinToJVMBytecodeCompiler.kt:282)
+	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.runFrontendAndGenerateIrUsingClassicFrontend(KotlinToJVMBytecodeCompiler.kt:195)
+	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.compileModules$cli(KotlinToJVMBytecodeCompiler.kt:106)
+	at org.jetbrains.kotlin.cli.jvm.K2JVMCompiler.doExecute(K2JVMCompiler.kt:170)
+	at org.jetbrains.kotlin.cli.jvm.K2JVMCompiler.doExecute(K2JVMCompiler.kt:43)
+	at org.jetbrains.kotlin.cli.common.CLICompiler.execImpl(CLICompiler.kt:103)
+	at org.jetbrains.kotlin.cli.common.CLICompiler.execImpl(CLICompiler.kt:49)
+	at org.jetbrains.kotlin.cli.common.CLITool.exec(CLITool.kt:101)
+	at org.jetbrains.kotlin.daemon.CompileServiceImpl.compile(CompileServiceImpl.kt:1555)
+	at jdk.internal.reflect.GeneratedMethodAccessor90.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:569)
+	at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:360)
+	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:200)
+	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:197)
+	at java.base/java.security.AccessController.doPrivileged(AccessController.java:712)
+	at java.rmi/sun.rmi.transport.Transport.serviceCall(Transport.java:196)
+	at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:587)
+	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:828)
+	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(TCPTransport.java:705)
+	at java.base/java.security.AccessController.doPrivileged(AccessController.java:399)
+	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:704)
+	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136)
+	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
+	at java.base/java.lang.Thread.run(Thread.java:840)
+
+
diff --git a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/proto/AutopilotModels.kt b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/proto/AutopilotModels.kt
index a2224f5b..205b044f 100644
--- a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/proto/AutopilotModels.kt
+++ b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/proto/AutopilotModels.kt
@@ -136,6 +136,15 @@ data class SecretsManagedRepoPage(
     val pagination: Pagination = Pagination(),
 )
 
+@Serializable
+data class AutopilotCloneRepoBody(val fullName: String)
+
+@Serializable
+data class AutopilotCloneRepoResult(val project: Project)
+
+@Serializable
+data class AutopilotInstallUrlResponse(val url: String)
+
 // MARK: - Secrets
 
 @Serializable
diff --git a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/proto/AutopilotPayloads.kt b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/proto/AutopilotPayloads.kt
index 70f04c7d..b0fed8fa 100644
--- a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/proto/AutopilotPayloads.kt
+++ b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/proto/AutopilotPayloads.kt
@@ -37,6 +37,8 @@ enum class AutopilotOp(val wire: String) {
     // Account
     ACCOUNT_STATUS("accountStatus"),
     LIST_MANAGED_REPOS("listManagedRepos"),
+    CLONE_MANAGED_REPO("cloneManagedRepo"),
+    INSTALL_GITHUB_APP_URL("installGitHubAppUrl"),
 
     // Automation settings (schema-driven form)
     AUTOMATION_SCHEMA("automationSchema"),
diff --git a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/proto/Models.kt b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/proto/Models.kt
index 742887b8..1105787f 100644
--- a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/proto/Models.kt
+++ b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/proto/Models.kt
@@ -34,6 +34,10 @@ data class SessionSummary(
     val hasUncheckedCompletion: Boolean = false,
     val queuedMessages: List<QueuedUserMessage> = emptyList(),
     val todos: List<TodoItem>? = null,
+    /** Id of the thread this was spawned from (e.g. a [Code Review] thread). */
+    val parentThreadId: String? = null,
+    /** Short label chip (e.g. "Code Review"). Null for ordinary threads. */
+    val threadLabel: String? = null,
 )
 
 @Serializable
diff --git a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/proto/Payload.kt b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/proto/Payload.kt
index 486fef8e..b83c56ba 100644
--- a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/proto/Payload.kt
+++ b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/proto/Payload.kt
@@ -97,6 +97,18 @@ sealed class Payload {
     data class BranchOpResult(val data: BranchOpResultPayload) : Payload() {
         override val type = "branch_op_result"
     }
+    data class FolderTreeRequest(val data: FolderTreeRequestPayload) : Payload() {
+        override val type = "folder_tree_request"
+    }
+    data class FolderTreeResult(val data: FolderTreeResultPayload) : Payload() {
+        override val type = "folder_tree_result"
+    }
+    data class CreateProjectRequest(val data: CreateProjectRequestPayload) : Payload() {
+        override val type = "create_project_request"
+    }
+    data class CreateProjectResult(val data: CreateProjectResultPayload) : Payload() {
+        override val type = "create_project_result"
+    }
     data class DeleteProjectRequest(val data: DeleteProjectRequestPayload) : Payload() {
         override val type = "delete_project_request"
     }
@@ -390,6 +402,47 @@ data class BranchOpResultPayload(
     val errorMessage: String? = null,
 )
 
+@Serializable
+data class RemoteFolderNode(
+    val name: String,
+    val path: String,
+    val isSelectable: Boolean = true,
+    val isDirectory: Boolean = true,
+    val children: List<RemoteFolderNode> = emptyList(),
+)
+
+@Serializable
+data class FolderTreeRequestPayload(
+    @Serializable(with = UuidSerializer::class) val clientRequestID: UUID = UUID.randomUUID(),
+    val path: String? = null,
+    val depth: Int = 1,
+    val includeHidden: Boolean = false,
+    val includeFiles: Boolean = false,
+)
+
+@Serializable
+data class FolderTreeResultPayload(
+    @Serializable(with = UuidSerializer::class) val clientRequestID: UUID,
+    val requestedPath: String? = null,
+    val ok: Boolean,
+    val root: RemoteFolderNode? = null,
+    val errorMessage: String? = null,
+)
+
+@Serializable
+data class CreateProjectRequestPayload(
+    @Serializable(with = UuidSerializer::class) val clientRequestID: UUID = UUID.randomUUID(),
+    val path: String,
+)
+
+@Serializable
+data class CreateProjectResultPayload(
+    @Serializable(with = UuidSerializer::class) val clientRequestID: UUID,
+    val ok: Boolean,
+    val project: Project? = null,
+    val errorMessage: String? = null,
+)
+
 /**
  * Mobile → desktop request to upsert or delete a [RunProfile]. The desktop
  * replies with [RunProfileResultPayload]; on success it also broadcasts a
@@ -563,6 +616,10 @@ object PayloadSerializer : KSerializer<Payload> {
             "plan_decision" -> Payload.PlanDecision(json.decodeFromJsonElement(PlanDecisionPayload.serializer(), data))
             "branch_op_request" -> Payload.BranchOpRequest(json.decodeFromJsonElement(BranchOpRequestPayload.serializer(), data))
             "branch_op_result" -> Payload.BranchOpResult(json.decodeFromJsonElement(BranchOpResultPayload.serializer(), data))
+            "folder_tree_request" -> Payload.FolderTreeRequest(json.decodeFromJsonElement(FolderTreeRequestPayload.serializer(), data))
+            "folder_tree_result" -> Payload.FolderTreeResult(json.decodeFromJsonElement(FolderTreeResultPayload.serializer(), data))
+            "create_project_request" -> Payload.CreateProjectRequest(json.decodeFromJsonElement(CreateProjectRequestPayload.serializer(), data))
+            "create_project_result" -> Payload.CreateProjectResult(json.decodeFromJsonElement(CreateProjectResultPayload.serializer(), data))
             "delete_project_request" -> Payload.DeleteProjectRequest(json.decodeFromJsonElement(DeleteProjectRequestPayload.serializer(), data))
             "delete_project_result" -> Payload.DeleteProjectResult(json.decodeFromJsonElement(DeleteProjectResultPayload.serializer(), data))
             "run_profile_mutation_request" -> Payload.RunProfileMutationRequest(json.decodeFromJsonElement(RunProfileMutationRequestPayload.serializer(), data))
@@ -620,6 +677,10 @@ object PayloadSerializer : KSerializer<Payload> {
             is Payload.PlanDecision -> value.type to json.encodeToJsonElement(PlanDecisionPayload.serializer(), value.data)
             is Payload.BranchOpRequest -> value.type to json.encodeToJsonElement(BranchOpRequestPayload.serializer(), value.data)
             is Payload.BranchOpResult -> value.type to json.encodeToJsonElement(BranchOpResultPayload.serializer(), value.data)
+            is Payload.FolderTreeRequest -> value.type to json.encodeToJsonElement(FolderTreeRequestPayload.serializer(), value.data)
+            is Payload.FolderTreeResult -> value.type to json.encodeToJsonElement(FolderTreeResultPayload.serializer(), value.data)
+            is Payload.CreateProjectRequest -> value.type to json.encodeToJsonElement(CreateProjectRequestPayload.serializer(), value.data)
+            is Payload.CreateProjectResult -> value.type to json.encodeToJsonElement(CreateProjectResultPayload.serializer(), value.data)
             is Payload.DeleteProjectRequest -> value.type to json.encodeToJsonElement(DeleteProjectRequestPayload.serializer(), value.data)
             is Payload.DeleteProjectResult -> value.type to json.encodeToJsonElement(DeleteProjectResultPayload.serializer(), value.data)
             is Payload.RunProfileMutationRequest -> value.type to json.encodeToJsonElement(RunProfileMutationRequestPayload.serializer(), value.data)
diff --git a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/state/AutopilotService.kt b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/state/AutopilotService.kt
index 6937e915..8bb58b75 100644
--- a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/state/AutopilotService.kt
+++ b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/state/AutopilotService.kt
@@ -7,6 +7,8 @@ import app.rxlab.rxcode.proto.AutopilotAccountStatus
 import app.rxlab.rxcode.proto.AutopilotCIClosePRBody
 import app.rxlab.rxcode.proto.AutopilotCIFrequencyBody
 import app.rxlab.rxcode.proto.AutopilotCIHistoryBody
+import app.rxlab.rxcode.proto.AutopilotCloneRepoBody
+import app.rxlab.rxcode.proto.AutopilotCloneRepoResult
 import app.rxlab.rxcode.proto.AutopilotCursorQuery
 import app.rxlab.rxcode.proto.AutopilotDocsCreateTokenBody
 import app.rxlab.rxcode.proto.AutopilotDocsDocBody
@@ -21,6 +23,7 @@ import app.rxlab.rxcode.proto.AutopilotProjectSecretsDownloadResult
 import app.rxlab.rxcode.proto.AutopilotProjectSecretsWriteBody
 import app.rxlab.rxcode.proto.AutopilotProjectStatus
 import app.rxlab.rxcode.proto.AutopilotPullRequestResult
+import app.rxlab.rxcode.proto.AutopilotInstallUrlResponse
 import app.rxlab.rxcode.proto.AutopilotSearchBody
 import app.rxlab.rxcode.proto.AutopilotSearchResult
 import app.rxlab.rxcode.proto.AutopilotReleaseDispatchBody
@@ -53,6 +56,7 @@ import app.rxlab.rxcode.proto.MobileReleaseWorkflow
 import app.rxlab.rxcode.proto.MobileReleaseWorkflowList
 import app.rxlab.rxcode.proto.Payload
 import app.rxlab.rxcode.proto.PreferencesValues
+import app.rxlab.rxcode.proto.Project
 import app.rxlab.rxcode.proto.ReleaseDispatchRequest
 import app.rxlab.rxcode.proto.ReleaseDispatchResult
 import app.rxlab.rxcode.proto.ReleaseGithubSecretResult
@@ -167,6 +171,19 @@ class AutopilotService(
             )
         )
 
+    suspend fun cloneManagedRepo(fullName: String): Project =
+        decodeResult<AutopilotCloneRepoResult>(
+            rawCall(
+                AutopilotDomain.ACCOUNT, AutopilotOp.CLONE_MANAGED_REPO,
+                encodeBody(AutopilotCloneRepoBody(fullName)),
+            )
+        ).project
+
+    suspend fun githubAppInstallUrl(): String =
+        decodeResult<AutopilotInstallUrlResponse>(
+            rawCall(AutopilotDomain.ACCOUNT, AutopilotOp.INSTALL_GITHUB_APP_URL, null)
+        ).url
+
     // MARK: - Automation
 
     suspend fun automationSchema(): SchemaEnvelope =
diff --git a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/state/MobileAppState.kt b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/state/MobileAppState.kt
index d0b5e03b..6f0e1c8d 100644
--- a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/state/MobileAppState.kt
+++ b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/state/MobileAppState.kt
@@ -11,7 +11,9 @@ import app.rxlab.rxcode.proto.AutopilotProjectSecretsWriteBody
 import app.rxlab.rxcode.proto.AutopilotProjectStatus
 import app.rxlab.rxcode.proto.BranchOpRequestPayload
 import app.rxlab.rxcode.proto.CancelStreamPayload
+import app.rxlab.rxcode.proto.CreateProjectRequestPayload
 import app.rxlab.rxcode.proto.DeleteProjectRequestPayload
+import app.rxlab.rxcode.proto.FolderTreeRequestPayload
 import app.rxlab.rxcode.proto.LoadMoreMessagesRequestPayload
 import app.rxlab.rxcode.proto.MobileRunTaskSnapshot
 import app.rxlab.rxcode.proto.NewSessionRequestPayload
@@ -27,6 +29,7 @@ import app.rxlab.rxcode.proto.RunProfile
 import app.rxlab.rxcode.proto.RunProfileMutationRequestPayload
 import app.rxlab.rxcode.proto.RunProfileRunRequestPayload
 import app.rxlab.rxcode.proto.RunProfileStopRequestPayload
+import app.rxlab.rxcode.proto.SecretsManagedRepo
 import app.rxlab.rxcode.proto.SessionUpdatePayload
 import app.rxlab.rxcode.proto.SubscribeSessionPayload
 import app.rxlab.rxcode.proto.ThreadActionRequestPayload
@@ -73,6 +76,8 @@ class MobileAppState @Inject constructor(
 
     private var started = false
     private var pairingTimeout: Job? = null
+    private var pendingFolderTreeRequestId: UUID? = null
+    private var pendingCreateProjectId: UUID? = null
     private var pendingThreadChangesId: UUID? = null
     private var pendingDeleteProjectId: UUID? = null
     private var searchJob: Job? = null
@@ -212,6 +217,52 @@ class MobileAppState @Inject constructor(
                 if (payload.data.ok) requestSnapshot("branch_op_${payload.data.operation.name}")
                 else Log.w(TAG, "branch op ${payload.data.operation.name} failed: ${payload.data.errorMessage}")
             }
+            is Payload.FolderTreeResult -> {
+                if (!isActiveDesktop(fromHex)) return
+                if (payload.data.clientRequestID != pendingFolderTreeRequestId) return
+                pendingFolderTreeRequestId = null
+                _state.update {
+                    if (payload.data.ok && payload.data.root != null) {
+                        it.copy(
+                            remoteFolderRoot = payload.data.root,
+                            remoteFolderIsLoading = false,
+                            remoteFolderError = null,
+                        )
+                    } else {
+                        it.copy(
+                            remoteFolderIsLoading = false,
+                            remoteFolderError = payload.data.errorMessage ?: "Failed to load folders.",
+                        )
+                    }
+                }
+            }
+            is Payload.CreateProjectResult -> {
+                if (!isActiveDesktop(fromHex)) return
+                if (payload.data.clientRequestID != pendingCreateProjectId) return
+                pendingCreateProjectId = null
+                _state.update { current ->
+                    if (payload.data.ok && payload.data.project != null) {
+                        val project = payload.data.project
+                        val projects = if (current.projects.any { it.id == project.id }) {
+                            current.projects
+                        } else {
+                            current.projects + project
+                        }
+                        current.copy(
+                            projects = projects,
+                            remoteProjectCreateInFlight = false,
+                            remoteProjectCreateError = null,
+                            lastCreatedProjectID = project.id,
+                        )
+                    } else {
+                        current.copy(
+                            remoteProjectCreateInFlight = false,
+                            remoteProjectCreateError = payload.data.errorMessage ?: "Failed to add project.",
+                        )
+                    }
+                }
+                if (payload.data.ok) requestSnapshot("create_project")
+            }
             is Payload.DeleteProjectResult -> {
                 if (!isActiveDesktop(fromHex)) return
                 if (payload.data.clientRequestID != pendingDeleteProjectId) return
@@ -681,6 +732,81 @@ class MobileAppState @Inject constructor(
 
     // MARK: - Project context-menu actions
 
+    fun requestRemoteFolder(path: String? = null, includeFiles: Boolean = false) {
+        val hex = _state.value.activeDesktopPubkey
+        if (hex.isEmpty()) return
+        val request = FolderTreeRequestPayload(path = path, depth = 1, includeFiles = includeFiles)
+        pendingFolderTreeRequestId = request.clientRequestID
+        _state.update {
+            it.copy(
+                remoteFolderIsLoading = true,
+                remoteFolderError = null,
+            )
+        }
+        viewModelScope.launch {
+            val sent = client.send(Payload.FolderTreeRequest(request), hex)
+            if (!sent && pendingFolderTreeRequestId == request.clientRequestID) {
+                pendingFolderTreeRequestId = null
+                _state.update {
+                    it.copy(
+                        remoteFolderIsLoading = false,
+                        remoteFolderError = "Couldn't reach your Mac to load folders.",
+                    )
+                }
+            }
+        }
+    }
+
+    fun clearRemoteFolderError() {
+        _state.update { it.copy(remoteFolderError = null) }
+    }
+
+    fun createProjectFromRemoteFolder(path: String) {
+        val hex = _state.value.activeDesktopPubkey
+        if (hex.isEmpty()) return
+        val trimmed = path.trim()
+        if (trimmed.isEmpty()) return
+        val request = CreateProjectRequestPayload(path = trimmed)
+        pendingCreateProjectId = request.clientRequestID
+        _state.update {
+            it.copy(
+                remoteProjectCreateInFlight = true,
+                remoteProjectCreateError = null,
+                lastCreatedProjectID = null,
+            )
+        }
+        viewModelScope.launch {
+            val sent = client.send(Payload.CreateProjectRequest(request), hex)
+            if (!sent && pendingCreateProjectId == request.clientRequestID) {
+                pendingCreateProjectId = null
+                _state.update {
+                    it.copy(
+                        remoteProjectCreateInFlight = false,
+                        remoteProjectCreateError = "Couldn't reach your Mac to add the project.",
+                    )
+                }
+            }
+        }
+    }
+
+    fun clearRemoteProjectCreateError() {
+        _state.update { it.copy(remoteProjectCreateError = null) }
+    }
+
+    suspend fun cloneAutopilotRepo(repo: SecretsManagedRepo): app.rxlab.rxcode.proto.Project {
+        val project = autopilot.cloneManagedRepo(repo.fullName)
+        _state.update { current ->
+            val projects = if (current.projects.any { it.id == project.id }) {
+                current.projects
+            } else {
+                current.projects + project
+            }
+            current.copy(projects = projects, lastCreatedProjectID = project.id)
+        }
+        requestSnapshot("clone_managed_repo")
+        return project
+    }
+
     /**
      * Cascade-delete a project on the desktop. Optimistically drops it (and its
      * sessions) from local state so the UI updates immediately; the desktop
diff --git a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/state/MobileState.kt b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/state/MobileState.kt
index 1af3d3ed..d124a613 100644
--- a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/state/MobileState.kt
+++ b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/state/MobileState.kt
@@ -16,6 +16,7 @@ import app.rxlab.rxcode.proto.PermissionRequestPayload
 import app.rxlab.rxcode.proto.Project
 import app.rxlab.rxcode.proto.ProjectBranchInfo
 import app.rxlab.rxcode.proto.ProjectCIStatus
+import app.rxlab.rxcode.proto.RemoteFolderNode
 import app.rxlab.rxcode.proto.RunProfile
 import app.rxlab.rxcode.proto.SearchHit
 import app.rxlab.rxcode.proto.SessionSummary
@@ -84,6 +85,13 @@ data class MobileState(
     val hasReceivedInitialSnapshot: Boolean = false,
     val lastError: String? = null,
 
+    val remoteFolderRoot: RemoteFolderNode? = null,
+    val remoteFolderIsLoading: Boolean = false,
+    val remoteFolderError: String? = null,
+    val remoteProjectCreateInFlight: Boolean = false,
+    val remoteProjectCreateError: String? = null,
+    val lastCreatedProjectID: UUID? = null,
+
     /**
      * Set by [MobileAppState.openThreadFromNotification] when an FCM
      * notification tap should route the UI to a specific thread. Consumed by
diff --git a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/ui/autopilot/AutopilotRepoPicker.kt b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/ui/autopilot/AutopilotRepoPicker.kt
index bf6194c1..64ee1806 100644
--- a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/ui/autopilot/AutopilotRepoPicker.kt
+++ b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/ui/autopilot/AutopilotRepoPicker.kt
@@ -12,12 +12,13 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.MenuBook
 import androidx.compose.material.icons.outlined.AddCircleOutline
 import androidx.compose.material.icons.outlined.Lock
-import androidx.compose.material.icons.outlined.MenuBook
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.OutlinedTextField
@@ -33,6 +34,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.unit.dp
 import app.rxlab.rxcode.proto.SecretsManagedRepo
 import app.rxlab.rxcode.state.AutopilotException
@@ -56,12 +58,14 @@ fun AutopilotRepoPicker(
 ) {
     val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
     val scope = rememberCoroutineScope()
+    val uriHandler = LocalUriHandler.current
 
     var search by remember { mutableStateOf("") }
     var repos by remember { mutableStateOf<List<SecretsManagedRepo>>(emptyList()) }
     var cursor by remember { mutableStateOf<String?>(null) }
     var hasMore by remember { mutableStateOf(false) }
     var isLoading by remember { mutableStateOf(false) }
+    var isOpeningInstallUrl by remember { mutableStateOf(false) }
     var errorMessage by remember { mutableStateOf<String?>(null) }
     var addingFullName by remember { mutableStateOf<String?>(null) }
 
@@ -87,7 +91,38 @@ fun AutopilotRepoPicker(
 
     ModalBottomSheet(onDismissRequest = onDismiss, sheetState = sheetState) {
         Column(Modifier.padding(horizontal = 16.dp).padding(bottom = 24.dp)) {
-            Text(title, style = MaterialTheme.typography.titleLarge, modifier = Modifier.padding(bottom = 8.dp))
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 8.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Text(title, style = MaterialTheme.typography.titleLarge, modifier = Modifier.weight(1f))
+                IconButton(
+                    enabled = !isOpeningInstallUrl,
+                    onClick = {
+                        scope.launch {
+                            isOpeningInstallUrl = true
+                            errorMessage = null
+                            try {
+                                val url = service.githubAppInstallUrl()
+                                if (url.isBlank()) throw AutopilotException("The Mac returned an invalid GitHub App install URL.")
+                                uriHandler.openUri(url)
+                            } catch (e: Exception) {
+                                errorMessage = e.message ?: "Failed to open the GitHub App install URL."
+                            } finally {
+                                isOpeningInstallUrl = false
+                            }
+                        }
+                    },
+                ) {
+                    if (isOpeningInstallUrl) {
+                        CircularProgressIndicator(Modifier.size(20.dp), strokeWidth = 2.dp)
+                    } else {
+                        Icon(Icons.Outlined.AddCircleOutline, contentDescription = "Install GitHub App")
+                    }
+                }
+            }
             OutlinedTextField(
                 value = search,
                 onValueChange = { search = it },
@@ -169,7 +204,7 @@ private fun RepoPickerRow(
         horizontalArrangement = Arrangement.spacedBy(12.dp),
     ) {
         Icon(
-            if (repo.isPrivate) Icons.Outlined.Lock else Icons.Outlined.MenuBook,
+            if (repo.isPrivate) Icons.Outlined.Lock else Icons.AutoMirrored.Outlined.MenuBook,
             contentDescription = null,
             tint = MaterialTheme.colorScheme.onSurfaceVariant,
             modifier = Modifier.size(20.dp),
diff --git a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/ui/projects/ProjectsScreen.kt b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/ui/projects/ProjectsScreen.kt
index ce8ebe89..3b2b4ad9 100644
--- a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/ui/projects/ProjectsScreen.kt
+++ b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/ui/projects/ProjectsScreen.kt
@@ -16,12 +16,16 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Add
 import androidx.compose.material.icons.outlined.Folder
 import androidx.compose.material.icons.outlined.Search
 import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material3.Button
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.Icon
@@ -32,6 +36,7 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.pulltorefresh.PullToRefreshBox
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -44,9 +49,13 @@ import androidx.compose.material.icons.outlined.AccountTree
 import androidx.compose.material.icons.outlined.Bolt
 import androidx.compose.material3.AssistChip
 import androidx.compose.material3.AssistChipDefaults
+import app.rxlab.rxcode.proto.AutopilotAccountStatus
 import app.rxlab.rxcode.proto.Project
+import app.rxlab.rxcode.relay.RelayClient
+import app.rxlab.rxcode.state.AutopilotException
 import app.rxlab.rxcode.state.MobileAppState
 import app.rxlab.rxcode.state.MobileState
+import app.rxlab.rxcode.ui.autopilot.AutopilotRepoPicker
 import app.rxlab.rxcode.ui.util.HapticEvent
 import app.rxlab.rxcode.ui.util.rememberHaptics
 import kotlinx.coroutines.delay
@@ -65,12 +74,57 @@ fun ProjectsScreen(
     val haptics = rememberHaptics()
     val scope = rememberCoroutineScope()
     var refreshing by remember { mutableStateOf(false) }
+    var showingAddProjectMenu by remember { mutableStateOf(false) }
+    var showingLocalProjectPicker by remember { mutableStateOf(false) }
+    var showingRemoteProjectPicker by remember { mutableStateOf(false) }
+    var autopilotAccount by remember { mutableStateOf<AutopilotAccountStatus?>(null) }
+
+    LaunchedEffect(viewModel, state.activeDesktopPubkey, state.connectionState) {
+        if (viewModel == null || state.connectionState != RelayClient.ConnectionState.CONNECTED) {
+            autopilotAccount = null
+            return@LaunchedEffect
+        }
+        try {
+            autopilotAccount = viewModel.autopilot.accountStatus()
+        } catch (_: AutopilotException) {
+            autopilotAccount = null
+        }
+    }
+
+    val canAddFromRemoteRepositories = viewModel != null &&
+        state.isPaired &&
+        state.connectionState == RelayClient.ConnectionState.CONNECTED &&
+        autopilotAccount?.isSignedIn == true
+    val existingGitHubRepoNames = remember(state.projects) {
+        state.projects.mapNotNull { it.gitHubRepo?.lowercase() }.toSet()
+    }
+
     Scaffold(
         containerColor = MaterialTheme.colorScheme.background,
         topBar = {
             CenterAlignedTopAppBar(
                 title = { Text("Projects") },
                 actions = {
+                    if (viewModel != null) {
+                        Box {
+                            IconButton(onClick = { showingAddProjectMenu = true }) {
+                                Icon(Icons.Outlined.Add, contentDescription = "Add Project")
+                            }
+                            AddProjectDropdownMenu(
+                                expanded = showingAddProjectMenu,
+                                canAddFromRemoteRepositories = canAddFromRemoteRepositories,
+                                onDismiss = { showingAddProjectMenu = false },
+                                onAddLocal = {
+                                    showingAddProjectMenu = false
+                                    showingLocalProjectPicker = true
+                                },
+                                onAddRemote = {
+                                    showingAddProjectMenu = false
+                                    showingRemoteProjectPicker = true
+                                },
+                            )
+                        }
+                    }
                     IconButton(onClick = onOpenSearch) {
                         Icon(Icons.Outlined.Search, contentDescription = "Search")
                     }
@@ -96,7 +150,11 @@ fun ProjectsScreen(
                 Modifier.fillMaxSize().padding(padding),
                 contentAlignment = Alignment.Center,
             ) {
-                EmptyProjects()
+                EmptyProjects(
+                    onAddProject = viewModel?.let {
+                        { showingAddProjectMenu = true }
+                    },
+                )
             }
 
             else -> PullToRefreshBox(
@@ -224,10 +282,52 @@ fun ProjectsScreen(
             }
         }
     }
+    if (showingLocalProjectPicker && viewModel != null) {
+        RemoteFolderPickerSheet(
+            state = state,
+            viewModel = viewModel,
+            onDismiss = { showingLocalProjectPicker = false },
+        )
+    }
+    if (showingRemoteProjectPicker && viewModel != null) {
+        AutopilotRepoPicker(
+            service = viewModel.autopilot,
+            title = "Add Project",
+            existingFullNames = existingGitHubRepoNames,
+            onSelect = { repo ->
+                viewModel.cloneAutopilotRepo(repo)
+            },
+            onDismiss = { showingRemoteProjectPicker = false },
+        )
+    }
+}
+
+@Composable
+private fun AddProjectDropdownMenu(
+    expanded: Boolean,
+    canAddFromRemoteRepositories: Boolean,
+    onDismiss: () -> Unit,
+    onAddLocal: () -> Unit,
+    onAddRemote: () -> Unit,
+) {
+    DropdownMenu(expanded = expanded, onDismissRequest = onDismiss) {
+        DropdownMenuItem(
+            text = { Text("Add project locally") },
+            leadingIcon = { Icon(Icons.Outlined.Folder, contentDescription = null) },
+            onClick = onAddLocal,
+        )
+        if (canAddFromRemoteRepositories) {
+            DropdownMenuItem(
+                text = { Text("Add project from remote repositories") },
+                leadingIcon = { Icon(Icons.Outlined.Add, contentDescription = null) },
+                onClick = onAddRemote,
+            )
+        }
+    }
 }
 
 @Composable
-private fun EmptyProjects() {
+private fun EmptyProjects(onAddProject: (() -> Unit)? = null) {
     Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(12.dp)) {
         Surface(
             shape = CircleShape,
@@ -240,6 +340,13 @@ private fun EmptyProjects() {
             }
         }
         Text("No projects yet", style = MaterialTheme.typography.titleMedium)
-        Text("Add a project on macOS.", color = MaterialTheme.colorScheme.onSurfaceVariant)
+        Text("Add a project from your Mac.", color = MaterialTheme.colorScheme.onSurfaceVariant)
+        if (onAddProject != null) {
+            Button(onClick = onAddProject) {
+                Icon(Icons.Outlined.Add, contentDescription = null, modifier = Modifier.size(18.dp))
+                Spacer(Modifier.width(8.dp))
+                Text("Add Project")
+            }
+        }
     }
 }
diff --git a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/ui/projects/RemoteFolderPickerSheet.kt b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/ui/projects/RemoteFolderPickerSheet.kt
new file mode 100644
index 00000000..aee637fb
--- /dev/null
+++ b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/ui/projects/RemoteFolderPickerSheet.kt
@@ -0,0 +1,353 @@
+package app.rxlab.rxcode.ui.projects
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowForward
+import androidx.compose.material.icons.automirrored.outlined.InsertDriveFile
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.Folder
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import app.rxlab.rxcode.proto.RemoteFolderNode
+import app.rxlab.rxcode.state.MobileAppState
+import app.rxlab.rxcode.state.MobileState
+import app.rxlab.rxcode.ui.util.HapticEvent
+import app.rxlab.rxcode.ui.util.rememberHaptics
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun RemoteFolderPickerSheet(
+    state: MobileState,
+    viewModel: MobileAppState,
+    onDismiss: () -> Unit,
+) {
+    val haptics = rememberHaptics()
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    var navigationPath by remember { mutableStateOf<List<String>>(emptyList()) }
+    var dismissedAfterCreateId by remember { mutableStateOf(state.lastCreatedProjectID) }
+
+    val currentPath = navigationPath.lastOrNull()
+    val currentNode = state.remoteFolderRoot
+    val canAdd = currentNode != null &&
+        currentNode.path.isNotBlank() &&
+        currentNode.isSelectable &&
+        !state.remoteProjectCreateInFlight
+
+    LaunchedEffect(currentPath) {
+        viewModel.requestRemoteFolder(path = currentPath)
+    }
+
+    LaunchedEffect(state.lastCreatedProjectID) {
+        val createdId = state.lastCreatedProjectID ?: return@LaunchedEffect
+        if (dismissedAfterCreateId != createdId) {
+            dismissedAfterCreateId = createdId
+            onDismiss()
+        }
+    }
+
+    BackHandler(enabled = navigationPath.isNotEmpty()) {
+        navigationPath = navigationPath.dropLast(1)
+    }
+
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = sheetState,
+        containerColor = MaterialTheme.colorScheme.surfaceContainerLow,
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp)
+                .padding(bottom = 24.dp),
+            verticalArrangement = Arrangement.spacedBy(12.dp),
+        ) {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                IconButton(onClick = onDismiss) {
+                    Icon(Icons.Outlined.Close, contentDescription = "Close")
+                }
+                Text(
+                    "Add Project",
+                    style = MaterialTheme.typography.titleMedium,
+                    fontWeight = FontWeight.SemiBold,
+                    modifier = Modifier.weight(1f),
+                )
+                IconButton(
+                    enabled = canAdd,
+                    onClick = {
+                        val path = currentNode?.path ?: return@IconButton
+                        haptics.play(HapticEvent.LightTap)
+                        viewModel.createProjectFromRemoteFolder(path)
+                    },
+                ) {
+                    if (state.remoteProjectCreateInFlight) {
+                        CircularProgressIndicator(Modifier.size(20.dp), strokeWidth = 2.dp)
+                    } else {
+                        Icon(Icons.Outlined.Add, contentDescription = "Add Project")
+                    }
+                }
+            }
+
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .heightIn(min = 240.dp, max = 560.dp),
+            ) {
+                when {
+                    currentNode != null -> FolderList(
+                        node = currentNode,
+                        isLoading = state.remoteFolderIsLoading,
+                        onOpen = { child ->
+                            haptics.play(HapticEvent.Selection)
+                            navigationPath = folderNavigationPath(child.path)
+                        },
+                    )
+
+                    state.remoteFolderIsLoading -> LoadingFolders()
+
+                    else -> FolderUnavailable(state.remoteFolderError)
+                }
+
+                if (state.remoteFolderIsLoading && currentNode != null) {
+                    CircularProgressIndicator(Modifier.align(Alignment.Center))
+                }
+            }
+        }
+    }
+
+    state.remoteFolderError?.let { message ->
+        AlertDialog(
+            onDismissRequest = { viewModel.clearRemoteFolderError() },
+            confirmButton = {
+                TextButton(onClick = { viewModel.requestRemoteFolder(path = currentPath) }) {
+                    Text("Retry")
+                }
+            },
+            dismissButton = {
+                TextButton(onClick = { viewModel.clearRemoteFolderError() }) {
+                    Text("OK")
+                }
+            },
+            title = { Text("Unable to Load Folder") },
+            text = { Text(message) },
+        )
+    }
+
+    state.remoteProjectCreateError?.let { message ->
+        AlertDialog(
+            onDismissRequest = { viewModel.clearRemoteProjectCreateError() },
+            confirmButton = {
+                TextButton(
+                    enabled = !currentNode?.path.isNullOrBlank(),
+                    onClick = { viewModel.createProjectFromRemoteFolder(currentNode?.path.orEmpty()) },
+                ) {
+                    Text("Retry")
+                }
+            },
+            dismissButton = {
+                TextButton(onClick = { viewModel.clearRemoteProjectCreateError() }) {
+                    Text("OK")
+                }
+            },
+            title = { Text("Unable to Add Project") },
+            text = { Text(message) },
+        )
+    }
+}
+
+@Composable
+private fun FolderList(
+    node: RemoteFolderNode,
+    isLoading: Boolean,
+    onOpen: (RemoteFolderNode) -> Unit,
+) {
+    LazyColumn(Modifier.fillMaxWidth()) {
+        item {
+            CurrentFolderRow(node)
+        }
+        if (node.children.isEmpty() && !isLoading) {
+            item {
+                EmptyFolderRow()
+            }
+        } else {
+            items(node.children, key = { it.path }) { child ->
+                if (child.isDirectory) {
+                    FolderRow(child = child, onClick = { onOpen(child) })
+                } else {
+                    FileRow(child)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun CurrentFolderRow(node: RemoteFolderNode) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 12.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        Icon(Icons.Outlined.Folder, contentDescription = null, tint = MaterialTheme.colorScheme.primary)
+        Column(Modifier.weight(1f)) {
+            Text(node.name, style = MaterialTheme.typography.titleSmall)
+            if (node.path.isNotBlank()) {
+                Text(
+                    node.path,
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun FolderRow(child: RemoteFolderNode, onClick: () -> Unit) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable(onClick = onClick)
+            .padding(vertical = 10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        Icon(Icons.Outlined.Folder, contentDescription = null, tint = MaterialTheme.colorScheme.primary)
+        Column(Modifier.weight(1f)) {
+            Text(child.name, maxLines = 1, overflow = TextOverflow.Ellipsis)
+            Text(
+                child.path,
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+        Icon(
+            Icons.AutoMirrored.Outlined.ArrowForward,
+            contentDescription = null,
+            tint = MaterialTheme.colorScheme.outline,
+            modifier = Modifier.size(18.dp),
+        )
+    }
+}
+
+@Composable
+private fun FileRow(child: RemoteFolderNode) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        Icon(Icons.AutoMirrored.Outlined.InsertDriveFile, contentDescription = null, tint = MaterialTheme.colorScheme.outline)
+        Text(
+            child.name,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+    }
+}
+
+@Composable
+private fun EmptyFolderRow() {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 40.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(8.dp),
+    ) {
+        Icon(Icons.Outlined.Folder, contentDescription = null, tint = MaterialTheme.colorScheme.outline)
+        Text("No folders", style = MaterialTheme.typography.titleSmall)
+        Text("This location has no visible folders.", color = MaterialTheme.colorScheme.onSurfaceVariant)
+    }
+}
+
+@Composable
+private fun LoadingFolders() {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(240.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center,
+    ) {
+        CircularProgressIndicator()
+        Spacer(Modifier.height(12.dp))
+        Text("Loading folders", color = MaterialTheme.colorScheme.onSurfaceVariant)
+    }
+}
+
+@Composable
+private fun FolderUnavailable(message: String?) {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 48.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(8.dp),
+    ) {
+        Icon(Icons.Outlined.Folder, contentDescription = null, tint = MaterialTheme.colorScheme.outline)
+        Text("Folders unavailable", style = MaterialTheme.typography.titleSmall)
+        Text(
+            message ?: "Connect to your Mac and try again.",
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+        )
+    }
+}
+
+private fun folderNavigationPath(path: String): List<String> {
+    val clean = path.trim().trimEnd('/')
+    if (clean.isBlank()) return emptyList()
+    if (clean == "/") return listOf("/")
+    val components = clean.trim('/').split('/').filter { it.isNotBlank() }
+    val paths = mutableListOf("/")
+    var cursor = ""
+    components.forEach { component ->
+        cursor += "/$component"
+        paths.add(cursor)
+    }
+    return paths
+}
diff --git a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/ui/sessions/SessionsScreen.kt b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/ui/sessions/SessionsScreen.kt
index 9394abd7..d528770f 100644
--- a/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/ui/sessions/SessionsScreen.kt
+++ b/RxCodeAndroid/app/src/main/java/app/rxlab/rxcode/ui/sessions/SessionsScreen.kt
@@ -313,6 +313,20 @@ private fun SessionCard(
                     fontWeight = FontWeight.SemiBold,
                     maxLines = 2,
                 )
+                session.threadLabel?.takeIf { it.isNotBlank() }?.let { label ->
+                    Surface(
+                        shape = MaterialTheme.shapes.small,
+                        color = MaterialTheme.colorScheme.primaryContainer,
+                    ) {
+                        Text(
+                            label,
+                            style = MaterialTheme.typography.labelSmall,
+                            fontWeight = FontWeight.SemiBold,
+                            color = MaterialTheme.colorScheme.onPrimaryContainer,
+                            modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp),
+                        )
+                    }
+                }
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
                     horizontalArrangement = Arrangement.spacedBy(10.dp),
diff --git a/RxCodeAndroid/app/src/test/java/app/rxlab/rxcode/proto/RemoteProjectPayloadTest.kt b/RxCodeAndroid/app/src/test/java/app/rxlab/rxcode/proto/RemoteProjectPayloadTest.kt
new file mode 100644
index 00000000..b338c303
--- /dev/null
+++ b/RxCodeAndroid/app/src/test/java/app/rxlab/rxcode/proto/RemoteProjectPayloadTest.kt
@@ -0,0 +1,88 @@
+package app.rxlab.rxcode.proto
+
+import java.util.UUID
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class RemoteProjectPayloadTest {
+
+    @Test
+    fun folderTreePayloadsRoundTrip() {
+        val request = Payload.FolderTreeRequest(
+            FolderTreeRequestPayload(
+                path = "/Users/alex/Code",
+                depth = 1,
+                includeFiles = false,
+            )
+        )
+
+        val decodedRequest = RxJson.decodeFromString<Payload>(
+            RxJson.encodeToString(Payload.serializer(), request)
+        )
+
+        assertTrue(decodedRequest is Payload.FolderTreeRequest)
+        assertEquals("/Users/alex/Code", (decodedRequest as Payload.FolderTreeRequest).data.path)
+
+        val result = Payload.FolderTreeResult(
+            FolderTreeResultPayload(
+                clientRequestID = request.data.clientRequestID,
+                requestedPath = "/Users/alex/Code",
+                ok = true,
+                root = RemoteFolderNode(
+                    name = "Code",
+                    path = "/Users/alex/Code",
+                    children = listOf(
+                        RemoteFolderNode(name = "RxCode", path = "/Users/alex/Code/RxCode"),
+                    ),
+                ),
+            )
+        )
+
+        val decodedResult = RxJson.decodeFromString<Payload>(
+            RxJson.encodeToString(Payload.serializer(), result)
+        )
+
+        assertTrue(decodedResult is Payload.FolderTreeResult)
+        val data = (decodedResult as Payload.FolderTreeResult).data
+        assertEquals(request.data.clientRequestID, data.clientRequestID)
+        assertEquals("RxCode", data.root?.children?.firstOrNull()?.name)
+    }
+
+    @Test
+    fun createProjectPayloadsRoundTrip() {
+        val projectId = UUID.fromString("11111111-2222-3333-4444-555555555555")
+        val request = Payload.CreateProjectRequest(
+            CreateProjectRequestPayload(path = "/Users/alex/Code/RxCode")
+        )
+
+        val decodedRequest = RxJson.decodeFromString<Payload>(
+            RxJson.encodeToString(Payload.serializer(), request)
+        )
+
+        assertTrue(decodedRequest is Payload.CreateProjectRequest)
+        assertEquals("/Users/alex/Code/RxCode", (decodedRequest as Payload.CreateProjectRequest).data.path)
+
+        val result = Payload.CreateProjectResult(
+            CreateProjectResultPayload(
+                clientRequestID = request.data.clientRequestID,
+                ok = true,
+                project = Project(
+                    id = projectId,
+                    name = "RxCode",
+                    path = "/Users/alex/Code/RxCode",
+                ),
+            )
+        )
+
+        val decodedResult = RxJson.decodeFromString<Payload>(
+            RxJson.encodeToString(Payload.serializer(), result)
+        )
+
+        assertTrue(decodedResult is Payload.CreateProjectResult)
+        val data = (decodedResult as Payload.CreateProjectResult).data
+        assertEquals(request.data.clientRequestID, data.clientRequestID)
+        assertEquals(projectId, data.project?.id)
+        assertEquals("RxCode", data.project?.name)
+    }
+}
diff --git a/RxCodeMobile/Resources/Localizable.xcstrings b/RxCodeMobile/Resources/Localizable.xcstrings
index d4fd0c3a..8d0d0b7a 100644
--- a/RxCodeMobile/Resources/Localizable.xcstrings
+++ b/RxCodeMobile/Resources/Localizable.xcstrings
@@ -693,6 +693,12 @@
           }
         }
       }
+    },
+    "Add project from remote repositories" : {
+
+    },
+    "Add project locally" : {
+
     },
     "Agent Clients" : {
       "localizations" : {
@@ -4635,6 +4641,9 @@
           }
         }
       }
+    },
+    "Install GitHub App" : {
+
     },
     "Install RELEASE_TOKEN" : {
       "localizations" : {
@@ -9125,6 +9134,9 @@
           }
         }
       }
+    },
+    "The Mac returned an invalid GitHub App install URL." : {
+
     },
     "The Mac returned an invalid pull-request URL." : {
       "localizations" : {
diff --git a/RxCodeMobile/RxCodeMobileApp.swift b/RxCodeMobile/RxCodeMobileApp.swift
index c090a8b9..433e01b9 100644
--- a/RxCodeMobile/RxCodeMobileApp.swift
+++ b/RxCodeMobile/RxCodeMobileApp.swift
@@ -1,5 +1,6 @@
 import SwiftUI
 import RxCodeCore
+import RxCodeSync
 import TipKit
 
 @main
@@ -46,9 +47,24 @@ struct RxCodeMobileApp: App {
     }
 
     private func handlePairingURL(_ url: URL) {
+        guard Self.isPairingURL(url) else { return }
         MobileHaptics.buttonTap()
         Task {
             await state.pair(from: url, displayName: UIDevice.current.name)
         }
     }
+
+    private static func isPairingURL(_ url: URL) -> Bool {
+        if url.absoluteString.hasPrefix(PairingToken.legacySchemePrefix) {
+            return true
+        }
+        guard url.scheme == "https",
+              url.host?.lowercased() == PairingToken.deeplinkHost,
+              url.path == PairingToken.deeplinkPath,
+              let components = URLComponents(url: url, resolvingAgainstBaseURL: false),
+              components.queryItems?.contains(where: { $0.name == "token" && !($0.value ?? "").isEmpty }) == true else {
+            return false
+        }
+        return true
+    }
 }
diff --git a/RxCodeMobile/State/MobileAppState+Autopilot.swift b/RxCodeMobile/State/MobileAppState+Autopilot.swift
index 69734f0e..9fce1890 100644
--- a/RxCodeMobile/State/MobileAppState+Autopilot.swift
+++ b/RxCodeMobile/State/MobileAppState+Autopilot.swift
@@ -130,6 +130,27 @@ extension MobileAppState {
                                 as: SecretsManagedRepoPage.self)
     }
 
+    @discardableResult
+    func cloneAutopilotRepo(_ repo: SecretsManagedRepo) async throws -> Project {
+        let result = try await autopilotSend(.account, .cloneManagedRepo,
+                                             body: AutopilotCloneRepoBody(fullName: repo.fullName),
+                                             as: AutopilotCloneRepoResult.self)
+        if !projects.contains(where: { $0.id == result.project.id }) {
+            projects.append(result.project)
+        }
+        lastCreatedProjectID = result.project.id
+        Task { await requestSnapshot() }
+        return result.project
+    }
+
+    func githubAppInstallURL() async throws -> URL {
+        let response = try await autopilotSend(.account, .installGitHubAppUrl, as: AutopilotInstallUrlResponse.self)
+        guard let url = URL(string: response.url) else {
+            throw AutopilotRemoteError.server(String(localized: "The Mac returned an invalid GitHub App install URL."))
+        }
+        return url
+    }
+
     // MARK: - Automation settings
 
     func automationSchema() async throws -> SchemaEnvelope {
diff --git a/RxCodeMobile/Views/Autopilot/MobileAutopilotRepoPicker.swift b/RxCodeMobile/Views/Autopilot/MobileAutopilotRepoPicker.swift
index 462dcdb3..787c7e8e 100644
--- a/RxCodeMobile/Views/Autopilot/MobileAutopilotRepoPicker.swift
+++ b/RxCodeMobile/Views/Autopilot/MobileAutopilotRepoPicker.swift
@@ -10,17 +10,19 @@ import SwiftUI
 struct MobileAutopilotRepoPicker: View {
     @EnvironmentObject private var state: MobileAppState
     @Environment(\.dismiss) private var dismiss
+    @Environment(\.openURL) private var openURL
 
     let title: String
     /// Full names already registered, hidden from the picker.
     let existingRepoFullNames: Set<String>
-    let onSelect: (SecretsManagedRepo) async -> Void
+    let onSelect: (SecretsManagedRepo) async throws -> Void
 
     @State private var repos: [SecretsManagedRepo] = []
     @State private var search = ""
     @State private var nextCursor: String?
     @State private var hasMore = false
     @State private var isLoading = false
+    @State private var isOpeningInstallURL = false
     @State private var addingFullName: String?
     @State private var errorMessage: String?
     @State private var searchTask: Task<Void, Never>?
@@ -90,6 +92,19 @@ struct MobileAutopilotRepoPicker: View {
                 ToolbarItem(placement: .cancellationAction) {
                     Button("Cancel") { dismiss() }
                 }
+                ToolbarItem(placement: .topBarTrailing) {
+                    Button {
+                        Task { await openGitHubAppInstallURL() }
+                    } label: {
+                        if isOpeningInstallURL {
+                            ProgressView()
+                        } else {
+                            Image(systemName: "app.badge.checkmark")
+                        }
+                    }
+                    .accessibilityLabel("Install GitHub App")
+                    .disabled(isOpeningInstallURL)
+                }
             }
             .task { await reload() }
         }
@@ -128,7 +143,22 @@ struct MobileAutopilotRepoPicker: View {
     private func select(_ repo: SecretsManagedRepo) async {
         addingFullName = repo.fullName
         defer { addingFullName = nil }
-        await onSelect(repo)
-        dismiss()
+        do {
+            try await onSelect(repo)
+            dismiss()
+        } catch {
+            errorMessage = error.localizedDescription
+        }
+    }
+
+    private func openGitHubAppInstallURL() async {
+        isOpeningInstallURL = true
+        errorMessage = nil
+        defer { isOpeningInstallURL = false }
+        do {
+            openURL(try await state.githubAppInstallURL())
+        } catch {
+            errorMessage = error.localizedDescription
+        }
     }
 }
diff --git a/RxCodeMobile/Views/GlassThreadCard.swift b/RxCodeMobile/Views/GlassThreadCard.swift
index 5812e5d4..c1551bf9 100644
--- a/RxCodeMobile/Views/GlassThreadCard.swift
+++ b/RxCodeMobile/Views/GlassThreadCard.swift
@@ -59,6 +59,15 @@ struct GlassThreadCard: View {
                         .font(.system(size: 16, weight: .medium))
                         .foregroundStyle(.primary)
                         .lineLimit(1)
+
+                    if let label = session.threadLabel, !label.isEmpty {
+                        Text(label)
+                            .font(.system(size: 10, weight: .semibold))
+                            .foregroundStyle(ClaudeTheme.accent)
+                            .padding(.horizontal, 6)
+                            .padding(.vertical, 2)
+                            .background(ClaudeTheme.accent.opacity(0.15), in: Capsule())
+                    }
                 }
                 
                 // Metadata row
diff --git a/RxCodeMobile/Views/MobileRunProfileEditorView.swift b/RxCodeMobile/Views/MobileRunProfileEditorView.swift
index fd48e4f4..a5f39633 100644
--- a/RxCodeMobile/Views/MobileRunProfileEditorView.swift
+++ b/RxCodeMobile/Views/MobileRunProfileEditorView.swift
@@ -51,10 +51,10 @@ struct MobileRunProfileEditorView: View {
                         if type == .packageScript, draft.package == nil { draft.package = PackageRunConfig() }
                     }
                 )) {
-                    Text("Bash").tag(RunProfileType.bash)
-                    Text("Xcode").tag(RunProfileType.xcode)
-                    Text("Make").tag(RunProfileType.make)
-                    Text("Package").tag(RunProfileType.packageScript)
+                    Text(RunProfileType.bash.displayName).tag(RunProfileType.bash)
+                    Text(RunProfileType.xcode.displayName).tag(RunProfileType.xcode)
+                    Text(RunProfileType.make.displayName).tag(RunProfileType.make)
+                    Text(RunProfileType.packageScript.displayName).tag(RunProfileType.packageScript)
                 }
             }
 
@@ -224,7 +224,7 @@ struct MobileRunProfileEditorView: View {
     }
 
     private var packageSection: some View {
-        Section("Package") {
+        Section("Node.js") {
             let pkg = Binding(
                 get: { draft.package ?? PackageRunConfig() },
                 set: { draft.package = $0 }
diff --git a/RxCodeMobile/Views/MobileRunProfilesView.swift b/RxCodeMobile/Views/MobileRunProfilesView.swift
index 0fb7793d..4ee50d8c 100644
--- a/RxCodeMobile/Views/MobileRunProfilesView.swift
+++ b/RxCodeMobile/Views/MobileRunProfilesView.swift
@@ -236,7 +236,7 @@ struct MobileRunProfilesView: View {
                 Button {
                     editingProfile = Self.newProfile(projectID: projectID, type: .packageScript)
                 } label: {
-                    Label("Package Configuration", systemImage: "shippingbox.fill")
+                    Label("Node.js Configuration", systemImage: "shippingbox.fill")
                 }
             }
 
@@ -311,7 +311,7 @@ struct MobileRunProfilesView: View {
         case .packageScript:
             return RunProfile(
                 projectId: projectID,
-                name: "New Package Configuration",
+                name: "New Node.js Configuration",
                 type: .packageScript,
                 package: PackageRunConfig(),
                 createdAt: now,
diff --git a/RxCodeMobile/Views/ProjectsSidebar.swift b/RxCodeMobile/Views/ProjectsSidebar.swift
index a83500f1..145a82e1 100644
--- a/RxCodeMobile/Views/ProjectsSidebar.swift
+++ b/RxCodeMobile/Views/ProjectsSidebar.swift
@@ -13,6 +13,7 @@ struct ProjectsSidebar: View {
     var usesSelection = true
     @State private var searchText = ""
     @State private var showingRemoteFolderPicker = false
+    @State private var showingGitHubRepoPicker = false
     @Namespace private var glassNamespace
 
     var body: some View {
@@ -20,12 +21,7 @@ struct ProjectsSidebar: View {
             .navigationTitle("Projects")
             .toolbar {
                 ToolbarItem(placement: .topBarTrailing) {
-                    Button {
-                        showingRemoteFolderPicker = true
-                    } label: {
-                        Image(systemName: "folder.badge.plus")
-                    }
-                    .accessibilityLabel("Add Project")
+                    addProjectMenu(iconOnly: true)
                     .popoverTip(MobileTips.RemoteProjectTip(), arrowEdge: .top)
                 }
             }
@@ -34,9 +30,25 @@ struct ProjectsSidebar: View {
                     .environmentObject(state)
                     .mobileSheetPresentation()
             }
+            .sheet(isPresented: $showingGitHubRepoPicker) {
+                MobileAutopilotRepoPicker(
+                    title: "Add Project",
+                    existingRepoFullNames: existingGitHubRepoNames
+                ) { repo in
+                    try await state.cloneAutopilotRepo(repo)
+                }
+                .environmentObject(state)
+                .mobileSheetPresentation()
+            }
             .refreshable {
                 await state.refreshSnapshot()
             }
+            .task {
+                await loadAutopilotAccountIfNeeded()
+            }
+            .onChange(of: state.connectionState) { _, _ in
+                Task { await loadAutopilotAccountIfNeeded(force: true) }
+            }
             .modifier(ProjectSidebarSearchModifier(isEnabled: showsSearch, searchText: $searchText))
             .modifier(ProjectSidebarSearchTipModifier(isEnabled: showsSearch))
             .autocorrectionDisabled(true)
@@ -230,12 +242,8 @@ struct ProjectsSidebar: View {
                 .multilineTextAlignment(.center)
                 .padding(.horizontal, 32)
 
-            Button {
-                showingRemoteFolderPicker = true
-            } label: {
-                Label("Add Project", systemImage: "plus")
-                    .font(.subheadline.weight(.medium))
-            }
+            addProjectMenu(iconOnly: false)
+                .font(.subheadline.weight(.medium))
             .buttonStyle(.glass)
             .padding(.top, 8)
         }
@@ -250,6 +258,48 @@ struct ProjectsSidebar: View {
         false
     }
 
+    private var canAddFromRemoteRepositories: Bool {
+        state.isPaired
+            && state.connectionState == .connected
+            && state.autopilotAccount?.isSignedIn == true
+    }
+
+    private var existingGitHubRepoNames: Set<String> {
+        Set(state.projects.compactMap { $0.gitHubRepo?.lowercased() })
+    }
+
+    @ViewBuilder
+    private func addProjectMenu(iconOnly: Bool) -> some View {
+        Menu {
+            Button {
+                showingRemoteFolderPicker = true
+            } label: {
+                Label("Add project locally", systemImage: "folder.badge.plus")
+            }
+
+            if canAddFromRemoteRepositories {
+                Button {
+                    showingGitHubRepoPicker = true
+                } label: {
+                    Label("Add project from remote repositories", systemImage: "square.and.arrow.down")
+                }
+            }
+        } label: {
+            if iconOnly {
+                Image(systemName: "plus")
+            } else {
+                Label("Add Project", systemImage: "plus")
+            }
+        }
+        .accessibilityLabel("Add Project")
+    }
+
+    private func loadAutopilotAccountIfNeeded(force: Bool = false) async {
+        guard state.isPaired, state.connectionState == .connected else { return }
+        if !force, state.autopilotAccount != nil { return }
+        _ = try? await state.loadAutopilotAccount()
+    }
+
     private func threadCount(for projectID: UUID) -> Int {
         state.sessions.filter { $0.projectId == projectID && !$0.isArchived }.count
     }
diff --git a/RxCodeTests/GeneratedTextSanitizerTests.swift b/RxCodeTests/GeneratedTextSanitizerTests.swift
new file mode 100644
index 00000000..8fd05af7
--- /dev/null
+++ b/RxCodeTests/GeneratedTextSanitizerTests.swift
@@ -0,0 +1,70 @@
+import XCTest
+@testable import RxCode
+
+final class GeneratedTextSanitizerTests: XCTestCase {
+    func testCleanMarkdownDocumentUnwrapsFencedMarkdown() {
+        let raw = """
+        ```markdown
+        ### Features
+        - Added branch briefing cleanup.
+        ```
+        """
+
+        XCTAssertEqual(
+            GeneratedTextSanitizer.cleanMarkdownDocument(raw),
+            """
+            ### Features
+            - Added branch briefing cleanup.
+            """
+        )
+    }
+
+    func testCleanMarkdownDocumentDropsPersistedLanguageLabel() {
+        let raw = """
+        markdown
+        ### Fixes
+        - Hid the stray language marker.
+        """
+
+        XCTAssertEqual(
+            GeneratedTextSanitizer.cleanMarkdownDocument(raw),
+            """
+            ### Fixes
+            - Hid the stray language marker.
+            """
+        )
+    }
+
+    func testCleanMarkdownDocumentUnwrapsQuotedFencedMarkdown() {
+        let raw = """
+        "```markdown
+        ### Improvements
+        - Preserved headings while removing wrappers.
+        ```"
+        """
+
+        XCTAssertEqual(
+            GeneratedTextSanitizer.cleanMarkdownDocument(raw),
+            """
+            ### Improvements
+            - Preserved headings while removing wrappers.
+            """
+        )
+    }
+
+    func testCleanSummaryRejectsProviderErrorsAfterFenceCleanup() {
+        let raw = """
+        ```text
+        Error: model unavailable
+        ```
+        """
+
+        XCTAssertNil(
+            GeneratedTextSanitizer.cleanSummary(
+                raw,
+                limit: 180,
+                errorPrefixes: ["error:"]
+            )
+        )
+    }
+}
diff --git a/relay-server/k8s/configmap.yaml b/relay-server/k8s/configmap.yaml
index b0e307db..b37bdd00 100644
--- a/relay-server/k8s/configmap.yaml
+++ b/relay-server/k8s/configmap.yaml
@@ -9,7 +9,7 @@ data:
   # Listen address inside the pod. The Service targets this port.
   RELAY_ADDR: ":8787"
   # APNs topic must equal the RxCode Mobile bundle identifier exactly.
-  APNS_TOPIC: "com.idealapp.RxCode.Mobile"
+  APNS_TOPIC: "app.rxlab.rxcodemobile"
   # Fallback only for old desktop builds that omit per-device APNs environment.
   # Current desktop clients send sandbox/production per paired device.
   APNS_PRODUCTION: "true"