BitSquare/Codeman
2
0
Fork 0
mirror of https://github.com/Ark0N/Codeman.git synced 2026-10-09 08:59:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(terminal): trim the padding and shared indent out of a copied selection

Browse Source 
xterm hands back whole screen rows and trims only the cells that were
never written to, so the real spaces a full-screen TUI paints across the
unused part of a row count as content and reach the clipboard. Measured
against Claude Code in a 282-column pane, single lines arrived carrying
138 trailing spaces, and every line carried the two-space transcript
indent as well. Windows Terminal, iTerm2 and GNOME Terminal all trim that
for you, decideAutoCopy already calls a wall of spaces "never what the
gesture meant", and _selectTouchSelectionLine already treats those cells
as padding — the mouse and keyboard paths never had the same rule.

CodemanCopySelection.clean lives in constants.js beside decideAutoCopy,
its pure sibling. It drops the trailing run from each line, and removes
the leading run only where every selected row shares one. A selection of
a single row keeps its run, because one row shares nothing with anything
and stripping it would silently reindent one line of `git log` body text
or one line out of `less`. A drag that began inside a row keeps its
partial first line untouched and out of the measurement, which otherwise
pins the shared run to zero and leaves every following row indented.

Every pass over a line is a scan rather than a regex. `/[ \t]+(\r?)$/` is
quadratic on a line whose spaces are followed by a non-space character,
which is what right-aligned or centred TUI content looks like: measured
over 50 000 rows with a 280-column run it took 2.9s, against 1.3ms for
the scan, and a 2 000-column run took 16s. The scan is also the faster of
the two on an ordinary padded row.

cleanedTerminalSelection in terminal-ui.js is the half that needs the
live terminal. It returns a COLUMN selection untouched: Alt+drag makes
one, and a rectangle's rows lining up is the point of the gesture, so
both halves of the clean would destroy it. xterm exposes the mode nowhere
public, so the check reads terminal._core._selectionService, the way this
file already reads terminal._core for cell dimensions, and cleans
normally if a future xterm renames the field. A test pins that assumption
against the library rather than against a stub repeating the literal.

The Ctrl+C chord decides on the cleaned selection, not the raw one. A
drag across the blank part of a row selects real padding spaces, so the
raw text is truthy, and testing it would spend that press on a copy of
nothing and make the user press again to interrupt. A padding-only
selection is now dropped and the press falls through to the PTY, while
Ctrl+Shift+C still never falls through. copyTerminalSelection gates on
trim() for the same reason, since a multi-row drag across padding cleans
to line breaks alone and a bare newline pasted into a chat composer
submits it.

