agent page: assemble forge URL backend-side
Per review: build the full forge profile URL in the harness instead of the client. /api/state now returns forge_url: Option<String> (assembled from the request Host header — resolves against whatever host the operator reached the page on), replacing the forge_present bool. The JS just links forge_url when present — no client-side URL construction.
This commit is contained in:
parent
6ab667901d
commit
fc3490086b
3 changed files with 33 additions and 15 deletions
|
|
@ -359,9 +359,9 @@ Layout, top to bottom:
|
||||||
- Banner (gradient shimmer while state=thinking).
|
- Banner (gradient shimmer while state=thinking).
|
||||||
- Title with `↑ DASHB04RD` back-link (new tab) + `↻ R3BU1LD`.
|
- Title with `↑ DASHB04RD` back-link (new tab) + `↻ R3BU1LD`.
|
||||||
- Meta links row: `📊 stats →`, `🖥 screen →` (shown when
|
- Meta links row: `📊 stats →`, `🖥 screen →` (shown when
|
||||||
`gui_enabled`), and `⬡ forge ↗` (shown when `forge_present` —
|
`gui_enabled`), and `⬡ forge ↗` (shown when `/api/state`
|
||||||
links to the agent's Forgejo profile at `<host>:3000/<label>`,
|
supplies a non-null `forge_url` — the agent's Forgejo profile,
|
||||||
new tab).
|
assembled server-side from the request `Host` header, new tab).
|
||||||
- Status section: empty when online (alive-badge in the state
|
- Status section: empty when online (alive-badge in the state
|
||||||
row carries the signal), populated with the login form /
|
row carries the signal), populated with the login form /
|
||||||
OAuth URL when `status` is `needs_login_*`.
|
OAuth URL when `status` is `needs_login_*`.
|
||||||
|
|
|
||||||
|
|
@ -677,12 +677,12 @@
|
||||||
// Show the screen link when the weston VNC compositor is enabled.
|
// Show the screen link when the weston VNC compositor is enabled.
|
||||||
const screenLink = $('screen-link');
|
const screenLink = $('screen-link');
|
||||||
if (screenLink) screenLink.style.display = s.gui_enabled ? '' : 'none';
|
if (screenLink) screenLink.style.display = s.gui_enabled ? '' : 'none';
|
||||||
// Show the forge profile link when this agent has a forge account.
|
// Forge profile link — the backend hands us the full URL (or
|
||||||
// The forge runs on :3000 of the same host; the user is the label.
|
// null when this agent has no forge account).
|
||||||
const forgeLink = $('forge-link');
|
const forgeLink = $('forge-link');
|
||||||
if (forgeLink) {
|
if (forgeLink) {
|
||||||
if (s.forge_present) {
|
if (s.forge_url) {
|
||||||
forgeLink.href = `http://${window.location.hostname}:3000/${s.label}`;
|
forgeLink.href = s.forge_url;
|
||||||
forgeLink.style.display = '';
|
forgeLink.style.display = '';
|
||||||
} else {
|
} else {
|
||||||
forgeLink.style.display = 'none';
|
forgeLink.style.display = 'none';
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ use anyhow::{Context, Result};
|
||||||
use axum::{
|
use axum::{
|
||||||
Form, Router,
|
Form, Router,
|
||||||
extract::State,
|
extract::State,
|
||||||
http::StatusCode,
|
http::{HeaderMap, StatusCode},
|
||||||
response::{
|
response::{
|
||||||
IntoResponse, Response,
|
IntoResponse, Response,
|
||||||
sse::{Event, KeepAlive, Sse},
|
sse::{Event, KeepAlive, Sse},
|
||||||
|
|
@ -383,11 +383,11 @@ struct StateSnapshot {
|
||||||
/// (i.e. `/etc/hyperhive/gui.json` was present at harness startup).
|
/// (i.e. `/etc/hyperhive/gui.json` was present at harness startup).
|
||||||
/// When true, the UI may render a `🖥 screen` link to `/screen`.
|
/// When true, the UI may render a `🖥 screen` link to `/screen`.
|
||||||
gui_enabled: bool,
|
gui_enabled: bool,
|
||||||
/// Whether this agent has a Forgejo account wired — its
|
/// Full URL of this agent's Forgejo profile, or `null` when the
|
||||||
/// `forge-token` file exists in the state dir. When true the UI
|
/// agent has no forge account (`forge-token` absent). Assembled
|
||||||
/// links to the agent's forge profile at `<host>:3000/<label>`
|
/// server-side from the request `Host` header so the UI just
|
||||||
/// (the per-agent forge user is named after the agent).
|
/// links it — no client-side URL construction.
|
||||||
forge_present: bool,
|
forge_url: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize)]
|
||||||
|
|
@ -445,7 +445,7 @@ async fn api_loose_ends(State(state): State<AppState>) -> Response {
|
||||||
axum::Json(serde_json::json!({ "loose_ends": loose_ends })).into_response()
|
axum::Json(serde_json::json!({ "loose_ends": loose_ends })).into_response()
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn api_state(State(state): State<AppState>) -> axum::Json<StateSnapshot> {
|
async fn api_state(headers: HeaderMap, State(state): State<AppState>) -> axum::Json<StateSnapshot> {
|
||||||
// Capture seq *before* any reads so the dedupe contract is
|
// Capture seq *before* any reads so the dedupe contract is
|
||||||
// "events with seq > snapshot.seq are post-snapshot, never missed."
|
// "events with seq > snapshot.seq are post-snapshot, never missed."
|
||||||
let seq = state.bus.current_seq();
|
let seq = state.bus.current_seq();
|
||||||
|
|
@ -490,10 +490,28 @@ async fn api_state(State(state): State<AppState>) -> axum::Json<StateSnapshot> {
|
||||||
ctx_usage,
|
ctx_usage,
|
||||||
cost_usage,
|
cost_usage,
|
||||||
gui_enabled: state.gui_vnc_port.is_some(),
|
gui_enabled: state.gui_vnc_port.is_some(),
|
||||||
forge_present: crate::paths::state_dir().join("forge-token").is_file(),
|
forge_url: forge_profile_url(&headers, &state.label),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// This agent's Forgejo profile URL — `Some` only when the agent has a
|
||||||
|
/// forge account (its `forge-token` file exists). The host is taken
|
||||||
|
/// from the request `Host` header so the link resolves against
|
||||||
|
/// whatever host the operator reached the page on; the forge always
|
||||||
|
/// listens on `:3000`, and the per-agent forge user is named after
|
||||||
|
/// the agent (`label`).
|
||||||
|
fn forge_profile_url(headers: &HeaderMap, label: &str) -> Option<String> {
|
||||||
|
if !crate::paths::state_dir().join("forge-token").is_file() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
let host = headers
|
||||||
|
.get("host")
|
||||||
|
.and_then(|h| h.to_str().ok())
|
||||||
|
.unwrap_or("localhost");
|
||||||
|
let hostname = host.split(':').next().unwrap_or(host);
|
||||||
|
Some(format!("http://{hostname}:3000/{label}"))
|
||||||
|
}
|
||||||
|
|
||||||
/// Best-effort: pull the last 30 messages addressed to us via the
|
/// Best-effort: pull the last 30 messages addressed to us via the
|
||||||
/// per-agent / manager socket. Empty list on any transport / decode
|
/// per-agent / manager socket. Empty list on any transport / decode
|
||||||
/// failure — the inbox section is decorative, not authoritative.
|
/// failure — the inbox section is decorative, not authoritative.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue