mirror of
https://github.com/stablyai/orca.git
synced 2026-09-23 08:02:31 +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.
96 lines
2.2 KiB
TypeScript
96 lines
2.2 KiB
TypeScript
// Why: runtime clients can be CLI, desktop, or future non-Electron shells.
|
|
// Keeping the envelope contract here avoids making those clients import each
|
|
// other just to validate the shared RPC frame shape.
|
|
import { z } from 'zod'
|
|
import type { OrchestrationCompatibilityEvidence } from './orchestration-compatibility-evidence'
|
|
|
|
// Why: clients and runtimes update independently; strip additive envelope
|
|
// fields while continuing to validate every known discriminator and field.
|
|
const MetaSuccess = z
|
|
.object({
|
|
runtimeId: z.string()
|
|
})
|
|
.strip()
|
|
|
|
const MetaFailure = z
|
|
.object({
|
|
runtimeId: z.union([z.string(), z.null()])
|
|
})
|
|
.strip()
|
|
.optional()
|
|
|
|
const Success = z
|
|
.object({
|
|
id: z.string(),
|
|
ok: z.literal(true),
|
|
result: z.unknown(),
|
|
_meta: MetaSuccess
|
|
})
|
|
.strip()
|
|
|
|
const Failure = z
|
|
.object({
|
|
id: z.string(),
|
|
ok: z.literal(false),
|
|
error: z
|
|
.object({
|
|
code: z.string(),
|
|
message: z.string(),
|
|
data: z.unknown().optional()
|
|
})
|
|
.strip(),
|
|
_meta: MetaFailure
|
|
})
|
|
.strip()
|
|
|
|
const Keepalive = z
|
|
.object({
|
|
_keepalive: z.literal(true)
|
|
})
|
|
.strip()
|
|
|
|
export const RuntimeRpcEnvelopeSchema = z.union([Success, Failure, Keepalive])
|
|
|
|
export type RuntimeRpcSuccess<TResult> = {
|
|
id: string
|
|
ok: true
|
|
result: TResult
|
|
_meta: {
|
|
runtimeId: string
|
|
}
|
|
}
|
|
|
|
export type RuntimeRpcFailure = {
|
|
id: string
|
|
ok: false
|
|
error: {
|
|
code: string
|
|
message: string
|
|
data?: unknown
|
|
}
|
|
_meta?: {
|
|
runtimeId: string | null
|
|
}
|
|
}
|
|
|
|
export type RuntimeRpcResponse<TResult> = RuntimeRpcSuccess<TResult> | RuntimeRpcFailure
|
|
|
|
export type RuntimeOrchestrationEnvelope = {
|
|
orchestrationCapability?: string
|
|
orchestrationContractVersion?: number
|
|
orchestrationRequestId?: string
|
|
compatibilityInvocationId?: string
|
|
orchestrationCompatibilityEvidence?: OrchestrationCompatibilityEvidence
|
|
}
|
|
|
|
export type RuntimeRpcKeepaliveFrame = z.infer<typeof Keepalive>
|
|
|
|
export function isKeepaliveFrame(frame: unknown): frame is RuntimeRpcKeepaliveFrame {
|
|
return (
|
|
typeof frame === 'object' &&
|
|
frame !== null &&
|
|
'_keepalive' in frame &&
|
|
(frame as { _keepalive: unknown })._keepalive === true
|
|
)
|
|
}
|