tmux-ide 2.9.0-beta.34 → 2.9.0-beta.35

package/bin/cli.js

@@ -11279,7 +11279,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "tmux-ide",
-      version: "2.9.0-beta.34",
+      version: "2.9.0-beta.35",
       description: "A visual, agent-aware IDE for any tmux session, with optional workspace presets",
       type: "module",
       bin: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tmux-ide",
-  "version": "2.9.0-beta.34",
+  "version": "2.9.0-beta.35",
   "description": "A visual, agent-aware IDE for any tmux session, with optional workspace presets",
   "type": "module",
   "bin": {

package/packages/daemon/dist/tui/mirror/runtime/application-root-renderer.js

@@ -1,3 +1,4 @@
+import { acquireHostShiftCapture } from "./host-shift-capture.js";
 import { CliRenderEvents, createCliRenderer } from "@opentui/core";
 import { tuiPerfMark, tuiPerfStream } from "./application-performance-log.js";
 import { createRendererOutputTransport } from "./renderer-output-transport.js";
@@ -30,7 +31,10 @@ export async function createApplicationRootRenderer(kittyKeys, onOutputError, on
     let resize = () => { };
     let removeCapabilityObserver;
     const preserveCaptureDump = ["true", "1", "on", "yes"].includes((process.env.OTUI_DUMP_CAPTURES ?? "").toLowerCase());
+    let releaseShiftCapture;
     const disposeOutput = () => {
+        releaseShiftCapture?.();
+        releaseShiftCapture = undefined;
         removeCapabilityObserver?.();
         removeCapabilityObserver = undefined;
         clearTimeout(resizeTimer);
@@ -80,6 +84,7 @@ export async function createApplicationRootRenderer(kittyKeys, onOutputError, on
         disposeOutput();
         throw error;
     }
+    releaseShiftCapture = acquireHostShiftCapture();
     const activeRenderer = renderer;
     if (tuiPerfStream) {
         let previous;

package/packages/daemon/dist/tui/mirror/runtime/application-sidebar-shortcuts.js

@@ -0,0 +1,31 @@
+export function isSidebarToggleKey(key) {
+    return (key.name.toLowerCase() === "f10" &&
+        !key.shift &&
+        !key.ctrl &&
+        !key.meta &&
+        key.eventType !== "release");
+}
+export function createApplicationSidebarShortcuts(surface, visible, setVisible, machines, palette) {
+    return (event) => {
+        if (event.name.toLowerCase() === "f5") {
+            machines.sidebar.onBlur?.();
+            palette.setOpen(true, "keyboard");
+            return true;
+        }
+        if (isSidebarToggleKey(event)) {
+            event.preventDefault();
+            event.stopPropagation();
+            if (event.eventType === "press")
+                setVisible((value) => !value);
+            return true;
+        }
+        if (event.ctrl && event.name.toLowerCase() === "g") {
+            if (surface() === "home" || !visible())
+                machines.showSwitcher(false);
+            else
+                machines.focus();
+            return true;
+        }
+        return false;
+    };
+}

package/packages/daemon/dist/tui/mirror/runtime/application-terminal-workspace.jsx

@@ -1032,6 +1032,16 @@ export function ApplicationTerminalWorkspace(props) {
                 const head = gestureLeaseCurrent(active.lease) && cell
                     ? terminalSelectionCell(snapshot, cell.col, cell.row, scrollback.offset(active.paneId), selectionViewport(active.paneId, active.frame))
                     : null;
+                if (active.linkUrl &&
+                    head &&
+                    !active.moved &&
+                    head.row === active.anchor.row &&
+                    head.col === active.anchor.col) {
+                    const url = active.linkUrl;
+                    endSelectionView();
+                    props.onOpenLink?.(url);
+                    return;
+                }
                 if (!snapshot ||
                     !head ||
                     (active.unit === "cell" &&
@@ -1096,15 +1106,20 @@ export function ApplicationTerminalWorkspace(props) {
             const lease = captureGestureLease(hit.frame.paneId, hit.frame);
             if (!lease)
                 return;
+            let shiftLink;
             if (props.onOpenLink && isTerminalLinkClick(event)) {
                 const cell = terminalSelectionCell(snapshot, hit.col, hit.row, scrollback.offset(hit.frame.paneId), selectionViewport(hit.frame.paneId, hit.frame));
                 const url = cell && terminalLinkAt(snapshot, cell);
                 if (url) {
                     event.stopPropagation?.();
-                    linkPointer = true;
                     lastSelectionClick = null;
-                    props.onOpenLink(url);
-                    return;
+                    if (event.modifiers?.shift)
+                        shiftLink = url;
+                    else {
+                        linkPointer = true;
+                        props.onOpenLink(url);
+                        return;
+                    }
                 }
             }
             const appMouse = terminalMouseActionSupported(snapshot, "down");
@@ -1183,6 +1198,7 @@ export function ApplicationTerminalWorkspace(props) {
                     frame: hit.frame,
                     lease: selectionLease,
                     moved: false,
+                    linkUrl: shiftLink ? (terminalLinkAt(selectionSnapshot, anchor) ?? undefined) : undefined,
                 };
                 setPointerSelecting(true);
                 setCommittedSelection(null);

package/packages/daemon/dist/tui/mirror/runtime/host-shift-capture.js

@@ -0,0 +1,32 @@
+import { closeSync, openSync, writeSync } from "node:fs";
+/** XTSHIFTESCAPE is a host request, not pane input or a persistent user setting. */
+export function acquireHostShiftCapture(environment = process.env, write = (sequence) => {
+    const fd = openSync("/dev/tty", "w");
+    try {
+        writeSync(fd, sequence);
+    }
+    finally {
+        closeSync(fd);
+    }
+}) {
+    // A surrounding multiplexer owns the outer terminal protocol. Do not send
+    // unqualified passthrough sequences to an unknown terminal through it.
+    if (environment.TERM_PROGRAM !== "ghostty" || environment.TMUX)
+        return () => { };
+    let active = true;
+    const request = (capture) => {
+        try {
+            write(capture ? "\u001b[>1s" : "\u001b[>0s");
+        }
+        catch {
+            // A missing controlling terminal must not prevent startup or cleanup.
+        }
+    };
+    request(true);
+    return () => {
+        if (!active)
+            return;
+        active = false;
+        request(false);
+    };
+}

package/packages/daemon/dist/tui/mirror/runtime/terminal-links.js

@@ -4,8 +4,9 @@ const MAX_LINK_LINE = 8192;
 export function isTerminalLinkClick(event) {
     return (event.type === "down" &&
         event.button === 0 &&
-        Boolean(event.modifiers?.ctrl || event.modifiers?.meta) &&
-        !event.modifiers?.shift &&
+        (event.modifiers?.shift
+            ? !event.modifiers.ctrl && !event.modifiers.meta
+            : Boolean(event.modifiers?.ctrl || event.modifiers?.meta)) &&
         !event.modifiers?.alt);
 }
 export function safeTerminalLink(value) {

package/packages/daemon/dist/tui/mirror/ui/key-hint.jsx

@@ -5,9 +5,11 @@ import { useKeyboardRoute } from "./keyboard-router.jsx";
 /** A one-row, cell-aligned keyboard affordance with optional pointer/keyboard activation. */
 export function KeyHint(props) {
     const palette = () => componentPalette(props.theme, props, "neutral");
-    const background = () => props.quiet && !props.focused && !props.hovered
-        ? props.theme.roles.surfaces.panel
-        : palette().background;
+    const background = () => props.button
+        ? props.theme.roles.surfaces.panelRaised
+        : props.quiet && !props.focused && !props.hovered
+            ? props.theme.roles.surfaces.panel
+            : palette().background;
     const foreground = () => props.quiet && !props.focused && !props.hovered
         ? props.theme.roles.text.muted
         : palette().foreground;
@@ -39,9 +41,14 @@ export function KeyHint(props) {
             activate();
         }}>
       <text fg={foreground()} bg={background()}>
-        {props.focused || props.selected ? (<strong>{content()}</strong>) : props.quiet && !props.presentation ? (<>
+        {props.focused || props.selected ? (<strong>{content()}</strong>) : (props.quiet || props.button) && !props.presentation ? (<>
             {" "}
-            <span style={{ fg: props.theme.roles.text.primary }}>
+            <span style={{
+                fg: props.button
+                    ? props.theme.roles.selection.selectionText
+                    : props.theme.roles.text.primary,
+                bg: props.button ? props.theme.roles.selection.selection : background(),
+            }}>
               {clipTerminal(props.keys, Math.max(0, width() - 1))}
             </span>
             {clipTerminal(props.label ? ` ${props.label} ` : " ", Math.max(0, width() - terminalDisplayWidth(props.keys) - 1))}

package/packages/daemon/dist/tui/mirror/workspace/application-command-description.js

@@ -12,6 +12,7 @@ export function applicationCommandDescription(command) {
             id: command,
             label: command === "hide-sidebar" ? "Hide sidebar" : "Show sidebar",
             detail: "Terminal layout",
+            shortcut: "F10",
         };
     if (command === "switch-session")
         return {

package/packages/daemon/dist/tui/mirror/workspace/application-shortcuts.js

@@ -6,8 +6,11 @@ export const APPLICATION_SHORTCUTS = [
         return { category: "Application", label: description.label, keys: description.shortcut };
     }),
     { category: "Application", label: "Commands", keys: "F5" },
+    { category: "Application", label: "Show / hide sidebar", keys: "F10" },
     { category: "Application", label: "Agent attention", keys: "F7" },
     { category: "Application", label: "Sidebar / Sessions when hidden", keys: "Ctrl+G" },
+    { category: "Terminals", label: "Open link", keys: "Shift+click" },
+    { category: "Terminals", label: "Select and copy text", keys: "Shift+drag" },
     { category: "Home", label: "Find an agent or workspace", keys: "/" },
     { category: "Home", label: "Cycle machine filter", keys: "f" },
     { category: "Home", label: "Toggle attention filter", keys: "a" },

package/packages/daemon/src/tui/mirror/runtime/application-root-renderer.ts

@@ -1,3 +1,4 @@
+import { acquireHostShiftCapture } from "./host-shift-capture.ts";
 import { CliRenderEvents, createCliRenderer } from "@opentui/core";
 
 import { tuiPerfMark, tuiPerfStream } from "./application-performance-log.ts";
@@ -37,7 +38,10 @@ export async function createApplicationRootRenderer(
   const preserveCaptureDump = ["true", "1", "on", "yes"].includes(
     (process.env.OTUI_DUMP_CAPTURES ?? "").toLowerCase(),
   );
+  let releaseShiftCapture: (() => void) | undefined;
   const disposeOutput = () => {
+    releaseShiftCapture?.();
+    releaseShiftCapture = undefined;
     removeCapabilityObserver?.();
     removeCapabilityObserver = undefined;
     clearTimeout(resizeTimer);
@@ -84,6 +88,7 @@ export async function createApplicationRootRenderer(
     disposeOutput();
     throw error;
   }
+  releaseShiftCapture = acquireHostShiftCapture();
   const activeRenderer = renderer;
   if (tuiPerfStream) {
     let previous: string | undefined;

package/packages/daemon/src/tui/mirror/runtime/application-root-v2.tsx

@@ -1,3 +1,4 @@
+import { createApplicationSidebarShortcuts } from "./application-sidebar-shortcuts.ts";
 import type { TmuxServerScope } from "@tmux-ide/contracts";
 import { terminalWindowActionCallbacks } from "./application-terminal-workspace-policy.ts";
 import { applicationRouteConnection } from "./application-route-connection.ts";
@@ -425,6 +426,13 @@ export async function startApplicationRoot(options: StartApplicationRootOptions
           focusedPane();
           terminalInputIngress.adopt();
         });
+        const sidebarShortcut = createApplicationSidebarShortcuts(
+          activeSurface,
+          sidebarVisible,
+          setSidebarVisible,
+          machines,
+          paletteCommands,
+        );
         useKeyboard((event) => {
           noteHostInteraction();
           const name = event.name.toLowerCase();
@@ -438,11 +446,6 @@ export async function startApplicationRoot(options: StartApplicationRootOptions
           }
           if (name === "f6" || name === "f7") paletteCommands.setOpen(false, "keyboard");
           if (handleFleetShortcut(event, machines)) return;
-          if (name === "f5") {
-            machines.sidebar.onBlur?.();
-            paletteCommands.setOpen(true, "keyboard");
-            return;
-          }
           if (appearance.handlePickerKey(event)) return;
           if (paneRename.handleKey(event)) return;
           if (
@@ -453,11 +456,7 @@ export async function startApplicationRoot(options: StartApplicationRootOptions
           )
             return;
           if (paletteCommands.handleKey(event)) return;
-          if (event.ctrl && name === "g") {
-            if (activeSurface() === "home" || !sidebarVisible()) machines.showSwitcher(false);
-            else machines.focus();
-            return;
-          }
+          if (sidebarShortcut(event)) return;
           if (machines.focused() && !["f1", "f2"].includes(name) && !(event.ctrl && name === "q")) {
             componentKeyboardRoutes.route(event);
             return;

package/packages/daemon/src/tui/mirror/runtime/application-shell-catalog.tsx

@@ -12,6 +12,7 @@ import { For, Show, createMemo } from "solid-js";
 import { shellChromeLayout, type ShellChromeView } from "../shell-chrome.ts";
 import type { SemanticThemeSnapshot } from "../theme.ts";
 import { clipTerminal, friendlySessionLabel } from "../terminal-text.ts";
+import { KeyHint } from "../ui/key-hint.tsx";
 import { Button } from "../ui/button.tsx";
 import { NavigationRow } from "../ui/navigation-row.tsx";
 import type { OverlayLayer } from "../ui/overlay-host.tsx";
@@ -244,9 +245,12 @@ function CatalogStatusStrip(props: {
             />
           )}
         </For>
-        <StatusBarSegment
+        <KeyHint
           theme={props.theme}
-          label="F5 Commands"
+          keys="F5"
+          label="Commands"
+          quiet
+          button
           width={15}
           onPress={props.onOpenCommands}
         />

package/packages/daemon/src/tui/mirror/runtime/application-shell-view.tsx

@@ -1,3 +1,4 @@
+import { isSidebarToggleKey } from "./application-sidebar-shortcuts.ts";
 import {
   ApplicationMachineSidebar,
   type ApplicationMachineSidebarModel,
@@ -48,13 +49,25 @@ export { applicationShellViewport } from "./application-shell-viewport.ts";
 type TerminalWorkspaceProps = ComponentProps<typeof ApplicationTerminalWorkspace>;
 export type RootSurface = "home" | "terminals";
 type InputSource = "keyboard" | "mouse";
-export type ApplicationShellKeyAction = "home" | "terminals" | "palette-open" | "palette-close";
+export type ApplicationShellKeyAction =
+  | "home"
+  | "terminals"
+  | "palette-open"
+  | "palette-close"
+  | "sidebar-toggle";
 
 export function applicationShellKeyAction(
-  key: { readonly name: string },
+  key: {
+    readonly name: string;
+    readonly shift?: boolean;
+    readonly ctrl?: boolean;
+    readonly meta?: boolean;
+    readonly eventType?: string;
+  },
   paletteOpen: boolean,
 ): ApplicationShellKeyAction | null {
   const name = key.name.toLowerCase();
+  if (isSidebarToggleKey(key)) return "sidebar-toggle";
   if (name === "f1") return "home";
   if (name === "f2") return "terminals";
   if (name === "f5") return "palette-open";

package/packages/daemon/src/tui/mirror/runtime/application-sidebar-shortcuts.ts

@@ -0,0 +1,51 @@
+interface Key {
+  readonly name: string;
+  readonly ctrl?: boolean;
+  readonly shift?: boolean;
+  readonly meta?: boolean;
+  readonly eventType?: string;
+  preventDefault(): void;
+  stopPropagation(): void;
+}
+
+export function isSidebarToggleKey(key: Omit<Key, "preventDefault" | "stopPropagation">): boolean {
+  return (
+    key.name.toLowerCase() === "f10" &&
+    !key.shift &&
+    !key.ctrl &&
+    !key.meta &&
+    key.eventType !== "release"
+  );
+}
+
+export function createApplicationSidebarShortcuts(
+  surface: () => string,
+  visible: () => boolean,
+  setVisible: (update: (value: boolean) => boolean) => unknown,
+  machines: {
+    showSwitcher(attention: boolean): void;
+    focus(): void;
+    sidebar: { onBlur?: () => void };
+  },
+  palette: { setOpen(open: boolean, source: "keyboard"): void },
+): (event: Key) => boolean {
+  return (event) => {
+    if (event.name.toLowerCase() === "f5") {
+      machines.sidebar.onBlur?.();
+      palette.setOpen(true, "keyboard");
+      return true;
+    }
+    if (isSidebarToggleKey(event)) {
+      event.preventDefault();
+      event.stopPropagation();
+      if (event.eventType === "press") setVisible((value) => !value);
+      return true;
+    }
+    if (event.ctrl && event.name.toLowerCase() === "g") {
+      if (surface() === "home" || !visible()) machines.showSwitcher(false);
+      else machines.focus();
+      return true;
+    }
+    return false;
+  };
+}

package/packages/daemon/src/tui/mirror/runtime/application-terminal-workspace.tsx

@@ -512,6 +512,7 @@ export function ApplicationTerminalWorkspace(props: ApplicationTerminalWorkspace
     }>;
     pointer: Readonly<{ x: number; y: number }>;
     moved: boolean;
+    readonly linkUrl?: string;
   } | null = null;
   let linkPointer = false;
   let liveReturnPointer = false;
@@ -1457,6 +1458,18 @@ export function ApplicationTerminalWorkspace(props: ApplicationTerminalWorkspace
                 selectionViewport(active.paneId, active.frame),
               )
             : null;
+        if (
+          active.linkUrl &&
+          head &&
+          !active.moved &&
+          head.row === active.anchor.row &&
+          head.col === active.anchor.col
+        ) {
+          const url = active.linkUrl;
+          endSelectionView();
+          props.onOpenLink?.(url);
+          return;
+        }
         if (
           !snapshot ||
           !head ||
@@ -1522,6 +1535,7 @@ export function ApplicationTerminalWorkspace(props: ApplicationTerminalWorkspace
       if (!snapshot) return;
       const lease = captureGestureLease(hit.frame.paneId, hit.frame);
       if (!lease) return;
+      let shiftLink: string | undefined;
       if (props.onOpenLink && isTerminalLinkClick(event)) {
         const cell = terminalSelectionCell(
           snapshot,
@@ -1533,10 +1547,13 @@ export function ApplicationTerminalWorkspace(props: ApplicationTerminalWorkspace
         const url = cell && terminalLinkAt(snapshot, cell);
         if (url) {
           event.stopPropagation?.();
-          linkPointer = true;
           lastSelectionClick = null;
-          props.onOpenLink(url);
-          return;
+          if (event.modifiers?.shift) shiftLink = url;
+          else {
+            linkPointer = true;
+            props.onOpenLink(url);
+            return;
+          }
         }
       }
       const appMouse = terminalMouseActionSupported(snapshot, "down");
@@ -1625,6 +1642,7 @@ export function ApplicationTerminalWorkspace(props: ApplicationTerminalWorkspace
           frame: hit.frame,
           lease: selectionLease,
           moved: false,
+          linkUrl: shiftLink ? (terminalLinkAt(selectionSnapshot, anchor) ?? undefined) : undefined,
         };
         setPointerSelecting(true);
         setCommittedSelection(null);

package/packages/daemon/src/tui/mirror/runtime/host-shift-capture.ts

@@ -0,0 +1,32 @@
+import { closeSync, openSync, writeSync } from "node:fs";
+
+/** XTSHIFTESCAPE is a host request, not pane input or a persistent user setting. */
+export function acquireHostShiftCapture(
+  environment: NodeJS.ProcessEnv = process.env,
+  write: (sequence: string) => void = (sequence) => {
+    const fd = openSync("/dev/tty", "w");
+    try {
+      writeSync(fd, sequence);
+    } finally {
+      closeSync(fd);
+    }
+  },
+): () => void {
+  // A surrounding multiplexer owns the outer terminal protocol. Do not send
+  // unqualified passthrough sequences to an unknown terminal through it.
+  if (environment.TERM_PROGRAM !== "ghostty" || environment.TMUX) return () => {};
+  let active = true;
+  const request = (capture: boolean) => {
+    try {
+      write(capture ? "\u001b[>1s" : "\u001b[>0s");
+    } catch {
+      // A missing controlling terminal must not prevent startup or cleanup.
+    }
+  };
+  request(true);
+  return () => {
+    if (!active) return;
+    active = false;
+    request(false);
+  };
+}

package/packages/daemon/src/tui/mirror/runtime/terminal-links.ts

@@ -18,8 +18,9 @@ export function isTerminalLinkClick(event: {
   return (
     event.type === "down" &&
     event.button === 0 &&
-    Boolean(event.modifiers?.ctrl || event.modifiers?.meta) &&
-    !event.modifiers?.shift &&
+    (event.modifiers?.shift
+      ? !event.modifiers.ctrl && !event.modifiers.meta
+      : Boolean(event.modifiers?.ctrl || event.modifiers?.meta)) &&
     !event.modifiers?.alt
   );
 }

package/packages/daemon/src/tui/mirror/shell-chrome-view.tsx

@@ -225,6 +225,7 @@ export function ContextStatusBar(props: ShellStatusStripProps) {
           label={props.layout.status.width >= 24 ? "Commands" : undefined}
           width={commandWidth()}
           quiet
+          button
           onPress={props.onHelp}
         />
       </StatusBarGroup>

package/packages/daemon/src/tui/mirror/ui/key-hint.tsx

@@ -14,15 +14,19 @@ export interface KeyHintProps extends ComponentInteractionState {
   presentation?: string;
   onPress?: () => void;
   quiet?: boolean;
+  /** Distinct footer button with an emphasized shortcut. */
+  button?: boolean;
 }
 
 /** A one-row, cell-aligned keyboard affordance with optional pointer/keyboard activation. */
 export function KeyHint(props: KeyHintProps) {
   const palette = () => componentPalette(props.theme, props, "neutral");
   const background = () =>
-    props.quiet && !props.focused && !props.hovered
-      ? props.theme.roles.surfaces.panel
-      : palette().background;
+    props.button
+      ? props.theme.roles.surfaces.panelRaised
+      : props.quiet && !props.focused && !props.hovered
+        ? props.theme.roles.surfaces.panel
+        : palette().background;
   const foreground = () =>
     props.quiet && !props.focused && !props.hovered
       ? props.theme.roles.text.muted
@@ -67,10 +71,17 @@ export function KeyHint(props: KeyHintProps) {
       <text fg={foreground()} bg={background()}>
         {props.focused || props.selected ? (
           <strong>{content()}</strong>
-        ) : props.quiet && !props.presentation ? (
+        ) : (props.quiet || props.button) && !props.presentation ? (
           <>
             {" "}
-            <span style={{ fg: props.theme.roles.text.primary }}>
+            <span
+              style={{
+                fg: props.button
+                  ? props.theme.roles.selection.selectionText
+                  : props.theme.roles.text.primary,
+                bg: props.button ? props.theme.roles.selection.selection : background(),
+              }}
+            >
               {clipTerminal(props.keys, Math.max(0, width() - 1))}
             </span>
             {clipTerminal(

package/packages/daemon/src/tui/mirror/workspace/application-command-description.ts

@@ -71,6 +71,7 @@ export function applicationCommandDescription(command: ApplicationPaletteCommand
       id: command,
       label: command === "hide-sidebar" ? "Hide sidebar" : "Show sidebar",
       detail: "Terminal layout",
+      shortcut: "F10",
     };
   if (command === "switch-session")
     return {

package/packages/daemon/src/tui/mirror/workspace/application-shortcuts.ts

@@ -13,8 +13,11 @@ export const APPLICATION_SHORTCUTS: readonly ApplicationShortcut[] = [
     return { category: "Application", label: description.label, keys: description.shortcut! };
   }),
   { category: "Application", label: "Commands", keys: "F5" },
+  { category: "Application", label: "Show / hide sidebar", keys: "F10" },
   { category: "Application", label: "Agent attention", keys: "F7" },
   { category: "Application", label: "Sidebar / Sessions when hidden", keys: "Ctrl+G" },
+  { category: "Terminals", label: "Open link", keys: "Shift+click" },
+  { category: "Terminals", label: "Select and copy text", keys: "Shift+drag" },
   { category: "Home", label: "Find an agent or workspace", keys: "/" },
   { category: "Home", label: "Cycle machine filter", keys: "f" },
   { category: "Home", label: "Toggle attention filter", keys: "a" },