diff --git a/README.md b/README.md index b4698a6..af9c7f3 100644 --- a/README.md +++ b/README.md @@ -51,11 +51,11 @@ Built with [Wails v2](https://wails.io/) (Go backend, HTML/CSS/JS frontend, [xte ### What You'll Need -| Tool | Version | Where to get it | -|------|---------|-----------------| -| Go | 1.23+ | [golang.org/dl](https://golang.org/dl/) | -| Node.js | 18+ | [nodejs.org](https://nodejs.org/) | -| Wails CLI | v2 | `go install github.com/wailsapp/wails/v2/cmd/wails@latest` | +| Tool | Version | Where to get it | +| --------- | ------- | ---------------------------------------------------------- | +| Go | 1.23+ | [golang.org/dl](https://golang.org/dl/) | +| Node.js | 18+ | [nodejs.org](https://nodejs.org/) | +| Wails CLI | v2 | `go install github.com/wailsapp/wails/v2/cmd/wails@latest` | > **Linux users:** you'll also need GTK and WebKit system libraries. Run `wails doctor` to check your setup. @@ -80,23 +80,23 @@ If you just want to connect to a server without setting up a full profile, press All shortcuts use **Cmd** on macOS and **Ctrl** on Windows/Linux. -| Shortcut | Action | -|----------|--------| -| Cmd + K | Open command palette | -| Cmd + N | New connection | -| Cmd + W | Close current tab | -| Cmd + Tab | Next tab | -| Cmd + Shift + Tab | Previous tab | -| Cmd + 1–9 | Switch to tab by number | -| Cmd + , | Open settings | -| Cmd + F | Find in terminal | -| Cmd + Shift + D | Split pane vertically | -| Cmd + Shift + E | Split pane horizontally | -| Cmd + Shift + R | Toggle session recording | -| Cmd + Shift + B | Toggle broadcast input mode | -| Cmd + Shift + S | Open snippet library | -| Cmd + Shift + Q | Quick connect | -| F11 | Toggle fullscreen (Windows/Linux) | +| Shortcut | Action | +| ----------------- | --------------------------------- | +| Cmd + K | Open command palette | +| Cmd + N | New connection | +| Cmd + W | Close current tab | +| Cmd + Tab | Next tab | +| Cmd + Shift + Tab | Previous tab | +| Cmd + 1–9 | Switch to tab by number | +| Cmd + , | Open settings | +| Cmd + F | Find in terminal | +| Cmd + Shift + D | Split pane vertically | +| Cmd + Shift + E | Split pane horizontally | +| Cmd + Shift + R | Toggle session recording | +| Cmd + Shift + B | Toggle broadcast input mode | +| Cmd + Shift + S | Open snippet library | +| Cmd + Shift + Q | Quick connect | +| F11 | Toggle fullscreen (Windows/Linux) | --- @@ -156,7 +156,7 @@ Press **Cmd+Shift+S** to open the snippet library. Save frequently-used commands Press **Cmd+F** to open the search overlay on the active terminal. Features include: - Case-sensitive toggle (**Aa** button) -- Regular expression toggle (**.*** button) +- Regular expression toggle (**.\*** button) - Match count indicator - Navigate through matches with up/down arrows or Enter/Shift+Enter @@ -203,13 +203,13 @@ Nexus Terminal takes credential storage seriously. Your passwords and private ke ### How the Encryption Works -| Detail | Value | -|--------|-------| -| Cipher | AES-256-GCM | +| Detail | Value | +| -------------- | -------------------------------------------------- | +| Cipher | AES-256-GCM | | Key derivation | Argon2id — 128 MiB memory, 3 iterations, 4 threads | -| Key length | 256 bits (32 bytes) | -| Salt | 32 random bytes (unique per vault) | -| Nonce | Random, prepended to ciphertext | +| Key length | 256 bits (32 bytes) | +| Salt | 32 random bytes (unique per vault) | +| Nonce | Random, prepended to ciphertext | ### TOTP/2FA @@ -272,13 +272,13 @@ frontend/ ## Building & Testing -| Command | What it does | -|---------|-------------| -| `make deps` | Install Go modules and npm packages | +| Command | What it does | +| ------------ | --------------------------------------------------------- | +| `make deps` | Install Go modules and npm packages | | `make build` | Production build → `build/bin/nexus-terminal.app` (macOS) | -| `make dev` | Development mode with hot reload | -| `make test` | Run all Go tests (`go test ./... -v -count=1`) | -| `make lint` | Run golangci-lint | +| `make dev` | Development mode with hot reload | +| `make test` | Run all Go tests (`go test ./... -v -count=1`) | +| `make lint` | Run golangci-lint | To run tests for a single package: @@ -322,11 +322,11 @@ Then reopen your terminal so `gcc` is on `PATH` and retry `build.ps1`. ## Data Locations -| Platform | Database | Vault | Recordings | -|----------|----------|-------|------------| -| macOS | `~/Library/Application Support/NexusTerminal/nexus.db` | `.../vault` | `.../recordings/` | -| Linux | `~/.config/NexusTerminal/nexus.db` | `.../vault` | `.../recordings/` | -| Windows | `%APPDATA%\NexusTerminal\nexus.db` | `...\vault` | `...\recordings\` | +| Platform | Database | Vault | Recordings | +| -------- | ------------------------------------------------------ | ----------- | ----------------- | +| macOS | `~/Library/Application Support/NexusTerminal/nexus.db` | `.../vault` | `.../recordings/` | +| Linux | `~/.config/NexusTerminal/nexus.db` | `.../vault` | `.../recordings/` | +| Windows | `%APPDATA%\NexusTerminal\nexus.db` | `...\vault` | `...\recordings\` | The database uses SQLite in WAL (Write-Ahead Logging) mode. Migrations are embedded at compile time and applied automatically on startup. @@ -360,9 +360,11 @@ Check the character encoding setting on the connection profile. Most modern serv **Build fails with "wails: command not found"** Install the Wails CLI: + ```bash go install github.com/wailsapp/wails/v2/cmd/wails@latest ``` + Make sure `$GOPATH/bin` (or `$HOME/go/bin`) is in your `PATH`. --- diff --git a/build/windows/info.json b/build/windows/info.json new file mode 100644 index 0000000..9727946 --- /dev/null +++ b/build/windows/info.json @@ -0,0 +1,15 @@ +{ + "fixed": { + "file_version": "{{.Info.ProductVersion}}" + }, + "info": { + "0000": { + "ProductVersion": "{{.Info.ProductVersion}}", + "CompanyName": "{{.Info.CompanyName}}", + "FileDescription": "{{.Info.ProductName}}", + "LegalCopyright": "{{.Info.Copyright}}", + "ProductName": "{{.Info.ProductName}}", + "Comments": "{{.Info.Comments}}" + } + } +} \ No newline at end of file diff --git a/build/windows/wails.exe.manifest b/build/windows/wails.exe.manifest new file mode 100644 index 0000000..17e1a23 --- /dev/null +++ b/build/windows/wails.exe.manifest @@ -0,0 +1,15 @@ + + + + + + + + + + + true/pm + permonitorv2,permonitor + + + \ No newline at end of file diff --git a/frontend/index.html b/frontend/index.html index f0f876f..3adf795 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -1,104 +1,166 @@ - + - - - + + + Nexus Terminal - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
- - -
+ - -
-
- -
- - +
+
+
+ + +
- -
- -
-
- - - - - -
-

No active sessions

-

Select a connection from the sidebar or create a new one to get started.

-
- - -
-
+
+ +
+
+ + + + + +
+

No active sessions

+

+ Select a connection from the sidebar or create a new one to get + started. +

+
+ + +
+
- -
-
+ +
+
- - +
@@ -215,5 +305,5 @@ - + diff --git a/frontend/scripts/copy-assets.js b/frontend/scripts/copy-assets.js index db8d17b..0e00a16 100644 --- a/frontend/scripts/copy-assets.js +++ b/frontend/scripts/copy-assets.js @@ -4,38 +4,38 @@ * * Run automatically via the postinstall hook in package.json. */ -'use strict'; +"use strict"; -const fs = require('fs'); -const path = require('path'); +const fs = require("fs"); +const path = require("path"); -const frontendDir = path.resolve(__dirname, '..'); +const frontendDir = path.resolve(__dirname, ".."); // Mapping: source (relative to node_modules) → destination (relative to frontend/) const assets = [ { - src: 'xterm/css/xterm.css', - dest: 'src/css/lib/xterm.css', + src: "xterm/css/xterm.css", + dest: "src/css/lib/xterm.css", }, { - src: 'xterm/lib/xterm.js', - dest: 'src/js/lib/xterm.min.js', + src: "xterm/lib/xterm.js", + dest: "src/js/lib/xterm.min.js", }, { - src: 'xterm-addon-fit/lib/xterm-addon-fit.js', - dest: 'src/js/lib/xterm-addon-fit.min.js', + src: "xterm-addon-fit/lib/xterm-addon-fit.js", + dest: "src/js/lib/xterm-addon-fit.min.js", }, { - src: 'xterm-addon-search/lib/xterm-addon-search.js', - dest: 'src/js/lib/xterm-addon-search.min.js', + src: "xterm-addon-search/lib/xterm-addon-search.js", + dest: "src/js/lib/xterm-addon-search.min.js", }, { - src: 'xterm-addon-unicode11/lib/xterm-addon-unicode11.js', - dest: 'src/js/lib/xterm-addon-unicode11.min.js', + src: "xterm-addon-unicode11/lib/xterm-addon-unicode11.js", + dest: "src/js/lib/xterm-addon-unicode11.min.js", }, { - src: 'xterm-addon-web-links/lib/xterm-addon-web-links.js', - dest: 'src/js/lib/xterm-addon-web-links.min.js', + src: "xterm-addon-web-links/lib/xterm-addon-web-links.js", + dest: "src/js/lib/xterm-addon-web-links.min.js", }, ]; @@ -53,7 +53,7 @@ function ensureDir(filePath) { * Copies a single asset, logging the result. */ function copyAsset(entry) { - const srcPath = path.join(frontendDir, 'node_modules', entry.src); + const srcPath = path.join(frontendDir, "node_modules", entry.src); const destPath = path.join(frontendDir, entry.dest); if (!fs.existsSync(srcPath)) { @@ -69,7 +69,7 @@ function copyAsset(entry) { // --- Main --- -console.log('[copy-assets] Copying xterm library files…'); +console.log("[copy-assets] Copying xterm library files…"); let failures = 0; for (const entry of assets) { @@ -84,4 +84,4 @@ if (failures > 0) { process.exit(1); } -console.log('[copy-assets] All assets copied successfully.'); +console.log("[copy-assets] All assets copied successfully."); diff --git a/frontend/src/css/github.css b/frontend/src/css/github.css index de684a5..d7ab2e8 100644 --- a/frontend/src/css/github.css +++ b/frontend/src/css/github.css @@ -174,6 +174,12 @@ margin-bottom: 2px; } +.github-repo-commit { + font-size: var(--font-size-xs); + color: var(--text-muted); + margin-bottom: 4px; +} + .github-repo-name { font-size: var(--font-size-sm); font-weight: 600; @@ -190,6 +196,35 @@ letter-spacing: 0.03em; } +.github-repo-actions { + margin-left: auto; + display: flex; + flex-direction: column; + align-items: flex-end; + gap: 4px; +} + +.github-repo-download, +.github-repo-visit { + padding: 0 6px; + height: 18px; + border-radius: var(--radius-full); + border: 1px solid var(--border-subtle); + background: var(--bg-tertiary); + color: var(--text-secondary); + font-size: 10px; + letter-spacing: 0.04em; + cursor: pointer; + transition: background 0.15s, color 0.15s, border-color 0.15s; +} + +.github-repo-download:hover, +.github-repo-visit:hover { + background: var(--bg-hover); + color: var(--protocol-github); + border-color: var(--protocol-github); +} + .github-repo-private { background: rgba(255, 167, 38, 0.12); color: #ffa726; diff --git a/frontend/src/css/sidebar.css b/frontend/src/css/sidebar.css index 7bff9c5..75bd12b 100644 --- a/frontend/src/css/sidebar.css +++ b/frontend/src/css/sidebar.css @@ -53,6 +53,34 @@ padding-bottom: var(--space-2); } +/* ----------------------------------------------------------------------- + Bulk actions bar (multi-select) + ----------------------------------------------------------------------- */ +.sidebar-bulk-actions { + position: sticky; + top: 0; + z-index: 2; + display: flex; + align-items: center; + justify-content: space-between; + gap: var(--space-2); + padding: var(--space-2) var(--space-3); + background: var(--bg-secondary); + border-bottom: 1px solid var(--border-subtle); +} + +.sidebar-bulk-count { + font-size: var(--text-xs); + color: var(--text-secondary); + font-weight: var(--weight-semibold); +} + +.sidebar-bulk-buttons { + display: flex; + flex-wrap: wrap; + gap: var(--space-1); +} + /* ----------------------------------------------------------------------- Sections (Favourites, Recent, All Connections) ----------------------------------------------------------------------- */ @@ -167,6 +195,15 @@ background: var(--bg-active); } +.sidebar-item-selected { + background: var(--accent-muted); + box-shadow: inset 0 0 0 1px var(--accent); +} + +.sidebar-item-selected .sidebar-item-name { + color: var(--text-primary); +} + /* Active / selected state */ .sidebar-item.active { background: var(--accent-muted); diff --git a/frontend/src/js/app.js b/frontend/src/js/app.js index 7c1e7e8..2aef9b0 100644 --- a/frontend/src/js/app.js +++ b/frontend/src/js/app.js @@ -1,28 +1,45 @@ -(function() { -/** - * Nexus Terminal — main application entry point. - * Initialises the application shell, loads profiles, and sets up event listeners. - */ +(function () { + /** + * Nexus Terminal — main application entry point. + * Initialises the application shell, loads profiles, and sets up event listeners. + */ -const { State, Sidebar, TabManager, TerminalManager, ProfileEditor, RawViewer, Notifications, Settings, CommandPalette, SecretPrompt, SplitPaneManager, RecordingManager, ExportImportUI, SFTPBrowser, SnippetLibrary, stateLabel } = window.NexusTerminal; + const { + State, + Sidebar, + TabManager, + TerminalManager, + ProfileEditor, + RawViewer, + Notifications, + Settings, + CommandPalette, + SecretPrompt, + SplitPaneManager, + RecordingManager, + ExportImportUI, + SFTPBrowser, + SnippetLibrary, + stateLabel, + } = window.NexusTerminal; -class App { + class App { constructor() { - this.state = new State(); - this.notifications = new Notifications(); - this.sidebar = new Sidebar(this); - this.tabs = new TabManager(this); - this.terminals = new TerminalManager(this); - this.profileEditor = new ProfileEditor(this); - this.rawViewer = new RawViewer(this); - this.settings = new Settings(this); - this.commandPalette = new CommandPalette(this); - this.secretPrompt = new SecretPrompt(this); - this.splitPanes = new SplitPaneManager(this); - this.recordings = new RecordingManager(this); - this.exportImport = new ExportImportUI(this); - this.sftp = new SFTPBrowser(this); - this.snippets = new SnippetLibrary(this); + this.state = new State(); + this.notifications = new Notifications(); + this.sidebar = new Sidebar(this); + this.tabs = new TabManager(this); + this.terminals = new TerminalManager(this); + this.profileEditor = new ProfileEditor(this); + this.rawViewer = new RawViewer(this); + this.settings = new Settings(this); + this.commandPalette = new CommandPalette(this); + this.secretPrompt = new SecretPrompt(this); + this.splitPanes = new SplitPaneManager(this); + this.recordings = new RecordingManager(this); + this.exportImport = new ExportImportUI(this); + this.sftp = new SFTPBrowser(this); + this.snippets = new SnippetLibrary(this); } /** @@ -31,19 +48,19 @@ class App { * Backend data loading waits for the Wails runtime to be available. */ async init() { - // Phase 1 — bind all UI event handlers immediately (DOM-only, no backend). - this.setupUI(); - this.setupKeyboard(); - this.updateStatusBar(); + // Phase 1 — bind all UI event handlers immediately (DOM-only, no backend). + this.setupUI(); + this.setupKeyboard(); + this.updateStatusBar(); - // Phase 2 — wait for the Wails runtime, then load backend data and bind events. - await this._waitForWailsRuntime(); - this.setupEvents(); + // Phase 2 — wait for the Wails runtime, then load backend data and bind events. + await this._waitForWailsRuntime(); + this.setupEvents(); - await this.loadProfiles(); - await this.loadPreferences(); - await this.checkSecretStore(); - this.updateStatusBar(); + await this.loadProfiles(); + await this.loadPreferences(); + await this.checkSecretStore(); + this.updateStatusBar(); } /** @@ -55,21 +72,25 @@ class App { * @private */ _waitForWailsRuntime() { - return new Promise((resolve) => { - const maxWait = 5000; - const start = Date.now(); - const check = () => { - if (window.go && window.runtime) { - resolve(); - } else if (Date.now() - start < maxWait) { - setTimeout(check, 50); - } else { - console.warn('Wails runtime not detected after ' + maxWait + 'ms — proceeding anyway'); - resolve(); - } - }; - check(); - }); + return new Promise((resolve) => { + const maxWait = 5000; + const start = Date.now(); + const check = () => { + if (window.go && window.runtime) { + resolve(); + } else if (Date.now() - start < maxWait) { + setTimeout(check, 50); + } else { + console.warn( + "Wails runtime not detected after " + + maxWait + + "ms — proceeding anyway", + ); + resolve(); + } + }; + check(); + }); } // ── Data loading ───────────────────────────────────────────────── @@ -78,45 +99,46 @@ class App { * Fetches all connection profiles from the backend and renders the sidebar. */ async loadProfiles() { - try { - const profiles = await window.go.api.Service.ListProfiles(); - this.state.setProfiles(profiles || []); - this.sidebar.render(); - } catch (err) { - this.notifications.error('Failed to load profiles: ' + err); - } + try { + const profiles = await window.go.api.Service.ListProfiles(); + this.state.setProfiles(profiles || []); + this.sidebar.render(); + } catch (err) { + this.notifications.error("Failed to load profiles: " + err); + } } /** * Loads user preferences from the backend. */ async loadPreferences() { - try { - const prefs = await window.go.api.Service.GetPreferences(); - this.state.setPreferences(prefs || {}); - this._applyPreferences(); - } catch (err) { - // Non-fatal — fall back to defaults - console.warn('Failed to load preferences:', err); - } + try { + const prefs = await window.go.api.Service.GetPreferences(); + this.state.setPreferences(prefs || {}); + this._applyPreferences(); + } catch (err) { + // Non-fatal — fall back to defaults + console.warn("Failed to load preferences:", err); + } } /** * Queries the secret store status (initialised / unlocked). */ async checkSecretStore() { - try { - const initialised = await window.go.api.Service.IsSecretStoreInitialised(); - this.state.setSecretStoreInitialised(!!initialised); - if (initialised) { - const unlocked = await window.go.api.Service.IsSecretStoreUnlocked(); - this.state.setSecretStoreState(!!unlocked); - } else { - this.state.setSecretStoreState(false); - } - } catch (_) { - // Secret store may not be available yet + try { + const initialised = + await window.go.api.Service.IsSecretStoreInitialised(); + this.state.setSecretStoreInitialised(!!initialised); + if (initialised) { + const unlocked = await window.go.api.Service.IsSecretStoreUnlocked(); + this.state.setSecretStoreState(!!unlocked); + } else { + this.state.setSecretStoreState(false); } + } catch (_) { + // Secret store may not be available yet + } } // ── Wails event listeners ──────────────────────────────────────── @@ -126,152 +148,200 @@ class App { * Guarded: silently skips if the runtime is unavailable. */ setupEvents() { - if (!window.runtime || typeof window.runtime.EventsOn !== 'function') { - console.warn('window.runtime not available — Wails event listeners not bound'); - return; + if (!window.runtime || typeof window.runtime.EventsOn !== "function") { + console.warn( + "window.runtime not available — Wails event listeners not bound", + ); + return; + } + // Incoming session data (terminal output) + window.runtime.EventsOn("session:data", (payload) => { + this.terminals.handleData(payload.sessionID, payload.data); + }); + + // Session state transitions (connecting → connected → reconnecting → disconnected) + window.runtime.EventsOn("session:state", (payload) => { + this.tabs.updateSessionState( + payload.sessionID, + payload.state, + payload.error, + ); + this.updateStatusBar(); + + if (payload.state === "error" && payload.error) { + this._handleSessionError(payload.sessionID, payload.error); } - // Incoming session data (terminal output) - window.runtime.EventsOn('session:data', (payload) => { - this.terminals.handleData(payload.sessionID, payload.data); - }); - // Session state transitions (connecting → connected → reconnecting → disconnected) - window.runtime.EventsOn('session:state', (payload) => { - this.tabs.updateSessionState(payload.sessionID, payload.state, payload.error); - this.updateStatusBar(); + // Show reconnecting notification + if (payload.state === "reconnecting") { + const attempt = payload.attempt || 1; + const maxRetries = payload.maxRetries || 5; + const delaySec = payload.delaySec || 1; + this.notifications.info( + `Reconnecting (attempt ${attempt}/${maxRetries}) in ${delaySec}s…`, + ); + } - // Show reconnecting notification - if (payload.state === 'reconnecting') { - const attempt = payload.attempt || 1; - const maxRetries = payload.maxRetries || 5; - const delaySec = payload.delaySec || 1; - this.notifications.info( - `Reconnecting (attempt ${attempt}/${maxRetries}) in ${delaySec}s…` - ); - } - - // Once connected, ensure the backend PTY has the correct dimensions. - // The initial fit happens before the SSH handshake completes, so the - // onResize callback fires when the backend isn't ready. By the time - // the connection is established, xterm already has the right cols/rows - // and fitAddon.fit() won't trigger a new resize event. We must - // explicitly send the current terminal size to the backend. - if (payload.state === 'connected') { - const entry = this.terminals.terminals.get(payload.sessionID); - if (entry) { - const { cols, rows } = entry.term; - try { - window.go.api.Service.ResizeSession(payload.sessionID, cols, rows); - } catch (_) { /* noop */ } - } - // Also re-fit to catch any layout changes that occurred while connecting. - const fit = () => this.terminals.fitSession(payload.sessionID); - setTimeout(fit, 50); - setTimeout(fit, 300); - } - }); - - // Session closed by backend - window.runtime.EventsOn('session:closed', (payload) => { - this.sftp.close(payload.sessionID); - this.tabs.handleSessionClosed(payload.sessionID); - this.updateStatusBar(); - }); - - // RAW TCP data (separate channel for the raw viewer) - window.runtime.EventsOn('session:raw:data', (payload) => { - this.rawViewer.handleData(payload); - }); - - // GitHub repository data - window.runtime.EventsOn('session:github:repos', (payload) => { - window.NexusTerminal.GitHubViewer.updateRepos( - payload.sessionID, payload.login, payload.repos - ); - }); - - // GitHub refresh errors - window.runtime.EventsOn('session:github:error', (payload) => { - window.NexusTerminal.GitHubViewer.showError( - payload.sessionID, payload.error - ); - }); - - // Port-forwarding events - window.runtime.EventsOn('session:forward:started', (payload) => { - const fwd = payload.forward || {}; - const label = fwd.label || `${fwd.bindHost || ''}:${fwd.bindPort} → ${fwd.destHost}:${fwd.destPort}`; - this.notifications.success(`Forward started: ${label}`); - }); - - window.runtime.EventsOn('session:forward:stopped', (payload) => { - this.notifications.info(`Forward stopped: ${payload.forwardID}`); - }); - - window.runtime.EventsOn('session:forward:error', (payload) => { - this.notifications.error(`Forward error: ${payload.error}`); - }); - - // Recording events - window.runtime.EventsOn('session:recording:started', (payload) => { - this.recordings.activeSessions.add(payload.sessionID); - this.recordings._updateRecordingIndicator(payload.sessionID, true); - }); - - window.runtime.EventsOn('session:recording:stopped', (payload) => { - this.recordings.activeSessions.delete(payload.sessionID); - this.recordings._updateRecordingIndicator(payload.sessionID, false); - }); - - // Telnet negotiation debug messages - window.runtime.EventsOn('session:debug', (payload) => { - console.debug('[session:debug]', payload); - }); - - // Backend ready event (emitted from DomReady) - window.runtime.EventsOn('backend:ready', () => { - console.log('Backend is ready'); - }); - - // Host key verification requests - window.runtime.EventsOn('session:hostkey:verify', async (payload) => { + // Once connected, ensure the backend PTY has the correct dimensions. + // The initial fit happens before the SSH handshake completes, so the + // onResize callback fires when the backend isn't ready. By the time + // the connection is established, xterm already has the right cols/rows + // and fitAddon.fit() won't trigger a new resize event. We must + // explicitly send the current terminal size to the backend. + if (payload.state === "connected") { + const entry = this.terminals.terminals.get(payload.sessionID); + if (entry) { + const { cols, rows } = entry.term; try { - const accepted = await this.secretPrompt.promptHostKeyVerification( - payload.host, - payload.keyType, - payload.fingerprint, - ); - window.runtime.EventsEmit('session:hostkey:response', { - sessionID: payload.sessionID, - accepted, - }); + window.go.api.Service.ResizeSession( + payload.sessionID, + cols, + rows, + ); } catch (_) { - window.runtime.EventsEmit('session:hostkey:response', { - sessionID: payload.sessionID, - accepted: false, - }); + /* noop */ } - }); + } + // Also re-fit to catch any layout changes that occurred while connecting. + const fit = () => this.terminals.fitSession(payload.sessionID); + setTimeout(fit, 50); + setTimeout(fit, 300); + } + }); - // Password/passphrase prompt requests from the backend - window.runtime.EventsOn('session:secret:prompt', async (payload) => { - try { - const value = await this.secretPrompt.prompt( - payload.title || 'Credentials Required', - payload.message || 'Enter your password or passphrase.', - ); - window.runtime.EventsEmit('session:secret:response', { - requestID: payload.requestID, - value, - }); - } catch (_) { - window.runtime.EventsEmit('session:secret:response', { - requestID: payload.requestID, - value: '', - cancelled: true, - }); - } - }); + // Session closed by backend + window.runtime.EventsOn("session:closed", (payload) => { + this.sftp.close(payload.sessionID); + this.tabs.handleSessionClosed(payload.sessionID); + this.updateStatusBar(); + }); + + // RAW TCP data (separate channel for the raw viewer) + window.runtime.EventsOn("session:raw:data", (payload) => { + this.rawViewer.handleData(payload); + }); + + // GitHub repository data + window.runtime.EventsOn("session:github:repos", (payload) => { + window.NexusTerminal.GitHubViewer.updateRepos( + payload.sessionID, + payload.login, + payload.repos, + ); + }); + + // GitHub refresh errors + window.runtime.EventsOn("session:github:error", (payload) => { + window.NexusTerminal.GitHubViewer.showError( + payload.sessionID, + payload.error, + ); + }); + + // GitHub status updates + window.runtime.EventsOn("session:github:status", (payload) => { + window.NexusTerminal.GitHubViewer.setStatus( + payload.sessionID, + payload.status, + ); + }); + + // Port-forwarding events + window.runtime.EventsOn("session:forward:started", (payload) => { + const fwd = payload.forward || {}; + const label = + fwd.label || + `${fwd.bindHost || ""}:${fwd.bindPort} → ${fwd.destHost}:${fwd.destPort}`; + this.notifications.success(`Forward started: ${label}`); + }); + + window.runtime.EventsOn("session:forward:stopped", (payload) => { + this.notifications.info(`Forward stopped: ${payload.forwardID}`); + }); + + window.runtime.EventsOn("session:forward:error", (payload) => { + this.notifications.error(`Forward error: ${payload.error}`); + }); + + // Recording events + window.runtime.EventsOn("session:recording:started", (payload) => { + this.recordings.activeSessions.add(payload.sessionID); + this.recordings._updateRecordingIndicator(payload.sessionID, true); + }); + + window.runtime.EventsOn("session:recording:stopped", (payload) => { + this.recordings.activeSessions.delete(payload.sessionID); + this.recordings._updateRecordingIndicator(payload.sessionID, false); + }); + + // Telnet negotiation debug messages + window.runtime.EventsOn("session:debug", (payload) => { + console.debug("[session:debug]", payload); + }); + + // Backend ready event (emitted from DomReady) + window.runtime.EventsOn("backend:ready", () => { + console.log("Backend is ready"); + }); + + // Host key verification requests + window.runtime.EventsOn("session:hostkey:verify", async (payload) => { + try { + const accepted = await this.secretPrompt.promptHostKeyVerification( + payload.host, + payload.keyType, + payload.fingerprint, + ); + window.runtime.EventsEmit("session:hostkey:response", { + sessionID: payload.sessionID, + accepted, + }); + } catch (_) { + window.runtime.EventsEmit("session:hostkey:response", { + sessionID: payload.sessionID, + accepted: false, + }); + } + }); + + // Password/passphrase prompt requests from the backend + window.runtime.EventsOn("session:secret:prompt", async (payload) => { + try { + const value = await this.secretPrompt.prompt( + payload.title || "Credentials Required", + payload.message || "Enter your password or passphrase.", + ); + window.runtime.EventsEmit("session:secret:response", { + requestID: payload.requestID, + value, + }); + } catch (_) { + window.runtime.EventsEmit("session:secret:response", { + requestID: payload.requestID, + value: "", + cancelled: true, + }); + } + }); + } + + /** + * Disconnects and removes a session without confirmation prompts. + * @param {string} sessionId + */ + async closeSessionImmediate(sessionId) { + try { + await window.go.api.Service.DisconnectSession(sessionId); + } catch (_) { + // Ignore failures; we still want to clean up locally. + } + + this.terminals.destroyTerminal(sessionId); + this.rawViewer.destroyViewer(sessionId); + window.NexusTerminal.GitHubViewer.destroyViewer(sessionId); + this.state.removeSession(sessionId); + this.tabs.removeTab(sessionId); + this.updateStatusBar(); } // ── Keyboard shortcuts ─────────────────────────────────────────── @@ -280,127 +350,132 @@ class App { * Registers global keyboard shortcuts. */ setupKeyboard() { - document.addEventListener('keydown', (e) => { - const mod = e.ctrlKey || e.metaKey; + document.addEventListener("keydown", (e) => { + const mod = e.ctrlKey || e.metaKey; - // Ctrl/Cmd+K — command palette - if (mod && e.key === 'k') { - e.preventDefault(); - this.commandPalette.toggle(); - return; - } + // Ctrl/Cmd+K — command palette + if (mod && e.key === "k") { + e.preventDefault(); + this.commandPalette.toggle(); + return; + } - // Ctrl/Cmd+N — new connection - if (mod && e.key === 'n') { - e.preventDefault(); - this.profileEditor.openNew(); - return; - } + // Ctrl/Cmd+N — new connection + if (mod && e.key === "n") { + e.preventDefault(); + this.profileEditor.openNew(); + return; + } - // Ctrl/Cmd+W — close active tab - if (mod && e.key === 'w') { - e.preventDefault(); - this.tabs.closeActive(); - return; - } + // Ctrl/Cmd+W — close active tab + if (mod && e.key === "w") { + e.preventDefault(); + this.tabs.closeActive(); + return; + } - // Ctrl/Cmd+Tab — next tab - if (mod && e.key === 'Tab' && !e.shiftKey) { - e.preventDefault(); - const next = this.tabs.getNextTab(); - if (next) this.tabs.setActive(next); - return; - } + // Ctrl/Cmd+Tab — next tab + if (mod && e.key === "Tab" && !e.shiftKey) { + e.preventDefault(); + const next = this.tabs.getNextTab(); + if (next) this.tabs.setActive(next); + return; + } - // Ctrl/Cmd+Shift+Tab — previous tab - if (mod && e.key === 'Tab' && e.shiftKey) { - e.preventDefault(); - const prev = this.tabs.getPrevTab(); - if (prev) this.tabs.setActive(prev); - return; - } + // Ctrl/Cmd+Shift+Tab — previous tab + if (mod && e.key === "Tab" && e.shiftKey) { + e.preventDefault(); + const prev = this.tabs.getPrevTab(); + if (prev) this.tabs.setActive(prev); + return; + } - // Ctrl/Cmd+1-9 — switch to tab by index - if (mod && e.key >= '1' && e.key <= '9') { - e.preventDefault(); - const idx = parseInt(e.key, 10) - 1; - const order = this.tabs.getTabOrder(); - if (idx < order.length) { - this.tabs.setActive(order[idx]); - } - return; - } + // Ctrl/Cmd+1-9 — switch to tab by index + if (mod && e.key >= "1" && e.key <= "9") { + e.preventDefault(); + const idx = parseInt(e.key, 10) - 1; + const order = this.tabs.getTabOrder(); + if (idx < order.length) { + this.tabs.setActive(order[idx]); + } + return; + } - // Ctrl/Cmd+, — settings - if (mod && e.key === ',') { - e.preventDefault(); - this.settings.open(); - return; - } + // Ctrl/Cmd+, — settings + if (mod && e.key === ",") { + e.preventDefault(); + this.settings.open(); + return; + } - // Ctrl/Cmd+F — find in terminal - if (mod && e.key === 'f') { - e.preventDefault(); - this._openTerminalSearch(); - return; - } + // Ctrl/Cmd+F — find in terminal + if (mod && e.key === "f") { + e.preventDefault(); + this._openTerminalSearch(); + return; + } - // F11 — toggle fullscreen (Windows/Linux convention) - if (e.key === 'F11') { - e.preventDefault(); - if (window.runtime && typeof window.runtime.WindowFullscreen === 'function') { - window.runtime.WindowFullscreen(); - } - return; - } + // F11 — toggle fullscreen (Windows/Linux convention) + if (e.key === "F11") { + e.preventDefault(); + if ( + window.runtime && + typeof window.runtime.WindowFullscreen === "function" + ) { + window.runtime.WindowFullscreen(); + } + return; + } - // Escape — close any open overlays - if (e.key === 'Escape') { - this.commandPalette.close(); - // Also exit fullscreen if active (Windows/Linux) - if (window.runtime && typeof window.runtime.WindowUnfullscreen === 'function') { - window.runtime.WindowUnfullscreen(); - } - } + // Escape — close any open overlays + if (e.key === "Escape") { + this.commandPalette.close(); + // Also exit fullscreen if active (Windows/Linux) + if ( + window.runtime && + typeof window.runtime.WindowUnfullscreen === "function" + ) { + window.runtime.WindowUnfullscreen(); + } + } - // Ctrl/Cmd+Shift+D — split pane vertically (left/right) - if (mod && e.shiftKey && e.key === 'D') { - e.preventDefault(); - this.splitPane('vertical'); - return; - } + // Ctrl/Cmd+Shift+D — split pane vertically (left/right) + if (mod && e.shiftKey && e.key === "D") { + e.preventDefault(); + this.splitPane("vertical"); + return; + } - // Ctrl/Cmd+Shift+E — split pane horizontally (top/bottom) - if (mod && e.shiftKey && e.key === 'E') { - e.preventDefault(); - this.splitPane('horizontal'); - return; - } + // Ctrl/Cmd+Shift+E — split pane horizontally (top/bottom) + if (mod && e.shiftKey && e.key === "E") { + e.preventDefault(); + this.splitPane("horizontal"); + return; + } - // Ctrl/Cmd+Shift+R — toggle recording on active session - if (mod && e.shiftKey && e.key === 'R') { - e.preventDefault(); - if (this.state.activeSessionId) { - this.recordings.toggle(this.state.activeSessionId); - } - return; - } + // Ctrl/Cmd+Shift+R — toggle recording on active session + if (mod && e.shiftKey && e.key === "R") { + e.preventDefault(); + if (this.state.activeSessionId) { + this.recordings.toggle(this.state.activeSessionId); + } + return; + } - // Ctrl/Cmd+Shift+B — toggle broadcast mode - if (mod && e.shiftKey && e.key === 'B') { - e.preventDefault(); - this.toggleBroadcast(); - return; - } + // Ctrl/Cmd+Shift+B — toggle broadcast mode + if (mod && e.shiftKey && e.key === "B") { + e.preventDefault(); + this.toggleBroadcast(); + return; + } - // Ctrl/Cmd+Shift+S — open snippet library - if (mod && e.shiftKey && e.key === 'S') { - e.preventDefault(); - this.snippets.open(); - return; - } - - }); + // Ctrl/Cmd+Shift+S — open snippet library + if (mod && e.shiftKey && e.key === "S") { + e.preventDefault(); + this.snippets.open(); + return; + } + }); } // ── UI event wiring ────────────────────────────────────────────── @@ -409,28 +484,33 @@ class App { * Binds click handlers to static UI elements. */ setupUI() { - var btnEl = document.getElementById('btn-new-connection'); - this._bindClick('btn-new-connection', () => this.profileEditor.openNew()); - this._bindClick('btn-settings', () => this.settings.open()); - this._bindClick('btn-import', () => this.importProfiles()); - this._bindClick('btn-export', () => this.exportProfiles()); - this._bindClick('btn-recordings', () => this.recordings.openBrowser()); - this._bindClick('btn-new-tab', () => this.profileEditor.openNew()); - this._bindClick('btn-broadcast', () => this.toggleBroadcast()); - this._bindClick('btn-empty-connect', () => this.profileEditor.openNew()); - this._bindClick('btn-empty-quick', () => this.quickConnect()); + var btnEl = document.getElementById("btn-new-connection"); + this._bindClick("btn-new-connection", () => this.profileEditor.openNew()); + this._bindClick("btn-settings", () => this.settings.open()); + this._bindClick("btn-import", () => this.importProfiles()); + this._bindClick("btn-export", () => this.exportProfiles()); + this._bindClick("btn-recordings", () => this.recordings.openBrowser()); + this._bindClick("btn-new-tab", () => this.profileEditor.openNew()); + this._bindClick("btn-broadcast", () => this.toggleBroadcast()); + this._bindClick("btn-empty-connect", () => this.profileEditor.openNew()); + this._bindClick("btn-empty-quick", () => this.quickConnect()); - const searchInput = document.getElementById('profile-search'); - if (searchInput) { - searchInput.addEventListener('input', (e) => this.sidebar.search(e.target.value)); - } + const searchInput = document.getElementById("profile-search"); + if (searchInput) { + searchInput.addEventListener("input", (e) => + this.sidebar.search(e.target.value), + ); + } - // Window resize → re-fit active terminal (debounced) - const { debounce } = window.NexusTerminal; - window.addEventListener('resize', debounce(() => { - this.terminals.fitActive(); - this.splitPanes.refitAll(); - }, 100)); + // Window resize → re-fit active terminal (debounced) + const { debounce } = window.NexusTerminal; + window.addEventListener( + "resize", + debounce(() => { + this.terminals.fitActive(); + this.splitPanes.refitAll(); + }, 100), + ); } // ── Split pane ───────────────────────────────────────────────── @@ -440,12 +520,12 @@ class App { * @param {'horizontal'|'vertical'} direction */ splitPane(direction) { - if (!this.state.activeSessionId) return; - if (direction === 'horizontal') { - this.splitPanes.splitHorizontal(); - } else { - this.splitPanes.splitVertical(); - } + if (!this.state.activeSessionId) return; + if (direction === "horizontal") { + this.splitPanes.splitHorizontal(); + } else { + this.splitPanes.splitVertical(); + } } // ── Broadcast mode ───────────────────────────────────────────── @@ -455,19 +535,19 @@ class App { * connected sessions simultaneously. */ toggleBroadcast() { - this.state.broadcastMode = !this.state.broadcastMode; - const btn = document.getElementById('btn-broadcast'); - if (btn) { - btn.classList.toggle('is-active', this.state.broadcastMode); - btn.title = this.state.broadcastMode - ? 'Broadcast Mode ON — keystrokes sent to all sessions (Ctrl+Shift+B)' - : 'Toggle Broadcast Mode (Ctrl+Shift+B)'; - } - this.notifications.info( - this.state.broadcastMode - ? 'Broadcast mode enabled — input sent to all sessions' - : 'Broadcast mode disabled' - ); + this.state.broadcastMode = !this.state.broadcastMode; + const btn = document.getElementById("btn-broadcast"); + if (btn) { + btn.classList.toggle("is-active", this.state.broadcastMode); + btn.title = this.state.broadcastMode + ? "Broadcast Mode ON — keystrokes sent to all sessions (Ctrl+Shift+B)" + : "Toggle Broadcast Mode (Ctrl+Shift+B)"; + } + this.notifications.info( + this.state.broadcastMode + ? "Broadcast mode enabled — input sent to all sessions" + : "Broadcast mode disabled", + ); } // ── Connection lifecycle ───────────────────────────────────────── @@ -477,64 +557,75 @@ class App { * @param {string} profileId */ async connectProfile(profileId) { - const profile = this.state.getProfile(profileId); - if (!profile) { - this.notifications.error('Profile not found'); - return; + const profile = this.state.getProfile(profileId); + if (!profile) { + this.notifications.error("Profile not found"); + return; + } + + const existingSessions = this.state.getAllSessions().filter((session) => { + if (session.profileId !== profileId) return false; + return ( + session.state === "connected" || + session.state === "connecting" || + session.state === "reconnecting" + ); + }); + if (existingSessions.length > 0) { + const preferred = + existingSessions.find((s) => s.id === this.state.activeSessionId) || + existingSessions[0]; + const decision = await this._confirmReuseSession(profile, preferred); + if (decision === "existing") { + this.tabs.setActive(preferred.id); + if (preferred.protocol !== "raw" && preferred.protocol !== "github") { + this.terminals.focusTerminal(preferred.id); + } + return; + } + if (decision !== "new") return; + } + + try { + const sessionInfo = + await window.go.api.Service.ConnectSession(profileId); + this.state.addSession(sessionInfo); + this.tabs.addTab(sessionInfo); + + // Create the appropriate viewer + const panelId = `panel-${sessionInfo.id}`; + if (profile.protocol === "raw") { + this.rawViewer.createViewer(sessionInfo.id, panelId, profile); + } else if (profile.protocol === "github") { + const container = document.getElementById(panelId); + if (container) { + window.NexusTerminal.GitHubViewer.createViewer( + sessionInfo.id, + container, + profile.displayName || profile.host, + ); + } + } else { + this.terminals.createTerminal(sessionInfo.id, panelId, profile); } - const existingSessions = this.state.getAllSessions().filter((session) => { - if (session.profileId !== profileId) return false; - return session.state === 'connected' || session.state === 'connecting' || session.state === 'reconnecting'; - }); - if (existingSessions.length > 0) { - const preferred = existingSessions.find((s) => s.id === this.state.activeSessionId) || existingSessions[0]; - const decision = await this._confirmReuseSession(profile, preferred); - if (decision === 'existing') { - this.tabs.setActive(preferred.id); - if (preferred.protocol !== 'raw' && preferred.protocol !== 'github') { - this.terminals.focusTerminal(preferred.id); - } - return; - } - if (decision !== 'new') return; - } - - try { - const sessionInfo = await window.go.api.Service.ConnectSession(profileId); - this.state.addSession(sessionInfo); - this.tabs.addTab(sessionInfo); - - // Create the appropriate viewer - const panelId = `panel-${sessionInfo.id}`; - if (profile.protocol === 'raw') { - this.rawViewer.createViewer(sessionInfo.id, panelId, profile); - } else if (profile.protocol === 'github') { - const container = document.getElementById(panelId); - if (container) { - window.NexusTerminal.GitHubViewer.createViewer( - sessionInfo.id, container, profile.displayName || profile.host - ); - } - } else { - this.terminals.createTerminal(sessionInfo.id, panelId, profile); - } - - this.notifications.info(`Connecting to ${profile.displayName || profile.host}…`); - } catch (err) { - this.notifications.error('Connection failed: ' + err); - } + this.notifications.info( + `Connecting to ${profile.displayName || profile.host}…`, + ); + } catch (err) { + this.notifications.error("Connection failed: " + err); + } } /** * Opens a quick connect dialog for ad-hoc connections without saving a profile. */ async quickConnect() { - const createElement = window.NexusTerminal.createElement; - const result = await new Promise((resolve) => { - const backdrop = createElement('div', 'modal-backdrop'); - const modal = createElement('div', 'modal modal-sm'); - modal.innerHTML = ` + const createElement = window.NexusTerminal.createElement; + const result = await new Promise((resolve) => { + const backdrop = createElement("div", "modal-backdrop"); + const modal = createElement("div", "modal modal-sm"); + modal.innerHTML = `

Quick Connect

@@ -566,83 +657,94 @@ class App {
`; - backdrop.appendChild(modal); - document.body.appendChild(backdrop); - requestAnimationFrame(() => { - backdrop.classList.add('is-visible'); - modal.classList.add('is-visible'); - }); - - const protocolSelect = modal.querySelector('.qc-protocol'); - const portInput = modal.querySelector('.qc-port'); - const usernameGroup = modal.querySelector('.qc-username-group'); - const hostInput = modal.querySelector('.qc-host'); - - // Update port default and username visibility when protocol changes - protocolSelect.addEventListener('change', () => { - const proto = protocolSelect.value; - const defaultPorts = { ssh: 22, telnet: 23, raw: 23 }; - portInput.value = defaultPorts[proto] || 22; - usernameGroup.style.display = proto === 'ssh' ? '' : 'none'; - }); - - const close = (value) => { - backdrop.classList.remove('is-visible'); - modal.classList.remove('is-visible'); - setTimeout(() => backdrop.remove(), 200); - resolve(value); - }; - - modal.querySelector('.modal-close').addEventListener('click', () => close(null)); - modal.querySelector('.qc-cancel').addEventListener('click', () => close(null)); - modal.querySelector('.qc-connect').addEventListener('click', () => { - const host = hostInput.value.trim(); - if (!host) { - hostInput.focus(); - return; - } - close({ - protocol: protocolSelect.value, - host, - port: parseInt(portInput.value, 10) || 22, - username: modal.querySelector('.qc-username').value.trim(), - }); - }); - backdrop.addEventListener('click', (e) => { if (e.target === backdrop) close(null); }); - hostInput.addEventListener('keydown', (e) => { - if (e.key === 'Enter') modal.querySelector('.qc-connect').click(); - if (e.key === 'Escape') close(null); - }); - - setTimeout(() => hostInput.focus(), 50); + backdrop.appendChild(modal); + document.body.appendChild(backdrop); + requestAnimationFrame(() => { + backdrop.classList.add("is-visible"); + modal.classList.add("is-visible"); }); - if (!result) return; + const protocolSelect = modal.querySelector(".qc-protocol"); + const portInput = modal.querySelector(".qc-port"); + const usernameGroup = modal.querySelector(".qc-username-group"); + const hostInput = modal.querySelector(".qc-host"); - try { - const profile = { - protocol: result.protocol, - host: result.host, - port: result.port, - username: result.username || '', - displayName: result.host, - tags: [], - }; - const sessionInfo = await window.go.api.Service.ConnectQuick(profile); - this.state.addSession(sessionInfo); - this.tabs.addTab(sessionInfo); + // Update port default and username visibility when protocol changes + protocolSelect.addEventListener("change", () => { + const proto = protocolSelect.value; + const defaultPorts = { ssh: 22, telnet: 23, raw: 23 }; + portInput.value = defaultPorts[proto] || 22; + usernameGroup.style.display = proto === "ssh" ? "" : "none"; + }); - const panelId = `panel-${sessionInfo.id}`; - if (result.protocol === 'raw') { - this.rawViewer.createViewer(sessionInfo.id, panelId, { protocol: 'raw', raw: {} }); - } else { - this.terminals.createTerminal(sessionInfo.id, panelId, { protocol: result.protocol }); - } + const close = (value) => { + backdrop.classList.remove("is-visible"); + modal.classList.remove("is-visible"); + setTimeout(() => backdrop.remove(), 200); + resolve(value); + }; - this.notifications.info(`Connecting to ${result.host}…`); - } catch (err) { - this.notifications.error('Quick connect failed: ' + err); + modal + .querySelector(".modal-close") + .addEventListener("click", () => close(null)); + modal + .querySelector(".qc-cancel") + .addEventListener("click", () => close(null)); + modal.querySelector(".qc-connect").addEventListener("click", () => { + const host = hostInput.value.trim(); + if (!host) { + hostInput.focus(); + return; + } + close({ + protocol: protocolSelect.value, + host, + port: parseInt(portInput.value, 10) || 22, + username: modal.querySelector(".qc-username").value.trim(), + }); + }); + backdrop.addEventListener("click", (e) => { + if (e.target === backdrop) close(null); + }); + hostInput.addEventListener("keydown", (e) => { + if (e.key === "Enter") modal.querySelector(".qc-connect").click(); + if (e.key === "Escape") close(null); + }); + + setTimeout(() => hostInput.focus(), 50); + }); + + if (!result) return; + + try { + const profile = { + protocol: result.protocol, + host: result.host, + port: result.port, + username: result.username || "", + displayName: result.host, + tags: [], + }; + const sessionInfo = await window.go.api.Service.ConnectQuick(profile); + this.state.addSession(sessionInfo); + this.tabs.addTab(sessionInfo); + + const panelId = `panel-${sessionInfo.id}`; + if (result.protocol === "raw") { + this.rawViewer.createViewer(sessionInfo.id, panelId, { + protocol: "raw", + raw: {}, + }); + } else { + this.terminals.createTerminal(sessionInfo.id, panelId, { + protocol: result.protocol, + }); } + + this.notifications.info(`Connecting to ${result.host}…`); + } catch (err) { + this.notifications.error("Quick connect failed: " + err); + } } /** @@ -653,14 +755,15 @@ class App { * @private */ _confirmReuseSession(profile, session) { - const createElement = window.NexusTerminal.createElement; - const label = (profile.displayName || profile.host || 'Untitled').trim(); - const stateLabel = session.state === 'connected' ? 'connected' : 'connecting'; + const createElement = window.NexusTerminal.createElement; + const label = (profile.displayName || profile.host || "Untitled").trim(); + const stateLabel = + session.state === "connected" ? "connected" : "connecting"; - return new Promise((resolve) => { - const backdrop = createElement('div', 'modal-backdrop'); - const modal = createElement('div', 'modal modal-sm'); - modal.innerHTML = ` + return new Promise((resolve) => { + const backdrop = createElement("div", "modal-backdrop"); + const modal = createElement("div", "modal modal-sm"); + modal.innerHTML = `

Connection Already Open

@@ -677,26 +780,36 @@ class App {
`; - backdrop.appendChild(modal); - document.body.appendChild(backdrop); - requestAnimationFrame(() => { - backdrop.classList.add('is-visible'); - modal.classList.add('is-visible'); - }); - - const close = (val) => { - backdrop.classList.remove('is-visible'); - modal.classList.remove('is-visible'); - setTimeout(() => backdrop.remove(), 200); - resolve(val); - }; - - modal.querySelector('.modal-close').addEventListener('click', () => close(null)); - modal.querySelector('.confirm-cancel').addEventListener('click', () => close(null)); - modal.querySelector('.confirm-ok').addEventListener('click', () => close('existing')); - modal.querySelector('.confirm-new').addEventListener('click', () => close('new')); - backdrop.addEventListener('click', (e) => { if (e.target === backdrop) close(null); }); + backdrop.appendChild(modal); + document.body.appendChild(backdrop); + requestAnimationFrame(() => { + backdrop.classList.add("is-visible"); + modal.classList.add("is-visible"); }); + + const close = (val) => { + backdrop.classList.remove("is-visible"); + modal.classList.remove("is-visible"); + setTimeout(() => backdrop.remove(), 200); + resolve(val); + }; + + modal + .querySelector(".modal-close") + .addEventListener("click", () => close(null)); + modal + .querySelector(".confirm-cancel") + .addEventListener("click", () => close(null)); + modal + .querySelector(".confirm-ok") + .addEventListener("click", () => close("existing")); + modal + .querySelector(".confirm-new") + .addEventListener("click", () => close("new")); + backdrop.addEventListener("click", (e) => { + if (e.target === backdrop) close(null); + }); + }); } // ── Import / Export ────────────────────────────────────────────── @@ -705,14 +818,14 @@ class App { * Triggers the encrypted profile import dialog. */ async importProfiles() { - this.exportImport.showImportModal(); + this.exportImport.showImportModal(); } /** * Triggers the encrypted profile export dialog. */ async exportProfiles() { - this.exportImport.showExportModal(); + this.exportImport.showExportModal(); } // ── Status bar ─────────────────────────────────────────────────── @@ -721,29 +834,32 @@ class App { * Updates the status bar with current session info. */ updateStatusBar() { - const connEl = document.getElementById('status-connection'); - const countEl = document.getElementById('status-session-count'); - const vaultEl = document.getElementById('status-vault'); - if (!connEl) return; + const connEl = document.getElementById("status-connection"); + const countEl = document.getElementById("status-session-count"); + const vaultEl = document.getElementById("status-vault"); + if (!connEl) return; - const sessions = this.state.getAllSessions(); - const connected = sessions.filter((s) => s.state === 'connected').length; - const total = sessions.length; + const sessions = this.state.getAllSessions(); + const connected = sessions.filter((s) => s.state === "connected").length; + const total = sessions.length; - const activeSession = this.state.activeSessionId - ? this.state.getSession(this.state.activeSessionId) - : null; + const activeSession = this.state.activeSessionId + ? this.state.getSession(this.state.activeSessionId) + : null; - if (activeSession) { - connEl.innerHTML = ` ${stateLabel(activeSession.state)}`; - } else { - connEl.innerHTML = ' No active session'; - } + if (activeSession) { + connEl.innerHTML = ` ${stateLabel(activeSession.state)}`; + } else { + connEl.innerHTML = + ' No active session'; + } - if (countEl) countEl.textContent = `${connected}/${total} sessions`; - if (vaultEl) { - vaultEl.textContent = this.state.secretStoreUnlocked ? '🔓 Unlocked' : '🔒 Locked'; - } + if (countEl) countEl.textContent = `${connected}/${total} sessions`; + if (vaultEl) { + vaultEl.textContent = this.state.secretStoreUnlocked + ? "🔓 Unlocked" + : "🔒 Locked"; + } } // ── Internal helpers ───────────────────────────────────────────── @@ -753,34 +869,172 @@ class App { * @private */ _applyPreferences() { - const prefs = this.state.preferences; + const prefs = this.state.preferences; - // Sidebar width (drives the grid column width). - // Use the CSS variable so the workspace never sits underneath the sidebar. - const root = document.documentElement; - const sidebar = document.getElementById('sidebar'); - const parsedSidebarWidth = Number(prefs.sidebarWidth); - if (Number.isFinite(parsedSidebarWidth) && parsedSidebarWidth > 0) { - const clampedWidth = Math.max(180, Math.min(500, Math.round(parsedSidebarWidth))); - root.style.setProperty('--sidebar-width', `${clampedWidth}px`); - } else { - root.style.removeProperty('--sidebar-width'); - } - if (sidebar) { - sidebar.style.width = ''; - } + // Sidebar width (drives the grid column width). + // Use the CSS variable so the workspace never sits underneath the sidebar. + const root = document.documentElement; + const sidebar = document.getElementById("sidebar"); + const parsedSidebarWidth = Number(prefs.sidebarWidth); + if (Number.isFinite(parsedSidebarWidth) && parsedSidebarWidth > 0) { + const clampedWidth = Math.max( + 180, + Math.min(500, Math.round(parsedSidebarWidth)), + ); + root.style.setProperty("--sidebar-width", `${clampedWidth}px`); + } else { + root.style.removeProperty("--sidebar-width"); + } + if (sidebar) { + sidebar.style.width = ""; + } - // Status bar visibility - const statusBar = document.getElementById('status-bar'); - if (statusBar) { - statusBar.style.display = prefs.showStatusBar === false ? 'none' : 'flex'; - } + // Status bar visibility + const statusBar = document.getElementById("status-bar"); + if (statusBar) { + statusBar.style.display = + prefs.showStatusBar === false ? "none" : "flex"; + } - // Refit any visible terminal after geometry changes. - requestAnimationFrame(() => { - this.terminals.fitActive(); - this.splitPanes.refitAll(); + // Refit any visible terminal after geometry changes. + requestAnimationFrame(() => { + this.terminals.fitActive(); + this.splitPanes.refitAll(); + }); + } + + /** + * Determines whether an error is a common authentication or host key issue. + * @param {string} message + * @returns {Object|null} + * @private + */ + _classifySessionError(message) { + const msg = (message || "").toLowerCase(); + + const authPatterns = [ + "unable to authenticate", + "authentication failed", + "permission denied", + "no supported methods", + ]; + const hostKeyPatterns = [ + "host key", + "fingerprint", + ]; + + if (authPatterns.some((p) => msg.includes(p))) { + return { + type: "auth", + title: "Authentication Failed", + message: + "The server rejected the provided credentials. Check username, password, keys, and auth methods.", + actions: ["edit", "retry"], + }; + } + + if (hostKeyPatterns.some((p) => msg.includes(p))) { + return { + type: "hostkey", + title: "Host Key Verification Failed", + message: + "The server's host key could not be verified. Manage known hosts or update the profile's policy.", + actions: ["knownhosts", "edit", "retry"], + }; + } + + return null; + } + + /** + * Shows a guided action modal for common session errors. + * @param {string} sessionId + * @param {string} message + * @private + */ + _handleSessionError(sessionId, message) { + const info = this._classifySessionError(message); + if (!info) return; + + const session = this.state.getSession(sessionId); + const label = session?.tabName || session?.host || "Session"; + const body = `${info.message}\n\n${message}`; + this._showGuidedErrorModal(info.title, label, body, (action) => { + if (action === "edit" && session?.profileId) { + this.profileEditor.openEdit(session.profileId); + } + if (action === "retry") { + this.tabs._reconnect(sessionId); + } + if (action === "knownhosts") { + this.settings.openTab("knownhosts"); + } + }, info.actions); + } + + /** + * Builds and displays a modal with guided action buttons. + * @param {string} title + * @param {string} label + * @param {string} message + * @param {Function} onAction + * @param {Array} actions + * @private + */ + _showGuidedErrorModal(title, label, message, onAction, actions) { + const createElement = window.NexusTerminal.createElement; + const backdrop = createElement("div", "modal-backdrop"); + const modal = createElement("div", "modal modal-sm"); + const safeLabel = window.NexusTerminal.escapeHtml(label || "Session"); + + modal.innerHTML = ` +
+

${title}

+ +
+
+

+ ${safeLabel} +

+

+ ${window.NexusTerminal.escapeHtml(message)} +

+
+
+ `; + + const footer = modal.querySelector(".modal-footer"); + const addActionBtn = (label, action, primary) => { + const btn = createElement("button", `btn btn-sm${primary ? " btn-primary" : ""}`, { + textContent: label, }); + btn.addEventListener("click", () => close(action)); + footer.appendChild(btn); + }; + + addActionBtn("Close", null, false); + if (actions.includes("knownhosts")) addActionBtn("Known Hosts", "knownhosts", false); + if (actions.includes("edit")) addActionBtn("Edit Profile", "edit", false); + if (actions.includes("retry")) addActionBtn("Retry", "retry", true); + + const close = (action) => { + backdrop.classList.remove("is-visible"); + modal.classList.remove("is-visible"); + setTimeout(() => backdrop.remove(), 200); + if (action) onAction(action); + }; + + modal.querySelector(".modal-close").addEventListener("click", () => close(null)); + backdrop.addEventListener("click", (e) => { + if (e.target === backdrop) close(null); + }); + + backdrop.appendChild(modal); + document.body.appendChild(backdrop); + requestAnimationFrame(() => { + backdrop.classList.add("is-visible"); + modal.classList.add("is-visible"); + }); } /** @@ -788,123 +1042,139 @@ class App { * @private */ _openTerminalSearch() { - const sessionId = this.state.activeSessionId; - if (!sessionId) return; + const sessionId = this.state.activeSessionId; + if (!sessionId) return; - const panel = document.getElementById(`panel-${sessionId}`); - if (!panel) return; + const panel = document.getElementById(`panel-${sessionId}`); + if (!panel) return; - // If search bar already exists, just focus the input - const existing = panel.querySelector('.terminal-search'); - if (existing) { - const input = existing.querySelector('input'); - if (input) input.focus(); - return; + // If search bar already exists, just focus the input + const existing = panel.querySelector(".terminal-search"); + if (existing) { + const input = existing.querySelector("input"); + if (input) input.focus(); + return; + } + + const bar = document.createElement("div"); + bar.className = "terminal-search"; + + const input = document.createElement("input"); + input.type = "text"; + input.placeholder = "Find in terminal…"; + input.className = "terminal-search-input"; + + const count = document.createElement("span"); + count.className = "terminal-search-count"; + count.textContent = ""; + + const prevBtn = document.createElement("button"); + prevBtn.className = "btn btn-xs btn-ghost"; + prevBtn.textContent = "▲"; + prevBtn.title = "Previous match (Shift+Enter)"; + + const nextBtn = document.createElement("button"); + nextBtn.className = "btn btn-xs btn-ghost"; + nextBtn.textContent = "▼"; + nextBtn.title = "Next match (Enter)"; + + const caseSensBtn = document.createElement("button"); + caseSensBtn.className = "btn btn-xs btn-ghost terminal-search-toggle"; + caseSensBtn.textContent = "Aa"; + caseSensBtn.title = "Toggle case sensitivity"; + let caseSensitive = false; + + const regexBtn = document.createElement("button"); + regexBtn.className = "btn btn-xs btn-ghost terminal-search-toggle"; + regexBtn.textContent = ".*"; + regexBtn.title = "Toggle regular expression"; + let useRegex = false; + + const closeBtn = document.createElement("button"); + closeBtn.className = "btn btn-xs btn-ghost"; + closeBtn.textContent = "✕"; + closeBtn.title = "Close (Escape)"; + + bar.appendChild(input); + bar.appendChild(count); + bar.appendChild(prevBtn); + bar.appendChild(nextBtn); + bar.appendChild(caseSensBtn); + bar.appendChild(regexBtn); + bar.appendChild(closeBtn); + + const searchOpts = () => ({ caseSensitive, regex: useRegex }); + + const doSearch = () => { + const found = this.terminals.search( + sessionId, + input.value, + searchOpts(), + ); + count.textContent = input.value + ? found + ? "Match found" + : "No matches" + : ""; + }; + const doPrev = () => { + const found = this.terminals.searchPrevious( + sessionId, + input.value, + searchOpts(), + ); + count.textContent = input.value + ? found + ? "Match found" + : "No matches" + : ""; + }; + + const closeSearch = () => { + // Clear search decorations + const entry = this.terminals.terminals.get(sessionId); + if (entry && entry.searchAddon) { + entry.searchAddon.clearDecorations(); } + bar.classList.remove("is-visible"); + setTimeout(() => bar.remove(), 200); + this.terminals.focusTerminal(sessionId); + }; - const bar = document.createElement('div'); - bar.className = 'terminal-search'; + input.addEventListener("input", doSearch); + input.addEventListener("keydown", (e) => { + if (e.key === "Enter") { + e.preventDefault(); + e.shiftKey ? doPrev() : doSearch(); + } + if (e.key === "Escape") { + e.preventDefault(); + closeSearch(); + } + }); - const input = document.createElement('input'); - input.type = 'text'; - input.placeholder = 'Find in terminal…'; - input.className = 'terminal-search-input'; + nextBtn.addEventListener("click", doSearch); + prevBtn.addEventListener("click", doPrev); + closeBtn.addEventListener("click", closeSearch); - const count = document.createElement('span'); - count.className = 'terminal-search-count'; - count.textContent = ''; + caseSensBtn.addEventListener("click", () => { + caseSensitive = !caseSensitive; + caseSensBtn.classList.toggle("is-active", caseSensitive); + doSearch(); + }); - const prevBtn = document.createElement('button'); - prevBtn.className = 'btn btn-xs btn-ghost'; - prevBtn.textContent = '▲'; - prevBtn.title = 'Previous match (Shift+Enter)'; + regexBtn.addEventListener("click", () => { + useRegex = !useRegex; + regexBtn.classList.toggle("is-active", useRegex); + doSearch(); + }); - const nextBtn = document.createElement('button'); - nextBtn.className = 'btn btn-xs btn-ghost'; - nextBtn.textContent = '▼'; - nextBtn.title = 'Next match (Enter)'; - - const caseSensBtn = document.createElement('button'); - caseSensBtn.className = 'btn btn-xs btn-ghost terminal-search-toggle'; - caseSensBtn.textContent = 'Aa'; - caseSensBtn.title = 'Toggle case sensitivity'; - let caseSensitive = false; - - const regexBtn = document.createElement('button'); - regexBtn.className = 'btn btn-xs btn-ghost terminal-search-toggle'; - regexBtn.textContent = '.*'; - regexBtn.title = 'Toggle regular expression'; - let useRegex = false; - - const closeBtn = document.createElement('button'); - closeBtn.className = 'btn btn-xs btn-ghost'; - closeBtn.textContent = '✕'; - closeBtn.title = 'Close (Escape)'; - - bar.appendChild(input); - bar.appendChild(count); - bar.appendChild(prevBtn); - bar.appendChild(nextBtn); - bar.appendChild(caseSensBtn); - bar.appendChild(regexBtn); - bar.appendChild(closeBtn); - - const searchOpts = () => ({ caseSensitive, regex: useRegex }); - - const doSearch = () => { - const found = this.terminals.search(sessionId, input.value, searchOpts()); - count.textContent = input.value ? (found ? 'Match found' : 'No matches') : ''; - }; - const doPrev = () => { - const found = this.terminals.searchPrevious(sessionId, input.value, searchOpts()); - count.textContent = input.value ? (found ? 'Match found' : 'No matches') : ''; - }; - - const closeSearch = () => { - // Clear search decorations - const entry = this.terminals.terminals.get(sessionId); - if (entry && entry.searchAddon) { - entry.searchAddon.clearDecorations(); - } - bar.classList.remove('is-visible'); - setTimeout(() => bar.remove(), 200); - this.terminals.focusTerminal(sessionId); - }; - - input.addEventListener('input', doSearch); - input.addEventListener('keydown', (e) => { - if (e.key === 'Enter') { - e.preventDefault(); - e.shiftKey ? doPrev() : doSearch(); - } - if (e.key === 'Escape') { - e.preventDefault(); - closeSearch(); - } - }); - - nextBtn.addEventListener('click', doSearch); - prevBtn.addEventListener('click', doPrev); - closeBtn.addEventListener('click', closeSearch); - - caseSensBtn.addEventListener('click', () => { - caseSensitive = !caseSensitive; - caseSensBtn.classList.toggle('is-active', caseSensitive); - doSearch(); - }); - - regexBtn.addEventListener('click', () => { - useRegex = !useRegex; - regexBtn.classList.toggle('is-active', useRegex); - doSearch(); - }); - - panel.appendChild(bar); - // Trigger the entrance animation - requestAnimationFrame(() => { - bar.classList.add('is-visible'); - input.focus(); - }); + panel.appendChild(bar); + // Trigger the entrance animation + requestAnimationFrame(() => { + bar.classList.add("is-visible"); + input.focus(); + }); } /** @@ -914,16 +1184,16 @@ class App { * @private */ _bindClick(id, handler) { - const el = document.getElementById(id); - if (el) { - el.addEventListener('click', (e) => { - try { - handler(e); - } catch (err) { - console.error('Click handler error for', id, err); - } - }); - } + const el = document.getElementById(id); + if (el) { + el.addEventListener("click", (e) => { + try { + handler(e); + } catch (err) { + console.error("Click handler error for", id, err); + } + }); + } } /** @@ -936,11 +1206,11 @@ class App { * @private */ _inputPrompt(title, label, placeholder) { - const createElement = window.NexusTerminal.createElement; - return new Promise((resolve) => { - const backdrop = createElement('div', 'modal-backdrop'); - const modal = createElement('div', 'modal modal-sm'); - modal.innerHTML = ` + const createElement = window.NexusTerminal.createElement; + return new Promise((resolve) => { + const backdrop = createElement("div", "modal-backdrop"); + const modal = createElement("div", "modal modal-sm"); + modal.innerHTML = `

${title}

@@ -948,7 +1218,7 @@ class App {
- +
@@ -956,43 +1226,49 @@ class App {
`; - backdrop.appendChild(modal); - document.body.appendChild(backdrop); - requestAnimationFrame(() => backdrop.classList.add('is-visible')); + backdrop.appendChild(modal); + document.body.appendChild(backdrop); + requestAnimationFrame(() => backdrop.classList.add("is-visible")); - const input = modal.querySelector('input'); - const close = (value) => { - backdrop.classList.remove('is-visible'); - setTimeout(() => backdrop.remove(), 200); - resolve(value); - }; + const input = modal.querySelector("input"); + const close = (value) => { + backdrop.classList.remove("is-visible"); + setTimeout(() => backdrop.remove(), 200); + resolve(value); + }; - modal.querySelector('.modal-close').addEventListener('click', () => close(null)); - modal.querySelector('.prompt-cancel').addEventListener('click', () => close(null)); - modal.querySelector('.prompt-ok').addEventListener('click', () => close(input.value)); - backdrop.addEventListener('click', (e) => { if (e.target === backdrop) close(null); }); - input.addEventListener('keydown', (e) => { - if (e.key === 'Enter') close(input.value); - if (e.key === 'Escape') close(null); - }); - - setTimeout(() => input.focus(), 50); + modal + .querySelector(".modal-close") + .addEventListener("click", () => close(null)); + modal + .querySelector(".prompt-cancel") + .addEventListener("click", () => close(null)); + modal + .querySelector(".prompt-ok") + .addEventListener("click", () => close(input.value)); + backdrop.addEventListener("click", (e) => { + if (e.target === backdrop) close(null); }); + input.addEventListener("keydown", (e) => { + if (e.key === "Enter") close(input.value); + if (e.key === "Escape") close(null); + }); + + setTimeout(() => input.focus(), 50); + }); } -} + } -// ── Bootstrap ──────────────────────────────────────────────────────── + // ── Bootstrap ──────────────────────────────────────────────────────── - -document.addEventListener('DOMContentLoaded', () => { + document.addEventListener("DOMContentLoaded", () => { try { - const app = new App(); - app.init().catch((err) => { - console.error('App initialisation failed:', err); - }); + const app = new App(); + app.init().catch((err) => { + console.error("App initialisation failed:", err); + }); } catch (err) { - console.error('App constructor failed:', err); + console.error("App constructor failed:", err); } -}); - + }); })(); diff --git a/frontend/src/js/github.js b/frontend/src/js/github.js index fd23c97..7aa800a 100644 --- a/frontend/src/js/github.js +++ b/frontend/src/js/github.js @@ -53,6 +53,18 @@ class GitHubViewer { } } + /** + * Updates the status line for a session. + * @param {string} sessionID + * @param {string} message + */ + setStatus(sessionID, message) { + const viewer = this._viewers.get(sessionID); + if (viewer) { + viewer.setStatus(message); + } + } + /** * Handles an error event for a session. * @param {string} sessionID @@ -165,6 +177,16 @@ class GitHubViewerInstance { this._renderList(); } + /** + * Updates the status line with a custom message. + * @param {string} message + */ + setStatus(message) { + if (!this._statusEl) return; + this._statusEl.classList.remove('github-viewer-status-error'); + this._statusEl.textContent = message || ''; + } + /** * Displays an error message in the status bar. * @param {string} message @@ -272,6 +294,7 @@ class GitHubViewerInstance { nameEl.textContent = repo.name; topRow.appendChild(nameEl); + if (repo.private) { const badge = createElement('span', 'github-repo-badge github-repo-private'); badge.textContent = 'Private'; @@ -288,8 +311,46 @@ class GitHubViewerInstance { topRow.appendChild(badge); } + const actions = createElement('div', 'github-repo-actions'); + + const downloadBtn = createElement('button', 'github-repo-download', { + textContent: 'ZIP', + title: 'Download repository as zip', + }); + downloadBtn.addEventListener('click', (e) => { + e.stopPropagation(); + this._downloadRepo(repo); + }); + actions.appendChild(downloadBtn); + + const visitLink = createElement('button', 'github-repo-visit', { + textContent: 'Visit', + title: 'Open repository in browser', + }); + visitLink.addEventListener('click', (e) => { + e.stopPropagation(); + if (repo.htmlURL) { + if (window.runtime && window.runtime.BrowserOpenURL) { + window.runtime.BrowserOpenURL(repo.htmlURL); + } else { + window.open(repo.htmlURL, '_blank'); + } + } + }); + actions.appendChild(visitLink); + + topRow.appendChild(actions); + card.appendChild(topRow); + if (repo.latestCommitter && repo.latestCommitAt) { + const commitLine = createElement('div', 'github-repo-commit'); + const when = new Date(repo.latestCommitAt); + const whenText = isNaN(when.getTime()) ? repo.latestCommitAt : when.toLocaleString(); + commitLine.textContent = `Last commit: ${whenText} by ${repo.latestCommitter}`; + card.appendChild(commitLine); + } + // Description if (repo.description) { const desc = createElement('div', 'github-repo-desc'); @@ -324,6 +385,25 @@ class GitHubViewerInstance { return card; } + async _downloadRepo(repo) { + if (!this._statusEl) return; + const ref = repo.defaultBranch || ''; + this._statusEl.classList.remove('github-viewer-status-error'); + this._statusEl.textContent = `Downloading ${repo.fullName}...`; + + try { + await window.go.api.Service.DownloadGitHubRepoArchive( + this.sessionID, + repo.fullName, + ref, + ); + this._updateStatus(); + } catch (err) { + this._statusEl.textContent = `⚠ Download failed: ${err}`; + this._statusEl.classList.add('github-viewer-status-error'); + } + } + async _manualRefresh() { if (!this._statusEl) return; this._statusEl.textContent = 'Refreshing…'; diff --git a/frontend/src/js/profiles.js b/frontend/src/js/profiles.js index 4b1555d..e0cc5c3 100644 --- a/frontend/src/js/profiles.js +++ b/frontend/src/js/profiles.js @@ -183,12 +183,19 @@ class ProfileEditor { const testBtn = createElement('button', 'btn btn-outline', { textContent: 'Test' }); const saveBtn = createElement('button', 'btn btn-primary', { textContent: isNew ? 'Create' : 'Save' }); const connectBtn = createElement('button', 'btn btn-accent', { textContent: isNew ? 'Create & Connect' : 'Save & Connect' }); + const deleteBtn = !isNew + ? createElement('button', 'btn btn-danger', { textContent: 'Delete' }) + : null; cancelBtn.addEventListener('click', () => this.close()); testBtn.addEventListener('click', () => this._testConnection()); saveBtn.addEventListener('click', () => this._handleSave(false)); connectBtn.addEventListener('click', () => this._handleSave(true)); + if (deleteBtn) { + deleteBtn.addEventListener('click', () => this._handleDelete()); + } + if (deleteBtn) footer.appendChild(deleteBtn); footer.appendChild(cancelBtn); footer.appendChild(testBtn); footer.appendChild(saveBtn); @@ -1464,6 +1471,22 @@ class ProfileEditor { } } + /** @private */ + async _handleDelete() { + const ok = await this._confirmDelete(); + if (!ok) return; + + try { + await window.go.api.Service.DeleteProfile(this._profile.id); + this.app.state.removeProfile(this._profile.id); + this.app.sidebar.render(); + this.app.notifications.success('Profile deleted'); + this.close(); + } catch (err) { + this.app.notifications.error('Failed to delete profile: ' + err); + } + } + /** @private */ async _testConnection() { this._collectFormValues(); @@ -1485,6 +1508,51 @@ class ProfileEditor { } } + /** + * Shows a confirmation modal for profile deletion. + * @returns {Promise} + * @private + */ + _confirmDelete() { + return new Promise((resolve) => { + const backdrop = createElement('div', 'modal-backdrop'); + const modal = createElement('div', 'modal modal-sm'); + const label = escapeHtml(this._profile.displayName || this._profile.host || 'Untitled'); + modal.innerHTML = ` +
+

