mirror of
https://github.com/stablyai/orca.git
synced 2026-09-22 16:02:32 +00:00
Neil
4882eeb8ac
* Revert "fix terminal attribution shim removal edge cases (#14187)"
This reverts 585dd6d3a9. Re-landed in the next commit without the host capability gate. Nothing shipped with it, so no migration constraint.
* rm git shim: neutralize stale wrappers without a host gate
Re-lands the cleanup half of #14187: pass-through tombstones for retained wrapper paths, env/PATH scrubbing at every spawn owner, and the retired setting drop.
Only writes tombstones when the legacy directory already exists, so a clean install no longer has it created. Leaves out the terminal.attribution-removed.v1 capability gate: the tombstone neutralizes each host locally, so refusing terminal create/split against older hosts denied service without adding cleanup.
* rm git shim: surface neutralization failures and fix rollback marker
Readiness review follow-ups: warn on each failed attempt and on give-up (was silent and undiagnosable); write a VERSION marker distinct from the retired shim's '7' so a rolled-back build rewrites its own wrappers; clear a captured ORCA_REAL_* path that no longer exists so the cmd wrapper's where.exe fallback can run; stop a locked temp file masking the real error. Adds retry-exhaustion coverage.
* rm git shim: pin the cmd fallback order and correct the give-up count
Round-2 review follow-ups: string-pin that a stale ORCA_REAL_* is cleared before the where.exe fallback, and count the initial attempt in the give-up warning so it agrees with the per-attempt line.
* rm git shim: keep the split-failure toast
The revert took a toast that #14187 added alongside the gate but which stands on its own: without it a failed remote split only reaches the console and the pane silently never appears. Also pins attempt ordinals in the retry-exhaustion test.
57 lines
2.1 KiB
TypeScript
57 lines
2.1 KiB
TypeScript
import { randomUUID } from 'node:crypto'
|
|
import { remoteRuntimeUnavailableError } from './remote-runtime-request-frames'
|
|
import { admitSharedControlSubscription } from './remote-runtime-shared-control-admission'
|
|
import { createSharedControlSubscription } from './remote-runtime-shared-control-subscriptions'
|
|
import { finishSharedControlSubscription } from './remote-runtime-shared-control-state'
|
|
import type {
|
|
RemoteRuntimeSharedSubscription,
|
|
SharedControlLogicalSubscription,
|
|
SharedControlSubscriptionCallbacks
|
|
} from './remote-runtime-shared-control-types'
|
|
|
|
export async function startSharedControlSubscription<TResult>(args: {
|
|
subscriptions: Map<string, SharedControlLogicalSubscription<unknown>>
|
|
deviceToken: string
|
|
method: string
|
|
params: unknown
|
|
callbacks: SharedControlSubscriptionCallbacks<TResult>
|
|
ensureReady: () => Promise<void>
|
|
sendSubscription: (subscription: SharedControlLogicalSubscription<unknown>) => void
|
|
closeSubscription: (requestId: string) => void
|
|
}): Promise<RemoteRuntimeSharedSubscription> {
|
|
const retainedParamsBytes = admitSharedControlSubscription({
|
|
subscriptions: args.subscriptions,
|
|
deviceToken: args.deviceToken,
|
|
method: args.method,
|
|
params: args.params
|
|
})
|
|
const requestId = randomUUID()
|
|
const subscription = createSharedControlSubscription({
|
|
requestId,
|
|
method: args.method,
|
|
params: args.params,
|
|
retainedParamsBytes,
|
|
callbacks: args.callbacks
|
|
})
|
|
args.subscriptions.set(requestId, subscription as SharedControlLogicalSubscription<unknown>)
|
|
try {
|
|
await args.ensureReady()
|
|
} catch (error) {
|
|
finishSharedControlSubscription(
|
|
args.subscriptions,
|
|
subscription as SharedControlLogicalSubscription<unknown>,
|
|
false
|
|
)
|
|
throw error
|
|
}
|
|
if (args.subscriptions.get(requestId) !== subscription) {
|
|
throw remoteRuntimeUnavailableError('Remote runtime subscription closed before it started.')
|
|
}
|
|
args.sendSubscription(subscription as SharedControlLogicalSubscription<unknown>)
|
|
return {
|
|
requestId,
|
|
close: () => args.closeSubscription(requestId),
|
|
sendBinary: () => false
|
|
}
|
|
}
|