mirror of
https://github.com/stablyai/orca.git
synced 2026-09-22 08:02:28 +00:00
* refactor(runtime): split OrcaRuntimeService into focused modules
* test(runtime): cover admission tiers and strict worktree reconciliation
* fix(runtime): preserve owner and structured session visibility
* fix(runtime): port post-extraction compatibility fixes
* fix(runtime): preserve skill-share cancellation barrier
* test(runtime): update identity inventory after extraction
* fix(runtime): preserve hook transport environment cleanup
* fix(runtime): consolidate idle probe imports
* test(runtime): retire split file process allowlist entry
* fix(runtime): route child process types through shared boundary
* test(runtime): preserve worktree host metadata precedence
* fix(runtime): update extracted test seams
* fix(runtime): gate the split's ts-nocheck set and restore the stop-confirmed contract
Audit follow-ups for the OrcaRuntimeService split:
- Freeze the 171 @ts-nocheck files behind a ratchet so no new file can disable
type checking. The split's linear mixin chain cannot express forward
references yet, so the existing suppressions are grandfathered; the baseline
may only shrink.
- Drop the stray @ts-nocheck at the end of orca-runtime-get-status.ts. It sat
after the first statement, where TypeScript ignores it, so the module was
already checked.
- Restore `retireRejectedPty(ptyId, stopConfirmed: boolean)` as a required
argument. The split widened it to optional and patched the resulting error
with `stopConfirmed === true`; an omitted argument would have silently taken
the unverified-stop path instead of failing to compile.
- Guard that every orca-runtime-tests fragment is imported by the compatibility
entrypoint. The fragments are .spec.ts, which no Vitest include glob matches,
so one left out of the list would silently stop running.
* fix(runtime): restore four behaviors the OrcaRuntimeService split dropped
Audit findings against the refactor's true base (ad5ba2572e):
- retirePtyAgentLaunchAuthority collected pane keys after deleting the
restored-authority receipt instead of before it. collectPaneKeysForPty reads
that receipt, so a receipt-only pane lost its key and never had its agent-hook
compatibility authority retired. on-pty-exit.ts already carried a comment
naming this exact invariant.
- The PTY-exit path kept orchestrationMailboxNotifications.retirePty but lost
the loop that schedules a debounced mail-pointer repoint for the dead pty's
terminal handle and any run bound to its panes. Restores the schedule call
count to 7, matching base.
- subscribeToPtyExit lost isPtyKnownExited's leaf fallback and its
post-registration lifecycle-generation recheck. leavesByPtyId is rebuilt from
the renderer graph independently of ptysById, so a leaf can outlive its pty
record; without the fallback a caller waiting on an already-dead pty never
gets released.
- The chain root declared `[key: string]: unknown`, which base had nowhere. It
leaked through the exported runtime type into every consumer, so any misspelled
member access typechecked as unknown instead of erroring, and it accounted for
957 of the suppressed errors. Removing it costs zero type errors.
* fix(runtime): restore escalation prose and unscoped automation publication
Two more behaviors the split dropped, each with a regression test that fails
against the pre-fix code:
- The worker-exit escalation stopped deriving its title through
buildOrchestrationTaskDisplayMetadata and inlined `task.spec` instead. That
ignored an explicit task_title, dropped the single-line normalization and the
80-character bound, and turned the no-spec case into a quoted, duplicated id.
A multi-paragraph spec landed verbatim in the coordinator's banner. The
existing 11 tests all use short single-line specs, where the derived title and
the raw spec are identical, so none of them could see it.
Also reverts an added `if (!handle) return` guard: the dispatch lookup is
deliberately keyed on the pane as well, because a reminted handle no longer
matches the row while the pane identity outlives the remint.
- updateAutomation stopped going through automationChangePublications and
published `source` unconditionally while gating the fallback on a non-null
destination. A destination the store can no longer name then published only
the stale source, so subscribers scoped elsewhere kept rendering a row that
had left them — the exact case the helper documents. The helper had been left
with zero callers; all three sites use it again.
* fix(skills): stop swallowing lookup errors and hard-erroring on non-ssh hosts
Follow-ups from auditing the skill install path against the refactor's base:
- resolveWorktree wrapped showManagedWorktree in `.catch(() => null)`, so a
transient git or IO failure surfaced to the user as
skill-install-workspace-not-found with the real cause discarded. Errors
propagate again; a genuine id mismatch still returns null.
- resolveSkillSshTarget threw skill-install-workspace-host-unavailable when the
execution host was neither local nor ssh, on both the repo and folder
branches. Base gated these on connectionId, so a runtime-owned repo simply
was not an SSH install and fell through to the local path. Both return null
again, and the error code the split invented is now unreferenced.
- listManagedSkillInstalls awaited the receipt walk and the worktree resolve in
sequence. They are independent and either can hit disk, WSL, or an SSH scan,
so Promise.all is restored.
Deliberately unchanged: resolving the worktree through listResolvedWorktrees
rather than showManagedWorktree, which disambiguates a worktree id colliding
across hosts and is covered by its own test, and the SSH-folder
skill-install-ssh-dispatch-required throw, which matches the repo branch.
* fix(runtime): merge duplicate worktree-logic imports
The #17448 port added a third import from ../ipc/worktree-logic, which the
code-quality oxlint config rejects under --deny-warnings. Plain oxlint does not
flag it, so it only surfaced in CI's static analysis job.
* ci: run the ts-nocheck ratchet in PR checks
pr-workflow-lint-parity requires every leaf command in `pnpm lint` to have a
matching step in pr.yml. The ratchet was wired into lint but not the workflow,
so PR CI would not have enforced it.
* Merge remote-tracking branch 'origin/main' and retry the paired-host launch evaluate
main advanced 9 commits; none touch the orca-runtime.ts this branch splits, so
nothing needed porting.
CI failed twice on `Execution context was destroyed` thrown from
headless-paired-runtime-host's first `evaluate` after launch — a different spec
each run, which is the signature of the flake #17780 describes rather than a
regression. That commit added retryTransientMainEvaluate and adopted it in five
helpers but not this call site, even though its docblock names exactly this
case: the first evaluate after electron.launch() resolves, before the app is
ready. Wrapped it the same way.
167 lines
6.1 KiB
TypeScript
167 lines
6.1 KiB
TypeScript
// @ts-nocheck -- mechanically split from OrcaRuntimeService; behavior is covered by AST equivalence and characterization tests.
|
|
import { OrcaRuntimeWithPickMostRecentActor } from './orca-runtime-pick-most-recent-actor'
|
|
import type { ApplyLayoutResult, PtyLayoutState, PtyLayoutTarget } from './orca-runtime-core'
|
|
|
|
export class OrcaRuntimeWithApplyLayout extends OrcaRuntimeWithPickMostRecentActor {
|
|
protected async applyLayout(ptyId: string, target: PtyLayoutTarget): Promise<ApplyLayoutResult> {
|
|
// Why: re-check pty-exit at the head of the slot — the queue may have
|
|
// accepted this target before onPtyExit ran.
|
|
if (!this.layouts.has(ptyId) && !this.isFreshSubscribe(ptyId)) {
|
|
return { ok: false, reason: 'pty-exited' }
|
|
}
|
|
|
|
const prev = this.layouts.get(ptyId) ?? null
|
|
const seq = (prev?.seq ?? 0) + 1
|
|
const next: PtyLayoutState = { ...target, seq, appliedAt: Date.now() }
|
|
|
|
const currentSize = this.getTerminalSize(ptyId)
|
|
const dimsChanged = currentSize?.cols !== target.cols || currentSize?.rows !== target.rows
|
|
const modeChanged = (prev?.kind ?? 'desktop') !== target.kind
|
|
|
|
// Snapshot for rollback.
|
|
const prevFitOverride = this.terminalFitOverrides.get(ptyId) ?? null
|
|
|
|
// Tentative writes — the resize is the point of no return.
|
|
this.layouts.set(ptyId, next)
|
|
if (target.kind === 'phone') {
|
|
// Why: pull baseline cols+rows atomically from the same subscriber so
|
|
// they can't desync.
|
|
const baseline = (() => {
|
|
const inner = this.mobileSubscribers.get(ptyId)
|
|
if (!inner) {
|
|
return null
|
|
}
|
|
return this.pickEarliestRestoreTarget(inner)
|
|
})()
|
|
this.terminalFitOverrides.set(ptyId, {
|
|
mode: 'mobile-fit',
|
|
cols: target.cols,
|
|
rows: target.rows,
|
|
previousCols: baseline?.previousCols ?? null,
|
|
previousRows: baseline?.previousRows ?? null,
|
|
updatedAt: next.appliedAt,
|
|
clientId: target.ownerClientId
|
|
})
|
|
} else {
|
|
this.terminalFitOverrides.delete(ptyId)
|
|
}
|
|
|
|
if (dimsChanged) {
|
|
let ok = false
|
|
try {
|
|
const r = this.ptyController?.resize?.(ptyId, target.cols, target.rows)
|
|
ok = r ?? true
|
|
} catch (err) {
|
|
console.error('[layout] ptyController.resize threw', { ptyId, err })
|
|
ok = false
|
|
}
|
|
if (!ok) {
|
|
// Roll back to pre-call snapshot. seq is NOT bumped on the wire
|
|
// because we never emit below.
|
|
if (prev) {
|
|
this.layouts.set(ptyId, prev)
|
|
} else {
|
|
this.layouts.delete(ptyId)
|
|
}
|
|
if (prevFitOverride) {
|
|
this.terminalFitOverrides.set(ptyId, prevFitOverride)
|
|
} else {
|
|
this.terminalFitOverrides.delete(ptyId)
|
|
}
|
|
return { ok: false, reason: 'resize-failed' }
|
|
}
|
|
this.resizeHeadlessTerminal(ptyId, target.cols, target.rows)
|
|
}
|
|
|
|
// Why: remote desktop ownership is a fit hold for the host and passive
|
|
// peer viewers. Emit every remote layout so owner changes at equal geometry
|
|
// still park/release the correct clients without relying on resize deltas.
|
|
// Defense-in-depth (#7588): also emit when the override's presence
|
|
// changed even without a kind flip. applyLayout is the sole writer and
|
|
// keeps override presence in lockstep with layout kind, so overrideChanged
|
|
// ≡ modeChanged in every reachable state today; the extra clause fires
|
|
// only if that invariant is ever violated, repairing the renderer instead
|
|
// of stranding the held modal.
|
|
const overrideChanged = (prevFitOverride != null) !== (target.kind === 'phone')
|
|
if (target.kind === 'remote-desktop' || modeChanged || overrideChanged) {
|
|
// Why: phone→desktop arms the renderer-cascade suppress window
|
|
// before the collateral safeFit IPCs arrive. See "Renderer cascade
|
|
// suppression".
|
|
if (target.kind === 'desktop') {
|
|
this.lastRendererSizes.delete(ptyId)
|
|
this.suppressResizesForMs(500)
|
|
}
|
|
this.notifier?.terminalFitOverrideChanged(
|
|
ptyId,
|
|
target.kind === 'phone'
|
|
? 'mobile-fit'
|
|
: target.kind === 'remote-desktop'
|
|
? 'remote-desktop-fit'
|
|
: 'desktop-fit',
|
|
target.cols,
|
|
target.rows
|
|
)
|
|
this.notifyFitOverrideListeners(
|
|
ptyId,
|
|
target.kind === 'phone'
|
|
? 'mobile-fit'
|
|
: target.kind === 'remote-desktop'
|
|
? 'remote-desktop-fit'
|
|
: 'desktop-fit',
|
|
target.cols,
|
|
target.rows
|
|
)
|
|
}
|
|
|
|
// Mobile-facing event always fires (phone clients need to re-fit on
|
|
// every dim change, not just mode flips).
|
|
this.notifyTerminalResize(ptyId, {
|
|
cols: target.cols,
|
|
rows: target.rows,
|
|
displayMode: target.kind === 'phone' ? 'phone' : 'desktop',
|
|
reason: 'apply-layout',
|
|
seq
|
|
})
|
|
|
|
return { ok: true, state: next }
|
|
}
|
|
|
|
// ─── Server-Authoritative Mobile Display Mode ─────────────────────
|
|
|
|
setMobileDisplayMode(ptyId: string, mode: 'auto' | 'desktop'): void {
|
|
if (mode === 'auto') {
|
|
this.mobileDisplayModes.delete(ptyId)
|
|
} else {
|
|
this.mobileDisplayModes.set(ptyId, mode)
|
|
}
|
|
}
|
|
|
|
getMobileDisplayMode(ptyId: string): 'auto' | 'desktop' {
|
|
return this.mobileDisplayModes.get(ptyId) ?? 'auto'
|
|
}
|
|
|
|
isMobileSubscriberActive(ptyId: string): boolean {
|
|
const inner = this.mobileSubscribers.get(ptyId)
|
|
return inner !== undefined && inner.size > 0
|
|
}
|
|
|
|
// Why: late-bind viewport on an existing subscriber record. Subscribers
|
|
// that registered before the mobile side measured (e.g. terminal first
|
|
// mounted while the WebView was still loading) have null viewport, and
|
|
// applyMobileDisplayMode's auto branch needs a viewport to phone-fit.
|
|
// The setDisplayMode RPC carries the latest viewport so we can patch it
|
|
// here just before applyMobileDisplayMode runs.
|
|
updateMobileSubscriberViewport(
|
|
ptyId: string,
|
|
clientId: string,
|
|
viewport: { cols: number; rows: number }
|
|
): void {
|
|
const inner = this.mobileSubscribers.get(ptyId)
|
|
const record = inner?.get(clientId)
|
|
if (!record) {
|
|
return
|
|
}
|
|
record.viewport = viewport
|
|
}
|
|
}
|