Delete Profile

+ +
+
+

+ Delete ${label}? This cannot be undone. +

+
+
+ + +
+ `; + backdrop.appendChild(modal); + document.body.appendChild(backdrop); + requestAnimationFrame(() => { + backdrop.classList.add('is-visible'); + modal.classList.add('is-visible'); + }); + + const close = (val) => { + backdrop.classList.remove('is-visible'); + modal.classList.remove('is-visible'); + setTimeout(() => backdrop.remove(), 200); + resolve(val); + }; + modal.querySelector('.modal-close').addEventListener('click', () => close(false)); + modal.querySelector('.confirm-cancel').addEventListener('click', () => close(false)); + modal.querySelector('.confirm-ok').addEventListener('click', () => close(true)); + backdrop.addEventListener('click', (e) => { if (e.target === backdrop) close(false); }); + }); + } + // ── Utilities ──────────────────────────────────────────────────── /** diff --git a/frontend/src/js/settings.js b/frontend/src/js/settings.js index 4bd647f..aacaa6a 100644 --- a/frontend/src/js/settings.js +++ b/frontend/src/js/settings.js @@ -42,9 +42,9 @@ class Settings { /** * Opens the settings modal. */ - async open() { + async open(tabKey) { this._prefs = JSON.parse(JSON.stringify(this.app.state.preferences)); - this._activeTab = 'general'; + this._activeTab = tabKey || this._activeTab || 'general'; try { this._knownHosts = await window.go.api.Service.ListKnownHosts() || []; @@ -55,6 +55,15 @@ class Settings { this._render(); } + /** + * Opens the settings modal on a specific tab. + * @param {string} tabKey + */ + async openTab(tabKey) { + this._activeTab = tabKey || 'general'; + return this.open(this._activeTab); + } + /** * Closes the settings modal. */ diff --git a/frontend/src/js/sidebar.js b/frontend/src/js/sidebar.js index 40a4f0e..6ef5781 100644 --- a/frontend/src/js/sidebar.js +++ b/frontend/src/js/sidebar.js @@ -19,11 +19,22 @@ class Sidebar { this.el = document.getElementById('sidebar-profiles'); this.searchQuery = ''; + /** @type {Set} */ + this.selectedProfiles = new Set(); + // Section collapse state this.collapsedSections = new Set(); // Dismiss context menus on any outside click document.addEventListener('click', () => dismissContextMenus()); + + if (this.el) { + this.el.addEventListener('click', (e) => { + if (!e.target.closest('.sidebar-item') && this.selectedProfiles.size > 0) { + this._clearSelection(); + } + }); + } } // ── Public API ─────────────────────────────────────────────────── @@ -41,6 +52,11 @@ class Sidebar { this.el.innerHTML = ''; const profiles = this._filteredProfiles(); + this._syncSelection(profiles); + + if (this.selectedProfiles.size > 0) { + this.el.appendChild(this._renderBulkActions()); + } // Favourites const favourites = profiles.filter((p) => p.favourite); @@ -178,6 +194,10 @@ class Sidebar { dataset: { profileId: profile.id }, }); + if (this.selectedProfiles.has(profile.id)) { + item.classList.add('sidebar-item-selected'); + } + // Highlight if this profile's session is active const activeSession = this.app.state.activeSessionId ? this.app.state.getSession(this.app.state.activeSessionId) @@ -227,8 +247,21 @@ class Sidebar { item.appendChild(star); } - // Click → connect - item.addEventListener('click', () => { + // Prevent mousedown text selection in WKWebView + item.addEventListener('mousedown', (e) => e.preventDefault()); + + // Click → connect / multi-select + item.addEventListener('click', (e) => { + const multi = e.metaKey || e.ctrlKey; + if (multi) { + e.preventDefault(); + this._toggleSelection(profile.id); + return; + } + + if (this.selectedProfiles.size > 0) { + this._clearSelection(); + } this.app.connectProfile(profile.id); }); @@ -406,6 +439,285 @@ class Sidebar { }); } + // ── Multi-select + bulk actions ───────────────────────────────── + + /** + * Removes selections that are no longer visible in the filtered list. + * @param {Array} profiles + * @private + */ + _syncSelection(profiles) { + const valid = new Set(profiles.map((p) => p.id)); + for (const id of [...this.selectedProfiles]) { + if (!valid.has(id)) this.selectedProfiles.delete(id); + } + } + + /** @private */ + _toggleSelection(profileId) { + if (this.selectedProfiles.has(profileId)) { + this.selectedProfiles.delete(profileId); + } else { + this.selectedProfiles.add(profileId); + } + this.render(); + } + + /** @private */ + _clearSelection() { + if (this.selectedProfiles.size === 0) return; + this.selectedProfiles.clear(); + this.render(); + } + + /** @private */ + _getSelectedProfiles() { + return this.app.state.profiles.filter((p) => this.selectedProfiles.has(p.id)); + } + + /** @private */ + _renderBulkActions() { + const bar = createElement('div', 'sidebar-bulk-actions'); + const count = createElement('span', 'sidebar-bulk-count', { + textContent: `${this.selectedProfiles.size} selected`, + }); + bar.appendChild(count); + + const actions = createElement('div', 'sidebar-bulk-buttons'); + const makeBtn = (label, handler, className) => { + const btn = createElement('button', `btn btn-xs ${className || ''}`.trim(), { + textContent: label, + }); + btn.addEventListener('click', handler); + actions.appendChild(btn); + }; + + makeBtn('Connect', () => this._bulkConnect()); + makeBtn('Disconnect', () => this._bulkDisconnect(), 'btn-outline'); + makeBtn('Tags', () => this._bulkEditTags(), 'btn-outline'); + makeBtn('Move Group', () => this._bulkMoveGroup(), 'btn-outline'); + makeBtn('Clear', () => this._clearSelection(), 'btn-ghost'); + + bar.appendChild(actions); + return bar; + } + + /** @private */ + _bulkConnect() { + const profiles = this._getSelectedProfiles(); + for (const p of profiles) { + this.app.connectProfile(p.id); + } + this._clearSelection(); + } + + /** @private */ + async _bulkDisconnect() { + const sessions = this.app.state.getAllSessions() + .filter((s) => this.selectedProfiles.has(s.profileId)); + if (sessions.length === 0) { + this.app.notifications.info('No active sessions to disconnect'); + return; + } + + const ok = await this._confirmBulkDisconnect(sessions.length); + if (!ok) return; + + for (const s of sessions) { + await this.app.closeSessionImmediate(s.id); + } + this._clearSelection(); + } + + /** @private */ + async _bulkEditTags() { + const result = await this._promptTagEdit(); + if (!result) return; + + const profiles = this._getSelectedProfiles(); + for (const p of profiles) { + const updated = JSON.parse(JSON.stringify(p)); + const existing = updated.tags || []; + if (result.mode === 'replace') { + updated.tags = result.tags; + } else { + const merged = new Set([...existing, ...result.tags]); + updated.tags = [...merged]; + } + + try { + const saved = await window.go.api.Service.UpdateProfile(updated); + this.app.state.updateProfile(saved); + } catch (err) { + this.app.notifications.error('Failed to update tags: ' + err); + } + } + + this.render(); + this._clearSelection(); + } + + /** @private */ + async _bulkMoveGroup() { + const folder = await this._promptGroupMove(); + if (folder === null) return; + + const profiles = this._getSelectedProfiles(); + for (const p of profiles) { + const updated = JSON.parse(JSON.stringify(p)); + updated.folder = folder; + try { + const saved = await window.go.api.Service.UpdateProfile(updated); + this.app.state.updateProfile(saved); + } catch (err) { + this.app.notifications.error('Failed to move group: ' + err); + } + } + + this.render(); + this._clearSelection(); + } + + /** @private */ + _confirmBulkDisconnect(count) { + return new Promise((resolve) => { + const backdrop = createElement('div', 'modal-backdrop'); + const modal = createElement('div', 'modal modal-sm'); + modal.innerHTML = ` +
+

