Skip to content

chore(release): sync upstream main for RTVision 0.0.50 - #55

Merged
kalvenschraut merged 64 commits into
rtvisionfrom
sync/upstream-rtvision-0.0.50
Sep 12, 2026
Merged

kalvenschraut merged 64 commits into
rtvisionfrom
sync/upstream-rtvision-0.0.50

Conversation

@kalvenschraut

@kalvenschraut kalvenschraut commented Sep 12, 2026 •

Copy link
Copy Markdown
Member

Sync rtvision with pingdotgg/t3code main through d1d15c67f, bringing 61 upstream commits into RTVision 0.0.50. This takes upstream's PR layout, cached label/reviewer updates, project-only PR queries, settings overrides, inline file previews, rewind behavior, and rendering improvements.

The merge retains RTVision's Gitea integration, review mentions and whitespace filtering, CI controls, scoped refreshes, Vim navigation, remote terminal editors, and release packaging. Conflict resolutions use upstream's layout and lifecycle behavior, with the compatible fork behavior applied on top. PR refreshes now use the project-only query too. The generated .pnpm-store database is excluded, consistent with .gitignore.

Validation: 233 focused web tests, 9 PR client-runtime tests, and 177 server tests pass. Web and desktop typechecks pass. Scoped lint completed with warnings and no errors. Hosted CI will run the full suite and release smoke build. Browser verification and PR images were explicitly waived.

CodeRabbit reviews the 23 integration overlay files in companion PR #56, which shares this exact head, because the full upstream sync exceeds its 100-file limit. After current-head CodeRabbit approval there and passing CI here, merge with upstream ancestry intact. The version bump triggers the RTVision release workflow; npm publication and artifact verification precede publishing the GitHub release.

Model: GPT-6. Harness: Codex.

