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.
54 lines
1.8 KiB
TypeScript
54 lines
1.8 KiB
TypeScript
import { RemoteRuntimeClientError } from './remote-runtime-client-error'
|
|
import {
|
|
measureRemoteRuntimeSubscriptionParams,
|
|
REMOTE_RUNTIME_MAX_RETAINED_SUBSCRIPTION_BYTES,
|
|
REMOTE_RUNTIME_MAX_SUBSCRIPTIONS,
|
|
serializeRemoteRuntimeRpcRequest
|
|
} from './remote-runtime-memory-limits'
|
|
import type { SharedControlLogicalSubscription } from './remote-runtime-shared-control-types'
|
|
|
|
export function admitSharedControlSubscription(args: {
|
|
subscriptions: Map<string, SharedControlLogicalSubscription<unknown>>
|
|
deviceToken: string
|
|
method: string
|
|
params: unknown
|
|
}): number {
|
|
if (args.subscriptions.size >= REMOTE_RUNTIME_MAX_SUBSCRIPTIONS) {
|
|
throw new RemoteRuntimeClientError(
|
|
'remote_runtime_busy',
|
|
'Remote runtime subscription limit reached; close a subscription and retry.'
|
|
)
|
|
}
|
|
const retainedParamsBytes = measureRemoteRuntimeSubscriptionParams(args.params)
|
|
if (
|
|
retainedSubscriptionBytes(args.subscriptions) + retainedParamsBytes >
|
|
REMOTE_RUNTIME_MAX_RETAINED_SUBSCRIPTION_BYTES
|
|
) {
|
|
throw new RemoteRuntimeClientError(
|
|
'remote_runtime_busy',
|
|
'Remote runtime subscription memory limit reached; close a subscription and retry.'
|
|
)
|
|
}
|
|
serializeRequest(args)
|
|
return retainedParamsBytes
|
|
}
|
|
|
|
function serializeRequest(args: { deviceToken: string; method: string; params: unknown }): void {
|
|
serializeRemoteRuntimeRpcRequest({
|
|
requestId: '00000000-0000-4000-8000-000000000000',
|
|
deviceToken: args.deviceToken,
|
|
method: args.method,
|
|
params: args.params
|
|
})
|
|
}
|
|
|
|
function retainedSubscriptionBytes(
|
|
subscriptions: Map<string, SharedControlLogicalSubscription<unknown>>
|
|
): number {
|
|
let bytes = 0
|
|
for (const subscription of subscriptions.values()) {
|
|
bytes += subscription.retainedParamsBytes
|
|
}
|
|
return bytes
|
|
}
|