Disconnect Sessions

+ +
+
+

+ Disconnect ${count} active ${count === 1 ? 'session' : 'sessions'}? +

+
+
+ + +
+ `; + backdrop.appendChild(modal); + document.body.appendChild(backdrop); + requestAnimationFrame(() => { + backdrop.classList.add('is-visible'); + modal.classList.add('is-visible'); + }); + + const close = (val) => { + backdrop.classList.remove('is-visible'); + modal.classList.remove('is-visible'); + setTimeout(() => backdrop.remove(), 200); + resolve(val); + }; + modal.querySelector('.modal-close').addEventListener('click', () => close(false)); + modal.querySelector('.confirm-cancel').addEventListener('click', () => close(false)); + modal.querySelector('.confirm-ok').addEventListener('click', () => close(true)); + backdrop.addEventListener('click', (e) => { if (e.target === backdrop) close(false); }); + }); + } + + /** @private */ + _promptTagEdit() { + return new Promise((resolve) => { + const backdrop = createElement('div', 'modal-backdrop'); + const modal = createElement('div', 'modal modal-sm'); + modal.innerHTML = ` +
+

Edit Tags

+ +
+
+
+ + +
+
+
+ + + +
+ `; + backdrop.appendChild(modal); + document.body.appendChild(backdrop); + requestAnimationFrame(() => { + backdrop.classList.add('is-visible'); + modal.classList.add('is-visible'); + }); + + const input = modal.querySelector('.tag-input'); + const parseTags = () => { + const raw = (input.value || '').split(','); + return raw.map((t) => t.trim()).filter((t) => t.length > 0); + }; + + const close = (val) => { + backdrop.classList.remove('is-visible'); + modal.classList.remove('is-visible'); + setTimeout(() => backdrop.remove(), 200); + resolve(val); + }; + modal.querySelector('.modal-close').addEventListener('click', () => close(null)); + modal.querySelector('.confirm-cancel').addEventListener('click', () => close(null)); + modal.querySelector('.confirm-add').addEventListener('click', () => { + close({ mode: 'add', tags: parseTags() }); + }); + modal.querySelector('.confirm-replace').addEventListener('click', () => { + close({ mode: 'replace', tags: parseTags() }); + }); + backdrop.addEventListener('click', (e) => { if (e.target === backdrop) close(null); }); + setTimeout(() => input.focus(), 50); + }); + } + + /** @private */ + _promptGroupMove() { + return new Promise((resolve) => { + const backdrop = createElement('div', 'modal-backdrop'); + const modal = createElement('div', 'modal modal-sm'); + modal.innerHTML = ` +
+

