mirror of
https://github.com/stablyai/orca.git
synced 2026-10-23 08:03:39 +00:00
Nine files conflicted. The load-bearing ones: - main hoisted `toVisibleTabType` into `src/shared/tab-types.ts` and deleted the three local copies this lane had also been editing. Adopt main's single definition and add this lane's `'agent-session'` case to it — taking main's body verbatim would have projected every structured chat tab to `'editor'`. - `writeTerminalAgentPrompt`: both sides added guards to the same paste loop. Main's abort/generation/permission checks and this lane's write-gate lease admission are independent failure modes, so both run at every checkpoint. - `refreshPtyLiveness`: keep main's liveness-verdict handling and this lane's `agentSessionOwners` reset on disconnect. - `web-session-focus-intent`: main's group-first resolution subsumes this lane's agent-session early return, but not its no-groups fallback — a chat tab has no active-entity map, so the entityId lookup can never address it. The two prompt happy-path tests in `agent-session-pty-write-enforcement.test.ts` now feed a working transition on submit: main's submission verification waits for one, and a fixture that never moves reads as `agent_prompt_stalled`.