All four of the main terminal's copy paths go through it: the Ctrl+C
chord, right-click, the phone selection button and Auto Copy. The
browser's own Edit menu copy, a disabled copy shortcut and the subagent
windows still copy raw rows, as they did before, and the invariants doc
now says so rather than claiming every copy is cleaned. Auto Copy
resolves its own toggle before it reads the selection, since it is off by
default and a selection can run to the 50 000-row scrollback ceiling.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Michael Grundberg
2026-09-18 20:18:25 +02:00
co-authored by Claude Opus 5
parent 20fc7b3c3d
commit f9edb33d15
7 changed files with 505 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/web/public/terminal-ui.js
+62 -6
View File
@@ -364,12 +364,23 @@ Object.assign(CodemanApp.prototype, {
// this handler before its own cancel()), so preventDefault is explicit:
// without it the browser runs its native copy on top of ours.
if (this.shouldCopyTerminalSelectionFromShortcut?.(ev)) {
const selection = this.terminal.hasSelection?.() ? this.terminal.getSelection() : '';
if (selection) {
// The CLEANED selection decides, not the raw one. A drag across the blank
// part of a row selects real padding spaces, which are truthy, so testing
// the raw text would spend this press on a copy of nothing and make the
// user press again to interrupt.
const selection = this.cleanedTerminalSelection();
if (selection.trim()) {
ev.preventDefault();
void this.copyTerminalSelection(selection);
return false;
}
// Nothing worth copying. Drop a padding-only selection first, or it would
// intercept every following press too, then fall through exactly as an
// empty selection does so this press still reaches the PTY as 0x03.
if (this.terminal?.hasSelection?.()) {
this.terminal.clearSelection?.();
this.showToast('Nothing to copy', 'warning');
}
if (ev.shiftKey) {
ev.preventDefault();
return false;
@@ -4069,12 +4080,51 @@ Object.assign(CodemanApp.prototype, {
return !ev.altKey && (ev.key || '').toLowerCase() === 'c';
},
/**
* xterm's current selection, cleaned for the clipboard. The transform itself
* is CodemanCopySelection.clean in constants.js, beside decideAutoCopy; this
* is the half that needs the live terminal.
*
* `text` is for the callers that already read the selection to decide whether
* to copy at all (the Ctrl+C gate and the right-click handler), so the read is
* not repeated. It must be the selection xterm holds RIGHT NOW, because the
* mid-row flag below comes from the live selection rather than from `text`.
*
* A COLUMN selection comes back untouched. Alt+drag makes one — xterm's
* shouldColumnSelect keys on altKey alone, and Codeman sets neither of the
* terminals it creates with the one option that would disable it — and a rectangle's whole point is that its rows line
* up, which both halves of the clean would destroy. xterm exposes the mode
* nowhere public, so this reads the private field the way this file already
* reads terminal._core for cell dimensions, and falls back to cleaning
* normally if a future xterm renames it. SelectionMode.COLUMN is 3.
*/
cleanedTerminalSelection(text) {
const raw = text ?? (this.terminal?.hasSelection?.() ? this.terminal.getSelection() : '');
if (!raw) return '';
if (this.terminal?._core?._selectionService?._activeSelectionMode === 3) return raw;
const clean = window.CodemanCopySelection?.clean;
if (!clean) return raw;
const start = this.terminal?.getSelectionPosition?.()?.start;
return clean(raw, { startedMidRow: !!start && start.x > 0 });
},
// Copy the current terminal selection. Goes through _copyText (Clipboard API,
// then a hidden-textarea + execCommand fallback) because install.sh's LAN
// option serves plain HTTP, where navigator.clipboard is undefined.
async copyTerminalSelection(text) {
const selection = text ?? (this.terminal.hasSelection?.() ? this.terminal.getSelection() : '');
if (!selection) return false;
const selection = this.cleanedTerminalSelection(text);
// trim(), not emptiness: a multi-row drag across padding cleans to newlines
// alone, which are truthy, and a bare newline pasted into a chat composer
// or a shell submits the line. decideAutoCopy applies the same rule.
if (!selection.trim()) {
// Clearing matters as much as the toast. The Ctrl+C gate tests the RAW
// selection, so a padding-only selection left set would make every later
// Ctrl+C copy nothing instead of interrupting — the exact failure
// docs/architecture-invariants.md warns about under Terminal smart copy.
this.terminal?.clearSelection?.();
this.showToast('Nothing to copy', 'warning');
return false;
}
const ok = await this._copyText(selection);
if (ok) {
// Clearing is what makes a second Ctrl+C an interrupt (and xterm already
@@ -4123,9 +4173,15 @@ Object.assign(CodemanApp.prototype, {
async _flushAutoCopySelection() {
const decide = window.CodemanAutoCopy?.decide;
if (!decide || !this.terminal) return;
const text = this.terminal.hasSelection?.() ? this.terminal.getSelection() : '';
// The toggle is read FIRST because Auto Copy is off by default: reading and
// cleaning a selection that can run to the 50 000-row scrollback ceiling
// costs real time on a phone, and every mouseup would pay it for nothing.
// Cleaning before decide() then means its dedupe and size cap both measure
// the text that actually reaches the clipboard, not the padded rows behind.
const enabled = this._autoCopySelectionEnabled();
const text = enabled ? this.cleanedTerminalSelection() : '';
const verdict = decide({
enabled: this._autoCopySelectionEnabled(),
enabled,
text,
lastCopied: this._autoCopyLastText,
pending: !!this._autoCopyPending,