Move to Group

+ +
+
+
+ + +

+ Leave blank to remove the group. +

+
+
+
+ + +
+ `; + backdrop.appendChild(modal); + document.body.appendChild(backdrop); + requestAnimationFrame(() => { + backdrop.classList.add('is-visible'); + modal.classList.add('is-visible'); + }); + + const input = modal.querySelector('.group-input'); + const close = (val) => { + backdrop.classList.remove('is-visible'); + modal.classList.remove('is-visible'); + setTimeout(() => backdrop.remove(), 200); + resolve(val); + }; + modal.querySelector('.modal-close').addEventListener('click', () => close(null)); + modal.querySelector('.confirm-cancel').addEventListener('click', () => close(null)); + modal.querySelector('.confirm-ok').addEventListener('click', () => close(input.value.trim())); + backdrop.addEventListener('click', (e) => { if (e.target === backdrop) close(null); }); + setTimeout(() => input.focus(), 50); + }); + } + // ── Filtering ──────────────────────────────────────────────────── /** diff --git a/frontend/src/js/terminal.js b/frontend/src/js/terminal.js index 8976372..9848db8 100644 --- a/frontend/src/js/terminal.js +++ b/frontend/src/js/terminal.js @@ -1,24 +1,24 @@ -(function() { -/** - * Nexus Terminal — xterm.js terminal manager. - * Creates, manages, and destroys xterm.js instances for SSH and Telnet sessions. - * Handles data routing, resizing, and search. - */ +(function () { + /** + * Nexus Terminal — xterm.js terminal manager. + * Creates, manages, and destroys xterm.js instances for SSH and Telnet sessions. + * Handles data routing, resizing, and search. + */ -/* global Terminal, FitAddon, SearchAddon, WebLinksAddon, Unicode11Addon */ + /* global Terminal, FitAddon, SearchAddon, WebLinksAddon, Unicode11Addon */ -class TerminalManager { + class TerminalManager { /** * @param {App} app */ constructor(app) { - this.app = app; + this.app = app; - /** - * Map of sessionId → { term, fitAddon, searchAddon, observer }. - * @type {Map} - */ - this.terminals = new Map(); + /** + * Map of sessionId → { term, fitAddon, searchAddon, observer }. + * @type {Map} + */ + this.terminals = new Map(); } // ── Public API ─────────────────────────────────────────────────── @@ -33,171 +33,190 @@ class TerminalManager { * @returns {Terminal} The xterm.js Terminal instance. */ createTerminal(sessionId, containerId, profile) { - const themeName = (this.app.state.preferences || {}).terminalTheme || 'charcoal'; - const term = new Terminal({ - theme: window.NexusTerminal.getTerminalTheme(themeName), - fontFamily: profile.terminalFontFamily || 'JetBrains Mono, Menlo, Monaco, Consolas, "Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", monospace', - fontSize: profile.terminalFontSize || 14, - scrollback: profile.terminalScrollback || 10000, - cursorStyle: profile.terminalCursorStyle || 'block', - cursorBlink: true, - allowProposedApi: true, - convertEol: false, - windowsMode: false, + const themeName = + (this.app.state.preferences || {}).terminalTheme || "charcoal"; + const term = new Terminal({ + theme: window.NexusTerminal.getTerminalTheme(themeName), + fontFamily: + profile.terminalFontFamily || + 'JetBrains Mono, Menlo, Monaco, Consolas, "Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", monospace', + fontSize: profile.terminalFontSize || 14, + scrollback: profile.terminalScrollback || 10000, + cursorStyle: profile.terminalCursorStyle || "block", + cursorBlink: true, + allowProposedApi: true, + convertEol: false, + windowsMode: false, + }); + + // Load addons + const fitAddon = new FitAddon.FitAddon(); + const searchAddon = new SearchAddon.SearchAddon(); + let webLinksAddon = null; + let unicode11Addon = null; + + term.loadAddon(fitAddon); + term.loadAddon(searchAddon); + + try { + unicode11Addon = new Unicode11Addon.Unicode11Addon(); + term.loadAddon(unicode11Addon); + term.unicode.activeVersion = "11"; + } catch (_) { + // Unicode 11 addon is optional; fall back to default unicode handling. + } + + // WebLinksAddon may not always be available + try { + webLinksAddon = new WebLinksAddon.WebLinksAddon((_event, uri) => { + window.runtime.BrowserOpenURL(uri); }); + term.loadAddon(webLinksAddon); + } catch (_) { + // Not critical — links just won't be clickable + } - // Load addons - const fitAddon = new FitAddon.FitAddon(); - const searchAddon = new SearchAddon.SearchAddon(); - let webLinksAddon = null; - let unicode11Addon = null; + // Open the terminal in the DOM container + const container = document.getElementById(containerId); + term.open(container); - term.loadAddon(fitAddon); - term.loadAddon(searchAddon); + let suppressPasteEvent = false; + const attachPasteGuard = () => { + const inputEl = term.textarea || container.querySelector("textarea"); + if (!inputEl) return; + inputEl.addEventListener("paste", (e) => { + if (!suppressPasteEvent) return; + e.preventDefault(); + e.stopPropagation(); + suppressPasteEvent = false; + }); + }; + attachPasteGuard(); + // Right-click context menu on the terminal viewport + const termEl = container.querySelector(".xterm"); + if (termEl) { + termEl.addEventListener("contextmenu", (e) => { + e.preventDefault(); + this._showTerminalContextMenu(sessionId, term, e.clientX, e.clientY); + }); + } + + // Force a synchronous layout reflow so the container reports its + // true dimensions, then fit the terminal to fill the space. + // eslint-disable-next-line no-unused-expressions + container.offsetHeight; + const doFit = () => { try { - unicode11Addon = new Unicode11Addon.Unicode11Addon(); - term.loadAddon(unicode11Addon); - term.unicode.activeVersion = '11'; + fitAddon.fit(); } catch (_) { - // Unicode 11 addon is optional; fall back to default unicode handling. + /* noop */ } + }; + doFit(); + // Belt-and-braces: retry once after a paint in case the initial + // reflow dimensions were still stale. + requestAnimationFrame(doFit); - // WebLinksAddon may not always be available + // Forward user keystrokes to the backend + term.onData((data) => { try { - webLinksAddon = new WebLinksAddon.WebLinksAddon((_event, uri) => { - window.runtime.BrowserOpenURL(uri); - }); - term.loadAddon(webLinksAddon); + const b64 = btoa(data); + window.go.api.Service.WriteSession(sessionId, b64); + + // Broadcast to all other connected sessions if enabled + if (this.app.state.broadcastMode) { + for (const [otherId] of this.terminals) { + if (otherId === sessionId) continue; + const otherSession = this.app.state.getSession(otherId); + if (otherSession && otherSession.state === "connected") { + try { + window.go.api.Service.WriteSession(otherId, b64); + } catch (_) { + /* non-critical */ + } + } + } + } + } catch (err) { + console.error("WriteSession error:", err); + } + }); + + // Clipboard: copy selection on Cmd/Ctrl+C, paste on Cmd/Ctrl+V + term.attachCustomKeyEventHandler((e) => { + const mod = e.ctrlKey || e.metaKey; + + // Cmd/Ctrl+C — copy selected text (let xterm handle it normally if no selection) + if (mod && e.key === "c" && e.type === "keydown") { + const selection = term.getSelection(); + if (selection) { + if (window.runtime && window.runtime.ClipboardSetText) { + window.runtime.ClipboardSetText(selection); + } else { + navigator.clipboard.writeText(selection).catch(function () {}); + } + return false; // Prevent xterm from sending Ctrl+C + } + // No selection — let Ctrl+C pass through as SIGINT + return true; + } + + // Cmd/Ctrl+V — paste from clipboard + if (mod && e.key === "v" && e.type === "keydown") { + suppressPasteEvent = true; + setTimeout(() => { + suppressPasteEvent = false; + }, 250); + if (window.runtime && window.runtime.ClipboardGetText) { + window.runtime + .ClipboardGetText() + .then(function (text) { + if (text) term.paste(text); + }) + .catch(function () {}); + } else { + navigator.clipboard + .readText() + .then(function (text) { + if (text) term.paste(text); + }) + .catch(function () {}); + } + return false; + } + + return true; + }); + + // Notify backend when terminal dimensions change + term.onResize(({ cols, rows }) => { + try { + window.go.api.Service.ResizeSession(sessionId, cols, rows); + } catch (err) { + console.error("ResizeSession error:", err); + } + }); + + // Re-fit when the container itself resizes + const observer = new ResizeObserver(() => { + try { + fitAddon.fit(); } catch (_) { - // Not critical — links just won't be clickable + // Ignore transient errors during layout shifts } + }); + observer.observe(container); - // Open the terminal in the DOM container - const container = document.getElementById(containerId); - term.open(container); + this.terminals.set(sessionId, { + term, + fitAddon, + searchAddon, + webLinksAddon, + observer, + }); - let suppressPasteEvent = false; - const attachPasteGuard = () => { - const inputEl = term.textarea || container.querySelector('textarea'); - if (!inputEl) return; - inputEl.addEventListener('paste', (e) => { - if (!suppressPasteEvent) return; - e.preventDefault(); - e.stopPropagation(); - suppressPasteEvent = false; - }); - }; - attachPasteGuard(); - - // Right-click context menu on the terminal viewport - const termEl = container.querySelector('.xterm'); - if (termEl) { - termEl.addEventListener('contextmenu', (e) => { - e.preventDefault(); - this._showTerminalContextMenu(sessionId, term, e.clientX, e.clientY); - }); - } - - // Force a synchronous layout reflow so the container reports its - // true dimensions, then fit the terminal to fill the space. - // eslint-disable-next-line no-unused-expressions - container.offsetHeight; - const doFit = () => { try { fitAddon.fit(); } catch (_) { /* noop */ } }; - doFit(); - // Belt-and-braces: retry once after a paint in case the initial - // reflow dimensions were still stale. - requestAnimationFrame(doFit); - - // Forward user keystrokes to the backend - term.onData((data) => { - try { - const b64 = btoa(data); - window.go.api.Service.WriteSession(sessionId, b64); - - // Broadcast to all other connected sessions if enabled - if (this.app.state.broadcastMode) { - for (const [otherId] of this.terminals) { - if (otherId === sessionId) continue; - const otherSession = this.app.state.getSession(otherId); - if (otherSession && otherSession.state === 'connected') { - try { - window.go.api.Service.WriteSession(otherId, b64); - } catch (_) { /* non-critical */ } - } - } - } - } catch (err) { - console.error('WriteSession error:', err); - } - }); - - // Clipboard: copy selection on Cmd/Ctrl+C, paste on Cmd/Ctrl+V - term.attachCustomKeyEventHandler((e) => { - const mod = e.ctrlKey || e.metaKey; - - // Cmd/Ctrl+C — copy selected text (let xterm handle it normally if no selection) - if (mod && e.key === 'c' && e.type === 'keydown') { - const selection = term.getSelection(); - if (selection) { - if (window.runtime && window.runtime.ClipboardSetText) { - window.runtime.ClipboardSetText(selection); - } else { - navigator.clipboard.writeText(selection).catch(function() {}); - } - return false; // Prevent xterm from sending Ctrl+C - } - // No selection — let Ctrl+C pass through as SIGINT - return true; - } - - // Cmd/Ctrl+V — paste from clipboard - if (mod && e.key === 'v' && e.type === 'keydown') { - suppressPasteEvent = true; - setTimeout(() => { suppressPasteEvent = false; }, 250); - if (window.runtime && window.runtime.ClipboardGetText) { - window.runtime.ClipboardGetText().then(function(text) { - if (text) term.paste(text); - }).catch(function() {}); - } else { - navigator.clipboard.readText().then(function(text) { - if (text) term.paste(text); - }).catch(function() {}); - } - return false; - } - - return true; - }); - - // Notify backend when terminal dimensions change - term.onResize(({ cols, rows }) => { - try { - window.go.api.Service.ResizeSession(sessionId, cols, rows); - } catch (err) { - console.error('ResizeSession error:', err); - } - }); - - // Re-fit when the container itself resizes - const observer = new ResizeObserver(() => { - try { - fitAddon.fit(); - } catch (_) { - // Ignore transient errors during layout shifts - } - }); - observer.observe(container); - - this.terminals.set(sessionId, { - term, - fitAddon, - searchAddon, - webLinksAddon, - observer, - }); - - return term; + return term; } /** @@ -206,15 +225,15 @@ class TerminalManager { * @param {string} base64Data */ handleData(sessionId, base64Data) { - const entry = this.terminals.get(sessionId); - if (!entry) return; + const entry = this.terminals.get(sessionId); + if (!entry) return; - try { - const raw = atob(base64Data); - entry.term.write(raw); - } catch (err) { - console.error('Failed to decode session data:', err); - } + try { + const raw = atob(base64Data); + entry.term.write(raw); + } catch (err) { + console.error("Failed to decode session data:", err); + } } /** @@ -222,12 +241,12 @@ class TerminalManager { * @param {string} sessionId */ destroyTerminal(sessionId) { - const entry = this.terminals.get(sessionId); - if (!entry) return; + const entry = this.terminals.get(sessionId); + if (!entry) return; - entry.observer.disconnect(); - entry.term.dispose(); - this.terminals.delete(sessionId); + entry.observer.disconnect(); + entry.term.dispose(); + this.terminals.delete(sessionId); } /** @@ -235,28 +254,32 @@ class TerminalManager { * @param {string} sessionId */ showTerminal(sessionId) { - for (const [id, entry] of this.terminals) { - const panel = document.getElementById(`panel-${id}`); - if (panel) { - panel.style.display = id === sessionId ? 'flex' : 'none'; - } + for (const [id, entry] of this.terminals) { + const panel = document.getElementById(`panel-${id}`); + if (panel) { + panel.style.display = id === sessionId ? "flex" : "none"; } + } - // Re-fit the newly visible terminal - const entry = this.terminals.get(sessionId); - if (entry) { - requestAnimationFrame(() => { - try { entry.fitAddon.fit(); } catch (_) { /* noop */ } - }); - } + // Re-fit the newly visible terminal + const entry = this.terminals.get(sessionId); + if (entry) { + requestAnimationFrame(() => { + try { + entry.fitAddon.fit(); + } catch (_) { + /* noop */ + } + }); + } } /** * Re-fits the currently active terminal to its container. */ fitActive() { - const id = this.app.state.activeSessionId; - if (id) this.fitSession(id); + const id = this.app.state.activeSessionId; + if (id) this.fitSession(id); } /** @@ -264,12 +287,16 @@ class TerminalManager { * @param {string} sessionId */ fitSession(sessionId) { - const entry = this.terminals.get(sessionId); - if (entry) { - requestAnimationFrame(() => { - try { entry.fitAddon.fit(); } catch (_) { /* noop */ } - }); - } + const entry = this.terminals.get(sessionId); + if (entry) { + requestAnimationFrame(() => { + try { + entry.fitAddon.fit(); + } catch (_) { + /* noop */ + } + }); + } } /** @@ -283,25 +310,25 @@ class TerminalManager { * @returns {boolean} Whether a match was found. */ search(sessionId, query, options = {}) { - const entry = this.terminals.get(sessionId); - if (!entry) return false; + const entry = this.terminals.get(sessionId); + if (!entry) return false; - if (!query) { - entry.searchAddon.clearDecorations(); - return false; - } + if (!query) { + entry.searchAddon.clearDecorations(); + return false; + } - return entry.searchAddon.findNext(query, { - regex: options.regex || false, - caseSensitive: options.caseSensitive || false, - wholeWord: options.wholeWord || false, - decorations: { - matchBackground: '#ffa72633', - activeMatchBackground: '#4ecdc466', - matchBorder: '#ffa726', - activeMatchBorder: '#4ecdc4', - }, - }); + return entry.searchAddon.findNext(query, { + regex: options.regex || false, + caseSensitive: options.caseSensitive || false, + wholeWord: options.wholeWord || false, + decorations: { + matchBackground: "#ffa72633", + activeMatchBackground: "#4ecdc466", + matchBorder: "#ffa726", + activeMatchBorder: "#4ecdc4", + }, + }); } /** @@ -312,13 +339,13 @@ class TerminalManager { * @returns {boolean} */ searchPrevious(sessionId, query, options = {}) { - const entry = this.terminals.get(sessionId); - if (!entry || !query) return false; - return entry.searchAddon.findPrevious(query, { - regex: options.regex || false, - caseSensitive: options.caseSensitive || false, - wholeWord: options.wholeWord || false, - }); + const entry = this.terminals.get(sessionId); + if (!entry || !query) return false; + return entry.searchAddon.findPrevious(query, { + regex: options.regex || false, + caseSensitive: options.caseSensitive || false, + wholeWord: options.wholeWord || false, + }); } /** @@ -326,8 +353,8 @@ class TerminalManager { * @param {string} sessionId */ clearTerminal(sessionId) { - const entry = this.terminals.get(sessionId); - if (entry) entry.term.clear(); + const entry = this.terminals.get(sessionId); + if (entry) entry.term.clear(); } /** @@ -335,8 +362,8 @@ class TerminalManager { * @param {string} sessionId */ resetTerminal(sessionId) { - const entry = this.terminals.get(sessionId); - if (entry) entry.term.reset(); + const entry = this.terminals.get(sessionId); + if (entry) entry.term.reset(); } /** @@ -344,8 +371,8 @@ class TerminalManager { * @param {string} sessionId */ focusTerminal(sessionId) { - const entry = this.terminals.get(sessionId); - if (entry) entry.term.focus(); + const entry = this.terminals.get(sessionId); + if (entry) entry.term.focus(); } /** @@ -353,10 +380,10 @@ class TerminalManager { * @param {string} themeName */ applyTheme(themeName) { - const themeObj = window.NexusTerminal.getTerminalTheme(themeName); - for (const [, entry] of this.terminals) { - entry.term.options.theme = themeObj; - } + const themeObj = window.NexusTerminal.getTerminalTheme(themeName); + for (const [, entry] of this.terminals) { + entry.term.options.theme = themeObj; + } } // ── Private helpers ────────────────────────────────────────────── @@ -370,95 +397,103 @@ class TerminalManager { * @private */ _showTerminalContextMenu(sessionId, term, x, y) { - const { createElement, dismissContextMenus } = window.NexusTerminal; - dismissContextMenus(); + const { createElement, dismissContextMenus } = window.NexusTerminal; + dismissContextMenus(); - const hasSelection = term.hasSelection(); - const menu = createElement('div', 'context-menu'); - menu.style.left = `${x}px`; - menu.style.top = `${y}px`; + const hasSelection = term.hasSelection(); + const menu = createElement("div", "context-menu"); + menu.style.left = `${x}px`; + menu.style.top = `${y}px`; - const items = [ - { - label: 'Copy', - disabled: !hasSelection, - action: () => { - const text = term.getSelection(); - if (text) { - if (window.runtime && window.runtime.ClipboardSetText) { - window.runtime.ClipboardSetText(text); - } else { - navigator.clipboard.writeText(text).catch(function() {}); - } - this.app.notifications.info('Copied to clipboard'); - } - }, - }, - { - label: 'Paste', - action: () => { - if (window.runtime && window.runtime.ClipboardGetText) { - window.runtime.ClipboardGetText().then((text) => { - if (text) term.paste(text); - }).catch(function() {}); - } else { - navigator.clipboard.readText().then((text) => { - if (text) term.paste(text); - }).catch(function() {}); - } - }, - }, - { divider: true }, - { - label: 'Select All', - action: () => term.selectAll(), - }, - { - label: 'Find…', - action: () => this.app._openTerminalSearch(), - }, - { - label: 'Send Snippet…', - action: () => this.app.snippets.open(), - }, - { divider: true }, - { - label: 'Clear Terminal', - action: () => term.clear(), - }, - { - label: 'Reset Terminal', - action: () => term.reset(), - }, - ]; - - for (const entry of items) { - if (entry.divider) { - menu.appendChild(createElement('div', 'context-menu-divider')); - continue; + const items = [ + { + label: "Copy", + disabled: !hasSelection, + action: () => { + const text = term.getSelection(); + if (text) { + if (window.runtime && window.runtime.ClipboardSetText) { + window.runtime.ClipboardSetText(text); + } else { + navigator.clipboard.writeText(text).catch(function () {}); + } + this.app.notifications.info("Copied to clipboard"); } - const btn = createElement('button', 'context-menu-item', { - textContent: entry.label, - }); - if (entry.disabled) { - btn.disabled = true; - btn.classList.add('context-menu-disabled'); + }, + }, + { + label: "Paste", + action: () => { + if (window.runtime && window.runtime.ClipboardGetText) { + window.runtime + .ClipboardGetText() + .then((text) => { + if (text) term.paste(text); + }) + .catch(function () {}); + } else { + navigator.clipboard + .readText() + .then((text) => { + if (text) term.paste(text); + }) + .catch(function () {}); } - btn.addEventListener('click', () => { - dismissContextMenus(); - entry.action(); - }); - // Prevent mousedown from causing text deselection in WKWebView - btn.addEventListener('mousedown', (e) => e.preventDefault()); - menu.appendChild(btn); + }, + }, + { divider: true }, + { + label: "Select All", + action: () => term.selectAll(), + }, + { + label: "Find…", + action: () => this.app._openTerminalSearch(), + }, + { + label: "Send Snippet…", + action: () => this.app.snippets.open(), + }, + { divider: true }, + { + label: "Clear Terminal", + action: () => term.clear(), + }, + { + label: "Reset Terminal", + action: () => term.reset(), + }, + ]; + + for (const entry of items) { + if (entry.divider) { + menu.appendChild(createElement("div", "context-menu-divider")); + continue; } + const btn = createElement("button", "context-menu-item", { + textContent: entry.label, + }); + if (entry.disabled) { + btn.disabled = true; + btn.classList.add("context-menu-disabled"); + } + btn.addEventListener("click", () => { + dismissContextMenus(); + entry.action(); + }); + // Prevent mousedown from causing text deselection in WKWebView + btn.addEventListener("mousedown", (e) => e.preventDefault()); + menu.appendChild(btn); + } - document.body.appendChild(menu); + document.body.appendChild(menu); - // Keep within viewport - const rect = menu.getBoundingClientRect(); - if (rect.right > window.innerWidth) menu.style.left = `${window.innerWidth - rect.width - 8}px`; - if (rect.bottom > window.innerHeight) menu.style.top = `${window.innerHeight - rect.height - 8}px`; + // Keep within viewport + const rect = menu.getBoundingClientRect(); + if (rect.right > window.innerWidth) + menu.style.left = `${window.innerWidth - rect.width - 8}px`; + if (rect.bottom > window.innerHeight) + menu.style.top = `${window.innerHeight - rect.height - 8}px`; } /** @@ -467,12 +502,12 @@ class TerminalManager { * @private */ _buildTheme() { - const themeName = (this.app.state.preferences || {}).terminalTheme || 'charcoal'; - return window.NexusTerminal.getTerminalTheme(themeName); + const themeName = + (this.app.state.preferences || {}).terminalTheme || "charcoal"; + return window.NexusTerminal.getTerminalTheme(themeName); } -} - -window.NexusTerminal = window.NexusTerminal || {}; -window.NexusTerminal.TerminalManager = TerminalManager; + } + window.NexusTerminal = window.NexusTerminal || {}; + window.NexusTerminal.TerminalManager = TerminalManager; })(); diff --git a/frontend/wailsjs/go/api/Service.d.ts b/frontend/wailsjs/go/api/Service.d.ts index 5e7a533..cbeded4 100755 --- a/frontend/wailsjs/go/api/Service.d.ts +++ b/frontend/wailsjs/go/api/Service.d.ts @@ -33,6 +33,8 @@ export function DeleteTOTPSecret(arg1:string):Promise; export function DisconnectSession(arg1:string):Promise; +export function DownloadGitHubRepoArchive(arg1:string,arg2:string,arg3:string):Promise; + export function DuplicateProfile(arg1:string):Promise; export function ExportProfiles(arg1:boolean):Promise; diff --git a/frontend/wailsjs/go/api/Service.js b/frontend/wailsjs/go/api/Service.js index 97b2350..619c9f3 100755 --- a/frontend/wailsjs/go/api/Service.js +++ b/frontend/wailsjs/go/api/Service.js @@ -62,6 +62,10 @@ export function DisconnectSession(arg1) { return window['go']['api']['Service']['DisconnectSession'](arg1); } +export function DownloadGitHubRepoArchive(arg1, arg2, arg3) { + return window['go']['api']['Service']['DownloadGitHubRepoArchive'](arg1, arg2, arg3); +} + export function DuplicateProfile(arg1) { return window['go']['api']['Service']['DuplicateProfile'](arg1); } diff --git a/frontend/wailsjs/go/models.ts b/frontend/wailsjs/go/models.ts index c82427f..80991dc 100755 --- a/frontend/wailsjs/go/models.ts +++ b/frontend/wailsjs/go/models.ts @@ -95,6 +95,9 @@ export namespace models { owner: string; description: string; htmlURL: string; + defaultBranch: string; + latestCommitter: string; + latestCommitAt: string; private: boolean; fork: boolean; archived: boolean; @@ -114,6 +117,9 @@ export namespace models { this.owner = source["owner"]; this.description = source["description"]; this.htmlURL = source["htmlURL"]; + this.defaultBranch = source["defaultBranch"]; + this.latestCommitter = source["latestCommitter"]; + this.latestCommitAt = source["latestCommitAt"]; this.private = source["private"]; this.fork = source["fork"]; this.archived = source["archived"]; diff --git a/internal/api/api.go b/internal/api/api.go index e8a9a2d..be82230 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -10,6 +10,7 @@ import ( "net" "path/filepath" "runtime" + "strings" "sync" "time" @@ -748,6 +749,46 @@ func (s *Service) RefreshGitHubRepos(sessionID string) ([]models.GitHubRepo, err return s.sessions.FetchGitHubRepos(sessionID) } +// DownloadGitHubRepoArchive downloads a repository zip archive to a local file. +func (s *Service) DownloadGitHubRepoArchive(sessionID string, fullName string, ref string) (string, error) { + if s.ctx == nil { + return "", fmt.Errorf("application context not set") + } + if fullName == "" { + return "", fmt.Errorf("repository name cannot be empty") + } + + parts := strings.Split(fullName, "/") + repoName := parts[len(parts)-1] + defaultName := repoName + ".zip" + if ref != "" { + safeRef := strings.ReplaceAll(ref, "/", "-") + defaultName = fmt.Sprintf("%s-%s.zip", repoName, safeRef) + } + + path, err := wailsRuntime.SaveFileDialog(s.ctx, wailsRuntime.SaveDialogOptions{ + Title: "Download Repository", + DefaultFilename: defaultName, + Filters: []wailsRuntime.FileFilter{ + {DisplayName: "Zip Archive (*.zip)", Pattern: "*.zip"}, + }, + }) + if err != nil { + return "", fmt.Errorf("save dialog failed: %w", err) + } + if path == "" { + return "", fmt.Errorf("download cancelled") + } + if filepath.Ext(path) != ".zip" { + path += ".zip" + } + + if err := s.sessions.DownloadGitHubArchive(sessionID, fullName, ref, path); err != nil { + return "", err + } + return path, nil +} + // --------------------------------------------------------------------------- // Port forwarding // --------------------------------------------------------------------------- diff --git a/internal/githubclient/githubclient.go b/internal/githubclient/githubclient.go index 2b90b54..cd8fab9 100644 --- a/internal/githubclient/githubclient.go +++ b/internal/githubclient/githubclient.go @@ -9,8 +9,11 @@ import ( "fmt" "io" "net/http" + "os" "sort" "strings" + "sync" + "sync/atomic" "time" "github.com/andydixon/nexus/internal/models" @@ -42,6 +45,7 @@ type apiRepo struct { Name string `json:"name"` Description string `json:"description"` HTMLURL string `json:"html_url"` + DefaultBranch string `json:"default_branch"` Private bool `json:"private"` Fork bool `json:"fork"` Archived bool `json:"archived"` @@ -58,6 +62,15 @@ type apiRepo struct { // paginating through the API. Results are sorted by pushed_at descending // (most recently active first). func (c *Client) FetchRepos(ctx context.Context) ([]models.GitHubRepo, error) { + return c.fetchRepos(ctx, nil) +} + +// FetchReposWithProgress fetches repositories and reports enrichment progress. +func (c *Client) FetchReposWithProgress(ctx context.Context, progress func(done int, total int)) ([]models.GitHubRepo, error) { + return c.fetchRepos(ctx, progress) +} + +func (c *Client) fetchRepos(ctx context.Context, progress func(done int, total int)) ([]models.GitHubRepo, error) { var all []apiRepo page := 1 @@ -120,6 +133,7 @@ func (c *Client) FetchRepos(ctx context.Context) ([]models.GitHubRepo, error) { Owner: r.Owner.Login, Description: r.Description, HTMLURL: r.HTMLURL, + DefaultBranch: r.DefaultBranch, Private: r.Private, Fork: r.Fork, Archived: r.Archived, @@ -129,9 +143,149 @@ func (c *Client) FetchRepos(ctx context.Context) ([]models.GitHubRepo, error) { UpdatedAt: r.UpdatedAt.Format(time.RFC3339), } } + + if progress != nil { + progress(0, len(result)) + } + + // Enrich with latest commit metadata (best-effort). + sem := make(chan struct{}, 5) + var wg sync.WaitGroup + var done int32 + for i := range result { + wg.Add(1) + go func(idx int) { + defer wg.Done() + sem <- struct{}{} + defer func() { <-sem }() + + ref := result[idx].DefaultBranch + if ref == "" { + ref = "HEAD" + } + committer, committedAt, err := c.FetchLatestCommit(ctx, result[idx].FullName, ref) + if err != nil { + if progress != nil { + current := int(atomic.AddInt32(&done, 1)) + progress(current, len(result)) + } + return + } + result[idx].LatestCommitter = committer + result[idx].LatestCommitAt = committedAt + if progress != nil { + current := int(atomic.AddInt32(&done, 1)) + progress(current, len(result)) + } + }(i) + } + wg.Wait() return result, nil } +// FetchLatestCommit returns the committer name and commit time for a repo/ref. +func (c *Client) FetchLatestCommit(ctx context.Context, fullName string, ref string) (string, string, error) { + url := fmt.Sprintf("%s/repos/%s/commits/%s", c.baseURL, fullName, ref) + if ref == "" { + url = fmt.Sprintf("%s/repos/%s/commits/HEAD", c.baseURL, fullName) + } + + req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil) + if err != nil { + return "", "", fmt.Errorf("building request: %w", err) + } + req.Header.Set("Authorization", "Bearer "+c.token) + req.Header.Set("Accept", "application/vnd.github+json") + req.Header.Set("User-Agent", "NexusTerminal/1.0") + + resp, err := c.httpClient.Do(req) + if err != nil { + return "", "", fmt.Errorf("fetching commit: %w", err) + } + defer resp.Body.Close() + + if resp.StatusCode == http.StatusUnauthorized || resp.StatusCode == http.StatusForbidden { + return "", "", fmt.Errorf("authentication failed (HTTP %d)", resp.StatusCode) + } + if resp.StatusCode != http.StatusOK { + body, _ := io.ReadAll(resp.Body) + return "", "", fmt.Errorf("GitHub API returned HTTP %d: %s", resp.StatusCode, string(body)) + } + + var payload struct { + Commit struct { + Committer struct { + Name string `json:"name"` + Date time.Time `json:"date"` + } `json:"committer"` + Author struct { + Name string `json:"name"` + Date time.Time `json:"date"` + } `json:"author"` + } `json:"commit"` + } + + if err := json.NewDecoder(resp.Body).Decode(&payload); err != nil { + return "", "", fmt.Errorf("decoding commit: %w", err) + } + + name := payload.Commit.Committer.Name + date := payload.Commit.Committer.Date + if name == "" { + name = payload.Commit.Author.Name + date = payload.Commit.Author.Date + } + if name == "" || date.IsZero() { + return "", "", fmt.Errorf("commit metadata missing") + } + + return name, date.Format(time.RFC3339), nil +} + +// DownloadRepoArchive downloads a repository zip archive to the given path. +func (c *Client) DownloadRepoArchive(ctx context.Context, fullName string, ref string, destPath string) error { + if fullName == "" { + return fmt.Errorf("repository name cannot be empty") + } + url := fmt.Sprintf("%s/repos/%s/zipball", c.baseURL, fullName) + if ref != "" { + url = url + "/" + ref + } + + req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil) + if err != nil { + return fmt.Errorf("building request: %w", err) + } + req.Header.Set("Authorization", "Bearer "+c.token) + req.Header.Set("Accept", "application/vnd.github+json") + req.Header.Set("User-Agent", "NexusTerminal/1.0") + + resp, err := c.httpClient.Do(req) + if err != nil { + return fmt.Errorf("downloading archive: %w", err) + } + defer resp.Body.Close() + + if resp.StatusCode == http.StatusUnauthorized || resp.StatusCode == http.StatusForbidden { + return fmt.Errorf("authentication failed (HTTP %d) — check your access token", resp.StatusCode) + } + if resp.StatusCode != http.StatusOK { + body, _ := io.ReadAll(resp.Body) + return fmt.Errorf("GitHub API returned HTTP %d: %s", resp.StatusCode, string(body)) + } + + file, err := os.Create(destPath) + if err != nil { + return fmt.Errorf("creating file: %w", err) + } + defer file.Close() + + if _, err := io.Copy(file, resp.Body); err != nil { + return fmt.Errorf("writing archive: %w", err) + } + return nil +} + // ValidateToken makes a lightweight call to /user to confirm the token works. func (c *Client) ValidateToken(ctx context.Context) (string, error) { url := c.baseURL + "/user" diff --git a/internal/models/models.go b/internal/models/models.go index 76b5dd6..40135b9 100644 --- a/internal/models/models.go +++ b/internal/models/models.go @@ -199,6 +199,9 @@ type GitHubRepo struct { Owner string `json:"owner"` Description string `json:"description"` HTMLURL string `json:"htmlURL"` + DefaultBranch string `json:"defaultBranch"` + LatestCommitter string `json:"latestCommitter"` + LatestCommitAt string `json:"latestCommitAt"` Private bool `json:"private"` Fork bool `json:"fork"` Archived bool `json:"archived"` diff --git a/internal/sessions/manager.go b/internal/sessions/manager.go index 9d15378..6116ae3 100644 --- a/internal/sessions/manager.go +++ b/internal/sessions/manager.go @@ -703,13 +703,40 @@ func (m *Manager) connectGitHub(sess *Session, getSecret func(prompt string) (st // Validate the token. login, err := client.ValidateToken(context.Background()) if err != nil { - return fmt.Errorf("GitHub authentication failed: %w", err) + if m.isGitHubAuthError(err) && getSecret != nil { + retryToken, retryErr := m.promptAndStoreSecret( + profile.ID, + "github-token", + ghConf.SecretMode, + getSecret, + "GitHub token did not work. Please enter a valid token:", + ) + if retryErr == nil && retryToken != "" { + client = githubclient.New(ghConf.BaseURL, retryToken) + login, err = client.ValidateToken(context.Background()) + } + } + if err != nil { + return fmt.Errorf("GitHub authentication failed: %w", err) + } } sess.githubClient = client // Perform the initial fetch. - repos, err := client.FetchRepos(context.Background()) + m.emitEvent("session:github:status", map[string]interface{}{ + "sessionID": sess.Info.ID, + "status": "Loading repositories...", + }) + repos, err := client.FetchReposWithProgress(context.Background(), func(done int, total int) { + if total <= 0 { + return + } + m.emitEvent("session:github:status", map[string]interface{}{ + "sessionID": sess.Info.ID, + "status": fmt.Sprintf("Loading commit info (%d/%d)", done, total), + }) + }) if err != nil { return fmt.Errorf("fetching repositories: %w", err) } @@ -739,7 +766,19 @@ func (m *Manager) connectGitHub(sess *Session, getSecret func(prompt string) (st case <-ctx.Done(): return case <-ticker.C: - updated, fetchErr := client.FetchRepos(ctx) + m.emitEvent("session:github:status", map[string]interface{}{ + "sessionID": sess.Info.ID, + "status": "Refreshing repositories...", + }) + updated, fetchErr := client.FetchReposWithProgress(ctx, func(done int, total int) { + if total <= 0 { + return + } + m.emitEvent("session:github:status", map[string]interface{}{ + "sessionID": sess.Info.ID, + "status": fmt.Sprintf("Loading commit info (%d/%d)", done, total), + }) + }) if fetchErr != nil { m.emitEvent("session:github:error", map[string]interface{}{ "sessionID": sess.Info.ID, @@ -785,6 +824,29 @@ func (m *Manager) FetchGitHubRepos(sessionID string) ([]models.GitHubRepo, error return repos, nil } +// DownloadGitHubArchive downloads a repository zip archive for a GitHub session. +func (m *Manager) DownloadGitHubArchive(sessionID string, fullName string, ref string, destPath string) error { + m.mu.RLock() + sess, ok := m.sessions[sessionID] + m.mu.RUnlock() + + if !ok { + return fmt.Errorf("sessions: session %q not found", sessionID) + } + if sess.githubClient == nil { + return fmt.Errorf("sessions: session %q is not a GitHub connection", sessionID) + } + + if ref == "" { + ref = "HEAD" + } + + if err := sess.githubClient.DownloadRepoArchive(context.Background(), fullName, ref, destPath); err != nil { + return fmt.Errorf("downloading archive: %w", err) + } + return nil +} + // --------------------------------------------------------------------------- // Session recording // --------------------------------------------------------------------------- @@ -1179,6 +1241,47 @@ func (m *Manager) buildSecretCallback(profileID string, secretType string, mode } } +// promptAndStoreSecret asks the user for a secret and stores it based on the mode. +func (m *Manager) promptAndStoreSecret(profileID string, secretType string, mode models.SecretMode, getSecret func(prompt string) (string, error), prompt string) (string, error) { + if getSecret == nil { + return "", fmt.Errorf("no %s available and no prompt callback provided", secretType) + } + val, err := getSecret(prompt) + if err != nil { + return "", err + } + if val == "" { + return "", fmt.Errorf("%s cannot be empty", secretType) + } + + if mode == models.SecretModeSaved { + stored := false + secretKey := fmt.Sprintf("profile:%s:%s", profileID, secretType) + if m.keychainStore != nil { + if sErr := m.keychainStore.SetSecret(secretKey, val); sErr == nil { + stored = true + } + } + if !stored && m.secretStore != nil && m.secretStore.IsUnlocked() { + _ = m.secretStore.SetSecret(secretKey, val) + } + } + + return val, nil +} + +// isGitHubAuthError checks whether an error indicates authentication failure. +func (m *Manager) isGitHubAuthError(err error) bool { + if err == nil { + return false + } + msg := strings.ToLower(err.Error()) + return strings.Contains(msg, "token validation failed") || + strings.Contains(msg, "authentication failed") || + strings.Contains(msg, "http 401") || + strings.Contains(msg, "http 403") +} + // closeSession shuts down the protocol client for a session. func (m *Manager) closeSession(sess *Session) { // Cancel any in-progress reconnect backoff.