mirror of
https://github.com/stablyai/orca.git
synced 2026-11-03 02:27:43 +00:00
* [comment audit] Align legacy failure-read counts with cached display * [comment audit] Condense shared provider lifecycle and browser recovery comments [skip ci] * [comment audit] Condense shared generation, path and preview comments [skip ci] * [comment audit] Condense host, file and Git contract rationale [skip ci] * [comment audit] Tighten Git lifecycle and provider contract comments [skip ci] * [comment audit] Clarify shared host authority and launch isolation [skip ci] * [comment audit] simplify local access mobile and native chat contracts [skip ci] * [comment audit] simplify native chat presentation and state contracts [skip ci] * [comment audit] simplify native runtime and provider contracts [skip ci] * [comment audit] simplify migration and orchestration contracts [skip ci] * [comment audit] simplify plugin trust and process capture rationale [skip ci] * [comment audit] simplify terminal delivery and remote compatibility rationale [skip ci] * [comment audit] clarify remote recovery and launch wire rationale [skip ci] * [comment audit] shorten shared RPC compatibility and runtime evidence comments [skip ci] * [comment audit] simplify secure storage shell startup and sidebar rationale [skip ci] * [comment audit] clarify sidebar, skill and SSH invariants [skip ci] * [comment audit] condense structured chat delivery and timing rationale [skip ci] * [comment audit] condense terminal replay and telemetry invariants [skip ci] * [comment audit] clarify launch permission and terminal delivery rationale [skip ci] * [comment audit] clarify workspace ownership and layout contracts [skip ci] * [comment audit] wait for fitted and painted SSH terminal links * [comment audit] clarify layout persistence and session ownership [skip ci] * [comment audit] clarify host routing and workspace lifecycle contracts [skip ci] * [comment audit] clarify startup persistence and app lifetime comments [skip ci] * [comment audit] clarify recovery and activity boundaries [skip ci] * [comment audit] condense activity and artifact invariants [skip ci] * [comment audit] condense automation authority contracts [skip ci] * [comment audit] simplify automation scheduling and history contracts [skip ci] * [comment audit] clarify browser chrome and annotation lifecycles [skip ci] * [comment audit] clarify browser routing and retained guest ownership [skip ci] * [comment audit] clarify browser recovery and document ownership comments [skip ci] * [comment audit] restore hosted runners required by native IME fixtures * [comment audit] shorten preview, palette and dashboard invariants [skip ci] * [comment audit] clarify terminal preview, dashboard and retention comments [skip ci] * [comment audit] clarify diff-note recovery and editor lifecycle comments [skip ci] * [comment audit] shorten rich-text and combined-diff ownership comments [skip ci] * [comment audit] shorten autosave, draft recovery and model ownership comments [skip ci] * [comment audit] shorten save-queue, notebook and Markdown constraints [skip ci] * [comment audit] shorten Monaco, PDF and rich Markdown safeguards [skip ci] * [comment audit] clarify rich Markdown source and selection safeguards [skip ci] * [comment audit] clarify editor loading and emulator stream lifetimes [skip ci] * [comment audit] trim emulator and feature tour narration [skip ci] * [comment audit] clarify floating workspace and GitHub cache ownership [skip ci] * [comment audit] trim provider controls and Linear filter explanations [skip ci] * [comment audit] clarify pairing and chat resume lifetimes [skip ci] * [comment audit] clarify chat delivery and transcript lifetimes [skip ci] * [comment audit] clarify session options and host-owned status [skip ci] * [comment audit] clarify draft durability and live-status precedence [skip ci] * [comment audit] Trim chat send and model ownership explanations [skip ci] * [comment audit] Shorten transcript ownership and send recovery comments [skip ci] * [comment audit] Simplify native chat composer and transcript hook comments [skip ci] * [comment audit] Shorten native chat scroll and structured session explanations [skip ci] * [comment audit] Trim workspace picker and onboarding commentary [skip ci] * [comment audit] Simplify pet rendering, review cache and quick open comments [skip ci] * [comment audit] Trim sidebar and session history explanations [skip ci] * [comment audit] Condense session resume and review checks comments [skip ci] * [comment audit] Shorten checks state and file explorer refresh comments [skip ci] * [comment audit] Trim plugin bridge and source-control action rationale [skip ci] * [comment audit] Trim source-control listing and review rationale [skip ci] * [comment audit] Shorten sidebar lifecycle and explorer safeguards [skip ci] * [comment audit] Condense Settings account and appearance rationale [skip ci] * [comment audit] Trim pairing and repository Settings explanations [skip ci] * [comment audit] Condense Settings search SSH and terminal safeguards [skip ci] * [comment audit] Shorten Settings voice and provider ownership comments [skip ci] * [comment audit] Condense Settings draft persistence and host-state rationale [skip ci] * [comment audit] Trim Settings hooks and sidebar setup rationale [skip ci] * [comment audit] Condense sidebar deletion and board-filter safeguards [skip ci] * [comment audit] Condense worktree cards, host ownership and Markdown contracts [skip ci] * [comment audit] Condense sidebar drag, folder and filtering contracts [skip ci] * [comment audit] Condense sidebar parity, sleep and host ownership contracts [skip ci] * [comment audit] Prune focus-read baseline after comment cleanup * [comment audit] Clarify sidebar visibility, board drops and agent evidence [skip ci] * [comment audit] Tighten sidebar listing, drag and reveal contracts [skip ci] * [comment audit] Clarify viewport geometry and skill update safeguards [skip ci] * [comment audit] Tighten skill inventory, usage and host status comments [skip ci] * [comment audit] Clarify usage ownership and resource kill safeguards [skip ci] * [comment audit] Tighten tab selection, rename and search contracts [skip ci] * [comment audit] Tighten tab-strip geometry and drag ownership comments [skip ci] * [comment audit] Tighten Tasks recovery, pagination and mutation comments [skip ci] * [comment audit] Tighten provider loading and terminal recovery comments [skip ci] * [comment audit] Tighten completion, cadence and PTY ownership comments [skip ci] * [comment audit] Clarify terminal restore and parked-pane boundaries [skip ci] * [comment audit] Tighten PTY startup and replay explanations [skip ci] * [comment audit] Clarify PTY identity and delivery ownership [skip ci] * [comment audit] Shorten remote reconnect and input replay rationale [skip ci] * [comment audit] Condense terminal parking clipboard and file link comments [skip ci] * [comment audit] Clarify IME ownership and trim trace history [skip ci] * [comment audit] Shorten pane recovery and parked watcher explanations [skip ci] * [comment audit] Condense snapshot replay and visibility recovery rationale [skip ci] * [comment audit] Shorten terminal parking and keyboard ownership rationale [skip ci] * [comment audit] Trim renderer lifecycle and menu rationale [skip ci] * [comment audit] Condense workspace cleanup ownership and settlement notes [skip ci] * [comment audit] Clarify renderer hook evidence and source ownership [skip ci] * [comment audit] Tighten IPC ownership and reconnect explanations [skip ci] * [comment audit] Trim renderer focus, paste and attention comments [skip ci] * [comment audit] Shorten scroll, locale and agent lifecycle comments [skip ci] * [comment audit] Trim agent launch, resume and ownership commentary [skip ci] * [comment audit] Shorten account, browser and editor comments [skip ci] * [comment audit] Clarify host-mirror waits, previews and input ownership [skip ci] * [comment audit] Condense launch recovery and editor tokenization comments [skip ci] * [comment audit] Condense workspace selection and terminal pane rationale [skip ci] * [comment audit] Condense terminal fitting and rendering recovery comments [skip ci] * [comment audit] Condense terminal input and host routing explanations [skip ci] * [comment audit] Condense ownership and sleeping-session recovery rationale [skip ci] * [comment audit] Condense structured launch and terminal link explanations [skip ci] * [comment audit] Condense terminal ownership and workspace file routing rationale [skip ci] * [comment audit] Condense session persistence and workspace activation rationale [skip ci] * [comment audit] Condense workspace routing and browser ownership rationale [skip ci] * [comment audit] Condense mirror recovery and layout authority rationale [skip ci] * [comment audit] Condense runtime transport and file safety rationale [skip ci] * [comment audit] Condense runtime graph and structured session rationale [skip ci] * [comment audit] Condense browser creation and remote tab recovery rationale [skip ci] * [comment audit] Condense snapshot authority and publisher recovery rationale [skip ci] * [comment audit] Condense frame, startup and provider cache rationale [skip ci] * [comment audit] Condense host twin and agent lifecycle rationale [skip ci] * [comment audit] Condense browser authority and editor cleanup rationale [skip ci] * [comment audit] Condense editor buffer identity and review cache rationale [skip ci] * [comment audit] Condense provider lifetime and repository ownership rationale [skip ci] * [comment audit] Condense reconnect, hydration and terminal retirement rationale [skip ci] * [comment audit] Condense recovery, reconciliation and persistence rationale [skip ci] * [comment audit] Condense cleanup ownership and listing admission rationale [skip ci] * [comment audit] Condense teardown ordering and terminal ownership rationale [skip ci] * [comment audit] Condense recovery ledger and web host-boundary rationale [skip ci] * [comment audit] Condense web reconnect and credential lifecycle rationale [skip ci] * [comment audit] Condense cloud rollout and assignment safety rationale [skip ci] * [comment audit] Condense relay session and database recovery rationale [skip ci] * [comment audit] Condense relay placement and protocol compatibility rationale [skip ci] * [comment audit] Condense build and packaging constraints [skip ci] * [comment audit] Condense CI gates and validation isolation rationale [skip ci] * [comment audit] Condense catalog identity and browser validation rationale [skip ci] * [comment audit] Condense mobile browser and frame-budget rationale [skip ci] * [comment audit] Shorten mobile route and browser test explanations [skip ci] * [comment audit] Condense editor and session seam test rationale [skip ci] * [comment audit] Trim session and terminal closure history [skip ci] * [comment audit] Shorten terminal browser and census explanations [skip ci] * [comment audit] Preserve root-only E2E diagnostic baseline * [comment audit] Condense mobile seam and HTML preview test rationale [skip ci] * [comment audit] Condense preview instrumentation and render harness rationale [skip ci] * [comment audit] Condense bundle contracts and native-build constraints [skip ci] * [comment audit] Shorten native packaging and CI routing rationale [skip ci] * [comment audit] Condense release tooling and benchmark constraints [skip ci] * [comment audit] Condense packaging and platform gate rationale [skip ci] * [comment audit] Shorten mobile route and history rationale [skip ci] * [comment audit] Condense mobile browser and component rationale [skip ci] * [comment audit] Shorten drawer and workspace-form rationale [skip ci] * [comment audit] Trim mobile review and editor-document explanations [skip ci] * [comment audit] Condense editor lifecycle and Markdown explanations [skip ci] * [comment audit] Trim mobile file, diagnostics and dictation commentary [skip ci] * [comment audit] Simplify mobile host-list and workspace-view explanations [skip ci] * [comment audit] Clarify mobile shell lifetime and bridge delivery constraints [skip ci] * [comment audit] Condense bridge stream, native request and audio rationale [skip ci] * [comment audit] Reduce bridge schema and page-client commentary [skip ci] * [comment audit] Tighten mobile page bridge contracts [skip ci] * [comment audit] Clarify mobile cache and session constraints [skip ci] * [comment audit] Condense mobile route and lifecycle rationale [skip ci] * [comment audit] Tighten mobile shell hook timing rationale [skip ci] * [comment audit] Clarify route handoff and notification compatibility [skip ci] * [comment audit] Clarify push registration and dictation cleanup constraints [skip ci] * [comment audit] Condense keyboard geometry and native media ownership rationale [skip ci] * [comment audit] Tighten mobile chat scroll and composer concurrency rationale [skip ci] * [comment audit] Condense mobile reply compatibility and upload ownership rationale [skip ci] * [comment audit] Condense optimistic echo and scroll ownership rationale [skip ci] * [comment audit] Tighten stream replay and queued session ownership rationale [skip ci] * [comment audit] Condense mobile composer and reply-schema constraints [skip ci] * [comment audit] Clarify mobile transcript recovery and session ownership [skip ci] * [comment audit] Clarify mobile queue and source-control compatibility [skip ci] * [comment audit] Condense storage and task launch constraints [skip ci] * [comment audit] Clarify task schemas and terminal document ownership [skip ci] * [comment audit] Tighten terminal input and viewport rationale [skip ci] * [comment audit] Shorten terminal and RPC recorder contracts [skip ci] * [comment audit] Condense recorder engine and connection contracts [skip ci] * [comment audit] Shorten host credential and relay recovery comments [skip ci] * [comment audit] Tighten pairing recovery and bundle transport rationale [skip ci] * [comment audit] Clarify RPC delivery and workspace catalog boundaries [skip ci] * [comment audit] Condense catalog and relay entry contracts [skip ci] * [comment audit] Shorten shutdown and SSH relay delivery contracts [skip ci] * [comment audit] Condense WSL relay and E2E regression rationale [skip ci] * [comment audit] Shorten cross-version harness and renderer fixture explanations [skip ci] * [comment audit] Condense paired-host and E2E lifecycle rationale [skip ci] * [comment audit] Shorten layout oracle and regression explanations [skip ci] * [comment audit] Condense paired recovery and ownership regression contracts [skip ci] * [comment audit] Shorten restart, sidebar and SSH lifecycle contracts [skip ci] * [comment audit] Condense terminal rendering and IME regression rationale [skip ci] * [comment audit] Shorten terminal recovery and benchmark contracts [skip ci] * [comment audit] Condense tooling and Windows lifecycle proof rationale [skip ci] * [comment audit] Condense workflow routing and release rationale [skip ci] * [comment audit] Condense mobile security and installer contracts [skip ci] * [comment audit] Shorten native rationale and stylesheet workarounds [skip ci] * [comment audit] Shorten Windows visibility probe rationale [skip ci] * [comment audit] Condense embedded release and signing rationale [skip ci] * [comment audit] Retain current main test behavior in final reconciliation [skip ci] * [comment audit] Complete final comment review across current source inventory * [comment audit] Handle consolidated audit reports before final CI * [comment audit] Preserve credential storage census detail [skip ci] * [comment audit] Scale broad changed E2E selections with verified timing shards * [comment audit] Align E2E assertions with browser close and settled session metadata * [comment audit] Match existing E2Es to current resource and windowing contracts * [comment audit] Observe the shared server outage notice in reconnect coverage * [comment audit] Make existing renderer probes measure settled tab and PTY work * [comment audit] Align palette E2E selector with task search * [comment audit] Refresh remaining palette search selectors * [comment audit] Keep selector correction within selected audit specs * [comment audit] Await emoji fixture settings inside renderer evaluation * [comment audit] Cancel fixture fit retries between terminal tests --------- Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
229 lines
7.8 KiB
TypeScript
229 lines
7.8 KiB
TypeScript
import { unwrapClaudePastedContent } from './claude-pasted-content'
|
||
import {
|
||
stripAnsiEscapeSequences,
|
||
TERMINAL_CONTROL_CHARACTER_PATTERN
|
||
} from './ansi-escape-sequences'
|
||
import { isTextBlock, type NativeChatBlock, type NativeChatMessage } from './native-chat-types'
|
||
import { imageReferenceToken, replaceImageReferences } from './native-chat-image-reference'
|
||
import { NATIVE_CHAT_QUOTED_FILE_REFERENCE } from './agent-image-paste'
|
||
|
||
const IMAGE_SOURCE_MARKER = /^\[Image:\s*source:\s*(.+?)\]\s*$/
|
||
const IMAGE_PROMPT_MARKER = /\[Image #\d+\]/
|
||
const IMAGE_PROMPT_MARKERS = /\[Image #\d+\]/g
|
||
// A quoted file reference is matched whole, so a path that reads like a marker is left as typed.
|
||
const IMAGE_PROMPT_MARKER_NUMBERS_OUTSIDE_FILE_REFERENCES = new RegExp(
|
||
`(${NATIVE_CHAT_QUOTED_FILE_REFERENCE.source})|\\[Image #(\\d+)\\]`,
|
||
'g'
|
||
)
|
||
const IMAGE_PROMPT_MARKER_AT_START = /^[^\S\r\n]*\[Image #\d+\]/
|
||
const IMAGE_PROMPT_MARKER_AT_END = /\[Image #\d+\][^\S\r\n]*$/
|
||
const HORIZONTAL_WHITESPACE_START = /^[^\S\r\n]+/
|
||
const HORIZONTAL_WHITESPACE_END = /[^\S\r\n]+$/
|
||
|
||
export function imageSourcePathFromText(text: string): string | null {
|
||
return text.match(IMAGE_SOURCE_MARKER)?.[1]?.trim() ?? null
|
||
}
|
||
|
||
/** Source paths only from all-text turns whose every block is an image-source marker. Claude groups multi-image pastes into one turn;
|
||
* requiring one block misses them, while accepting mixed blocks would hide real prompts. */
|
||
export function imageSourcePathsFromMessage(message: NativeChatMessage): string[] {
|
||
if (message.role !== 'user' || message.blocks.length === 0) {
|
||
return []
|
||
}
|
||
const paths: string[] = []
|
||
for (const block of message.blocks) {
|
||
if (!isTextBlock(block)) {
|
||
return []
|
||
}
|
||
const path = imageSourcePathFromText(block.text)
|
||
if (path === null) {
|
||
return []
|
||
}
|
||
paths.push(path)
|
||
}
|
||
return paths
|
||
}
|
||
|
||
export function isImageSourceUserTurn(message: NativeChatMessage): boolean {
|
||
return imageSourcePathsFromMessage(message).length > 0
|
||
}
|
||
|
||
/** Map chips to sent-image [Image #N] positions, matching Claude/Codex TUIs; drop chips whose images were not sent. */
|
||
export function imageReferencesToPromptMarkers(
|
||
text: string,
|
||
sentImageIds: readonly string[]
|
||
): string {
|
||
return replaceImageReferences(text, (attachmentId) => {
|
||
const index = sentImageIds.indexOf(attachmentId)
|
||
return index === -1 ? '' : `[Image #${index + 1}]`
|
||
})
|
||
}
|
||
|
||
function replaceSentImagePromptMarkers(
|
||
text: string,
|
||
replace: (number: number, marker: string) => string
|
||
): string {
|
||
return text.replace(
|
||
IMAGE_PROMPT_MARKER_NUMBERS_OUTSIDE_FILE_REFERENCES,
|
||
(match, fileReference: string | undefined, number: string) =>
|
||
fileReference === undefined ? replace(Number(number), match) : match
|
||
)
|
||
}
|
||
|
||
/** Restore sent markers as image chips; leave out-of-range numbers literal. */
|
||
export function promptMarkersToImageReferences(text: string, imageIds: readonly string[]): string {
|
||
return replaceSentImagePromptMarkers(text, (number, marker) => {
|
||
const attachmentId = imageIds[number - 1]
|
||
return attachmentId === undefined ? marker : imageReferenceToken(attachmentId)
|
||
})
|
||
}
|
||
|
||
/** Remove only markers belonging to this structured send’s imageCount; leave out-of-range numbers literal. */
|
||
export function stripSentImagePromptMarkers(text: string, imageCount: number): string {
|
||
return withoutStrippedMarkerSpace(
|
||
text,
|
||
replaceSentImagePromptMarkers(text, (number, marker) =>
|
||
number >= 1 && number <= imageCount ? '' : marker
|
||
)
|
||
)
|
||
}
|
||
|
||
export function stripImagePromptMarker(text: string): string {
|
||
return withoutStrippedMarkerSpace(text, text.replace(IMAGE_PROMPT_MARKERS, ''))
|
||
}
|
||
|
||
function withoutStrippedMarkerSpace(text: string, stripped: string): string {
|
||
if (stripped === text) {
|
||
return text
|
||
}
|
||
let result = IMAGE_PROMPT_MARKER_AT_START.test(text)
|
||
? stripped.replace(HORIZONTAL_WHITESPACE_START, '')
|
||
: stripped
|
||
if (IMAGE_PROMPT_MARKER_AT_END.test(text)) {
|
||
result = result.replace(HORIZONTAL_WHITESPACE_END, '')
|
||
}
|
||
return result
|
||
}
|
||
|
||
/** Normalizes PTY-backed user text into the pending-echo comparison key. */
|
||
export function normalizeNativeChatUserText(text: string): string {
|
||
// Strip sequences first so their printable tails cannot survive a lone-control pass.
|
||
return stripImagePromptMarker(
|
||
stripAnsiEscapeSequences(unwrapClaudePastedContent(text)).replace(
|
||
TERMINAL_CONTROL_CHARACTER_PATTERN,
|
||
''
|
||
)
|
||
)
|
||
.trim()
|
||
.replace(/\s+/g, ' ')
|
||
}
|
||
|
||
export function normalizedNativeChatUserMessageText(message: NativeChatMessage): string | null {
|
||
if (message.role !== 'user') {
|
||
return null
|
||
}
|
||
const normalized = normalizeNativeChatUserText(
|
||
message.blocks
|
||
.filter(isTextBlock)
|
||
.map((block) => unwrapClaudePastedContent(block.text))
|
||
.join(' ')
|
||
)
|
||
return normalized || null
|
||
}
|
||
|
||
function stripImagePromptMarkersFromTextBlocks(
|
||
blocks: readonly NativeChatBlock[]
|
||
): NativeChatBlock[] {
|
||
let sawText = false
|
||
let next: NativeChatBlock[] | null = null
|
||
for (let index = 0; index < blocks.length; index += 1) {
|
||
const block = blocks[index]!
|
||
if (!isTextBlock(block)) {
|
||
next?.push(block)
|
||
continue
|
||
}
|
||
const isFirstText = !sawText
|
||
sawText = true
|
||
const text = stripImagePromptMarker(block.text)
|
||
if (!text.trim() && (text !== block.text || isFirstText)) {
|
||
next ??= blocks.slice(0, index)
|
||
continue
|
||
}
|
||
if (text !== block.text) {
|
||
next ??= blocks.slice(0, index)
|
||
next.push({ ...block, text })
|
||
continue
|
||
}
|
||
next?.push(block)
|
||
}
|
||
return next ?? (blocks as NativeChatBlock[])
|
||
}
|
||
|
||
export function hasImagePromptMarker(message: NativeChatMessage): boolean {
|
||
return message.blocks.some((block) => isTextBlock(block) && IMAGE_PROMPT_MARKER.test(block.text))
|
||
}
|
||
|
||
/** Claude records image paths as source turns followed by a prompt carrying
|
||
* image markers. Merge the whole run back into one native user turn. */
|
||
export function normalizeImageTranscriptMessages(
|
||
messages: readonly NativeChatMessage[]
|
||
): NativeChatMessage[] {
|
||
let normalized: NativeChatMessage[] | null = null
|
||
for (let index = 0; index < messages.length; index += 1) {
|
||
const message = messages[index]!
|
||
if (message.role !== 'user') {
|
||
normalized?.push(message)
|
||
continue
|
||
}
|
||
const messageImagePaths = imageSourcePathsFromMessage(message)
|
||
if (messageImagePaths.length > 0) {
|
||
normalized ??= messages.slice(0, index)
|
||
const imagePaths = [...messageImagePaths]
|
||
let nextIndex = index + 1
|
||
while (nextIndex < messages.length) {
|
||
const candidate = messages[nextIndex]!
|
||
const candidatePaths = imageSourcePathsFromMessage(candidate)
|
||
if (
|
||
candidate.role !== 'user' ||
|
||
candidate.source !== message.source ||
|
||
candidatePaths.length === 0
|
||
) {
|
||
break
|
||
}
|
||
imagePaths.push(...candidatePaths)
|
||
nextIndex += 1
|
||
}
|
||
const prompt = messages[nextIndex]
|
||
if (
|
||
prompt?.role === 'user' &&
|
||
prompt.source === message.source &&
|
||
hasImagePromptMarker(prompt)
|
||
) {
|
||
normalized.push({
|
||
...prompt,
|
||
blocks: [
|
||
...imagePaths.map((path) => ({ type: 'image-ref' as const, path })),
|
||
...stripImagePromptMarkersFromTextBlocks(prompt.blocks)
|
||
]
|
||
})
|
||
index = nextIndex
|
||
continue
|
||
}
|
||
// Without a following prompt, keep only this turn’s paths; later scanned source turns remain separate.
|
||
normalized.push({
|
||
...message,
|
||
blocks: messageImagePaths.map((path) => ({ type: 'image-ref' as const, path }))
|
||
})
|
||
continue
|
||
}
|
||
const blocks = stripImagePromptMarkersFromTextBlocks(message.blocks)
|
||
if (blocks === message.blocks) {
|
||
normalized?.push(message)
|
||
} else {
|
||
normalized ??= messages.slice(0, index)
|
||
normalized.push({ ...message, blocks })
|
||
}
|
||
}
|
||
return normalized ?? (messages as NativeChatMessage[])
|
||
}
|