From 7123d9c2eec2eb75afe8739758140802bab84f14 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 5 Aug 2026 13:01:20 -0700
Subject: [PATCH] chore: preserve main formatting after merge

---
 .oxlintrc.json                                |  7 +++++-
 .../scripts/relay-watcher-fault-harness.mjs   | 22 ++++++++++---------
 src/main/runtime/orca-runtime.ts              |  5 ++++-
 .../GitHubMarkdownComposerEditorPane.tsx      |  5 +----
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/.oxlintrc.json b/.oxlintrc.json
index 0f679f17d52..4cdb4f2c0e2 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -150,5 +150,10 @@
       }
     }
   ],
-  "ignorePatterns": ["**/node_modules", "**/dist", "**/out", "tests/e2e/.cross-version-checkouts"]
+  "ignorePatterns": [
+    "**/node_modules",
+    "**/dist",
+    "**/out",
+    "tests/e2e/.cross-version-checkouts"
+  ]
 }
diff --git a/config/scripts/relay-watcher-fault-harness.mjs b/config/scripts/relay-watcher-fault-harness.mjs
index b27a1f945d9..12e36f72490 100644
--- a/config/scripts/relay-watcher-fault-harness.mjs
+++ b/config/scripts/relay-watcher-fault-harness.mjs
@@ -109,7 +109,9 @@ function waitForStdoutSentinel(proc, protocol, stderr) {
         settled = true
         proc.stdout.off('data', onData)
         rejectPromise(
-          new Error(`process exited before sentinel (code=${code}, signal=${signal})\n${stderr()}`)
+          new Error(
+            `process exited before sentinel (code=${code}, signal=${signal})\n${stderr()}`
+          )
         )
       }
       proc.stdout.on('data', onData)
@@ -160,7 +162,11 @@ function createRelayClient(entryPath, args, env, protocol) {
   })
 
   const waitForMessage = (startIndex, predicate, label) =>
-    pollUntil(() => messages.slice(startIndex).find(predicate), label, streams.stderr)
+    pollUntil(
+      () => messages.slice(startIndex).find(predicate),
+      label,
+      streams.stderr
+    )
 
   const request = async (method, params = {}) => {
     const id = nextSequence++
@@ -311,10 +317,8 @@ async function main() {
     )
 
     await relay.request('fs.watch', { rootPath: watchRoot })
-    const firstWatcherPid = await waitForWatcherPid(
-      pidFile,
-      undefined,
-      () => `${daemonStreams.stderr()}\n${relay.stderr()}`
+    const firstWatcherPid = await waitForWatcherPid(pidFile, undefined, () =>
+      `${daemonStreams.stderr()}\n${relay.stderr()}`
     )
     const beforePath = join(watchRoot, 'before.txt')
     startIndex = relay.messageCount()
@@ -326,10 +330,8 @@ async function main() {
     const faultSignal = process.platform === 'win32' ? 'SIGTERM' : 'SIGSEGV'
     startIndex = relay.messageCount()
     process.kill(firstWatcherPid, faultSignal)
-    const replacementWatcherPid = await waitForWatcherPid(
-      pidFile,
-      firstWatcherPid,
-      () => `${daemonStreams.stderr()}\n${relay.stderr()}`
+    const replacementWatcherPid = await waitForWatcherPid(pidFile, firstWatcherPid, () =>
+      `${daemonStreams.stderr()}\n${relay.stderr()}`
     )
     await relay.waitForNotification(startIndex, 'fs.changed', (params) =>
       Array.isArray(params.events)
diff --git a/src/main/runtime/orca-runtime.ts b/src/main/runtime/orca-runtime.ts
index b85bb01b463..5e23498f370 100644
--- a/src/main/runtime/orca-runtime.ts
+++ b/src/main/runtime/orca-runtime.ts
@@ -10762,7 +10762,10 @@ export class OrcaRuntimeService {
     // A spawn published (or admission pending) this generation already
     // attaches the provider stream; a replacement under a reused id must not
     // read as the discovered never-attached session it replaced.
-    if (this.spawnPublishedPtys.has(ptyId) || this.pendingPtyRegistrationIncarnations.has(ptyId)) {
+    if (
+      this.spawnPublishedPtys.has(ptyId) ||
+      this.pendingPtyRegistrationIncarnations.has(ptyId)
+    ) {
       return false
     }
     // SSH panes have their own lease/reattach machinery.
diff --git a/src/renderer/src/components/github/GitHubMarkdownComposerEditorPane.tsx b/src/renderer/src/components/github/GitHubMarkdownComposerEditorPane.tsx
index 792799376ea..6914f9b3aba 100644
--- a/src/renderer/src/components/github/GitHubMarkdownComposerEditorPane.tsx
+++ b/src/renderer/src/components/github/GitHubMarkdownComposerEditorPane.tsx
@@ -13,10 +13,7 @@ export function GitHubMarkdownComposerEditorPane({
   const scrollContainerRef = useRef<HTMLDivElement | null>(null)
 
   return (
-    <div
-      ref={scrollContainerRef}
-      className="relative max-h-[360px] overflow-y-auto scrollbar-sleek"
-    >
+    <div ref={scrollContainerRef} className="relative max-h-[360px] overflow-y-auto scrollbar-sleek">
       <EditorContent editor={editor} />
       <RichMarkdownTableControls
         disabled={disabled}