mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-10-07 16:09:43 +02:00
feat(terminal): take the transcript gutter off a copy, at the width the CLI declares
Copying a paragraph out of a Claude Code or Codex pane puts that pane's own two-column transcript gutter on the clipboard, so every pasted line arrives indented. #451 shipped the trailing half of the copy clean and left the leading half out, because deriving the width from the selection fires on 73% of ordinary indented text and cannot tell a margin from content. The width is DECLARED rather than derived. `capabilities.transcriptGutter` on the CLI registry is a bounded integer; claude and codex each declare 2, measured on live panes, and no other stock entry declares any, so a CLI whose transcript layout nobody has measured is never touched. The server publishes the map as `window.__codemanTranscriptGutter`, built by filtering `enabledClis()` on the capability rather than by listing ids, and `_activeCliGutterColumns()` looks the active session's mode up in it. The copy path reads no terminal buffer at all. The declared width is a CEILING, not the answer: `clean()` strips the lesser of it and the run every selected line shares. A block can therefore only shift as a unit, the structure inside a selection survives by construction, and a selection reaching column 0 loses nothing. That is what keeps a `git log` body at its own four-space indent inside an agent's two-column gutter. Codex was measured separately, because it renders nothing like Claude: it draws boxes narrower than the pane and pushes its transcript into ordinary scrollback. On a live 0.154.0 answer its `•`/`›`/`⚠` markers sit in the gutter, prose continuations sit at 2, and a nested YAML block the model wrote rendered at 2/4/6/8 for its own 0/2/4/6. Replayed at 100, 120, 160, 198, 235 and 282 columns its indents were 0, 2, 4, 6 and 8 at every one, never 1. Copying that YAML out of a live Codex pane now yields 0/2/4/6: gutter gone, nesting intact. Two derived versions were built and measured first, and both are recorded in the code because both looked correct: - Painted trailing padding — a full-screen TUI writes real spaces across the unused part of a row, a shell leaves them never-written for xterm to trim — has no false positives and never over-stripped. It is also a function of pane WIDTH: the padding exists only while a rendered line stops short of the CLI's own layout width, and Claude's prose wraps to fill it. Dragging the same two prose rows of one live transcript at five window sizes, the share of padded rows ran 44%, 6%, 6%, 7% and 87% at 123, 160, 198, 235 and 298 columns, so the strip silently did nothing at every ordinary size while a corpus captured entirely at 282 columns said it worked. - Taking the narrowest indent on the rows around the selection fires at every width and over-strips about 1% of selections, because a file listing inside the transcript can be the narrowest thing on screen. Measured over 1,392,281 selections — every 1, 2, 3, 5, 10 and 20-row window of real Claude screens replayed from live PTY streams at 100, 120, 160, 198, 235 and 282 columns — the declared width over-strips none, breaks no relative indent and alters no text, and serves 100% of the selections whose own indent covers the gutter. Verified end to end in a browser with a real mouse drag and a real Ctrl+C: Claude and Codex panes paste flush at 123, 198 and 298 columns, a shell pane is untouched at every one. The strip sits behind `copyStripMargin` (App Settings, Selection & clipboard), per-device and default ON: a display key, absent from the .strict() SettingsUpdateSchema, read as `!== false` because the desktop branch of getDefaultSettings() returns {}. The toggle is checked before the map. Two review findings from #451, handled: - The mid-row flag governs ONE line now. `range.start.x > 0` excludes only the first selected line, the one whose margin the mousedown genuinely cut off, so the same three rows no longer produce three different clipboard results. - The reversed-drag finding does not reproduce on the pinned xterm. `getSelectionPosition()` reads `_selectionService.selectionStart`, whose getter returns `SelectionModel.finalSelectionStart`, and that swaps the pair when `areSelectionValuesReversed()` says so. A real upward mouse drag through chromium against xterm 6.0 reports the same range as the downward drag. `_normalisedSelectionRange()` keeps the ordering as a guard, because the model one layer down exposes the unnormalised fields under the same two names. Tests: test/terminal-copy-clean.test.ts (64, up from 31), plus the injected script stripped in test/server-index-title.test.ts. Every guard is pinned: removing any one of seven reds at least one test, including declaring the wrong gutter width. Full suite green, 7,861 passed, 0 failed. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5
parent
9466acfc1a
commit
ce80b7a212
+51
-24
@@ -774,6 +774,8 @@ function resolveTerminalFontWeights(settings) {
|
||||
*/
|
||||
const AUTO_COPY_MAX_CHARS = 1_000_000;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* What an auto-copy attempt should do at the end of a selection gesture.
|
||||
*
|
||||
@@ -819,36 +821,32 @@ function decideAutoCopy({ enabled, text, lastCopied, pending } = {}) {
|
||||
// _selectTouchSelectionLine already treats those cells as padding. This is that
|
||||
// same rule for the mouse and keyboard paths, which never had it.
|
||||
//
|
||||
// ⚠ Trailing padding ONLY. A shared LEADING indent is deliberately left alone,
|
||||
// and this note is here so the idea is not re-derived: it was built, measured
|
||||
// and dropped before merge. Removing the longest leading run every selected row
|
||||
// shares looks like the mirror image of the trailing trim and is not, because
|
||||
// no native terminal does it and the transform cannot tell a TUI's margin from
|
||||
// content that is genuinely indented. Measured over 401 445 three-row windows
|
||||
// across 1 010 tracked files in this repo, it fired on 73% of them: 92% inside
|
||||
// a YAML workflow, 76% over `git log` output, 48% in a TypeScript source file.
|
||||
// No width threshold separates the two, because they are the same widths: a
|
||||
// live Claude Code pane's own margins measure 2 and 5 columns while the most
|
||||
// common non-TUI shared run is 4, sitting between them.
|
||||
// A LEADING margin is stripped too, but only the one the CLI in the pane
|
||||
// DECLARES as its transcript gutter, passed in as `options.margin`. Called with
|
||||
// no options this trims trailing padding and nothing else, which is what keeps
|
||||
// every caller that has no declared gutter on the old behaviour.
|
||||
//
|
||||
// The asymmetry that settles it is in the failure modes. A wrong trailing trim
|
||||
// ⚠ The failure modes are not symmetrical, and that asymmetry sets how much
|
||||
// evidence a leading strip has to show before it fires. A wrong trailing trim
|
||||
// costs nothing. A wrong dedent silently deletes information that was on the
|
||||
// screen, with no signal to the user and nothing in the clipboard to hint at
|
||||
// it, and it is wrong on `git log` bodies, on indented code read out of `cat`
|
||||
// (semantic in Python), on `git diff` context rows where the leading space is
|
||||
// the marker, and on stack traces.
|
||||
//
|
||||
// ⚠ It also cannot be made consistent cheaply. Whether the first row joins the
|
||||
// measurement depended on the mousedown COLUMN, which the user never sees, so
|
||||
// one block of three rows produced three different clipboard results; and the
|
||||
// flag read `getSelectionPosition().start`, which is the mousedown anchor that
|
||||
// xterm never normalises, so dragging UP through a block read it off the bottom
|
||||
// row. If it is ever revisited, the one qualification that measured clean is
|
||||
// painted trailing padding (a full-screen TUI writes real spaces across every
|
||||
// row; a shell pane leaves those cells never-written, so xterm trims them):
|
||||
// zero false positives over all 401 445 windows. It still mangles a `git log`
|
||||
// body sitting inside an agent's own gutter, which is why it was not taken now.
|
||||
function cleanCopiedSelection(text) {
|
||||
// ⚠ The declared gutter is a CEILING, not the answer. The strip is the lesser
|
||||
// of it and the run every selected line shares, so a block can only ever shift
|
||||
// as a unit: the relative structure inside a selection survives by
|
||||
// construction, and a selection reaching column 0 loses nothing at all.
|
||||
//
|
||||
// ⚠ Deriving the width from the text instead is what fails, twice over. The
|
||||
// selection's own shared indent cannot tell a margin from content, because a
|
||||
// three-row window of nested YAML shares an indent for the same reason a margin
|
||||
// does — it fired on 73% of ordinary indented text. Taking the narrowest indent
|
||||
// on the surrounding rows fails more quietly: a file listing inside the
|
||||
// transcript can be the narrowest thing on screen, which over-stripped about 1%
|
||||
// of selections across six pane widths.
|
||||
function cleanCopiedSelection(text, options) {
|
||||
if (typeof text !== 'string' || !text) return '';
|
||||
// Split on \n and leave any \r in place: xterm joins rows with \r\n on
|
||||
// Windows, and the clipboard should keep the endings xterm chose.
|
||||
@@ -868,7 +866,36 @@ function cleanCopiedSelection(text) {
|
||||
while (cut > 0 && (line[cut - 1] === ' ' || line[cut - 1] === '\t')) cut--;
|
||||
return cut === end ? line : line.slice(0, cut) + line.slice(end);
|
||||
};
|
||||
return text.split('\n').map(trimEnd).join('\n');
|
||||
const lines = text.split('\n');
|
||||
for (let i = 0; i < lines.length; i++) lines[i] = trimEnd(lines[i]);
|
||||
|
||||
const margin = Math.max(0, Math.trunc(Number(options?.margin) || 0));
|
||||
if (!margin) return lines.join('\n');
|
||||
|
||||
// The first line of a selection that began mid-row carries no margin — the
|
||||
// mousedown cut it off — so it neither votes on the shared indent nor gets
|
||||
// stripped. This is the ONE thing the mousedown column still decides, and it
|
||||
// decides it for that line alone. Whether the rest of the block is dedented
|
||||
// no longer depends on where the click landed, which is what made the same
|
||||
// three rows produce three different clipboard results before.
|
||||
const from = options?.firstLinePartial === true ? 1 : 0;
|
||||
|
||||
// The pane's margin is a ceiling, not the answer. Strip the narrower of it
|
||||
// and what every selected line shares, so the block shifts as a unit and no
|
||||
// line can lose indentation another line keeps.
|
||||
let shared = margin;
|
||||
for (let i = from; i < lines.length && shared > 0; i++) {
|
||||
const line = lines[i];
|
||||
if (!line || line === '\r') continue; // a padding-only row, already trimmed away
|
||||
let run = 0;
|
||||
while (run < line.length && line[run] === ' ') run++;
|
||||
if (run < shared) shared = run;
|
||||
}
|
||||
if (!shared) return lines.join('\n');
|
||||
for (let i = from; i < lines.length; i++) {
|
||||
if (lines[i] && lines[i] !== '\r') lines[i] = lines[i].slice(shared);
|
||||
}
|
||||
return lines.join('\n');
|
||||
}
|
||||
|
||||
if (typeof window !== 'undefined') {
|
||||
|
||||
Reference in New Issue
Block a user