mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-10-10 09:19:42 +02:00
JD
7aecbd29df
Anything typed on a phone vanished whenever the terminal viewport was not scrolled fully to the bottom. Codeman parks the viewport a few rows above the bottom on purpose (scrollToLastNonEmptyLine after a tab switch, or after the keyboard drops and the terminal regrows, so trailing blank rows stay off screen), and the overlay hid itself on a bare viewportY !== baseY test even though the prompt and the cursor were on screen. The text was buffered the whole time and Enter still sent it, which is what made the keyboard look dead. The overlay now gates on whether the cursor row is inside the viewport (promptRowInViewport), in both the render path and the scroll handler, so a deep scroll into history still hides it. A buffer without cursorY keeps the old bottom-only rule. Two of Codeman's custom prompt finders made the matching mistake of treating cursorY, which xterm reports relative to baseY, as a screen row; with the gate relaxed that would have painted the text on the wrong line. Both go through cursorViewportRow now, and the Claude finder looks for its glyph from the cursor's screen row up to the top of the live screen only, since a parked viewport shows scrolled-off history whose old composer rows used to be unreachable and would anchor the overlay on the wrong line.
92 lines
3.1 KiB
TypeScript
92 lines
3.1 KiB
TypeScript
import type { XtermTerminal, PromptFinder, PromptPosition } from './types.js';
|
|
|
|
/**
|
|
* Find the prompt in the terminal buffer using the configured strategy.
|
|
* Scans bottom-up through the viewport to find the most recent prompt.
|
|
*
|
|
* @returns The prompt position (viewport-relative), or `null` if not found.
|
|
*/
|
|
export function findPrompt(terminal: XtermTerminal, finder: PromptFinder): PromptPosition | null {
|
|
try {
|
|
const buffer = terminal.buffer.active;
|
|
const viewportTop = buffer.viewportY;
|
|
|
|
switch (finder.type) {
|
|
case 'character': {
|
|
for (let row = terminal.rows - 1; row >= 0; row--) {
|
|
const line = buffer.getLine(viewportTop + row);
|
|
if (!line) continue;
|
|
const text = line.translateToString(true);
|
|
const idx = text.lastIndexOf(finder.char);
|
|
if (idx >= 0) return { row, col: idx };
|
|
}
|
|
return null;
|
|
}
|
|
|
|
case 'regex': {
|
|
// Create a fresh non-global regex to avoid lastIndex mutation
|
|
// and ensure .match() returns a single result with .index
|
|
const pattern = finder.pattern;
|
|
const safePattern = pattern.global ? new RegExp(pattern.source, pattern.flags.replace('g', '')) : pattern;
|
|
for (let row = terminal.rows - 1; row >= 0; row--) {
|
|
const line = buffer.getLine(viewportTop + row);
|
|
if (!line) continue;
|
|
const text = line.translateToString(true);
|
|
const match = text.match(safePattern);
|
|
if (match) {
|
|
const col = match.index ?? 0;
|
|
return { row, col };
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
case 'custom':
|
|
return finder.find(terminal);
|
|
|
|
default:
|
|
return null;
|
|
}
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Read text after the prompt position on the same line.
|
|
*
|
|
* @param terminal - The xterm.js terminal instance
|
|
* @param prompt - The prompt position in the viewport
|
|
* @param offset - Characters to skip after the prompt marker (e.g., 2 for "> ")
|
|
* @returns The text after the prompt, trimmed. Empty string if nothing found.
|
|
*/
|
|
export function readTextAfterPrompt(terminal: XtermTerminal, prompt: PromptPosition, offset: number): string {
|
|
try {
|
|
const buffer = terminal.buffer.active;
|
|
const absRow = buffer.viewportY + prompt.row;
|
|
const line = buffer.getLine(absRow);
|
|
if (!line) return '';
|
|
const lineText = line.translateToString(true);
|
|
return lineText.slice(prompt.col + offset).trimEnd();
|
|
} catch {
|
|
return '';
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Whether the row the overlay draws on (the cursor row) is inside the viewport. A bare
|
|
* `viewportY === baseY` test is wrong for a host that parks the viewport a few rows above
|
|
* the bottom with the prompt still on screen; a buffer without `cursorY` keeps that rule.
|
|
*/
|
|
export function promptRowInViewport(terminal: XtermTerminal): boolean {
|
|
try {
|
|
const buf = terminal.buffer.active;
|
|
if (buf.viewportY === buf.baseY) return true;
|
|
if (typeof buf.cursorY !== 'number') return false;
|
|
const cursorRow = buf.baseY + buf.cursorY;
|
|
return cursorRow >= buf.viewportY && cursorRow < buf.viewportY + terminal.rows;
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|