diff --git a/crates/workspace-server/src/lib.rs b/crates/workspace-server/src/lib.rs index ad3dfc4b..d279a8d2 100644 --- a/crates/workspace-server/src/lib.rs +++ b/crates/workspace-server/src/lib.rs @@ -71,6 +71,8 @@ pub enum Error { }, #[error("unknown local repository `{0}`")] UnknownRepository(String), + #[error("workspace id does not match this Workspace backend")] + WorkspaceIdMismatch, #[error("workspace identity error: {0}")] WorkspaceIdentity(String), #[error("store error: {0}")] diff --git a/crates/workspace-server/src/server.rs b/crates/workspace-server/src/server.rs index 7e266f3a..9ff23033 100644 --- a/crates/workspace-server/src/server.rs +++ b/crates/workspace-server/src/server.rs @@ -221,84 +221,193 @@ impl WorkspaceApi { pub fn build_router(api: WorkspaceApi) -> Router { Router::new() .route("/api/workspace", get(get_workspace)) + .route("/api/w/{workspace_id}/workspace", get(scoped_get_workspace)) .route("/api/tickets", get(list_tickets)) + .route("/api/w/{workspace_id}/tickets", get(scoped_list_tickets)) .route("/api/tickets/{id}", get(get_ticket)) + .route("/api/w/{workspace_id}/tickets/{id}", get(scoped_get_ticket)) .route("/api/objectives", get(list_objectives)) + .route( + "/api/w/{workspace_id}/objectives", + get(scoped_list_objectives), + ) .route("/api/objectives/{id}", get(get_objective)) + .route( + "/api/w/{workspace_id}/objectives/{id}", + get(scoped_get_objective), + ) .route("/api/repositories", get(list_repositories)) + .route( + "/api/w/{workspace_id}/repositories", + get(scoped_list_repositories), + ) .route("/api/repositories/{repository_id}", get(repository_detail)) + .route( + "/api/w/{workspace_id}/repositories/{repository_id}", + get(scoped_repository_detail), + ) .route("/api/repositories/{repository_id}/log", get(repository_log)) + .route( + "/api/w/{workspace_id}/repositories/{repository_id}/log", + get(scoped_repository_log), + ) .route( "/api/repositories/{repository_id}/tickets", get(repository_tickets), ) + .route( + "/api/w/{workspace_id}/repositories/{repository_id}/tickets", + get(scoped_repository_tickets), + ) .route("/api/hosts", get(list_hosts)) + .route("/api/w/{workspace_id}/hosts", get(scoped_list_hosts)) .route("/api/runtimes", get(list_runtimes)) + .route("/api/w/{workspace_id}/runtimes", get(scoped_list_runtimes)) .route( "/api/workers", get(list_workers).post(create_workspace_worker), ) + .route( + "/api/w/{workspace_id}/workers", + get(scoped_list_workers).post(scoped_create_workspace_worker), + ) .route( "/api/workers/launch-options", get(get_worker_launch_options), ) + .route( + "/api/w/{workspace_id}/workers/launch-options", + get(scoped_get_worker_launch_options), + ) .route( "/api/settings/runtime-connections", get(get_runtime_connection_settings), ) + .route( + "/api/w/{workspace_id}/settings/runtime-connections", + get(scoped_get_runtime_connection_settings), + ) .route( "/api/settings/runtime-connections/remotes", post(add_remote_runtime_connection), ) + .route( + "/api/w/{workspace_id}/settings/runtime-connections/remotes", + post(scoped_add_remote_runtime_connection), + ) .route( "/api/settings/runtime-connections/remotes/{runtime_id}", delete(delete_remote_runtime_connection), ) + .route( + "/api/w/{workspace_id}/settings/runtime-connections/remotes/{runtime_id}", + delete(scoped_delete_remote_runtime_connection), + ) .route( "/api/settings/runtime-connections/remotes/{runtime_id}/test", post(test_remote_runtime_connection), ) + .route( + "/api/w/{workspace_id}/settings/runtime-connections/remotes/{runtime_id}/test", + post(scoped_test_remote_runtime_connection), + ) .route("/api/companion/status", get(get_companion_status)) + .route( + "/api/w/{workspace_id}/companion/status", + get(scoped_get_companion_status), + ) .route("/api/companion/transcript", get(get_companion_transcript)) + .route( + "/api/w/{workspace_id}/companion/transcript", + get(scoped_get_companion_transcript), + ) .route("/api/companion/messages", post(post_companion_message)) + .route( + "/api/w/{workspace_id}/companion/messages", + post(scoped_post_companion_message), + ) .route("/api/companion/cancel", post(post_companion_cancel)) + .route( + "/api/w/{workspace_id}/companion/cancel", + post(scoped_post_companion_cancel), + ) .route( "/api/runtimes/{runtime_id}/workers", post(create_runtime_worker), ) + .route( + "/api/w/{workspace_id}/runtimes/{runtime_id}/workers", + post(scoped_create_runtime_worker), + ) .route( "/api/runtimes/{runtime_id}/config-bundles", post(sync_runtime_config_bundle), ) + .route( + "/api/w/{workspace_id}/runtimes/{runtime_id}/config-bundles", + post(scoped_sync_runtime_config_bundle), + ) .route( "/api/runtimes/{runtime_id}/config-bundles/{bundle_id}/availability", get(check_runtime_config_bundle), ) + .route( + "/api/w/{workspace_id}/runtimes/{runtime_id}/config-bundles/{bundle_id}/availability", + get(scoped_check_runtime_config_bundle), + ) .route( "/api/runtimes/{runtime_id}/workers/{worker_id}", get(get_runtime_worker), ) + .route( + "/api/w/{workspace_id}/runtimes/{runtime_id}/workers/{worker_id}", + get(scoped_get_runtime_worker), + ) .route( "/api/runtimes/{runtime_id}/workers/{worker_id}/input", post(send_runtime_worker_input), ) + .route( + "/api/w/{workspace_id}/runtimes/{runtime_id}/workers/{worker_id}/input", + post(scoped_send_runtime_worker_input), + ) .route( "/api/runtimes/{runtime_id}/workers/{worker_id}/stop", post(stop_runtime_worker), ) + .route( + "/api/w/{workspace_id}/runtimes/{runtime_id}/workers/{worker_id}/stop", + post(scoped_stop_runtime_worker), + ) .route( "/api/runtimes/{runtime_id}/workers/{worker_id}/cancel", post(cancel_runtime_worker), ) + .route( + "/api/w/{workspace_id}/runtimes/{runtime_id}/workers/{worker_id}/cancel", + post(scoped_cancel_runtime_worker), + ) .route( "/api/runtimes/{runtime_id}/workers/{worker_id}/transcript", get(get_runtime_worker_transcript), ) + .route( + "/api/w/{workspace_id}/runtimes/{runtime_id}/workers/{worker_id}/transcript", + get(scoped_get_runtime_worker_transcript), + ) .route( "/api/runtimes/{runtime_id}/workers/{worker_id}/events/ws", get(worker_observation_ws), ) + .route( + "/api/w/{workspace_id}/runtimes/{runtime_id}/workers/{worker_id}/events/ws", + get(scoped_worker_observation_ws), + ) .route("/api/hosts/{host_id}/workers", get(list_host_workers)) + .route( + "/api/w/{workspace_id}/hosts/{host_id}/workers", + get(scoped_list_host_workers), + ) .fallback(get(static_or_spa_fallback)) .with_state(api) } @@ -522,6 +631,363 @@ struct TranscriptQuery { limit: Option, } +#[derive(Debug, Deserialize)] +struct ScopedWorkspacePath { + workspace_id: String, +} + +#[derive(Debug, Deserialize)] +struct ScopedRecordPath { + workspace_id: String, + id: String, +} + +#[derive(Debug, Deserialize)] +struct ScopedRepositoryPath { + workspace_id: String, + repository_id: String, +} + +#[derive(Debug, Deserialize)] +struct ScopedHostPath { + workspace_id: String, + host_id: String, +} + +#[derive(Debug, Deserialize)] +struct ScopedRuntimePath { + workspace_id: String, + runtime_id: String, +} + +#[derive(Debug, Deserialize)] +struct ScopedConfigBundlePath { + workspace_id: String, + runtime_id: String, + bundle_id: String, +} + +#[derive(Debug, Deserialize)] +struct ScopedRuntimeWorkerPath { + workspace_id: String, + runtime_id: String, + worker_id: String, +} + +fn validate_workspace_scope(api: &WorkspaceApi, workspace_id: &str) -> ApiResult<()> { + if workspace_id == api.workspace_id() { + Ok(()) + } else { + Err(workspace_id_mismatch_error()) + } +} + +async fn scoped_get_workspace( + State(api): State, + AxumPath(path): AxumPath, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + get_workspace(State(api)).await +} + +async fn scoped_list_tickets( + State(api): State, + AxumPath(path): AxumPath, +) -> ApiResult>> { + validate_workspace_scope(&api, &path.workspace_id)?; + list_tickets(State(api)).await +} + +async fn scoped_get_ticket( + State(api): State, + AxumPath(path): AxumPath, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + get_ticket(State(api), AxumPath(path.id)).await +} + +async fn scoped_list_objectives( + State(api): State, + AxumPath(path): AxumPath, +) -> ApiResult>> { + validate_workspace_scope(&api, &path.workspace_id)?; + list_objectives(State(api)).await +} + +async fn scoped_get_objective( + State(api): State, + AxumPath(path): AxumPath, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + get_objective(State(api), AxumPath(path.id)).await +} + +async fn scoped_list_repositories( + State(api): State, + AxumPath(path): AxumPath, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + list_repositories(State(api)).await +} + +async fn scoped_repository_detail( + State(api): State, + AxumPath(path): AxumPath, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + repository_detail(State(api), AxumPath(path.repository_id)).await +} + +async fn scoped_repository_log( + State(api): State, + AxumPath(path): AxumPath, + Query(query): Query, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + repository_log(State(api), AxumPath(path.repository_id), Query(query)).await +} + +async fn scoped_repository_tickets( + State(api): State, + AxumPath(path): AxumPath, + Query(query): Query, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + repository_tickets(State(api), AxumPath(path.repository_id), Query(query)).await +} + +async fn scoped_list_hosts( + State(api): State, + AxumPath(path): AxumPath, +) -> ApiResult>> { + validate_workspace_scope(&api, &path.workspace_id)?; + list_hosts(State(api)).await +} + +async fn scoped_list_runtimes( + State(api): State, + AxumPath(path): AxumPath, +) -> ApiResult>> { + validate_workspace_scope(&api, &path.workspace_id)?; + list_runtimes(State(api)).await +} + +async fn scoped_list_workers( + State(api): State, + AxumPath(path): AxumPath, +) -> ApiResult>> { + validate_workspace_scope(&api, &path.workspace_id)?; + list_workers(State(api)).await +} + +async fn scoped_create_workspace_worker( + State(api): State, + AxumPath(path): AxumPath, + Json(request): Json, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + create_workspace_worker(State(api), Json(request)).await +} + +async fn scoped_get_worker_launch_options( + State(api): State, + AxumPath(path): AxumPath, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + get_worker_launch_options(State(api)).await +} + +async fn scoped_get_runtime_connection_settings( + State(api): State, + AxumPath(path): AxumPath, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + get_runtime_connection_settings(State(api)).await +} + +async fn scoped_add_remote_runtime_connection( + State(api): State, + AxumPath(path): AxumPath, + Json(request): Json, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + add_remote_runtime_connection(State(api), Json(request)).await +} + +async fn scoped_delete_remote_runtime_connection( + State(api): State, + AxumPath(path): AxumPath, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + delete_remote_runtime_connection(State(api), AxumPath(path.runtime_id)).await +} + +async fn scoped_test_remote_runtime_connection( + State(api): State, + AxumPath(path): AxumPath, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + test_remote_runtime_connection(State(api), AxumPath(path.runtime_id)).await +} + +async fn scoped_get_companion_status( + State(api): State, + AxumPath(path): AxumPath, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + get_companion_status(State(api)).await +} + +async fn scoped_get_companion_transcript( + State(api): State, + AxumPath(path): AxumPath, + Query(query): Query, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + get_companion_transcript(State(api), Query(query)).await +} + +async fn scoped_post_companion_message( + State(api): State, + AxumPath(path): AxumPath, + Json(request): Json, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + post_companion_message(State(api), Json(request)).await +} + +async fn scoped_post_companion_cancel( + State(api): State, + AxumPath(path): AxumPath, + Json(request): Json, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + post_companion_cancel(State(api), Json(request)).await +} + +async fn scoped_create_runtime_worker( + State(api): State, + AxumPath(path): AxumPath, + Json(request): Json, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + create_runtime_worker(State(api), AxumPath(path.runtime_id), Json(request)).await +} + +async fn scoped_sync_runtime_config_bundle( + State(api): State, + AxumPath(path): AxumPath, + Json(request): Json, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + sync_runtime_config_bundle(State(api), AxumPath(path.runtime_id), Json(request)).await +} + +async fn scoped_check_runtime_config_bundle( + State(api): State, + AxumPath(path): AxumPath, + Query(query): Query, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + check_runtime_config_bundle( + State(api), + AxumPath((path.runtime_id, path.bundle_id)), + Query(query), + ) + .await +} + +async fn scoped_get_runtime_worker( + State(api): State, + AxumPath(path): AxumPath, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + get_runtime_worker(State(api), AxumPath((path.runtime_id, path.worker_id))).await +} + +async fn scoped_send_runtime_worker_input( + State(api): State, + AxumPath(path): AxumPath, + Json(request): Json, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + send_runtime_worker_input( + State(api), + AxumPath((path.runtime_id, path.worker_id)), + Json(request), + ) + .await +} + +async fn scoped_stop_runtime_worker( + State(api): State, + AxumPath(path): AxumPath, + Json(request): Json, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + stop_runtime_worker( + State(api), + AxumPath((path.runtime_id, path.worker_id)), + Json(request), + ) + .await +} + +async fn scoped_cancel_runtime_worker( + State(api): State, + AxumPath(path): AxumPath, + Json(request): Json, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + cancel_runtime_worker( + State(api), + AxumPath((path.runtime_id, path.worker_id)), + Json(request), + ) + .await +} + +async fn scoped_get_runtime_worker_transcript( + State(api): State, + AxumPath(path): AxumPath, + Query(query): Query, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + get_runtime_worker_transcript( + State(api), + AxumPath((path.runtime_id, path.worker_id)), + Query(query), + ) + .await +} + +async fn scoped_worker_observation_ws( + ws: WebSocketUpgrade, + State(api): State, + AxumPath(path): AxumPath, + Query(query): Query, +) -> Response { + if let Err(err) = validate_workspace_scope(&api, &path.workspace_id) { + return err.into_response(); + } + worker_observation_ws( + State(api), + AxumPath((path.runtime_id, path.worker_id)), + Query(query), + ws, + ) + .await + .into_response() +} + +async fn scoped_list_host_workers( + State(api): State, + AxumPath(path): AxumPath, +) -> ApiResult>> { + validate_workspace_scope(&api, &path.workspace_id)?; + list_host_workers(State(api), AxumPath(path.host_id)).await +} + async fn get_workspace(State(api): State) -> ApiResult> { let schema_version = api.store.schema_version().await?; let stored = api.store.get_workspace(api.workspace_id()).await?; @@ -1048,13 +1514,15 @@ async fn create_workspace_worker( })?; let runtime_id = worker.runtime_id.clone(); let worker_id = worker.worker_id.clone(); + let workspace_id = api.workspace_id().to_string(); let console_href = format!( - "/runtimes/{}/workers/{}/console", + "/w/{}/runtimes/{}/workers/{}/console", + encode_path_segment(&workspace_id), encode_path_segment(&runtime_id), encode_path_segment(&worker_id) ); Ok(Json(BrowserCreateWorkerResponse { - workspace_id: api.config.workspace_id, + workspace_id, runtime_id, worker_id, console_href, @@ -2263,6 +2731,12 @@ async fn static_or_spa_fallback(State(api): State, uri: Uri) -> Re .into_response(); } + if let Some(workspace_id) = workspace_id_from_ui_path(uri.path()) { + if workspace_id != api.workspace_id() { + return workspace_id_mismatch_error().into_response(); + } + } + let Some(static_root) = api.config.static_assets_dir.as_ref() else { return StatusCode::NOT_FOUND.into_response(); }; @@ -2279,6 +2753,16 @@ async fn static_or_spa_fallback(State(api): State, uri: Uri) -> Re } } +fn workspace_id_from_ui_path(path: &str) -> Option<&str> { + let tail = path.strip_prefix("/w/")?; + let workspace_id = tail.split('/').next().unwrap_or_default(); + if workspace_id.is_empty() { + None + } else { + Some(workspace_id) + } +} + struct StaticAsset { bytes: Vec, content_type: &'static str, @@ -2337,6 +2821,18 @@ fn content_type_for(path: &Path) -> &'static str { type ApiResult = std::result::Result; +fn workspace_id_mismatch_error() -> ApiError { + let message = "workspace id does not match this Workspace backend".to_string(); + ApiError::with_diagnostics( + Error::WorkspaceIdMismatch, + vec![RuntimeDiagnostic { + code: "workspace_id_mismatch".to_string(), + severity: DiagnosticSeverity::Error, + message, + }], + ) +} + struct ApiError { error: Error, diagnostics: Vec, @@ -2366,7 +2862,8 @@ impl IntoResponse for ApiError { | Error::UnknownHost(_) | Error::UnknownRuntime(_) | Error::UnknownWorker { .. } - | Error::UnknownRepository(_) => StatusCode::NOT_FOUND, + | Error::UnknownRepository(_) + | Error::WorkspaceIdMismatch => StatusCode::NOT_FOUND, Error::Ticket(_) => StatusCode::NOT_FOUND, Error::RuntimeCapabilityUnsupported { .. } => StatusCode::NOT_IMPLEMENTED, Error::RuntimeOperationFailed { code, .. } if code == "repository_not_configured" => { @@ -3076,6 +3573,31 @@ mod tests { ); } + let scoped_workspace = get_json( + app.clone(), + &format!("/api/w/{TEST_WORKSPACE_ID}/workspace"), + ) + .await; + assert_eq!(scoped_workspace["workspace_id"], TEST_WORKSPACE_ID); + + let mismatched_workspace = request_json( + app.clone(), + "GET", + "/api/w/not-this-workspace/workspace", + None, + StatusCode::NOT_FOUND, + ) + .await; + assert_eq!( + mismatched_workspace["diagnostics"][0]["code"], + "workspace_id_mismatch" + ); + assert!( + !mismatched_workspace + .to_string() + .contains(dir.path().to_string_lossy().as_ref()) + ); + let tickets = get_json(app.clone(), "/api/tickets").await; assert_eq!(tickets["items"][0]["id"], "00000000001J2"); assert_eq!(tickets["items"][0]["state"], "ready"); @@ -3083,6 +3605,18 @@ mod tests { let objectives = get_json(app.clone(), "/api/objectives").await; assert_eq!(objectives["items"][0]["id"], "00000000001J3"); assert_eq!(objectives["items"][0]["summary"], "Objective body."); + let scoped_objectives = get_json( + app.clone(), + &format!("/api/w/{TEST_WORKSPACE_ID}/objectives"), + ) + .await; + assert_eq!(scoped_objectives["items"][0]["id"], "00000000001J3"); + let scoped_objective = get_json( + app.clone(), + &format!("/api/w/{TEST_WORKSPACE_ID}/objectives/00000000001J3"), + ) + .await; + assert_eq!(scoped_objective["id"], "00000000001J3"); let repositories = get_json(app.clone(), "/api/repositories").await; assert_eq!(repositories["items"][0]["id"], TEST_REPOSITORY_ID); @@ -3099,6 +3633,12 @@ mod tests { let repository_detail = get_json(app.clone(), "/api/repositories/main").await; assert_eq!(repository_detail["item"]["id"], TEST_REPOSITORY_ID); + let scoped_repository_detail = get_json( + app.clone(), + &format!("/api/w/{TEST_WORKSPACE_ID}/repositories/main"), + ) + .await; + assert_eq!(scoped_repository_detail["item"]["id"], TEST_REPOSITORY_ID); let repository_log = get_json(app.clone(), "/api/repositories/main/log?limit=3").await; assert_eq!(repository_log["repository_id"], TEST_REPOSITORY_ID); diff --git a/web/workspace/deno.json b/web/workspace/deno.json index ae8656b4..0511dfa3 100644 --- a/web/workspace/deno.json +++ b/web/workspace/deno.json @@ -6,7 +6,7 @@ "dev": "deno run -A npm:vite@7.2.7 dev", "dev:backend": "cd ../.. && cargo run -p yoi-workspace-server -- serve --workspace . --db .yoi/workspace.db --listen 127.0.0.1:8787", "check": "deno run -A npm:@sveltejs/kit@2.49.4 sync && deno run -A npm:svelte-check@4.3.4 --tsconfig ./tsconfig.json", - "test": "deno test --allow-read=src src/lib/workspace-console/model.test.ts src/lib/workspace-console/worker-console.ui.test.ts src/lib/workspace-settings/model.test.ts src/lib/workspace-sidebar/worker-launch.test.ts src/lib/workspace-sidebar/repository-nav.test.ts", + "test": "deno test --allow-read=src src/lib/workspace-api/http.test.ts src/lib/workspace-console/model.test.ts src/lib/workspace-console/worker-console.ui.test.ts src/lib/workspace-settings/model.test.ts src/lib/workspace-sidebar/worker-launch.test.ts src/lib/workspace-sidebar/repository-nav.test.ts", "build": "deno run -A npm:vite@7.2.7 build", "preview": "deno run -A npm:vite@7.2.7 preview" }, diff --git a/web/workspace/src/lib/workspace-api/http.test.ts b/web/workspace/src/lib/workspace-api/http.test.ts new file mode 100644 index 00000000..99f1d73e --- /dev/null +++ b/web/workspace/src/lib/workspace-api/http.test.ts @@ -0,0 +1,22 @@ +import { workspaceApiPath, workspaceRoute } from "./http.ts"; + +declare const Deno: { + test(name: string, fn: () => void): void; +}; + +function assertEquals(actual: T, expected: T): void { + const actualJson = JSON.stringify(actual); + const expectedJson = JSON.stringify(expected); + if (actualJson !== expectedJson) { + throw new Error(`Expected ${expectedJson}, got ${actualJson}`); + } +} + +Deno.test("workspace route helpers scope browser routes and API by immutable workspace id", () => { + assertEquals(workspaceRoute("workspace 1"), "/w/workspace%201"); + assertEquals(workspaceRoute("workspace 1", "/objectives"), "/w/workspace%201/objectives"); + assertEquals( + workspaceApiPath("workspace 1", "/repositories/repo-a"), + "/api/w/workspace%201/repositories/repo-a", + ); +}); diff --git a/web/workspace/src/lib/workspace-api/http.ts b/web/workspace/src/lib/workspace-api/http.ts index 3f3573c8..92365eae 100644 --- a/web/workspace/src/lib/workspace-api/http.ts +++ b/web/workspace/src/lib/workspace-api/http.ts @@ -3,6 +3,19 @@ export type ApiResult = { error: string | null; }; +function normalizePath(path: string): string { + if (!path || path === '/') return ''; + return path.startsWith('/') ? path : `/${path}`; +} + +export function workspaceRoute(workspaceId: string, path = ''): string { + return `/w/${encodeURIComponent(workspaceId)}${normalizePath(path)}`; +} + +export function workspaceApiPath(workspaceId: string, path = ''): string { + return `/api/w/${encodeURIComponent(workspaceId)}${normalizePath(path)}`; +} + export async function loadJson( fetchFn: typeof fetch, path: string, diff --git a/web/workspace/src/lib/workspace-console/model.test.ts b/web/workspace/src/lib/workspace-console/model.test.ts index a918643a..42eaf18f 100644 --- a/web/workspace/src/lib/workspace-console/model.test.ts +++ b/web/workspace/src/lib/workspace-console/model.test.ts @@ -24,8 +24,8 @@ Deno.test("workerConsoleHref encodes runtime and worker target authority", () => workerConsoleHref({ runtime_id: "local runtime", worker_id: "worker/one", - }) === - "/runtimes/local%20runtime/workers/worker%2Fone/console", + }, "workspace-1") === + "/w/workspace-1/runtimes/local%20runtime/workers/worker%2Fone/console", "href should contain encoded runtime_id and worker_id segments", ); }); diff --git a/web/workspace/src/lib/workspace-console/model.ts b/web/workspace/src/lib/workspace-console/model.ts index d95d1feb..489c5169 100644 --- a/web/workspace/src/lib/workspace-console/model.ts +++ b/web/workspace/src/lib/workspace-console/model.ts @@ -4,6 +4,7 @@ import type { Segment, } from "$lib/generated/protocol"; import type { WorkerTranscriptItem } from "$lib/workspace-sidebar/types"; +import { workspaceRoute } from "$lib/workspace-api/http"; export type ConsoleLineKind = | "user" @@ -40,16 +41,23 @@ export type WorkerTarget = { worker_id: string; }; -export function workerConsoleHref(target: WorkerTarget): string { - return `/runtimes/${encodeURIComponent(target.runtime_id)}/workers/${ - encodeURIComponent( - target.worker_id, - ) - }/console`; +export function workerConsoleHref(target: WorkerTarget, workspaceId: string): string { + return workspaceRoute( + workspaceId, + `/runtimes/${encodeURIComponent(target.runtime_id)}/workers/${ + encodeURIComponent( + target.worker_id, + ) + }/console`, + ); } -export function workerConsolePath(runtimeId: string, workerId: string): string { - return workerConsoleHref({ runtime_id: runtimeId, worker_id: workerId }); +export function workerConsolePath( + workspaceId: string, + runtimeId: string, + workerId: string, +): string { + return workerConsoleHref({ runtime_id: runtimeId, worker_id: workerId }, workspaceId); } export function initialConsoleLines(items: WorkerTranscriptItem[]): ConsoleLine[] { diff --git a/web/workspace/src/lib/workspace-console/worker-console.ui.test.ts b/web/workspace/src/lib/workspace-console/worker-console.ui.test.ts index 2bf86df6..a688f57f 100644 --- a/web/workspace/src/lib/workspace-console/worker-console.ui.test.ts +++ b/web/workspace/src/lib/workspace-console/worker-console.ui.test.ts @@ -21,12 +21,12 @@ Deno.test("workspace Worker list and sidebar attach through Worker Console hrefs ); assert( - workspacePage.includes("workerConsoleHref(worker)") && + workspacePage.includes("workerConsoleHref(worker, workspaceId)") && workspacePage.includes("Open Console"), "top Worker list should expose an attach action per Worker", ); assert( - workersNav.includes("workerConsoleHref(worker)") && + workersNav.includes("workerConsoleHref(worker, workspaceId)") && workersNav.includes("aria-current"), "Workers sidebar rows should link to the Worker target Console route", ); @@ -40,26 +40,28 @@ Deno.test("workspace Worker list and sidebar attach through Worker Console hrefs Deno.test("Worker Console page is routed by runtime_id and worker_id through backend APIs", async () => { const consolePage = await Deno.readTextFile( new URL( - "./../../routes/runtimes/[runtimeId]/workers/[workerId]/console/+page.svelte", + "./../../routes/w/[workspaceId]/runtimes/[runtimeId]/workers/[workerId]/console/+page.svelte", import.meta.url, ), ); const routeLoad = await Deno.readTextFile( new URL( - "./../../routes/runtimes/[runtimeId]/workers/[workerId]/console/+page.ts", + "./../../routes/w/[workspaceId]/runtimes/[runtimeId]/workers/[workerId]/console/+page.ts", import.meta.url, ), ); assert( - routeLoad.includes("runtimeId") && routeLoad.includes("workerId"), - "route load should expose both target ids", + routeLoad.includes("workspaceId") && + routeLoad.includes("runtimeId") && routeLoad.includes("workerId"), + "route load should expose workspace and target ids", ); assert( - consolePage.includes( - "/api/runtimes/${encodeURIComponent(target.runtimeId)}/workers/${encodeURIComponent(target.workerId)}", - ), - "Worker detail should use the backend Worker detail API", + consolePage.includes("workspaceApiPath(workspaceId, path)") && + consolePage.includes( + "workerApiPath(`/runtimes/${encodeURIComponent(target.runtimeId)}/workers/${encodeURIComponent(target.workerId)}`)", + ), + "Worker detail should use the scoped backend Worker detail API", ); assert( consolePage.includes("/transcript?limit=200") && diff --git a/web/workspace/src/lib/workspace-sidebar/ObjectivesNavSection.svelte b/web/workspace/src/lib/workspace-sidebar/ObjectivesNavSection.svelte index 7052d95b..f0c3f204 100644 --- a/web/workspace/src/lib/workspace-sidebar/ObjectivesNavSection.svelte +++ b/web/workspace/src/lib/workspace-sidebar/ObjectivesNavSection.svelte @@ -1,9 +1,13 @@
@@ -11,7 +15,7 @@ Objectives - + Open Objectives workspace objectives diff --git a/web/workspace/src/lib/workspace-sidebar/RepositoriesNavSection.svelte b/web/workspace/src/lib/workspace-sidebar/RepositoriesNavSection.svelte index 2642eed3..63a9ebe8 100644 --- a/web/workspace/src/lib/workspace-sidebar/RepositoriesNavSection.svelte +++ b/web/workspace/src/lib/workspace-sidebar/RepositoriesNavSection.svelte @@ -6,10 +6,11 @@ repositories: RepositoryListResponse | null; repositoriesError?: string | null; currentPath?: string; + workspaceId: string; }; - let { repositories, repositoriesError = null, currentPath = '/' }: Props = $props(); - let navigation = $derived(projectRepositoryNav(repositories, currentPath)); + let { repositories, repositoriesError = null, currentPath = '/', workspaceId }: Props = $props(); + let navigation = $derived(projectRepositoryNav(repositories, currentPath, workspaceId));
diff --git a/web/workspace/src/lib/workspace-sidebar/WorkersNavSection.svelte b/web/workspace/src/lib/workspace-sidebar/WorkersNavSection.svelte index 613676c6..150f9459 100644 --- a/web/workspace/src/lib/workspace-sidebar/WorkersNavSection.svelte +++ b/web/workspace/src/lib/workspace-sidebar/WorkersNavSection.svelte @@ -1,4 +1,5 @@ diff --git a/web/workspace/src/lib/workspace-sidebar/repository-nav.test.ts b/web/workspace/src/lib/workspace-sidebar/repository-nav.test.ts index c87b28ea..e87d86df 100644 --- a/web/workspace/src/lib/workspace-sidebar/repository-nav.test.ts +++ b/web/workspace/src/lib/workspace-sidebar/repository-nav.test.ts @@ -36,7 +36,7 @@ Deno.test("repository nav does not invent main for an empty registry", () => { message: "No repositories configured", }, ], - }); + }, "/w/workspace-1", "workspace-1"); assertEquals(projection.count, 0); assertEquals(projection.items, []); @@ -56,14 +56,15 @@ Deno.test("repository nav links configured non-main repository ids", () => { diagnostics: [], }, ]), - "/repositories/infra", + "/w/workspace-1/repositories/infra", + "workspace-1", ); assertEquals(projection.count, 1); assertEquals(projection.items[0], { id: "infra", title: "Infrastructure", - href: "/repositories/infra", + href: "/w/workspace-1/repositories/infra", meta: "git repository · read-only", active: true, }); diff --git a/web/workspace/src/lib/workspace-sidebar/repository-nav.ts b/web/workspace/src/lib/workspace-sidebar/repository-nav.ts index a4057229..fb861367 100644 --- a/web/workspace/src/lib/workspace-sidebar/repository-nav.ts +++ b/web/workspace/src/lib/workspace-sidebar/repository-nav.ts @@ -1,3 +1,4 @@ +import { workspaceRoute } from "$lib/workspace-api/http"; import type { Diagnostic, RepositoryListResponse } from "./types"; export type RepositoryNavItem = { @@ -16,14 +17,15 @@ export type RepositoryNavProjection = { export function projectRepositoryNav( repositories: RepositoryListResponse | null, - currentPath = "/", + currentPath: string, + workspaceId: string, ): RepositoryNavProjection { const summaries = repositories?.items ?? []; return { count: summaries.length, diagnostics: repositories?.diagnostics ?? [], items: summaries.map((repository) => { - const href = `/repositories/${encodeURIComponent(repository.id)}`; + const href = workspaceRoute(workspaceId, `/repositories/${encodeURIComponent(repository.id)}`); return { id: repository.id, title: repository.display_name || repository.id, diff --git a/web/workspace/src/routes/+layout.ts b/web/workspace/src/routes/+layout.ts index cf187e8b..4fdaf406 100644 --- a/web/workspace/src/routes/+layout.ts +++ b/web/workspace/src/routes/+layout.ts @@ -1,4 +1,4 @@ -import { loadJson } from "$lib/workspace-api/http"; +import { loadJson, workspaceApiPath } from "$lib/workspace-api/http"; import type { RepositoryListResponse, WorkspaceResponse, @@ -8,10 +8,14 @@ import type { LayoutLoad } from "./$types"; export const ssr = false; export const prerender = false; -export const load: LayoutLoad = async ({ fetch }) => { +export const load: LayoutLoad = async ({ fetch, params }) => { + const workspaceId = params.workspaceId; + const apiPath = (path: string) => + workspaceId ? workspaceApiPath(workspaceId, path) : `/api${path}`; + const [workspace, repositories] = await Promise.all([ - loadJson(fetch, "/api/workspace"), - loadJson(fetch, "/api/repositories"), + loadJson(fetch, apiPath("/workspace")), + loadJson(fetch, apiPath("/repositories")), ]); return { diff --git a/web/workspace/src/routes/+page.svelte b/web/workspace/src/routes/+page.svelte index 9f1df537..34ca4a6a 100644 --- a/web/workspace/src/routes/+page.svelte +++ b/web/workspace/src/routes/+page.svelte @@ -3,6 +3,7 @@ import type { PageProps } from './$types'; let { data }: PageProps = $props(); + let workspaceId = $derived(data.workspace?.workspace_id ?? ''); @@ -116,7 +117,7 @@ {worker.state} · {worker.status} {worker.workspace.visibility} · {worker.workspace.identity} {worker.implementation.kind} - Open Console + Open Console {/each} diff --git a/web/workspace/src/routes/+page.ts b/web/workspace/src/routes/+page.ts index 0624eb86..9d2ca562 100644 --- a/web/workspace/src/routes/+page.ts +++ b/web/workspace/src/routes/+page.ts @@ -1,11 +1,15 @@ -import { loadJson } from "$lib/workspace-api/http"; +import { loadJson, workspaceApiPath } from "$lib/workspace-api/http"; import type { Host, ListResponse, Worker } from "$lib/workspace-sidebar/types"; import type { PageLoad } from "./$types"; -export const load: PageLoad = async ({ fetch }) => { +export const load: PageLoad = async ({ fetch, parent }) => { + const layout = await parent(); + const workspaceId = layout.workspace?.workspace_id ?? ""; + const apiPath = (path: string) => workspaceApiPath(workspaceId, path); + const [hosts, workers] = await Promise.all([ - loadJson>(fetch, "/api/hosts"), - loadJson>(fetch, "/api/workers"), + loadJson>(fetch, apiPath("/hosts")), + loadJson>(fetch, apiPath("/workers")), ]); return { diff --git a/web/workspace/src/routes/objectives/+page.svelte b/web/workspace/src/routes/objectives/+page.svelte index 5be8210d..088e66ec 100644 --- a/web/workspace/src/routes/objectives/+page.svelte +++ b/web/workspace/src/routes/objectives/+page.svelte @@ -1,5 +1,5 @@ + + + Yoi Workspace Control Plane + + + +
+

Workspace

+ {#if data.workspace} +
+
+
ID
+
{data.workspace.workspace_id}
+
+
+
Name
+
{data.workspace.display_name}
+
+
+
Record authority
+
{data.workspace.record_authority}
+
+
+
Host / Worker bridge
+
{data.workspace.extension_points.host_worker_bridge.status}
+
+
+ {:else if data.workspaceError} +

{data.workspaceError}

+ {:else} +

Waiting for /api/workspace…

+ {/if} +
+ +
+
+

Hosts

+ {#if data.hosts} + {#if data.hosts.items.length === 0} +

No local Hosts are visible.

+ {:else} +
+ {#each data.hosts.items as host} +
+
+ {host.label} + {host.status} +
+
+
+
ID
+
{host.host_id}
+
+
+
Kind
+
{host.kind}
+
+
+
Runtime
+
{host.runtime_id}
+
+
+
Scope
+
{host.capabilities.workspace_scope}
+
+
+
Platform
+
{host.capabilities.os} / {host.capabilities.arch}
+
+
+
+ {/each} +
+ {/if} + {:else if data.hostsError} +

{data.hostsError}

+ {:else} +

Waiting for /api/hosts…

+ {/if} +
+ +
+

Workers

+ {#if data.workers} + {#if data.workers.items.length === 0} +

No local Workers are visible.

+ {:else} +
+ + + + + + + + + + + + + {#each data.workers.items as worker} + + + + + + + + + {/each} + +
WorkerHostStateWorkspaceImplementationAttach
+ {worker.label} + {#if worker.role || worker.profile} + {worker.role ?? 'role unknown'} / {worker.profile ?? 'profile unknown'} + {/if} + {worker.host_id}{worker.state} · {worker.status}{worker.workspace.visibility} · {worker.workspace.identity}{worker.implementation.kind}Open Console
+
+ {/if} + {:else if data.workersError} +

{data.workersError}

+ {:else} +

Waiting for /api/workers…

+ {/if} +
+
diff --git a/web/workspace/src/routes/w/[workspaceId]/+page.ts b/web/workspace/src/routes/w/[workspaceId]/+page.ts new file mode 100644 index 00000000..c059d384 --- /dev/null +++ b/web/workspace/src/routes/w/[workspaceId]/+page.ts @@ -0,0 +1,19 @@ +import { loadJson, workspaceApiPath } from "$lib/workspace-api/http"; +import type { Host, ListResponse, Worker } from "$lib/workspace-sidebar/types"; +import type { PageLoad } from "./$types"; + +export const load: PageLoad = async ({ fetch, params }) => { + const apiPath = (path: string) => workspaceApiPath(params.workspaceId, path); + const [hosts, workers] = await Promise.all([ + loadJson>(fetch, apiPath("/hosts")), + loadJson>(fetch, apiPath("/workers")), + ]); + + return { + workspaceId: params.workspaceId, + hosts: hosts.data, + hostsError: hosts.error, + workers: workers.data, + workersError: workers.error, + }; +}; diff --git a/web/workspace/src/routes/w/[workspaceId]/objectives/+page.svelte b/web/workspace/src/routes/w/[workspaceId]/objectives/+page.svelte new file mode 100644 index 00000000..088e66ec --- /dev/null +++ b/web/workspace/src/routes/w/[workspaceId]/objectives/+page.svelte @@ -0,0 +1,46 @@ + + + + Objectives · Yoi Workspace + + +
+

Objectives

+

Objectives are read from canonical filesystem records through /api/objectives.

+ {#if data.objectives} + {#if data.objectives.items.length === 0} +

No Objective records are present.

+ {:else} +
+ {#each data.objectives.items as objective (objective.id)} + +
+
+ {objective.title} + {objective.state} +
+

{objective.summary || 'No summary text is available.'}

+
+
+ Updated {objective.updated_at ? formatDate(objective.updated_at) : 'unknown'} + {objective.linked_tickets?.length ? `${objective.linked_tickets.length} linked ticket(s)` : 'No linked tickets'} + {objective.id} +
+ + {/each} +
+ {/if} + {#if data.objectives.invalid_records.length > 0} +

{data.objectives.invalid_records.length} invalid objective record(s) hidden.

+ {/if} + {:else if data.objectivesError} +

{data.objectivesError}

+ {:else} +

Waiting for /api/objectives…

+ {/if} +
diff --git a/web/workspace/src/routes/w/[workspaceId]/objectives/+page.ts b/web/workspace/src/routes/w/[workspaceId]/objectives/+page.ts new file mode 100644 index 00000000..1e45b566 --- /dev/null +++ b/web/workspace/src/routes/w/[workspaceId]/objectives/+page.ts @@ -0,0 +1,17 @@ +import { loadJson, workspaceApiPath } from "$lib/workspace-api/http"; +import type { ObjectiveListResponse } from "$lib/workspace-sidebar/types"; +import type { PageLoad } from "./$types"; + +export const load: PageLoad = async ({ fetch, params }) => { + const apiPath = (path: string) => workspaceApiPath(params.workspaceId, path); + const objectives = await loadJson( + fetch, + apiPath("/objectives"), + ); + + return { + workspaceId: params.workspaceId, + objectives: objectives.data, + objectivesError: objectives.error, + }; +}; diff --git a/web/workspace/src/routes/w/[workspaceId]/objectives/[objectiveId]/+page.svelte b/web/workspace/src/routes/w/[workspaceId]/objectives/[objectiveId]/+page.svelte new file mode 100644 index 00000000..cf07c432 --- /dev/null +++ b/web/workspace/src/routes/w/[workspaceId]/objectives/[objectiveId]/+page.svelte @@ -0,0 +1,76 @@ + + + + {data.objective?.title ?? data.objectiveId} · Objective + + +
+

Objectives

+ {#if data.objectives} +
+ {#each data.objectives.items as objective (objective.id)} + +
+
+ {objective.title} + {objective.state} +
+

{objective.summary || 'No summary text is available.'}

+
+
+ Updated {objective.updated_at ? formatDate(objective.updated_at) : 'unknown'} + {objective.id} +
+ + {/each} +
+ {:else if data.objectivesError} +

{data.objectivesError}

+ {:else} +

Loading objectives…

+ {/if} +
+ +
+

Objective detail

+ {#if data.objective} +
+
+

{data.objective.title}

+

{data.objective.id}

+
+ {data.objective.state} +
+
+
+
Created
+
{data.objective.created_at ? formatDate(data.objective.created_at) : 'unknown'}
+
+
+
Updated
+
{data.objective.updated_at ? formatDate(data.objective.updated_at) : 'unknown'}
+
+
+
Record source
+
{data.objective.record_source}
+
+
+
Linked tickets
+
{data.objective.linked_tickets.length ? data.objective.linked_tickets.join(', ') : 'none'}
+
+
+ 
{data.objective.body}
+ {#if data.objective.body_truncated} +

Objective body was truncated by the Backend response limit.

+ {/if} + {:else if data.objectiveError} +

{data.objectiveError}

+ {:else} +

Loading objective detail…

+ {/if} +
diff --git a/web/workspace/src/routes/w/[workspaceId]/objectives/[objectiveId]/+page.ts b/web/workspace/src/routes/w/[workspaceId]/objectives/[objectiveId]/+page.ts new file mode 100644 index 00000000..395b4618 --- /dev/null +++ b/web/workspace/src/routes/w/[workspaceId]/objectives/[objectiveId]/+page.ts @@ -0,0 +1,27 @@ +import { loadJson, workspaceApiPath } from "$lib/workspace-api/http"; +import type { + ObjectiveDetail, + ObjectiveListResponse, +} from "$lib/workspace-sidebar/types"; +import type { PageLoad } from "./$types"; + +export const load: PageLoad = async ({ fetch, params }) => { + const apiPath = (path: string) => workspaceApiPath(params.workspaceId, path); + const objectiveId = params.objectiveId; + const [objectives, objective] = await Promise.all([ + loadJson(fetch, apiPath('/objectives')), + loadJson( + fetch, + apiPath(`/objectives/${encodeURIComponent(objectiveId)}`), + ), + ]); + + return { + workspaceId: params.workspaceId, + objectiveId, + objectives: objectives.data, + objectivesError: objectives.error, + objective: objective.data, + objectiveError: objective.error, + }; +}; diff --git a/web/workspace/src/routes/w/[workspaceId]/repositories/[repositoryId]/+page.svelte b/web/workspace/src/routes/w/[workspaceId]/repositories/[repositoryId]/+page.svelte new file mode 100644 index 00000000..d6493e49 --- /dev/null +++ b/web/workspace/src/routes/w/[workspaceId]/repositories/[repositoryId]/+page.svelte @@ -0,0 +1,105 @@ + + + + {data.repository?.item.display_name ?? data.repositoryId} · Repository + + +
+

Repository

+ {#if data.repository} +
+
+

{data.repository.item.display_name}

+

{data.repository.item.id}

+
+ {data.repository.item.git?.status ?? 'not observed'} +
+
+
+
Kind
+
{data.repository.item.kind}
+
+
+
Provider
+
{data.repository.item.provider}
+
+
+
Record authority
+
{data.repository.item.record_authority}
+
+
+
Default selector
+
{data.repository.item.default_selector ?? 'none configured'}
+
+
+
Branch
+
{data.repository.item.git?.branch ?? 'unknown'}
+
+
+
HEAD
+
{data.repository.item.git?.head ?? 'unknown'}
+
+
+
Dirty
+
{data.repository.item.git?.dirty ? 'yes' : 'no'}
+
+
+ {#if data.repository.item.diagnostics && data.repository.item.diagnostics.length > 0} +
    + {#each data.repository.item.diagnostics as diagnostic} +
  • {diagnostic.code}: {diagnostic.message}
    • + {/each} +
+ {/if} + {:else if data.repositoryError} +

{data.repositoryError}

+ {:else} +

Loading repository…

+ {/if} +
+ +
+

Recent commits

+ {#if data.repositoryLog} + {#if data.repositoryLog.items.length === 0} +

No recent commits are available.

+ {:else} +
+ {#each data.repositoryLog.items as commit} +
+ {commit.summary} + {commit.short_hash} · {commit.author_name} · {formatDate(commit.author_date)} +
+ {/each} +
+ {/if} + {#if data.repositoryLog.diagnostics.length > 0} +
    + {#each data.repositoryLog.diagnostics as diagnostic} +
  • {diagnostic.code}: {diagnostic.message}
    • + {/each} +
+ {/if} + {:else if data.repositoryLogError} +

{data.repositoryLogError}

+ {:else} +

Loading repository commits…

+ {/if} +
+ +
+

Repository Tickets

+ {#if data.repositoryTickets} + + {:else if data.repositoryTicketsError} +

{data.repositoryTicketsError}

+ {:else} +

Loading repository tickets…

+ {/if} +
diff --git a/web/workspace/src/routes/w/[workspaceId]/repositories/[repositoryId]/+page.ts b/web/workspace/src/routes/w/[workspaceId]/repositories/[repositoryId]/+page.ts new file mode 100644 index 00000000..db2b1cdb --- /dev/null +++ b/web/workspace/src/routes/w/[workspaceId]/repositories/[repositoryId]/+page.ts @@ -0,0 +1,36 @@ +import { loadJson, workspaceApiPath } from "$lib/workspace-api/http"; +import type { + RepositoryDetailResponse, + RepositoryLogResponse, + RepositoryTicketsResponse, +} from "$lib/workspace-sidebar/types"; +import type { PageLoad } from "./$types"; + +export const load: PageLoad = async ({ fetch, params }) => { + const apiPath = (path: string) => workspaceApiPath(params.workspaceId, path); + const repositoryId = params.repositoryId; + const [repository, log, tickets] = await Promise.all([ + loadJson( + fetch, + apiPath(`/repositories/${encodeURIComponent(repositoryId)}`), + ), + loadJson( + fetch, + apiPath(`/repositories/${encodeURIComponent(repositoryId)}/log`), + ), + loadJson( + fetch, + apiPath(`/repositories/${encodeURIComponent(repositoryId)}/tickets`), + ), + ]); + + return { + repositoryId, + repository: repository.data, + repositoryError: repository.error, + repositoryLog: log.data, + repositoryLogError: log.error, + repositoryTickets: tickets.data, + repositoryTicketsError: tickets.error, + }; +}; diff --git a/web/workspace/src/routes/w/[workspaceId]/runtimes/[runtimeId]/workers/[workerId]/console/+page.svelte b/web/workspace/src/routes/w/[workspaceId]/runtimes/[runtimeId]/workers/[workerId]/console/+page.svelte new file mode 100644 index 00000000..775be75e --- /dev/null +++ b/web/workspace/src/routes/w/[workspaceId]/runtimes/[runtimeId]/workers/[workerId]/console/+page.svelte @@ -0,0 +1,399 @@ + + + + Worker Console · Yoi Workspace + + + +
+
+
+

{worker?.label ?? workerId}

+
+
+
+ {worker?.state ?? 'unknown'} · {worker?.status ?? 'loading'} · stream {streamState} +
+ +
+
+ +
+
+ {#if projection.status || projection.usage} +

+ {#if projection.status}status: {projection.status}{/if} + {#if projection.status && projection.usage} · {/if} + {#if projection.usage}usage: {projection.usage}{/if} +

+ {/if} + + {#if workerError} +

{workerError}

+ {/if} + {#if transcriptError} +

{transcriptError}

+ {/if} + + {#if lines.length === 0} +

No console output is available for this Worker yet.

+ {:else} +
    + {#each lines as item} +
  1. + {#if lineClass(item) !== 'assistant' && lineClass(item) !== 'user'} +
    + {item.title} + {#if item.streaming}streaming{/if} +
    + {:else if item.streaming} +
    + streaming +
    + {/if} + 
    {item.body || '—'}
    + {#if item.detail} +
    + detail +

    {item.detail}

    +
    + {/if} +
    2. + {/each} +
+ {/if} +
+ +
+ + {#if workerDetailsOpen} + + {/if} + +
+ +
+ + {#if sendError}

{sendError}

{/if} +
+
+
diff --git a/web/workspace/src/routes/w/[workspaceId]/runtimes/[runtimeId]/workers/[workerId]/console/+page.ts b/web/workspace/src/routes/w/[workspaceId]/runtimes/[runtimeId]/workers/[workerId]/console/+page.ts new file mode 100644 index 00000000..4ea9fe95 --- /dev/null +++ b/web/workspace/src/routes/w/[workspaceId]/runtimes/[runtimeId]/workers/[workerId]/console/+page.ts @@ -0,0 +1,9 @@ +export function load( + { params }: { params: { workspaceId: string; runtimeId: string; workerId: string } }, +) { + return { + workspaceId: params.workspaceId, + runtimeId: params.runtimeId, + workerId: params.workerId, + }; +} diff --git a/web/workspace/src/routes/w/[workspaceId]/settings/+page.svelte b/web/workspace/src/routes/w/[workspaceId]/settings/+page.svelte new file mode 100644 index 00000000..1737a2bc --- /dev/null +++ b/web/workspace/src/routes/w/[workspaceId]/settings/+page.svelte @@ -0,0 +1,487 @@ + + + + Settings · Yoi Workspace + + +
+
+
+

Workspace Browser

+

Settings / Admin

+

+ Local administration surfaces for the Workspace backend. Runtime Connections v0 is editable through typed APIs; broader admin controls remain bounded placeholders. +

+
+ local only +
+ +
+
+

Authority boundary

+

No browser admin permission model

+

{SETTINGS_PERMISSION_NOTICE}

+
+
+ Restart-required + Runtime config changes are persisted, then applied after backend restart. +
+
+ +
+ {#each SETTINGS_SECTIONS as section} + + {section.label} + {section.status === "editable" ? "Editable" : section.status === "read-only" ? "Read-only" : "Placeholder"} + + {/each} +
+ +
+
+
+

editable

+

Runtime Connections

+
+ typed API +
+

{SETTINGS_SECTIONS.find((section) => section.id === "runtime-connections")?.summary}

+ + {#if runtimeLoading} +

Loading Runtime connections…

+ {:else if runtimeError} +

Runtime connection settings unavailable: {runtimeError}

+ {:else if runtimeSettings} +
+ +
+ + {#if showAddRuntimeForm} +
{ event.preventDefault(); void submitRemoteRuntime(); }}> +

Add remote Runtime

+

Endpoint is submitted to the Backend but not echoed back in settings responses.

+ + + + +
+ {/if} + + {#if mutationMessage} +

{mutationMessage}

+ {/if} + {@render DiagnosticsList({ diagnostics: mutationDiagnostics })} + +
+

Runtimes

+
+ + + + + + + + + + + + + + + + + + + {#if runtimeSettings.embedded.diagnostics.length > 0} + + + + {/if} + {#each runtimeSettings.remotes as remote (remote.runtime_id)} + + + + + + + + {#if remote.diagnostics.length > 0} + + + + {/if} + {#if tests[remote.runtime_id]} + {@const test = tests[remote.runtime_id]} + {@const available = capabilityOperations(test, "available")} + {@const unchecked = capabilityOperations(test, "unknown")} + + + + {/if} + {/each} + +
RuntimeSourceConnectionStatusActions
+ {runtimeSettings.embedded.display_name} + {runtimeSettings.embedded.runtime_id} + + embedded + Workspace backend process + Local Backend runtime + {runtimeSettings.embedded.status} + {#if runtimeSettings.embedded.restart_required} + restart required + {/if} + Managed by backend
{@render DiagnosticsList({ diagnostics: runtimeSettings.embedded.diagnostics })}
+ {remote.display_name} + {remote.runtime_id} + + remote + Configured Runtime endpoint + + Endpoint: {remote.endpoint_configured ? "configured" : "not configured"} + {#if remote.endpoint_configured}hidden{/if} + Token: {remote.token_ref_configured ? "configured" : "not configured"} + + {remote.status} + {#if remote.restart_required} + restart required + {/if} + +
+ + +
+
{@render DiagnosticsList({ diagnostics: remote.diagnostics })}
+
+ Test: {test.state} + {test.health_result} · {test.checked_at} +

{test.compatibility_basis}

+ {#if available.length > 0} +

Verified areas: {available.join(', ')}

+ {/if} + {#if unchecked.length > 0} +

Unchecked warning areas: {unchecked.join(', ')}

+ {/if} + {@render DiagnosticsList({ diagnostics: test.diagnostics })} +
+
+
+ {#if runtimeSettings.remotes.length === 0} +

No remote Runtime connections configured.

+ {/if} +
+ {/if} +
+ +
+ {#each SETTINGS_SECTIONS.filter((section) => section.id !== "runtime-connections") as section} +
+
+
+

{section.status}

+

{section.label}

+
+ {#if section.status === "placeholder"} + not implemented + {:else} + read-only + {/if} +
+

{section.summary}

+
    + {#each section.bullets as bullet} +
  • {bullet}
    • + {/each} +
+ + {#if section.id === "workspace-identity"} +
+
+
Workspace id
+
{workspace?.workspace_id ?? "loading"}
+
+
+
Display name
+
{workspace?.display_name ?? "loading"}
+
+
+
Record authority
+
.yoi tickets/objectives through the Backend projection
+
+
+ {/if} +
+ {/each} +
+ +
+
+

Implementation patterns

+

How settings should appear

+
+
+ {#each SETTINGS_PATTERNS as pattern} +
+

{pattern.title}

+

{pattern.body}

+
+ {/each} +
+
+ + {#if !workspace && !workspaceError} +

Loading workspace summary…

+ {:else if workspaceError} +

Workspace summary unavailable: {workspaceError}

+ {/if} +
+ +{#snippet DiagnosticsList({ diagnostics }: { diagnostics: Diagnostic[] })} + {#if diagnostics.length > 0} +
    + {#each diagnostics as diagnostic} +
  • + {diagnosticLabel(diagnostic)} + {diagnostic.message} +
    • + {/each} +
+ {/if} +{/snippet}