mirror of
https://github.com/stablyai/orca.git
synced 2026-10-18 00:03:20 +00:00
Neil
70df6f0224
Split out of #17170, which now carries only the xterm composition-overlay work. Codex and Claude draw an all-dim, full-row ghost placeholder. The opaque preedit overlay reproduces the committed row tail it covers, so without this the ghost is repeated to the right of the composing syllable instead of staying masked. The binding keys off the `.xterm-composition-remainder` class that #17170 adds and hides it through CSS while a composition owns a structurally verified placeholder row — bold prompt glyph plus a dimmed model footer below a blank gap for Codex, a frame line above the prompt for Claude. Arbitrary dim output, shell lookalikes, and any row carrying typed text keep their tail visible. readTerminalCursorLineContext moves from src/main/daemon to src/shared because the renderer now needs the same reader the daemon uses; the move is import-only. Depends on #17170.
401 lines
13 KiB
TypeScript
401 lines
13 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
||
import {
|
||
detectTerminalComposerDraft,
|
||
hasTerminalComposerPlaceholder
|
||
} from './terminal-composer-draft'
|
||
|
||
describe('detectTerminalComposerDraft', () => {
|
||
it('separates a cursor-right suggestion from the composer line', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['────────', '❯ proceed with the release'],
|
||
typedRows: ['────────', '❯'],
|
||
promptGlyphBoldRows: [false, false],
|
||
rowsBelow: [],
|
||
typedRowsBelow: [],
|
||
beforeCursor: '❯ ',
|
||
afterCursor: '',
|
||
rawAfterCursor: 'proceed with the release',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 8
|
||
})
|
||
).toEqual({
|
||
text: 'proceed with the release',
|
||
promptRow: 8,
|
||
cursorRow: 8,
|
||
endRow: 8,
|
||
promptGlyph: '❯'
|
||
})
|
||
})
|
||
|
||
it('keeps stock dim placeholders out of draft metadata', () => {
|
||
const context = {
|
||
rows: ['› Ask Codex to do anything'],
|
||
typedRows: ['›'],
|
||
promptGlyphBoldRows: [true],
|
||
rowsBelow: ['', 'gpt-5.6 · ~/repo'],
|
||
typedRowsBelow: ['', 'gpt-5.6 · ~/repo'],
|
||
beforeCursor: '› ',
|
||
afterCursor: '',
|
||
rawAfterCursor: 'Ask Codex to do anything',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 4
|
||
}
|
||
|
||
expect(detectTerminalComposerDraft(context)).toBeNull()
|
||
expect(hasTerminalComposerPlaceholder(context)).toBe(true)
|
||
})
|
||
|
||
it('keeps a typed draft whose stock placeholder is still rendered to its right', () => {
|
||
// The placeholder normally clears the moment you type, but a repaint can land the two on the
|
||
// row together. Classifying that as a placeholder would mask the row the user's text is on.
|
||
const context = {
|
||
rows: ['\u203a \uc548\ub155Ask Codex to do anything'],
|
||
typedRows: ['\u203a \uc548\ub155'],
|
||
promptGlyphBoldRows: [true],
|
||
rowsBelow: ['', 'gpt-5.6 \u00b7 ~/repo'],
|
||
typedRowsBelow: ['', 'gpt-5.6 \u00b7 ~/repo'],
|
||
beforeCursor: '\u203a \uc548\ub155',
|
||
afterCursor: '',
|
||
rawAfterCursor: 'Ask Codex to do anything',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 4
|
||
}
|
||
|
||
expect(detectTerminalComposerDraft(context)).toEqual({
|
||
text: '\uc548\ub155',
|
||
promptRow: 4,
|
||
cursorRow: 4,
|
||
endRow: 4,
|
||
promptGlyph: '\u203a'
|
||
})
|
||
expect(hasTerminalComposerPlaceholder(context)).toBe(false)
|
||
})
|
||
|
||
it('does not duplicate real typed text left of the cursor', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['────────', '❯ review the change'],
|
||
typedRows: ['────────', '❯ review the change'],
|
||
promptGlyphBoldRows: [false, false],
|
||
rowsBelow: [],
|
||
typedRowsBelow: [],
|
||
beforeCursor: '❯ review the change',
|
||
afterCursor: '',
|
||
rawAfterCursor: '',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 2
|
||
})?.text
|
||
).toBe('review the change')
|
||
})
|
||
|
||
it('preserves a shell prompt that happens to use the Claude glyph', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['last command output', '❯ git status'],
|
||
typedRows: ['last command output', '❯ git status'],
|
||
promptGlyphBoldRows: [false, false],
|
||
rowsBelow: [],
|
||
typedRowsBelow: [],
|
||
beforeCursor: '❯ git status',
|
||
afterCursor: '',
|
||
rawAfterCursor: '',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 7
|
||
})
|
||
).toBeNull()
|
||
})
|
||
|
||
it('rejects a hidden-cursor dialog even when its selected row uses a composer glyph', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['› 1. Yes, continue', ' Press enter to continue'],
|
||
typedRows: ['› 1. Yes, continue', ' Press enter to continue'],
|
||
promptGlyphBoldRows: [true, false],
|
||
rowsBelow: [],
|
||
typedRowsBelow: [],
|
||
beforeCursor: ' Press enter to continue',
|
||
afterCursor: '',
|
||
rawAfterCursor: '',
|
||
cursorHidden: true,
|
||
cursorViewportRow: 5
|
||
})
|
||
).toBeNull()
|
||
})
|
||
|
||
it('separates dimmed suggestion rows below the restored cursor', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['────────', '❯ proceed with the release'],
|
||
typedRows: ['────────', '❯'],
|
||
promptGlyphBoldRows: [false, false],
|
||
rowsBelow: [' and close the pull request', '────────'],
|
||
typedRowsBelow: ['', '────────'],
|
||
beforeCursor: '❯ ',
|
||
afterCursor: '',
|
||
rawAfterCursor: 'proceed with the release',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 8
|
||
})
|
||
).toEqual({
|
||
text: 'proceed with the release\nand close the pull request',
|
||
promptRow: 8,
|
||
cursorRow: 8,
|
||
endRow: 9,
|
||
promptGlyph: '❯'
|
||
})
|
||
})
|
||
|
||
it('recognizes the bold Codex ultra composer glyph', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['» review the change'],
|
||
typedRows: ['» review the change'],
|
||
promptGlyphBoldRows: [true],
|
||
rowsBelow: ['gpt-5.6 · ~/repo'],
|
||
typedRowsBelow: ['gpt-5.6 · ~/repo'],
|
||
beforeCursor: '» review the change',
|
||
afterCursor: '',
|
||
rawAfterCursor: '',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 4
|
||
})
|
||
).toMatchObject({ text: 'review the change', promptGlyph: '»' })
|
||
})
|
||
|
||
it('recognizes the bold Codex composer when its footer is visible', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['› review the change'],
|
||
typedRows: ['› review the change'],
|
||
promptGlyphBoldRows: [true],
|
||
rowsBelow: ['gpt-5.6 · ~/repo'],
|
||
typedRowsBelow: ['gpt-5.6 · ~/repo'],
|
||
beforeCursor: '› review the change',
|
||
afterCursor: '',
|
||
rawAfterCursor: '',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 4
|
||
})
|
||
).toMatchObject({ text: 'review the change', promptGlyph: '›' })
|
||
})
|
||
|
||
it('recognizes a Codex composer with a context-only status footer', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['› review the change'],
|
||
typedRows: ['› review the change'],
|
||
promptGlyphBoldRows: [true],
|
||
rowsBelow: ['', ' Context 12% used'],
|
||
typedRowsBelow: ['', ''],
|
||
rowsBelowWrapped: [false, false],
|
||
beforeCursor: '› review the change',
|
||
afterCursor: '',
|
||
rawAfterCursor: '',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 4
|
||
})
|
||
).toMatchObject({ text: 'review the change', promptGlyph: '›' })
|
||
})
|
||
|
||
it('recognizes a Codex composer with an arbitrary dimmed thread-title footer', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['› review the change'],
|
||
typedRows: ['› review the change'],
|
||
promptGlyphBoldRows: [true],
|
||
rowsBelow: ['', ' Release train'],
|
||
typedRowsBelow: ['', ''],
|
||
rowsBelowWrapped: [false, false],
|
||
beforeCursor: '› review the change',
|
||
afterCursor: '',
|
||
rawAfterCursor: '',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 4
|
||
})
|
||
).toMatchObject({ text: 'review the change', promptGlyph: '›' })
|
||
})
|
||
|
||
it('preserves an ordinary shell prompt that uses the Codex glyph', () => {
|
||
const context = {
|
||
rows: ['last command output', '› git status'],
|
||
typedRows: ['last command output', '› git status'],
|
||
promptGlyphBoldRows: [false, true],
|
||
rowsBelow: [],
|
||
typedRowsBelow: [],
|
||
beforeCursor: '› git status',
|
||
afterCursor: '',
|
||
rawAfterCursor: '',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 7
|
||
}
|
||
|
||
expect(detectTerminalComposerDraft(context)).toBeNull()
|
||
expect(hasTerminalComposerPlaceholder(context)).toBe(false)
|
||
})
|
||
|
||
it('keeps the side-thread placeholder out of draft metadata', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['› Ask a follow-up question'],
|
||
typedRows: ['›'],
|
||
promptGlyphBoldRows: [true],
|
||
rowsBelow: [],
|
||
typedRowsBelow: [],
|
||
beforeCursor: '› ',
|
||
afterCursor: '',
|
||
rawAfterCursor: 'Ask a follow-up question',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 4
|
||
})
|
||
).toBeNull()
|
||
})
|
||
|
||
it('keeps a wrapped stock placeholder out of draft metadata', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['› Ask Codex to do'],
|
||
typedRows: ['›'],
|
||
promptGlyphBoldRows: [true],
|
||
rowsBelow: [' anything'],
|
||
typedRowsBelow: [''],
|
||
beforeCursor: '› ',
|
||
afterCursor: '',
|
||
rawAfterCursor: 'Ask Codex to do',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 4
|
||
})
|
||
).toBeNull()
|
||
})
|
||
|
||
it('joins soft-wrapped continuation rows without inserting a newline', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['────────', '❯ proceed with the'],
|
||
typedRows: ['────────', '❯'],
|
||
promptGlyphBoldRows: [false, false],
|
||
rowsWrapped: [false, false],
|
||
rowsBelow: ['release'],
|
||
typedRowsBelow: [''],
|
||
rowsBelowWrapped: [true],
|
||
beforeCursor: '❯ ',
|
||
afterCursor: '',
|
||
rawAfterCursor: 'proceed with the ',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 8
|
||
})?.text
|
||
).toBe('proceed with the release')
|
||
})
|
||
|
||
it('keeps a draft continuation containing a middle dot', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['────────', '❯ proceed '],
|
||
typedRows: ['────────', '❯'],
|
||
promptGlyphBoldRows: [false, false],
|
||
rowsWrapped: [false, false],
|
||
rowsBelow: ['deploy · verify', '────────'],
|
||
typedRowsBelow: ['', '────────'],
|
||
rowsBelowWrapped: [true, false],
|
||
beforeCursor: '❯ ',
|
||
afterCursor: 'proceed ',
|
||
rawAfterCursor: 'proceed ',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 8
|
||
})?.text
|
||
).toBe('proceed deploy · verify')
|
||
})
|
||
|
||
it('keeps a model-like continuation before the Codex status footer', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['› compare '],
|
||
typedRows: ['› compare '],
|
||
promptGlyphBoldRows: [true],
|
||
rowsBelow: ['gpt-5 · verify', 'gpt-5.6 · Context 12% used'],
|
||
typedRowsBelow: ['gpt-5 · verify', 'gpt-5.6 · Context 12% used'],
|
||
rowsBelowWrapped: [false, false],
|
||
beforeCursor: '› compare ',
|
||
afterCursor: '',
|
||
rawAfterCursor: '',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 4
|
||
})?.text
|
||
).toBe('compare\ngpt-5 · verify')
|
||
})
|
||
|
||
it('keeps typed soft-wrapped rows below a restored cursor in the draft', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['────────', '❯ proceed with the '],
|
||
typedRows: ['────────', '❯ proceed with the '],
|
||
promptGlyphBoldRows: [false, false],
|
||
rowsWrapped: [false, false],
|
||
rowsBelow: ['release'],
|
||
typedRowsBelow: ['release'],
|
||
rowsBelowWrapped: [true],
|
||
beforeCursor: '❯ proceed',
|
||
afterCursor: ' with the ',
|
||
rawAfterCursor: ' with the ',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 8
|
||
})?.text
|
||
).toBe('proceed with the release')
|
||
})
|
||
|
||
it('keeps typed hard-newline rows below a restored cursor in the draft', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['────────', '❯ first line'],
|
||
typedRows: ['────────', '❯ first line'],
|
||
promptGlyphBoldRows: [false, false],
|
||
rowsWrapped: [false, false],
|
||
rowsBelow: [' second line', '────────'],
|
||
typedRowsBelow: [' second line', '────────'],
|
||
rowsBelowWrapped: [false, false],
|
||
beforeCursor: '❯ first',
|
||
afterCursor: ' line',
|
||
rawAfterCursor: ' line',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 8
|
||
})?.text
|
||
).toBe('first line\nsecond line')
|
||
})
|
||
|
||
it('keeps typed continuation rows after an intentional blank draft line', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['────────', '❯ first line'],
|
||
typedRows: ['────────', '❯ first line'],
|
||
promptGlyphBoldRows: [false, false],
|
||
rowsWrapped: [false, false],
|
||
rowsBelow: ['', ' second line', '────────'],
|
||
typedRowsBelow: ['', ' second line', '────────'],
|
||
rowsBelowWrapped: [false, false, false],
|
||
beforeCursor: '❯ first',
|
||
afterCursor: ' line',
|
||
rawAfterCursor: ' line',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 8
|
||
})
|
||
).toMatchObject({ text: 'first line\n\nsecond line', endRow: 10 })
|
||
})
|
||
|
||
it('stops before a blank row that only precedes the composer frame', () => {
|
||
expect(
|
||
detectTerminalComposerDraft({
|
||
rows: ['────────', '❯ first line'],
|
||
typedRows: ['────────', '❯ first line'],
|
||
promptGlyphBoldRows: [false, false],
|
||
rowsBelow: ['', '────────'],
|
||
typedRowsBelow: ['', '────────'],
|
||
beforeCursor: '❯ first line',
|
||
afterCursor: '',
|
||
rawAfterCursor: '',
|
||
cursorHidden: false,
|
||
cursorViewportRow: 8
|
||
})
|
||
).toMatchObject({ text: 'first line', endRow: 8 })
|
||
})
|
||
})
|