Merge #432: pop a session, a file preview or a web tab out into a native wrapper's own window

# Conflicts:
#	src/web/public/app.js
#	src/web/public/settings-ui.js
This commit is contained in:
Codeman maintainer
2026-10-09 05:55:08 +02:00
9 changed files with 253 additions and 8 deletions
+57 -2
View File
@@ -1164,6 +1164,8 @@ class CodemanApp {
this._selectUrlSession();
});
}
// mobile.css keeps the pop-out icon off phones unless a host can open windows.
document.documentElement.classList.toggle('host-windows', this.hasHostWindows());
// Initialize mobile handlers
KeyboardHandler.init();
SwipeHandler.init();
@@ -1667,6 +1669,21 @@ class CodemanApp {
// false only when we owned a now-closed window (re-dock + fall through to
// genuinely re-open below).
if (this.detachedSessions.has(id) && this._raiseDetached(id)) return;
// A native wrapper (an Android WebView app) has no browser pop-ups, but can
// open the solo URL in a window of its own, beside this one on a foldable or
// a split screen. There is no WindowProxy to poll, so the tab is tracked the
// way a dashboard reload tracks it: the solo window's channel announcements
// plus the roll-call liveness check.
const hosted = this.openInHostWindow(CodemanBase.url('/session/' + encodeURIComponent(id)));
if (hosted !== null) {
if (!hosted) {
this.showToast?.('Could not open a new window for this session', 'error');
return;
}
this._markDetached(id, true);
this._postWindowMessage({ type: 'detached', id });
return;
}
const features = 'width=960,height=680,menubar=no,toolbar=no,location=no,status=no';
let win = null;
try { win = window.open(CodemanBase.url('/session/' + encodeURIComponent(id)), 'codeman-session-' + id, features); } catch {}
@@ -1681,6 +1698,32 @@ class CodemanApp {
try { win.focus(); } catch {}
}
/**
* The embedding app's window opener, when there is one. A native wrapper
* exposes `window.CodemanHost.openWindow(absoluteUrl)` (returning whether a
* window opened) to say it can put a page in a window of its own; browsers
* never define it.
* @returns {boolean} whether a host window opener is present
*/
hasHostWindows() {
try {
return typeof window !== 'undefined' && typeof window.CodemanHost?.openWindow === 'function';
} catch { return false; }
}
/**
* Open a same-origin page in a host window.
* @param {string} url absolute or base-relative URL
* @returns {boolean|null} null when there is no host (use window.open),
* otherwise whether the host opened a window
*/
openInHostWindow(url) {
if (!this.hasHostWindows()) return null;
try {
return window.CodemanHost.openWindow(new URL(url, location.href).href) !== false;
} catch { return false; }
}
/** Raise the popup for an already-detached session. Returns true if the raise
* was handled (caller should stop); false if we owned a now-closed window and
* re-docked it (caller should fall through to inline / re-open). Unifies the
@@ -1810,8 +1853,12 @@ class CodemanApp {
// Roll-call has no id (broadcast to all) — answer before the id filter.
if (msg.type === 'roll-call') { this._postWindowMessage({ type: 'detached', id: this.soloSessionId }); return; }
if (msg.id !== this.soloSessionId) return;
if (msg.type === 'close-request') { try { window.close(); } catch {} }
else if (msg.type === 'focus-request') { try { window.focus(); } catch {} }
// A host window ignores window.close()/focus() from script it did not
// open by window.open, so ask the host when it offers the call.
if (msg.type === 'close-request') { this._closeSoloWindow(); }
else if (msg.type === 'focus-request') {
try { if (typeof window.CodemanHost?.focusWindow === 'function') window.CodemanHost.focusWindow(); else window.focus(); } catch {}
}
return;
}
// Dashboard side.
@@ -1863,6 +1910,14 @@ class CodemanApp {
}, 1200);
}
/** Solo window: close itself (the re-dock button and a dashboard close-request). */
_closeSoloWindow() {
try {
if (typeof window.CodemanHost?.closeWindow === 'function') window.CodemanHost.closeWindow();
else window.close();
} catch {}
}
/** Solo window: select the target session and apply minimal single-session
* chrome. Called from handleInit once the session list has loaded. */
_applySoloMode() {
+1 -1
View File
@@ -147,7 +147,7 @@
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg>
<span>Admin Panel</span>
</button>
<button class="btn-icon-header btn-solo-redock" id="soloRedockBtn" style="display: none;" onclick="window.close()" title="Re-dock to dashboard (close window)" aria-label="Re-dock session to dashboard">&#x229E;</button>
<button class="btn-icon-header btn-solo-redock" id="soloRedockBtn" style="display: none;" onclick="app._closeSoloWindow()" title="Re-dock to dashboard (close window)" aria-label="Re-dock session to dashboard">&#x229E;</button>
<button class="tunnel-indicator" id="tunnelIndicator" style="display: none;" onclick="app.toggleTunnelPanel()" title="Cloudflare Tunnel" aria-label="Tunnel status">
<span class="tunnel-dot"></span>
</button>
+11 -2
View File
@@ -39,8 +39,10 @@ html.mobile-init .file-browser-panel {
/* No "open in new window" (detach) on phones/tablets — popped-out browser
windows aren't usable there. !important beats the hover/detached reveal
rules in styles.css */
.session-tab .tab-detach {
rules in styles.css. A native wrapper that opens windows of its own (side
by side on a foldable) keeps it at tablet widths: app.js sets
html.host-windows. Phone widths hide it again in the 599px block. */
html:not(.host-windows) .session-tab .tab-detach {
display: none !important;
}
}
@@ -871,6 +873,13 @@ html.mobile-init .file-browser-panel {
display: none;
}
/* The tap-zone reserve counts gear + close only (test/mobile-tab-tap-zones),
so the pop-out icon stays off phone tabs even under a window-opening host,
which offers the pop-out from its own chrome (app.detachSession). */
.session-tab .tab-detach {
display: none !important;
}
/* Gear icon on active tab - tiny, subtle */
.session-tab.active .tab-gear {
display: inline-flex;
+6
View File
@@ -4334,6 +4334,12 @@ Object.assign(CodemanApp.prototype, {
*/
detachFilePreview() {
if (!this.filePreviewDetachUrl) return;
const hosted = this.openInHostWindow?.(this.filePreviewDetachUrl) ?? null;
if (hosted !== null) {
if (hosted) this.closeFilePreview();
else this.showToast('Could not open a new window for this preview', 'error');
return;
}
const win = window.open(this.filePreviewDetachUrl, '_blank');
if (!win) {
this.showToast('Pop-up blocked: allow pop-ups for this site to detach previews', 'error');
+6 -2
View File
@@ -506,7 +506,8 @@ Object.assign(CodemanApp.prototype, {
settings.tabRailSort ?? defaults.tabRailSort ?? 'activity';
document.getElementById('appSettingsTabArrangement').value = this.resolveTabArrangement(settings);
document.getElementById('appSettingsTabStateOrder').value = this.resolveTabStateOrder(settings);
document.getElementById('appSettingsShowTabDetachButton').checked = settings.showTabDetachButton ?? defaults.showTabDetachButton ?? false;
document.getElementById('appSettingsShowTabDetachButton').checked =
settings.showTabDetachButton ?? (this.hasHostWindows?.() ? true : (defaults.showTabDetachButton ?? false));
document.getElementById('appSettingsSessionListLayout').value =
settings.sessionListLayout ?? defaults.sessionListLayout ?? 'header';
const sessionSidebarFontSize = this.resolveSessionSidebarFontSize(
@@ -3721,7 +3722,10 @@ Object.assign(CodemanApp.prototype, {
// default OFF, per-device). Mirrored as a class on <html>: styles.css hides
// .tab-detach without it (a tab that is already detached keeps its icon as
// the re-focus affordance for the popped-out window).
const showTabDetach = settings.showTabDetachButton ?? defaults.showTabDetachButton ?? false;
// Under a host that opens windows (see hasHostWindows) popping out is the
// way to get two panes side by side, so the button defaults on there.
const showTabDetach =
settings.showTabDetachButton ?? (this.hasHostWindows?.() ? true : (defaults.showTabDetachButton ?? false));
document.documentElement.classList.toggle('tabs-show-detach', showTabDetach);
const compactHeader = MobileDetection.getDeviceType() !== 'desktop';
const showFontControls = compactHeader ? false : (settings.showFontControls ?? defaults.showFontControls ?? false);
+3 -1
View File
@@ -514,7 +514,9 @@ Object.assign(CodemanApp.prototype, {
openWebviewExternal(id) {
const webview = this.webviews.get(id || this.activeWebviewId);
if (webview) window.open(webview.url, '_blank', 'noopener');
if (!webview) return;
if (this.openInHostWindow?.(webview.url)) return;
window.open(webview.url, '_blank', 'noopener');
},
closeWebviewTab(id) {