chore: preserve main formatting after merge

This commit is contained in:
Brennan Benson
2026-08-05 13:01:20 -07:00
parent ee28f2cd81
commit 7123d9c2ee
4 changed files with 23 additions and 16 deletions
+6 -1
View File
@@ -150,5 +150,10 @@
}
}
],
"ignorePatterns": ["**/node_modules", "**/dist", "**/out", "tests/e2e/.cross-version-checkouts"]
"ignorePatterns": [
"**/node_modules",
"**/dist",
"**/out",
"tests/e2e/.cross-version-checkouts"
]
}
+12 -10
View File
@@ -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)
+4 -1
View File
@@ -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.
@@ -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}