maria-rcks and others added 30 commits September 10, 2026 23:36
…ngdotgg#11021)

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…ode (pingdotgg#11026)

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…ks (pingdotgg#11044)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…gg#11169)

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Code <noreply@anthropic.com>
…dotgg#11187)

Co-authored-by: Exotic <118054752+extoci@users.noreply.github.com>
@kalvenschraut

Copy link
Copy Markdown
Member Author

@coderabbitai review

Please review current head 0c171a43fa3960bf6add703f1ebb5dce5568bb8f for this upstream integration. Focus on semantic conflict resolutions: PR writable caches plus scoped refresh/CI atoms, project-only invalidation queries, reviewer re-request labels, mention and whitespace retention, ChatView route lifetime plus Vim focus, remote terminal editor dispatch, attachment previews, settings scopes, and release identity/version. Upstream ancestry is preserved; most of the diff is the 61 already-reviewed upstream commits. Browser use and PR images were explicitly waived. Merge is gated on your current-head approval and completed CI.

@github-actions github-actions Bot added vouch:trusted Author is trusted by repo permissions or the VOUCHED list. size:XXL 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. labels Sep 12, 2026
@coderabbitai

coderabbitai Bot commented Sep 12, 2026 •

Copy link
Copy Markdown
⚠️ Action not completed

Review skipped: 574 files exceed the limit of 100.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@kalvenschraut

Copy link
Copy Markdown
Member Author

@coderabbitai The automatic review exceeded your 100-file limit because the PR includes 61 upstream commits. Can you review the integration resolutions as a focused review on this PR? The relevant changes are visible with git show --remerge-diff 0c171a43fa3960bf6add703f1ebb5dce5568bb8f; that limits the work to the merge conflict resolutions plus the project-only invalidation query and release version bump. Please review those changes and report actionable findings. If that is unsupported, explain the supported way to restrict review scope for this one PR without changing the repository-wide review configuration. Approval remains required for the final integration head after CI passes.

@github-actions

Copy link
Copy Markdown

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider Metric Main baseline This PR Impact PR ceiling
Codex Total thread wire 13.4 KiB 13.6 KiB +209 B (+1.5%) 15.1 KiB ✅
Codex Thread snapshot wire 7.0 KiB 7.1 KiB +4 B (+0.1%) 7.3 KiB ✅
Codex Live turn WebSocket wire 6.4 KiB 6.6 KiB +205 B (+3.1%) 7.8 KiB ✅
Codex Live turn WebSocket decoded 56.1 KiB 57.1 KiB +954 B (+1.7%) 66.4 KiB ✅
Codex Live turn messages 7 10 +3 (+42.9%) 21 ✅
Claude Total thread wire 13.6 KiB 13.6 KiB +18 B (+0.1%) 15.1 KiB ✅
Claude Thread snapshot wire 7.0 KiB 7.1 KiB +7 B (+0.1%) 7.3 KiB ✅
Claude Live turn WebSocket wire 6.6 KiB 6.6 KiB +11 B (+0.2%) 7.8 KiB ✅
Claude Live turn WebSocket decoded 57.9 KiB 57.9 KiB 0 B (0.0%) 66.4 KiB ✅
Claude Live turn messages 10 10 0 (0.0%) 21 ✅

Baseline: afe3f55 · PR result: 0c171a4 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

  • Codex decoded thread snapshot: 113.9 KiB
  • Claude decoded thread snapshot: 114.6 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

@kalvenschraut

Copy link
Copy Markdown
Member Author

@coderabbitai Here is the complete merge-resolution diff for current head 0c171a43fa3960bf6add703f1ebb5dce5568bb8f, so the focused review does not require the 574-file PR diff. Please inspect these resolutions against both parents and the resulting source. All 16 checks now pass, including full tests, typechecks, desktop build, and release smoke. Report defects or a reviewed approval verdict; do not treat the successful CI alone as review.

25-file merge-resolution diff
commit 0c171a43fa3960bf6add703f1ebb5dce5568bb8f
Merge: afe3f556b d1d15c67f
Author: Kalven Schraut <kalvens@rtvision.com>
Date:   Sat Sep 12 12:04:53 2026 -0500

    chore(release): sync upstream main for RTVision 0.0.50

diff --git a/.pnpm-store/v11/index.db b/.pnpm-store/v11/index.db
deleted file mode 100644
index 7babead3f..000000000
Binary files a/.pnpm-store/v11/index.db and /dev/null differ
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index c6f4d1326..ed51bfca1 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@t3tools/desktop",
-  "version": "0.0.49",
+  "version": "0.0.50",
   "private": true,
   "type": "module",
   "main": "dist-electron/main.cjs",
diff --git a/apps/desktop/src/ipc/channels.ts b/apps/desktop/src/ipc/channels.ts
remerge CONFLICT (content): Merge conflict in apps/desktop/src/ipc/channels.ts
index 025b29921..276c30586 100644
--- a/apps/desktop/src/ipc/channels.ts
+++ b/apps/desktop/src/ipc/channels.ts
@@ -107,12 +107,9 @@ export const PREVIEW_RECORDING_FRAME_CHANNEL = "desktop:preview-recording-frame"
 export const PREVIEW_STATE_CHANGE_CHANNEL = "desktop:preview-state-change";
 export const PREVIEW_POINTER_EVENT_CHANNEL = "desktop:preview-pointer-event";
 
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
 export const PROBE_TERMINAL_EDITOR_CHANNEL = "desktop:probe-terminal-editor";
 export const OPEN_TERMINAL_EDITOR_CHANNEL = "desktop:open-terminal-editor";
 export const SET_TERMINAL_EDITOR_SETTINGS_CHANNEL = "desktop:set-terminal-editor-settings";
-=======
 export const MAC_PERMISSION_HELPER_CHANNEL = "desktop:mac-permission-helper";
 
 export const CHECK_SYSTEM_PERMISSION_CHANNEL = "desktop:check-system-permission";
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
remerge CONFLICT (content): Merge conflict in apps/desktop/src/main.ts
index a7257dc39..9e728d03a 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -1,9 +1,6 @@
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
 import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
 import { resolveDesktopSshRunner } from "./ssh/DesktopSshRunner.ts";
-=======
 import * as MacPermissions from "./permissions/MacPermissions.ts";
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
 for (const stream of [process.stdout, process.stderr]) {
   stream.on("error", (err: NodeJS.ErrnoException) => {
     if (err.code !== "EPIPE") throw err;
diff --git a/apps/server/package.json b/apps/server/package.json
index 3d04f7205..7e48d10d0 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "t3",
-  "version": "0.0.49",
+  "version": "0.0.50",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/apps/server/src/pullRequest/PullRequestService.ts b/apps/server/src/pullRequest/PullRequestService.ts
index c6f27555f..b951ce3c8 100644
--- a/apps/server/src/pullRequest/PullRequestService.ts
+++ b/apps/server/src/pullRequest/PullRequestService.ts
@@ -2701,11 +2701,11 @@ export const make = Effect.gen(function* () {
   ) {
     const route = yield* requireProject(reference).pipe(Effect.orElseSucceed(() => undefined));
     const host = route?.host ?? reference.host?.trim().toLowerCase();
-    const snapshot = yield* projections.getShellSnapshot().pipe(Effect.orElseSucceed(() => null));
+    const projects = yield* projections.getProjectShells().pipe(Effect.orElseSucceed(() => []));
     const projectIds = new Set(reference.host === undefined ? [reference.projectId] : []);
     // Hosted references can borrow any checkout. Their epoch belongs to the host and
     // repository; legacy references still need the epoch of each owning checkout.
-    for (const project of snapshot?.projects ?? []) {
+    for (const project of projects) {
       const identity = project.repositoryIdentity;
       const repository = sourceControlRepositorySelector(identity);
       if (
diff --git a/apps/web/package.json b/apps/web/package.json
index ff580a1b3..5a81279fd 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@t3tools/web",
-  "version": "0.0.49",
+  "version": "0.0.50",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/apps/web/src/components/ChatMarkdown.tsx b/apps/web/src/components/ChatMarkdown.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/ChatMarkdown.tsx
index 232176f33..ac8633ed6 100644
--- a/apps/web/src/components/ChatMarkdown.tsx
+++ b/apps/web/src/components/ChatMarkdown.tsx
@@ -3051,13 +3051,15 @@ const CHAT_MARKDOWN_COMPONENTS = {
     );
   },
   img: function MarkdownImage({ node, title, src, alt, ...props }) {
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
-    const { expandMedia, cwd, imageBaseDir, threadRef, environmentId, resolveImageAsset } = use(
-=======
-    const { expandMedia, cwd, imageBaseDir, threadRef, renderContextReference } = use(
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
-      ChatMarkdownRendererContext,
-    );
+    const {
+      expandMedia,
+      cwd,
+      imageBaseDir,
+      threadRef,
+      environmentId,
+      resolveImageAsset,
+      renderContextReference,
+    } = use(ChatMarkdownRendererContext);
     const imageExpand = use(MarkdownLinkContext) ? undefined : expandMedia;
     const contextReference = typeof src === "string" ? parseComposerContextHref(src) : null;
     if (contextReference) {
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/ChatView.tsx
index 9053b1cd5..70016ed42 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -1441,10 +1441,6 @@ export default function ChatView(props: ChatViewProps) {
     [environmentId, threadId],
   );
   const routeThreadKey = useMemo(() => scopedThreadKey(routeThreadRef), [routeThreadRef]);
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
-  const routeThreadKeyRef = useRef(routeThreadKey);
-  routeThreadKeyRef.current = routeThreadKey;
-=======
   const currentRouteThreadKeyRef = useRef<string | null>(routeThreadKey);
   useLayoutEffect(() => {
     currentRouteThreadKeyRef.current = routeThreadKey;
@@ -1452,7 +1448,6 @@ export default function ChatView(props: ChatViewProps) {
       currentRouteThreadKeyRef.current = null;
     };
   }, [routeThreadKey]);
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
   const updateProjectScriptSettings = useAtomCommand(serverEnvironment.updateSettings, {
     reportFailure: false,
   });
@@ -7637,7 +7632,7 @@ export default function ChatView(props: ChatViewProps) {
       turnStartSucceeded &&
       vimEnabled() &&
       resolvedSubmissionIntent !== "background" &&
-      routeThreadKeyRef.current === routeThreadKey &&
+      currentRouteThreadKeyRef.current === routeThreadKey &&
       document.activeElement === focusAtSend &&
       promptRef.current.length === 0
     )
@@ -8781,15 +8776,11 @@ export default function ChatView(props: ChatViewProps) {
             <div className="relative flex min-h-0 flex-1 flex-col bg-background">
               {/* Messages — LegendList handles virtualization and scrolling internally */}
               <MessagesTimeline
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
                 onVimBottom={() => scrollToEnd(false)}
                 vimHistoryError={
                   routeThreadState.error._tag === "Some" ? routeThreadState.error.value : null
                 }
-                citationRequest={citationRequest}
-=======
                 citationRequest={paintOnlyDisplayedTimeline ? null : citationRequest}
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
                 citationHistoryLoading={threadDetailLoading}
                 {...(!paintOnlyDisplayedTimeline
                   ? {
diff --git a/apps/web/src/components/Icons.tsx b/apps/web/src/components/Icons.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/Icons.tsx
index 88e77b7ea..2ae406362 100644
--- a/apps/web/src/components/Icons.tsx
+++ b/apps/web/src/components/Icons.tsx
@@ -2,7 +2,6 @@ import React, { type SVGProps, useId } from "react";
 import { cn } from "~/lib/utils";
 export type Icon = React.FC<SVGProps<SVGSVGElement>>;
 
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
 // Official mark: https://neovim.io/logos/neovim-mark.svg
 export const NeovimIcon: Icon = (props) => {
   const id = useId();
@@ -45,7 +44,6 @@ export const NeovimIcon: Icon = (props) => {
     </svg>
   );
 };
-=======
 export const FinderIcon: Icon = (props) => (
   <svg viewBox="0 0 24 24" fill="none" {...props}>
     <rect x="2" y="2" width="20" height="20" rx="4" fill="#36A9F5" />
@@ -73,7 +71,6 @@ export const FileExplorerIcon: Icon = (props) => (
     <path d="M10 16h4v2h-4Z" fill="#1879B9" />
   </svg>
 );
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
 
 // Apple brand mark from Simple Icons (CC0).
 export const AppleIcon: Icon = (props) => (
diff --git a/apps/web/src/components/chat/MessagesTimeline.tsx b/apps/web/src/components/chat/MessagesTimeline.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/chat/MessagesTimeline.tsx
index 3f9d52bdd..1a621b9c0 100644
--- a/apps/web/src/components/chat/MessagesTimeline.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.tsx
@@ -1,11 +1,7 @@
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
 import { useClientSettings } from "../../hooks/useSettings";
 import { VimTimeline } from "../../vim/VimTimeline";
-import { GitPullRequestIcon } from "lucide-react";
-=======
 import { ReadOnlySourcePreview } from "../files/AttachmentFilePreview";
 import { useRightPanelStore } from "~/rightPanelStore";
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
 import {
   getQuestionAnswerPreview,
   getQuestionAnswerText,
diff --git a/apps/web/src/components/chat/OpenInPicker.tsx b/apps/web/src/components/chat/OpenInPicker.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/chat/OpenInPicker.tsx
index 61e3d9b3b..13dfd758b 100644
--- a/apps/web/src/components/chat/OpenInPicker.tsx
+++ b/apps/web/src/components/chat/OpenInPicker.tsx
@@ -42,19 +42,13 @@ import {
   RustRoverIcon,
   WebStormIcon,
 } from "../JetBrainsIcons";
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
-import { cn } from "~/lib/utils";
+import { cn, isMacPlatform, isWindowsPlatform } from "~/lib/utils";
 import { toastManager } from "../ui/toast";
 import {
   isAtomCommandInterrupted,
   squashAtomCommandFailure,
 } from "@t3tools/client-runtime/state/runtime";
 import { Link } from "@tanstack/react-router";
-=======
-import { cn, isMacPlatform, isWindowsPlatform } from "~/lib/utils";
-import { shellEnvironment } from "~/state/shell";
-import { useAtomCommand } from "~/state/use-atom-command";
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
 
 type OpenInOption = {
   label: string;
@@ -220,13 +214,8 @@ export const OpenInPicker = memo(function OpenInPicker({
     terminal.state === "check-on-open" ||
     preferredEditor?.kind === "terminal";
   const options = useMemo(
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
-    () => resolveOptions(navigator.platform, dispatch.effectiveEditors),
+    () => resolveOpenInOptions(navigator.platform, dispatch.effectiveEditors),
     [dispatch.effectiveEditors],
-=======
-    () => resolveOpenInOptions(navigator.platform, effectiveEditors),
-    [effectiveEditors],
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
   );
   const primaryOption = options.find(({ value }) => value === preferredEditor?.editor) ?? null;
   const openInEditor = useCallback(
diff --git a/apps/web/src/components/files/FilePreviewPanel.tsx b/apps/web/src/components/files/FilePreviewPanel.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/files/FilePreviewPanel.tsx
index 4342b74fd..bd45d1c13 100644
--- a/apps/web/src/components/files/FilePreviewPanel.tsx
+++ b/apps/web/src/components/files/FilePreviewPanel.tsx
@@ -1084,33 +1084,8 @@ export default function FilePreviewPanel({
                 workspaceMutationId={workspaceMutationId}
               />
             </div>
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
-          ) : (
-            <ScrollArea
-              ref={breadcrumbRef}
-              hideScrollbars
-              scrollFade
-              className="min-w-0 flex-1 rounded-none"
-              data-file-breadcrumbs
-            >
-              <div className="flex h-full w-max min-w-full items-center text-xs">
-                <FileBreadcrumbs
-                  cwd={cwd}
-                  environmentId={environmentId}
-                  onOpenFile={onOpenFile}
-                  projectName={projectName}
-                  relativePath={relativePath}
-                  workspaceMutationId={workspaceMutationId}
-                />
-              </div>
-            </ScrollArea>
-          )}
-          {absolutePath ? (
-=======
           </ScrollArea>
-          {absolutePath &&
-          (environmentId === primaryEnvironmentId || remoteOpenState.mode !== "local-exec") ? (
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
+          {absolutePath ? (
             <OpenInPicker
               environmentId={environmentId}
               keybindings={keybindings}
diff --git a/apps/web/src/components/files/fileEditorLanguageReadiness.test.ts b/apps/web/src/components/files/fileEditorLanguageReadiness.test.ts
remerge CONFLICT (content): Merge conflict in apps/web/src/components/files/fileEditorLanguageReadiness.test.ts
index 3c2bd529f..927d963c4 100644
--- a/apps/web/src/components/files/fileEditorLanguageReadiness.test.ts
+++ b/apps/web/src/components/files/fileEditorLanguageReadiness.test.ts
@@ -40,7 +40,6 @@ const source = "export const View = () => <div>Ready</div>;";
 let pool: WorkerPoolManager;
 let renderer: FileRenderer;
 let terminationPromises: Promise<number>[];
-const animationFrames = new Set<ReturnType<typeof setImmediate>>();
 
 class WorkerTransport {
   private readonly worker = new NodeWorkerThreads.Worker(
@@ -97,18 +96,10 @@ function firstEnter(highlighter: DiffsHighlighter, file: FileContents, language:
 
 beforeEach(async () => {
   terminationPromises = [];
-  vi.stubGlobal("requestAnimationFrame", (callback: FrameRequestCallback) => {
-    const frame = setImmediate(() => {
-      animationFrames.delete(frame);
-      callback(0);
-    });
-    animationFrames.add(frame);
-    return frame;
-  });
-  vi.stubGlobal("cancelAnimationFrame", (frame: ReturnType<typeof setImmediate>) => {
-    animationFrames.delete(frame);
-    clearImmediate(frame);
-  });
+  vi.stubGlobal("requestAnimationFrame", (callback: FrameRequestCallback) =>
+    setImmediate(() => callback(0)),
+  );
+  vi.stubGlobal("cancelAnimationFrame", clearImmediate);
   vi.stubGlobal("window", { matchMedia: () => ({ matches: true }) });
   await disposeHighlighter();
   pool = new WorkerPoolManager(
@@ -125,14 +116,8 @@ afterEach(async () => {
   pool?.terminate();
   await Promise.all(terminationPromises);
   await disposeHighlighter();
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
-  // Pool termination can queue a final broadcast after its workers have exited.
-  for (const frame of animationFrames) clearImmediate(frame);
-  animationFrames.clear();
-=======
   // Drain the pool's final state broadcast before removing the animation frame stubs.
   await new Promise<void>((resolve) => setImmediate(resolve));
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
   vi.unstubAllGlobals();
 });
 
diff --git a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
index 5914c4e94..415ecf698 100644
--- a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
@@ -862,7 +862,6 @@ export function PullRequestDetailPanel({
     const identity = projects.find(
       (project) => project.id === reference.projectId && project.environmentId === environmentId,
     )?.repositoryIdentity;
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
     return matchingListEntry?.provider === "gitea" || identity?.provider === "gitea"
       ? giteaPullRequestBrowserUrl(identity, reference.repository, reference.number)
       : gitHubPullRequestBrowserUrl(identity, reference.repository, reference.number);
@@ -875,11 +874,6 @@ export function PullRequestDetailPanel({
     reference.repository,
   ]);
   // Project settings store the override under the sidebar group's key, which a duplicate row
-=======
-    return gitHubPullRequestBrowserUrl(identity, reference.repository, reference.number);
-  }, [environmentId, projects, reference.number, reference.projectId, reference.repository]);
-  // Project settings stored the override under the sidebar group's key, which a duplicate row
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
   // borrows from its siblings, so the project alone does not always name the same key.
   const legacyProjectDefaultMergeMethod = useMemo(() => {
     if (projectDefaultMergeMethod !== undefined) return undefined;
diff --git a/apps/web/src/components/pullRequest/PullRequestReviewerPicker.tsx b/apps/web/src/components/pullRequest/PullRequestReviewerPicker.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/pullRequest/PullRequestReviewerPicker.tsx
index 497e03020..679a6869d 100644
--- a/apps/web/src/components/pullRequest/PullRequestReviewerPicker.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestReviewerPicker.tsx
@@ -39,23 +39,14 @@ export function PullRequestReviewerPicker({
   environmentId,
   reference,
   allowed,
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
   comments,
-  onRequested,
-=======
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
 }: {
   environmentId: EnvironmentId;
   reference: PullRequestRef;
   /** False where the host would refuse this account's request, which is worth saying rather than
    * hiding: the control disabled with a reason answers the question its absence would raise. */
   allowed: boolean;
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
   comments: ReadonlyArray<PullRequestComment>;
-  /** The detail carries who is requested, so it is re-read once the host has taken the change. */
-  onRequested: () => void;
-=======
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
 }) {
   const [open, setOpen] = useState(false);
   const [query, setQuery] = useState("");
diff --git a/apps/web/src/components/pullRequest/PullRequestRow.tsx b/apps/web/src/components/pullRequest/PullRequestRow.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/pullRequest/PullRequestRow.tsx
index a5e8eea2a..366f68fc4 100644
--- a/apps/web/src/components/pullRequest/PullRequestRow.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestRow.tsx
@@ -150,17 +150,15 @@ function PullRequestRowImpl({
               Changes requested
             </span>
           ) : null}
-          {entry.checksState === undefined ? null : (
-            <PullRequestChecksPopover
-              checksState={entry.checksState}
-              environmentId={entry.environmentId}
-              reference={{
-                projectId: entry.projectId,
-                repository: entry.repository,
-                number: entry.number,
-              }}
-            />
-          )}
+          <PullRequestChecksPopover
+            checksState={entry.checksState ?? null}
+            environmentId={entry.environmentId}
+            reference={{
+              projectId: entry.projectId,
+              repository: entry.repository,
+              number: entry.number,
+            }}
+          />
           <PullRequestDiffStat
             additions={entry.additions}
             deletions={entry.deletions}
@@ -224,36 +222,6 @@ function PullRequestRowImpl({
             labelClassName="sr-only @xs/pr-row-meta:not-sr-only @xs/pr-row-meta:truncate"
           />
           {entry.labels.length > 0 ? <PullRequestRowLabels labels={entry.labels} /> : null}
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
-          {/* Only a verdict somebody has actually given: "review required" is the absence of
-              one, and saying so on every unreviewed row would say nothing. */}
-          {entry.reviewDecision === "approved" ? (
-            <Tooltip>
-              <TooltipTrigger render={<span className="inline-flex shrink-0" />}>
-                <UserCheckIcon
-                  aria-hidden
-                  className="size-3.5 text-emerald-600/90 dark:text-emerald-400/80"
-                />
-                <span className="sr-only">Approved</span>
-              </TooltipTrigger>
-              <TooltipPopup>Approved</TooltipPopup>
-            </Tooltip>
-          ) : entry.reviewDecision === "changes-requested" ? (
-            <span className="min-w-0 truncate text-amber-600/90 dark:text-amber-400/80">
-              Changes requested
-            </span>
-          ) : null}
-          <PullRequestChecksPopover
-            checksState={entry.checksState ?? null}
-            environmentId={entry.environmentId}
-            reference={{
-              projectId: entry.projectId,
-              repository: entry.repository,
-              number: entry.number,
-            }}
-          />
-=======
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
         </PullRequestMetaLine>
         <span className="col-start-2 row-start-2 flex items-center justify-self-end gap-3 whitespace-nowrap text-[11px] text-muted-foreground/70 tabular-nums">
           <span className="hidden @sm/pr-row:inline">
diff --git a/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx b/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
index b7b3472c5..b3f40fc27 100644
--- a/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
@@ -365,13 +365,8 @@ function CommentComposer({
   };
 
   return (
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
-    <div className="mt-3 space-y-2">
-      <MentionTextarea
-=======
     <div className="space-y-2">
-      <Textarea
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
+      <MentionTextarea
         // Locked while posting: the body is cleared on success, which would otherwise throw
         // away a new draft typed while the request was still in flight.
         disabled={submitting !== null || actionPending}
@@ -684,11 +679,7 @@ export function PullRequestSummaryTab({
                   environmentId={environmentId}
                   reference={reference}
                   allowed={detail.viewerPermissions.requestReviewers}
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
                   comments={detail.comments}
-                  onRequested={onRefresh}
-=======
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
                 />
               ) : null}
             </span>
@@ -769,22 +760,10 @@ export function PullRequestSummaryTab({
               ) : null}
             </div>
           )}
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
-          <PullRequestReactionBar
-            className="mt-2"
-            reactions={detail.reactions ?? []}
-            canReact={pullRequestCanReact(detail.capabilities, "change-request")}
-            environmentId={environmentId}
-            reference={reference}
-            onRefresh={onRefresh}
-          />
-=======
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
         </div>
       </section>
 
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
-      <Section title="Checks" count={detail.checks.length}>
+      <section aria-label="Checks" className="px-4 py-3">
         {detail.capabilities.ciRuns && (
           <PullRequestCiRuns
             environmentId={environmentId}
@@ -792,9 +771,6 @@ export function PullRequestSummaryTab({
             threadRef={threadRef}
           />
         )}
-=======
-      <section aria-label="Checks" className="px-4 py-3">
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
         {detail.checks.length === 0 ? (
           <p className="text-xs text-muted-foreground">No checks reported.</p>
         ) : (
diff --git a/apps/web/src/components/settings/DiagnosticsSettings.tsx b/apps/web/src/components/settings/DiagnosticsSettings.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/settings/DiagnosticsSettings.tsx
index d6cb06da7..f36765e2a 100644
--- a/apps/web/src/components/settings/DiagnosticsSettings.tsx
+++ b/apps/web/src/components/settings/DiagnosticsSettings.tsx
@@ -25,17 +25,7 @@ import { ensureLocalApi } from "../../localApi";
 import { useOpenInPreferredEditor } from "../../editorPreferences";
 import { formatRelativeTimeLabel, getRelativeTimeState } from "../../timestampFormat";
 import { useEnvironmentQuery } from "../../state/query";
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
-import {
-  primaryServerAvailableEditorsAtom,
-  primaryServerObservabilityAtom,
-  serverEnvironment,
-} from "../../state/server";
-import { usePrimaryEnvironment } from "../../state/environments";
-=======
 import { serverEnvironment } from "../../state/server";
-import { shellEnvironment } from "../../state/shell";
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
 import { useCopyToClipboard } from "../../hooks/useCopyToClipboard";
 import { Button } from "../ui/button";
 import { ScrollArea } from "../ui/scroll-area";
diff --git a/apps/web/src/components/settings/settingsSearch.ts b/apps/web/src/components/settings/settingsSearch.ts
index 94ab30073..ba8ed35bb 100644
--- a/apps/web/src/components/settings/settingsSearch.ts
+++ b/apps/web/src/components/settings/settingsSearch.ts
@@ -712,6 +712,7 @@ const SETTINGS_CATEGORY_SCOPES: Readonly<Record<SettingsPath, SettingsSearchScop
   "/settings/keybindings": null,
   "/settings/providers": null,
   "/settings/integrations": null,
+  "/settings/editors": null,
   "/settings/source-control": "environment-defaults",
   "/settings/connections": "connections",
   "/settings/archived": "project-defaults",
diff --git a/knip.jsonc b/knip.jsonc
remerge CONFLICT (content): Merge conflict in knip.jsonc
index ec709589c..722bdfc93 100644
--- a/knip.jsonc
+++ b/knip.jsonc
@@ -27,16 +27,7 @@
       ],
       // Keep the transitive Effect runtime pinned for standalone npm installs.
       // Native msgpack acceleration and the Vite+ web build prerequisite.
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
-      "ignoreDependencies": [
-        "msgpackr-extract",
-        "@t3tools/web",
-        // Pins npm resolution; npm ignores overrides inside installed dependencies.
-        "@effect/platform-node-shared",
-      ],
-=======
       "ignoreDependencies": ["@effect/platform-node-shared", "msgpackr-extract", "@t3tools/web"],
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
     },
     "apps/desktop": {
       // Electron loads these bundles by filename rather than importing them.
diff --git a/packages/client-runtime/src/state/pullRequests.test.ts b/packages/client-runtime/src/state/pullRequests.test.ts
remerge CONFLICT (content): Merge conflict in packages/client-runtime/src/state/pullRequests.test.ts
index 05a520888..4261780de 100644
--- a/packages/client-runtime/src/state/pullRequests.test.ts
+++ b/packages/client-runtime/src/state/pullRequests.test.ts
@@ -485,7 +485,6 @@ it.effect("refreshes pull request activity after a comment is updated", () =>
   ),
 );
 
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
 it.effect(
   "scoped refreshes update matching clients without re-fetching unrelated active repositories",
   () =>
@@ -642,7 +641,8 @@ it.effect(
         );
       }),
     ),
-=======
+);
+
 it.effect("updates cached labels after successful edits without rereading the host", () =>
   Effect.scoped(
     Effect.gen(function* () {
@@ -880,7 +880,6 @@ it.effect("updates reviewer requests and enriched reviewers without rereading th
       ).toEqual([hostActor]);
     }),
   ),
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
 );
 
 it.effect("refreshes stack state after reopening and head SHAs after a turn", () =>
diff --git a/packages/client-runtime/src/state/pullRequests.ts b/packages/client-runtime/src/state/pullRequests.ts
remerge CONFLICT (content): Merge conflict in packages/client-runtime/src/state/pullRequests.ts
index b91c3d3db..beb77286c 100644
--- a/packages/client-runtime/src/state/pullRequests.ts
+++ b/packages/client-runtime/src/state/pullRequests.ts
@@ -1,10 +1,8 @@
 import {
   WS_METHODS,
-  type EnvironmentId,
   type PullRequestActor,
   type PullRequestDetail,
   type PullRequestDiffInput,
-  type PullRequestRef,
   type PullRequestSummary,
   type PullRequestCiRuns,
   type PullRequestCiRunInput,
@@ -20,11 +18,7 @@ import * as HashMap from "effect/HashMap";
 import * as Stream from "effect/Stream";
 import * as Option from "effect/Option";
 import * as SubscriptionRef from "effect/SubscriptionRef";
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
-import { AsyncResult, Atom } from "effect/unstable/reactivity";
-=======
 import { AsyncResult, Atom, AtomRegistry } from "effect/unstable/reactivity";
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
 
 import {
   createAtomCommandScheduler,
@@ -51,7 +45,6 @@ export class EnvironmentHttpConnectionNotReadyError extends Data.TaggedError(
 
 const LINKED_PULL_REQUEST_IDLE_TTL_MS = 5_000;
 
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
 type PullRequestRefreshScope =
   | { readonly kind?: undefined }
   | { readonly kind: "reference" | "repository"; readonly reference: PullRequestRef }
@@ -142,7 +135,8 @@ function refreshRevision(scope: PullRequestRefreshScope, revisions: RefreshRevis
     revisions.global,
     Option.getOrElse(revision, () => 0),
   );
-=======
+}
+
 /** Keep confirmed edits on the same cached reference regardless of input property order. */
 function writableQueryFamily<A, E>(
   family: (target: {
@@ -187,7 +181,6 @@ function updateCached<A, E>(
 ) {
   if (refresh || registry.get(atom).waiting) registry.refresh(atom);
   registry.update(atom, AsyncResult.map(update));
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
 }
 
 function createPullRequestRefreshAtomFamily<R, E>(
@@ -271,7 +264,6 @@ export function pullRequestDetailToVcsStatus(
   };
 }
 
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
 /** CI reads and submission state shared by every mounted view in an environment. */
 export function createPullRequestCiEnvironmentAtoms<R, E>(
   runtime: Atom.AtomRuntime<EnvironmentRegistry | R, E>,
@@ -394,13 +386,11 @@ export function createPullRequestCiEnvironmentAtoms<R, E>(
   };
 }
 
-=======
 /**
  * Reopening a PR within a minute reuses detail and activity. Explicit refreshes and
  * turn notifications still revalidate. Mutations run serially per environment: actions on the same
  * pull request are order-sensitive. Confirmed label and reviewer edits update cached state.
  */
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
 export function createPullRequestEnvironmentAtoms<R, E>(
   runtime: Atom.AtomRuntime<EnvironmentRegistry | PullRequestDiffLoader | R, E>,
 ) {
@@ -410,21 +400,13 @@ export function createPullRequestEnvironmentAtoms<R, E>(
     mode: "serial",
     key: ({ environmentId }: { readonly environmentId: string }) => environmentId,
   } as const;
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
-  const activity = createEnvironmentRpcQueryAtomFamily(runtime, {
-    label: "environment-data:pull-requests:activity",
-    tag: WS_METHODS.pullRequestsActivity,
-    staleTimeMs: 60_000,
-    refreshTrigger: ({ environmentId, input }) =>
-      refreshes({ environmentId, input: { kind: "reference", reference: input } }),
-  });
-=======
   const activity = writableQueryFamily(
     createEnvironmentRpcQueryAtomFamily(runtime, {
       label: "environment-data:pull-requests:activity",
       tag: WS_METHODS.pullRequestsActivity,
       staleTimeMs: 60_000,
-      refreshTrigger: ({ environmentId }) => refreshes({ environmentId, input: {} }),
+      refreshTrigger: ({ environmentId, input }) =>
+        refreshes({ environmentId, input: { kind: "reference", reference: input } }),
     }),
   );
   const detail = writableQueryFamily(
@@ -432,7 +414,8 @@ export function createPullRequestEnvironmentAtoms<R, E>(
       label: "environment-data:pull-requests:detail",
       tag: WS_METHODS.pullRequestsDetail,
       staleTimeMs: 60_000,
-      refreshTrigger: ({ environmentId }) => refreshes({ environmentId, input: {} }),
+      refreshTrigger: ({ environmentId, input }) =>
+        refreshes({ environmentId, input: { kind: "reference", reference: input } }),
     }),
   );
   const labelCandidates = writableQueryFamily(
@@ -449,7 +432,6 @@ export function createPullRequestEnvironmentAtoms<R, E>(
       staleTimeMs: 60_000,
     }),
   );
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
   return {
     refreshes,
     linkedThreads: createEnvironmentRpcQueryAtomFamily(runtime, {
@@ -496,7 +478,6 @@ export function createPullRequestEnvironmentAtoms<R, E>(
           input: { kind: "list", projectIds: input.refs.map((ref) => ref.projectId) },
         }),
     }),
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
     ...createPullRequestCiEnvironmentAtoms(runtime, refreshes, commandScheduler),
     /** One bounded repository relationship read for the open PR panel, never for list rows. */
     dependencyContext: createEnvironmentRpcQueryAtomFamily(runtime, {
@@ -506,9 +487,7 @@ export function createPullRequestEnvironmentAtoms<R, E>(
       refreshTrigger: ({ environmentId, input }) =>
         refreshes({ environmentId, input: { kind: "repository", reference: input } }),
     }),
-=======
     detail,
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
     activity,
     viewedFiles: createEnvironmentRpcQueryAtomFamily(runtime, {
       label: "environment-data:pull-requests:viewed-files",
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index f1e73caab..26b6a1feb 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@t3tools/contracts",
-  "version": "0.0.49",
+  "version": "0.0.50",
   "private": true,
   "files": [
     "dist"
diff --git a/packages/shared/package.json b/packages/shared/package.json
remerge CONFLICT (content): Merge conflict in packages/shared/package.json
index e5be5ce33..b83ab603e 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -3,7 +3,6 @@
   "private": true,
   "type": "module",
   "exports": {
-<<<<<<< afe3f556b (feat(web): suggest usernames in PR review comments (#52))
     "./giteaAttachments": {
       "types": "./src/giteaAttachments.ts",
       "import": "./src/giteaAttachments.ts"
@@ -11,7 +10,7 @@
     "./releasePackage": {
       "types": "./src/releasePackage.ts",
       "import": "./src/releasePackage.ts"
-=======
+    },
     "./delimitedPreview": {
       "types": "./src/delimitedPreview.ts",
       "import": "./src/delimitedPreview.ts"
@@ -19,7 +18,6 @@
     "./composerPullRequestMatches": {
       "types": "./src/composerPullRequestMatches.ts",
       "import": "./src/composerPullRequestMatches.ts"
->>>>>>> d1d15c67f (feat(sidebar): fold the project scope into the search row (#11315))
     },
     "./themePalettes": {
       "types": "./src/themePalettes.ts",

@coderabbitai

coderabbitai Bot commented Sep 12, 2026

Copy link
Copy Markdown

Your plan includes PR reviews subject to rate limits. Reviews are available now.

Keep upstream versions at conflict sites as the review base for the following integration commit. This intermediate tree is not a release candidate.
Apply compatible fork behavior over the upstream merge and use project-only PR invalidation. The resulting tree matches the validated integration candidate.
coderabbitai[bot]
coderabbitai Bot previously approved these changes Sep 12, 2026
@coderabbitai

coderabbitai Bot commented Sep 12, 2026

Copy link
Copy Markdown
🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo '== Merge parents and file status =='
git show -s --format='commit=%H%nparents=%P%nsubject=%s' 0c171a43fa3960bf6add703f1ebb5dce5568bb8f
git diff-tree --no-commit-id --name-status -r -m 0c171a43fa3960bf6add703f1ebb5dce5568bb8f

echo '== Final source outlines =='
ast-grep outline packages/client-runtime/src/state/pullRequests.ts --items all --view expanded
ast-grep outline apps/web/src/components/pullRequest/PullRequestReviewerPicker.tsx --items all --view expanded
ast-grep outline apps/web/src/components/files/FilePreviewPanel.tsx --items all --view expanded
ast-grep outline apps/web/src/components/chat/OpenInPicker.tsx --items all --view expanded

echo '== Pull-request runtime resolution, final head =='
sed -n '1,230p' packages/client-runtime/src/state/pullRequests.ts
sed -n '250,540p' packages/client-runtime/src/state/pullRequests.ts
sed -n '470,910p' packages/client-runtime/src/state/pullRequests.test.ts

echo '== Reviewer request resolution and callers, final head =='
sed -n '1,260p' apps/web/src/components/pullRequest/PullRequestReviewerPicker.tsx
sed -n '630,710p' apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
rg -n -C 3 '\bonRequested\b|\bPullRequestReviewerPicker\b' apps/web/src --glob '*.tsx'

echo '== Open-in and preview resolutions, final head =='
sed -n '1,310p' apps/web/src/components/chat/OpenInPicker.tsx
sed -n '1020,1140p' apps/web/src/components/files/FilePreviewPanel.tsx
rg -n -C 3 '\bremoteOpenState\b|\bprimaryEnvironmentId\b|\babsolutePath\b' apps/web/src/components/files/FilePreviewPanel.tsx

echo '== Compare key resolutions with each parent =='
for parent in afe3f556b d1d15c67f; do
  echo "--- parent $parent: runtime ---"
  git show "$parent:packages/client-runtime/src/state/pullRequests.ts" | sed -n '35,210p'
  git show "$parent:packages/client-runtime/src/state/pullRequests.ts" | sed -n '380,525p'
  echo "--- parent $parent: reviewer picker ---"
  git show "$parent:apps/web/src/components/pullRequest/PullRequestReviewerPicker.tsx" | sed -n '1,260p'
  echo "--- parent $parent: file preview ---"
  git show "$parent:apps/web/src/components/files/FilePreviewPanel.tsx" | sed -n '1020,1140p'
done

echo '== Remaining focused resolution source =='
sed -n '2680,2755p' apps/server/src/pullRequest/PullRequestService.ts
sed -n '1415,1470p' apps/web/src/components/ChatView.tsx
sed -n '7610,7665p' apps/web/src/components/ChatView.tsx
sed -n '8750,8820p' apps/web/src/components/ChatView.tsx
sed -n '3000,3120p' apps/web/src/components/ChatMarkdown.tsx
sed -n '120,260p' apps/web/src/components/pullRequest/PullRequestRow.tsx
sed -n '340,395p' apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
sed -n '740,810p' apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
sed -n '1,130p' apps/web/src/components/settings/DiagnosticsSettings.tsx
sed -n '695,725p' apps/web/src/components/settings/settingsSearch.ts
git diff --check afe3f556b 0c171a43fa3960bf6add703f1ebb5dce5568bb8f
git diff --check d1d15c67f 0c171a43fa3960bf6add703f1ebb5dce5568bb8f

Length of output: 205061


🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo '== Resolution-only combined diff and conflict-marker check =='
git show --remerge-diff --format= --find-renames 0c171a43fa3960bf6add703f1ebb5dce5568bb8f
rg -n '^(<<<<<<<|=======|>>>>>>>)' --glob '!pnpm-lock.yaml' --glob '!*.snap' . || true

echo '== Complete final behavior for reviewer cache mutations =='
sed -n '520,790p' packages/client-runtime/src/state/pullRequests.ts
sed -n '790,930p' packages/client-runtime/src/state/pullRequests.ts
rg -n -C 4 '\brequestReviewers\b|\breviewerCandidates\b' packages/client-runtime/src/state/pullRequests.ts packages/client-runtime/src/state/pullRequests.test.ts

echo '== Open-in dispatch and remote routing contract =='
ast-grep outline apps/web/src/editorPreferences.ts --items all --view expanded
sed -n '1,330p' apps/web/src/editorPreferences.ts
sed -n '1,260p' apps/web/src/remoteOpen.ts
rg -n -C 4 '\buseEditorDispatch\b|\bworkspacePath\b|\beffectiveEditors\b' apps/web/src --glob '*.ts' --glob '*.tsx'
sed -n '1,360p' apps/web/src/components/chat/OpenInPicker.test.ts

echo '== Chat route lifetime and Vim integration tests =='
rg -n -C 5 '\bcurrentRouteThreadKeyRef\b|\bonVimBottom\b|\bvimHistoryError\b|\bfocusVimNormal\b' apps/web/src/components/ChatView.tsx apps/web/src/components/ChatView.logic.test.ts apps/web/src/components/chat/MessagesTimeline.tsx apps/web/src/components/chat/MessagesTimeline.test.tsx
sed -n '1,210p' apps/web/src/components/chat/MessagesTimeline.tsx

echo '== Server project-only invalidation definitions and tests =='
rg -n -C 5 '\bgetProjectShells\b|\binvalidateReference\b|\bprojectIds\b|\bpullRequestsSubscribeRefreshes\b' apps/server/src/pullRequest/PullRequestService.ts apps/server/src/pullRequest/PullRequestService.test.ts
git diff --unified=40 afe3f556b..0c171a43fa3960bf6add703f1ebb5dce5568bb8f -- apps/server/src/pullRequest/PullRequestService.ts
git diff --unified=40 d1d15c67f..0c171a43fa3960bf6add703f1ebb5dce5568bb8f -- apps/server/src/pullRequest/PullRequestService.ts

echo '== Version and release identity consistency =='
for f in package.json apps/desktop/package.json apps/server/package.json apps/web/package.json packages/client-runtime/package.json packages/contracts/package.json packages/shared/package.json packages/ssh/package.json; do
  printf '%s: ' "$f"
  jq -r '.name + " " + (.version // "no-version")' "$f"
done
rg -n -C 3 '0\.0\.49|0\.0\.50|RTVision|rtvision|t3code' package.json apps packages scripts .github --glob 'package.json' --glob '*.yml' --glob '*.yaml' --glob '*.ts' --glob '*.md' | head -100
git show 0c171a43fa3960bf6add703f1ebb5dce5568bb8f:.gitignore | tail -50
git cat-file -e 0c171a43fa3960bf6add703f1ebb5dce5568bb8f^2^{commit}

Length of output: 238702


@kalvenschraut Approved for current head 0c171a43fa3960bf6add703f1ebb5dce5568bb8f.

I found no actionable defects in the focused merge-resolution review.

I verified these integration points against both merge parents and the resulting source:

  • Scoped PR refresh revisions, writable caches, and CI atoms remain combined in packages/client-runtime/src/state/pullRequests.ts.
  • Project-scoped listing reads use getProjectShells(filter.projectIds). Sibling-checkout invalidation remains intact in apps/server/src/pullRequest/PullRequestService.ts.
  • Reviewer re-request labels remain correct. The writable reviewer cache updates the detail, activity, and candidate state after a successful request.
  • Mention input, Gitea PR URL selection, and retained whitespace-related UI behavior are present.
  • ChatView retains route-lifetime protection and Vim focus/timeline callbacks.
  • File previews retain remote terminal-editor dispatch through workspacePath={cwd}.
  • Settings search includes the Editors route with no required scope.
  • Release packages use version 0.0.50. The .pnpm-store/ exclusion is present.
  • The reviewed files contain no unresolved merge markers. Both parent-to-head checks found no whitespace errors.

This is a code review verdict. It is separate from the completed CI checks.

✅ Action performed

Comments resolved and changes approved.

@kalvenschraut
kalvenschraut dismissed coderabbitai[bot]’s stale review September 12, 2026 17:40

Superseded by a56b412, which fixes the editor preference finding. CodeRabbit confirmed current-head approval in companion PR #56; requesting a fresh formal approval attached to the release head.

@kalvenschraut

kalvenschraut commented Sep 12, 2026 •

Copy link
Copy Markdown
Member Author

@coderabbitai approve

Please submit a fresh formal APPROVED review attached to current commit a56b412. Your prior formal approval here was attached to 9b9ade2 and has been dismissed solely so it can be renewed at the current head.

You reviewed the integration resolutions here and in #56, then explicitly approved a56b412 in #56 (comment). The only delta from 9b9ade2 moves editor preference persistence after successful launch, which you confirmed fixes your finding. All 28 checks pass, and both complete CI runs 34708378230 and 34708378468 succeeded. The source has not changed since your latest confirmation. GitHub must record APPROVED at this commit before we merge and release.

@coderabbitai

coderabbitai Bot commented Sep 12, 2026

Copy link
Copy Markdown

@kalvenschraut Approved for current head a56b412c57ff4c7abffa53c936e80b63684ac6c2.

The focused integration review is complete. The editor preference persistence change addresses the prior finding. The reported CI status is separate from this review verdict.

✅ Action performed

Comments resolved and changes approved.

@coderabbitai

coderabbitai Bot commented Sep 12, 2026

Copy link
Copy Markdown

@kalvenschraut Approved for current commit a56b412c57ff4c7abffa53c936e80b63684ac6c2.

✅ Action performed

Comments resolved and changes approved.

@kalvenschraut
kalvenschraut merged commit 36d46a0 into rtvision Sep 12, 2026
41 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. size:XXL vouch:trusted Author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants