fix(terminal): withdraw unreleased archive command shortcut

README.md

@@ -129,7 +129,6 @@ If you regularly work with a fleet of servers, Netcatty is built for speed and f
 - **Session management** — run multiple connections side-by-side
 - **Save current screen** — right-click a terminal to save the visible final text, without replaying keystrokes or overwritten output; scroll first to save an earlier screen.
 - **Inline images** — render Kitty graphics, SIXEL and iTerm inline images from remote programs
-- **Archive shortcuts** — Ctrl+click a printed tar/zip filename at an empty Linux shell prompt to prepare an extraction command; press Enter to run it. Relative filenames are available only in the latest command's output; run `ls` again after submitting another command. Existing input is kept, and shortcuts stay off for unknown systems and broadcast mode. Names with spaces must be printed in quotes; wrapped filenames are excluded.
 
 ### 📁 SFTP + Built-in Editor
 - **File workflows** — drag & drop uploads/downloads

components/terminal/runtime/createXTermRuntime.ts

@@ -8,9 +8,6 @@ import { SearchAddon } from "@xterm/addon-search";
 import { SerializeAddon } from "@xterm/addon-serialize";
 import { UnicodeGraphemesAddon } from "@xterm/addon-unicode-graphemes";
 import { WebLinksAddon } from "@xterm/addon-web-links";
-import { supportsTerminalArchiveCommands } from "../../../domain/terminalArchives";
-import { registerTerminalArchiveLinks } from "./terminalArchiveLinks";
-import { isTerminalReadyForCommandInjection } from "./terminalCommandInjectionReadyRegistry";
 import { WebglAddon } from "@xterm/addon-webgl";
 import { Terminal as XTerm } from "@xterm/xterm";
 import type { RefObject } from "react";
@@ -317,7 +314,6 @@ export const resetKittyKeyboardModeStateForSession = (
 export type CreateXTermRuntimeContext = {
   container: HTMLDivElement;
   host: Host;
-  getHost?: () => Host;
   fontFamilyId: string;
   resolvedFontFamily: string;
   fontSize: number;
@@ -958,13 +954,6 @@ export const createXTermRuntime = (ctx: CreateXTermRuntimeContext): XTermRuntime
     terminalLinkHandler.activate(event, uri);
   });
   term.loadAddon(webLinksAddon);
