Skip to content

Fix remote server token recovery #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
firewalker06 merged 1 commit into from
Jun 21, 2026
Merged

Fix remote server token recovery #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions lib/hq/remote_ui/assets/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,10 @@ textarea {
.server-token-form {
display: grid;
gap: 10px;
margin-top: 10px;
}

.server-list-item .server-token-form {
margin: 0 12px 12px 46px;
}

Expand All @@ -776,6 +780,15 @@ textarea {
gap: 0;
}

.server-list-item > .detail-row {
align-items: start;
}

.server-list-item .chip {
width: max-content;
margin-top: 4px;
}

.server-section-label > div {
display: grid;
gap: 2px;
Expand Down Expand Up @@ -830,6 +843,34 @@ textarea {
.server-connection-grid {
grid-template-columns: 1fr;
}

.remote-server-list-item > .detail-row {
grid-template-columns: auto minmax(0, 1fr);
}

.remote-server-list-item > .detail-row > .server-row-actions {
grid-column: 1 / -1;
display: grid;
grid-template-columns: repeat(3, minmax(0, 1fr));
width: 100%;
}

.remote-server-list-item .server-row-actions .inline-icon-button {
justify-content: center;
min-width: 0;
padding-inline: 8px;
}

.remote-server-list-item .server-row-actions .inline-icon-button span {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

.remote-server-list-item .server-token-form {
margin-left: 0;
margin-right: 0;
}
}

#prompt-input {
Expand Down
23 changes: 21 additions & 2 deletions lib/hq/remote_ui/assets/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1809,10 +1809,11 @@ function renderNow() {
const running = state.agents.filter((agent) => agent.running);
const unread = state.agents.filter((agent) => agent.unread && !agent.awaiting_input && !agent.blocked && !agent.running);
const scheduleSection = renderScheduleNowSection();
const tokenRecovery = renderActiveServerTokenRecovery();
setHeader("Needs attention", connectionText(), "HQ");
setMainHeaderMore("now");

if (waiting.length === 0 && blocked.length === 0 && running.length === 0 && unread.length === 0 && !scheduleSection) {
if (waiting.length === 0 && blocked.length === 0 && running.length === 0 && unread.length === 0 && !scheduleSection && !tokenRecovery) {
replaceView(`
<section class="summary-card attention">
<p class="summary-text">Nothing to do, hooray!</p>
Expand Down Expand Up @@ -1843,13 +1844,31 @@ function renderNow() {

replaceView(`
${summary}
${tokenRecovery}
${scheduleSection}
${nowSection}
${unreadSection}
${runningSection}
`);
}

function renderActiveServerTokenRecovery() {
const server = activeServer();
if (!server || server.local || remoteServerToken(server.key)) return "";
if (!String(connectionText()).includes("rejected broker credentials")) return "";

return `
<section class="summary-card attention">
<div class="card-title">
<strong>Remote token required</strong>
<span class="wrap-anywhere">${escapeHtml(server.name || server.key)}</span>
</div>
<p class="summary-text">Enter this server's token to save it for this browser.</p>
${renderServerTokenForm(server)}
</section>
`;
}

function renderScheduleNowSection() {
const daemon = state.scheduleDaemon || {};
const schedules = state.schedules || [];
Expand Down Expand Up @@ -2509,7 +2528,7 @@ function renderServerRow(server) {
? `<span class="chip ${tokenConfigured || tokenSaved ? "done" : "need"}">${escapeHtml(tokenLabel)}</span>`
: "";
return `
<div class="server-list-item">
<div class="server-list-item ${server.local ? "local-server-list-item" : "remote-server-list-item"}">
<div class="detail-row">
<span class="status-mark ${className}" aria-hidden="true">${iconSvg(active ? "check" : "activity")}</span>
<div>
Expand Down
8 changes: 7 additions & 1 deletion test/remote_server_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2501,8 +2501,14 @@ def assert_remote_ui_routes_load_without_auth
js[:body].include?("saveRemoteServerToken") &&
js[:body].include?("brokerGetWithHeaders") &&
js[:body].include?("Remote token saved for this browser") &&
js[:body].include?("Token needed here"),
js[:body].include?("Token needed here") &&
js[:body].include?("function renderActiveServerTokenRecovery") &&
js[:body].include?("Remote token required"),
"expected Settings to let existing remote servers save a browser-local token")
assert(css[:body].include?(".remote-server-list-item > .detail-row > .server-row-actions") &&
css[:body].include?("grid-template-columns: repeat(3, minmax(0, 1fr))") &&
css[:body].include?(".remote-server-list-item .server-row-actions .inline-icon-button span"),
"expected remote server row actions to fit small screens")
assert(js[:body].include?("Restart the local Remote server to enable ad hoc peer switching"),
"expected stale broker errors to explain that the local Remote server must be restarted")
assert(!js[:body].include?("Connect local peer"),
Expand Down
Loading