-  const archiveLinks = registerTerminalArchiveLinks({
-    term,
-    isEnabled: () => ctx.statusRef.current === 'connected'
-      && !ctx.isBroadcastEnabledRef.current
-      && supportsTerminalArchiveCommands(ctx.getHost?.() ?? ctx.host, platform),
-    isInputReady: () => isTerminalReadyForCommandInjection(ctx.sessionId),
-  });
   const pluginLinkProviderHost = ctx.requestPluginTerminalProviders
     ? registerPluginTerminalLinkProvider({
         term,
@@ -3489,7 +3478,6 @@ export const createXTermRuntime = (ctx: CreateXTermRuntimeContext): XTermRuntime
       keywordHighlighter.dispose();
       cursorLineHighlighter.dispose();
       pluginLinkProviderHost?.dispose();
-      archiveLinks.dispose();
       pluginProviderHost?.dispose();
       eraseScrollbackDisposable.dispose();
       for (const disposable of cursorPositionReportRequestDisposables) {

components/terminal/runtime/terminalArchiveLinks.test.ts

@@ -1,67 +0,0 @@
-import test from 'node:test';
-import assert from 'node:assert/strict';
-import type { ILink, ILinkProvider, Terminal } from '@xterm/xterm';
-import { registerTerminalArchiveLinks } from './terminalArchiveLinks';
-
-function fixture() {
-  let provider!: ILinkProvider;
-  let text = 'backup.tar.gz';
-  let enabled = true, ready = true, registrationDisposed = false, wrapped = false;
-  const pasted: string[] = [];
-  let submitted: (data: string) => void = () => {};
-  let markerLine = -1;
-  const term = {
-    buffer: { active: { getLine: (y: number) => y === 0 ? { translateToString: () => text, isWrapped: wrapped } : undefined } },
-    paste: (value: string) => { pasted.push(value); ready = false; },
-    focus: () => {},
-    registerMarker: () => ({ line: markerLine, isDisposed: false, dispose() { this.isDisposed = true; } }),
-    onData: (listener: (data: string) => void) => { submitted = listener; return { dispose() {} }; },
-    registerLinkProvider: (next: ILinkProvider) => { provider = next; return { dispose: () => { registrationDisposed = true; } }; },
-  };
-  const registration = registerTerminalArchiveLinks({ term: term as unknown as Terminal, isEnabled: () => enabled, isInputReady: () => ready });
-  const links = () => { let value: ILink[] | undefined; provider.provideLinks(1, result => { value = result; }); return value; };
-  return { links, pasted, registration, submit: () => { markerLine = 0; submitted('\r'); }, setText: (value: string) => { text = value; }, setReady: (value: boolean) => { ready = value; }, setEnabled: (value: boolean) => { enabled = value; }, setWrapped: () => { wrapped = true; }, isDisposed: () => registrationDisposed };
-}
-
-const ctrlClick = { button: 0, ctrlKey: true } as MouseEvent;
-
-test('Ctrl+left click prepares exactly one command without Enter; ordinary click does nothing', () => {
-  const f = fixture(), link = f.links()![0];
-  assert.deepEqual(link.range, { start: { x: 1, y: 1 }, end: { x: 13, y: 1 } });
-  link.activate({ button: 0, ctrlKey: false } as MouseEvent, link.text);
-  assert.deepEqual(f.pasted, []);
-  link.activate(ctrlClick, link.text);
-  link.activate(ctrlClick, link.text);
-  assert.deepEqual(f.pasted, ["tar -xzf './backup.tar.gz'"]);
-});
-
-test('live readiness/platform checks preserve a draft even for cached links', () => {
-  const f = fixture(), link = f.links()![0];
-  f.setReady(false);
-  assert.equal(f.links(), undefined);
-  link.activate(ctrlClick, link.text);
-  f.setReady(true); f.setEnabled(false);
-  link.activate(ctrlClick, link.text);
-  assert.deepEqual(f.pasted, []);
-});
-
-test('stale output and disposed links cannot prepare commands; wrapped fragments are excluded', () => {
-  const f = fixture(), link = f.links()![0];
-  f.setText('changed.tar.gz'); link.activate(ctrlClick, link.text);
-  assert.deepEqual(f.pasted, []);
-  f.setWrapped(); assert.equal(f.links(), undefined);
-  f.registration.dispose(); assert.equal(f.isDisposed(), true);
-  link.activate(ctrlClick, link.text); assert.deepEqual(f.pasted, []);
-});
-
-test('submitting another command invalidates old relative names and cached links, but not absolute paths', () => {
-  const f = fixture(), link = f.links()![0];
-  f.submit();
-  assert.deepEqual(f.links(), []);
-  link.activate(ctrlClick, link.text);
-  assert.deepEqual(f.pasted, []);
-  f.setText('/tmp/backup.tar.gz');
-  const absolute = f.links()![0];
-  absolute.activate(ctrlClick, absolute.text);
-  assert.deepEqual(f.pasted, ["tar -xzf '/tmp/backup.tar.gz'"]);
-});

components/terminal/runtime/terminalArchiveLinks.ts

@@ -1,61 +0,0 @@
-import type { IDisposable, ILink, Terminal } from '@xterm/xterm';
-import { findTerminalArchives } from '../../../domain/terminalArchives';
-import { pluginTerminalCellRange, readPluginTerminalBufferText } from '../pluginTerminalBufferText';
-
-/** Archive commands are prepared only at an empty shell prompt, never submitted. */
-export function registerTerminalArchiveLinks(options: {
-  term: Terminal;
-  isEnabled: () => boolean;
-  isInputReady: () => boolean;
-}): IDisposable {
-  let disposed = false;
-  const { term } = options;
-  // Relative names belong only to output from the latest submitted command.
-  // A marker follows scrollback trimming without keeping a cwd history.
-  let commandStart = term.registerMarker(0);
-  const submission = term.onData(data => {
-    if (!/[\r\n]/u.test(data)) return;
-    commandStart?.dispose();
-    commandStart = term.registerMarker(0);
-  });
-  const hasRelativeContext = (y: number) => commandStart !== undefined
-    && !commandStart.isDisposed && y - 1 > commandStart.line;
-  const registration = term.registerLinkProvider({
-    provideLinks(y, callback) {
-      if (disposed || !options.isEnabled() || !options.isInputReady()) {
-        callback(undefined);
-        return;
-      }
-      const line = term.buffer.active.getLine(y - 1);
-      // Do not mistake a fragment of a wrapped filename for a complete archive.
-      if (!line || line.isWrapped || term.buffer.active.getLine(y)?.isWrapped) {
-        callback(undefined);
-        return;
-      }
-      const printed = readPluginTerminalBufferText(line, true);
-      if (printed.text.length > 8192) {
-        callback(undefined);
-        return;
-      }
-      const links: ILink[] = findTerminalArchives(printed.text).flatMap((match) => {
-        if (match.relative && !hasRelativeContext(y)) return [];
-        const cells = pluginTerminalCellRange(printed, match.start, match.length);
-        if (!cells) return [];
-        return [{
-          range: { start: { x: cells.x + 1, y }, end: { x: cells.x + cells.width, y } },
-          text: match.text,
-          decorations: { pointerCursor: true, underline: true },
-          activate(event) {
-            if (disposed || event.button !== 0 || !event.ctrlKey || !options.isEnabled() || !options.isInputReady()) return;
-            if (match.relative && !hasRelativeContext(y)) return;
-            if (term.buffer.active.getLine(y - 1)?.translateToString(true) !== printed.text) return;
-            term.paste(match.command);
-            term.focus();
-          },
-        }];
-      });
-      callback(links);
-    },
-  });
-  return { dispose() { disposed = true; submission.dispose(); commandStart?.dispose(); registration.dispose(); } };
-}

components/terminal/useTerminalEffects.ts

@@ -215,8 +215,6 @@ export function resolveSelectionOverlayPosition(term: any, container: HTMLElemen
 export function useTerminalEffects(ctx: TerminalEffectsContext) {
   const { CONNECTION_TIMEOUT, Error, XTERM_PERFORMANCE_CONFIG, applyUserCursorPreference, applyUserCursorWidthPreference, shouldApplyUserCursorPreference, auth, autocompleteCloseRef, autocompleteInputRef, autocompleteKeyEventRef, autocompleteRepositionRef, captureTerminalLogData, chainHosts, chainProgress, clearTerminalCwd, commandBufferRef, connectionLogBufferRef, containerRef, createPromptLineBreakState, createReplaySafeTerminalLogSanitizer, createXTermRuntime, deferTerminalResizeRef, disableTerminalFontZoomRef, effectiveFontSize, effectiveFontWeight, effectiveTheme, error, executeSnippetCommand, finalizeTerminalLogData, fitAddonRef, fontFamilyId, fontSize, fontWeightFixupDoneRef, forceCloseHibernatedSession, forceSyncRenderAfterResize, handleOsc52ReadRequest, handleTerminalDataCaptureOnce, hasConnectedRef, hasRuntimeRef, host, hotkeySchemeRef, hibernatedRef, identities, inWorkspace, isBootActiveRef, bootEpochRef, isBroadcastEnabledRef, broadcastPasswordBypassRef, isComposeBarOpen, isConnectionAwaitingUserInput, isConnectionPastTcpDial, isFocusMode, isFocused, isLocalConnection, isNetworkDevice, isResizing, isRestoringSelectionRef, isSearchOpen, isSerialConnection, isVisible, isVisibleRef, keyBindingsRef, keys, kittyKeyboardProtocolEnabledForSession, knownCwdRef, lastFittedSizeRef, lastToastedErrorRef, logger, mouseTrackingRef, needsHostKeyVerification, onBroadcastInputRef, onBroadcastInterruptPriorityChange, onCommandExecuted, onCommandSubmitted, onHotkeyActionRef, onOpenExternalError, onOutputTriggerUserInputRef, onPluginRuntimeCwdChange, onSnippetExecutorChange, onTerminalCwdChange, onTerminalTitleChange, onTerminalBell, onTerminalFontSizeChange, paneLayoutKey, passwordPromptActiveRef, pendingAuthRef, pendingOutputScrollRef, pluginDecorationRules, pluginTerminalLifecycle, pluginTerminalProviderRevision, isPluginTerminalProviderAvailable, requestPluginTerminalProviders, prepareRestoredReconnect, prepareInitialCwdIntent, prevIsResizingRef, promptLineBreakStateRef, resizeSession, resolveHostAuth, resolvedFontFamily, safeFit, scriptRecorderRef, searchAddonRef, serialConfig, serialLineBufferRef, serializeAddonRef, sessionId, sessionRef, sessionStarters, setError, setHasMouseTracking, setIsCancelling, setIsDisconnectedDialogDismissed, requestSearchFocus, setNeedsHostKeyVerification, setPendingHostKeyInfo, setPendingHostKeyRequestId, setProgressLogs, setProgressValue, setShowLogs, setStatus, setTimeLeft, shouldEnableNativeUserInputAutoScroll, shouldProbeSessionCwd, shouldStartTerminalBackend, attachExistingSession, attachAuthorization, attachHomeWebContentsIdRef, onSnippetShortkeyRef, snippetsRef, splitResizeActive, status, statusRef, sudoAutofillRef, t, teardown, telnetLocalEchoRef, termRef, terminalAltKeyOptions, terminalBackend, terminalContextActionsRef, terminalCwdTracker, terminalDataCapturedRef, terminalLogSanitizerRef, terminalOutputHistory, terminalSettings, terminalSettingsRef, terminalTitleRef, toHostKeyInfo, toast, updateStatus, useEffect, useLayoutEffect, xtermRuntimeRef, zmodem, zmodemToastedRef, restoreState, vaultInitialized } = ctx;
   const effectiveTerminalProtocol = resolveEffectiveTerminalProtocol(host);
-  const archiveHostRef = useRef(host);
-  archiveHostRef.current = host;
   const hibernateHiddenTabs = resolveTerminalHibernateEnabledForProtocol(
     terminalSettings,
     effectiveTerminalProtocol,
@@ -519,7 +517,6 @@ export function useTerminalEffects(ctx: TerminalEffectsContext) {
         const runtime = createXTermRuntime({
           container: containerRef.current,
           host,
-          getHost: () => archiveHostRef.current,
           fontFamilyId,
           resolvedFontFamily,
           fontSize,

domain/terminalArchives.test.ts

@@ -1,53 +0,0 @@
-import test from 'node:test';
-import assert from 'node:assert/strict';
-import { execFileSync } from 'node:child_process';
-import { findTerminalArchives, supportsTerminalArchiveCommands } from './terminalArchives';
-import type { Host } from './models';
-
-const host: Host = { id: 'test', label: 'Test', hostname: 'host', username: 'me', tags: [], os: 'linux' };
-
-test('archive commands require known Linux facts, not the default host icon', () => {
-  assert.equal(supportsTerminalArchiveCommands(host, 'darwin'), false);
-  assert.equal(supportsTerminalArchiveCommands({ ...host, distro: 'ubuntu' }, 'darwin'), true);
-  assert.equal(supportsTerminalArchiveCommands({ ...host, osOverride: 'linux' }, 'darwin'), true);
-  for (const osOverride of ['unknown', 'windows', 'macos', 'freebsd'] as const) {
-    assert.equal(supportsTerminalArchiveCommands({ ...host, osOverride, distro: 'ubuntu' }, 'linux'), false);
-  }
-  assert.equal(supportsTerminalArchiveCommands({ ...host, distro: 'ubuntu', deviceType: 'network' }, 'linux'), false);
-  for (const protocol of ['telnet', 'serial', 'plugin:test'] as const) {
-    assert.equal(supportsTerminalArchiveCommands({ ...host, protocol, osOverride: 'linux' }, 'linux'), false);
-  }
-  assert.equal(supportsTerminalArchiveCommands({ ...host, protocol: 'local' }, 'darwin'), false);
-  assert.equal(supportsTerminalArchiveCommands({ ...host, protocol: 'local' }, 'win32'), false);
-  assert.equal(supportsTerminalArchiveCommands({ ...host, protocol: 'local' }, 'linux'), true);
-});
-
-test('finite tar and zip formats prepare commands without Enter or source deletion', () => {
-  const commands = findTerminalArchives('a.tar b.tar.gz c.tgz d.tar.bz2 e.tbz2 f.tar.xz g.txz h.zip').map(x => x.command);
-  assert.deepEqual(commands, [
-    "tar -xf './a.tar'", "tar -xzf './b.tar.gz'", "tar -xzf './c.tgz'",
-    "tar -xjf './d.tar.bz2'", "tar -xjf './e.tbz2'", "tar -xJf './f.tar.xz'", "tar -xJf './g.txz'", "unzip './h.zip'",
-  ]);
-  assert.deepEqual(findTerminalArchives('a.gz b.rar c.7z tool.exe https://host/a.zip'), []);
-  assert.ok(commands.every(command => !/[\r\n]/u.test(command)));
-});
-
-test('quoted filenames, Unicode and leading options remain literal shell arguments', () => {
-  const text = `输出 "it's $(touch NO).tar.gz" '-options.zip' /opt/文件.tar ~/backup.zip`;
-  const matches = findTerminalArchives(text);
-  assert.equal(matches.length, 4);
-  for (const match of matches) assert.equal(text.slice(match.start, match.start + match.length), match.text);
-  const expected = ["./it's $(touch NO).tar.gz", './-options.zip', '/opt/文件.tar', `${process.env.HOME}/backup.zip`];
-  for (let i = 0; i < matches.length; i++) {
-    // Substitute only the fixed extractor name/options with printf: a real POSIX
-    // shell must see the original filename as exactly one literal argument.
-    const argument = matches[i].command.replace(/^(?:tar -x[zjJ]?f|unzip) /, '');
-    assert.equal(execFileSync('/bin/sh', ['-c', `printf '%s' ${argument}`], { encoding: 'utf8' }), expected[i]);
-  }
-});
-
-test('does not guess partial tokens inside malformed quotes or include control characters', () => {
-  assert.deepEqual(findTerminalArchives('"unfinished.tar.gz'), []);
-  assert.deepEqual(findTerminalArchives('file\u001b.tar.gz'), []);
-  assert.deepEqual(findTerminalArchives('"http://example.com/my archive.zip"'), []);
-});

domain/terminalArchives.ts

@@ -1,51 +0,0 @@
-import { resolveHostOs } from './host';
-import type { Host } from './models';
-
-export function supportsTerminalArchiveCommands(host: Host, localPlatform: string): boolean {
-  if (host.protocol === 'local') return localPlatform === 'linux';
-  if (host.protocol && !['ssh', 'mosh', 'et'].includes(host.protocol)) return false;
-  return host.deviceType !== 'network' && resolveHostOs(host) === 'linux';
-}
-
-const TAR_OPTIONS: Record<string, string> = {
-  '.tar': '-xf',
-  '.tar.gz': '-xzf',
-  '.tgz': '-xzf',
-  '.tar.bz2': '-xjf',
-  '.tbz2': '-xjf',
-  '.tar.xz': '-xJf',
-  '.txz': '-xJf',
-};
-
-function archiveCommand(file: string): string | null {
-  if (Array.from(file).some(char => char.charCodeAt(0) < 32 || char.charCodeAt(0) === 127)
-    || /^[a-z][a-z0-9+.-]*:/iu.test(file)) return null;
-  const suffix = Object.keys(TAR_OPTIONS).find((extension) => file.endsWith(extension));
-  if (!suffix && !file.endsWith('.zip')) return null;
-  // Prefix relative paths so an archive named "-options.zip" is never an option.
-  const path = file.startsWith('/') || file.startsWith('~/') ? file : `./${file}`;
-  const quote = (value: string) => `'${value.replace(/'/g, `'"'"'`)}'`;
-  const argument = path.startsWith('~/') ? `"$HOME"/${quote(path.slice(2))}` : quote(path);
-  return suffix ? `tar ${TAR_OPTIONS[suffix]} ${argument}` : `unzip ${argument}`;
-}
-
-export interface TerminalArchiveMatch {
-  start: number;
-  length: number;
-  text: string;
-  command: string;
-  relative: boolean;
-}
-
-/** One printed token, or an explicitly quoted filename containing spaces. */
-export function findTerminalArchives(line: string): TerminalArchiveMatch[] {
-  const tokens = /(^|\s)(?:"([^"\r\n]+)"|'([^'\r\n]+)'|([^\s"']+))(?=\s|$)/gu;
-  return Array.from(line.matchAll(tokens)).flatMap((match) => {
-    const text = match[0].slice(match[1].length);
-    const file = match[2] ?? match[3] ?? match[4];
-    const command = archiveCommand(file);
-    return command ? [{ start: match.index + match[1].length, length: text.length, text, command,
-      relative: !file.startsWith('/') && !file.startsWith('~/'),
-    }] : [];
-  });
-}