Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
142 changes: 141 additions & 1 deletion apps/desktop/src-host/src/remote.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use std::path::PathBuf;
use std::sync::{Arc, Mutex};

use codetwo_core::{Engine, Event, Store};
use codetwo_core::{Engine, Event, Member, MemberId, Store, WorkspaceId, WorkspaceRole};
use codetwo_kernel::{async_trait, Context, Injection, Plugin, PluginError, PluginResult};
use codetwo_plugins::{CanvasService, EngineService, EventBus, StoreService};
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -39,6 +39,14 @@ struct RemotePairingLink {
token: String,
expires_in: u64,
qr_svg: String,
#[serde(skip_serializing_if = "Option::is_none")]
member_id: Option<String>,
}

#[derive(Serialize)]
struct TeamInvite {
member: Member,
pairing: RemotePairingLink,
}

struct RemoteHandle {
Expand Down Expand Up @@ -207,6 +215,37 @@ impl RemoteRuntime {
fn shutdown(&self) {
self.lifecycle.lock().unwrap().shutdown();
}

fn member_pairing_link(
&self,
member_id: &MemberId,
ttl: std::time::Duration,
endpoint_id: Option<&str>,
) -> Result<RemotePairingLink, String> {
let (port, auth) = self
.lifecycle
.lock()
.unwrap()
.running_access()
.ok_or_else(|| "turn on network access first".to_string())?;
let endpoints = Self::endpoints(port);
let endpoint = codetwo_server::select_pairing_endpoint(&endpoints, endpoint_id)?;
let token = auth.issue_member_pairing_token(member_id.as_str(), ttl);
let url = codetwo_server::pairing_url_for_endpoint(&endpoint.url, &token);
let qr_svg = if endpoint.qr_shareable {
codetwo_server::pairing_qr_svg(&url).unwrap_or_default()
} else {
String::new()
};
Ok(RemotePairingLink {
endpoint_id: endpoint.id.clone(),
url,
token,
expires_in: ttl.as_secs(),
qr_svg,
member_id: Some(member_id.as_str().to_string()),
})
}
}

fn take_args<T: serde::de::DeserializeOwned>(value: Value) -> Result<T, PluginError> {
Expand All @@ -223,6 +262,14 @@ fn json<T: Serialize>(value: T) -> Result<Value, PluginError> {
serde_json::to_value(value).map_err(PluginError::new)
}

fn now_millis() -> i64 {
std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH)
.unwrap_or_default()
.as_millis()
.min(i64::MAX as u128) as i64
}

#[async_trait]
impl Plugin for RemotePlugin {
fn name(&self) -> &str {
Expand Down Expand Up @@ -404,10 +451,103 @@ impl Plugin for RemotePlugin {
token,
expires_in: ttl.as_secs(),
qr_svg,
member_id: None,
})
}
})?;

#[derive(Deserialize)]
struct TeamBootstrapArgs {
workspace_name: String,
admin_name: String,
#[serde(default)]
ttl_secs: Option<u64>,
#[serde(default)]
endpoint_id: Option<String>,
}
let service = runtime.clone();
ctx.command("remote.team_bootstrap", move |args| {
let service = service.clone();
async move {
let args: TeamBootstrapArgs = take_args(args)?;
let now_ms = now_millis();
let member = match service.store.workspace().map_err(PluginError::new)? {
Some(_) => service
.store
.list_members()
.map_err(PluginError::new)?
.into_iter()
.find(|member| member.active && member.role == WorkspaceRole::Admin)
.ok_or_else(|| PluginError::new("Workspace has no active Admin"))?,
None => {
let workspace_id =
WorkspaceId::new(format!("workspace-{}", uuid::Uuid::new_v4()));
service
.store
.create_workspace(workspace_id.clone(), &args.workspace_name, now_ms)
.map_err(PluginError::new)?;
service
.store
.create_member(
&workspace_id,
MemberId::new(format!("member-{}", uuid::Uuid::new_v4())),
&args.admin_name,
WorkspaceRole::Admin,
now_ms,
)
.map_err(PluginError::new)?
}
};
let ttl = std::time::Duration::from_secs(
args.ttl_secs
.unwrap_or(codetwo_server::DEFAULT_PAIRING_TTL.as_secs()),
);
let pairing = service
.member_pairing_link(&member.id, ttl, args.endpoint_id.as_deref())
.map_err(PluginError::new)?;
json(TeamInvite { member, pairing })
}
})?;

#[derive(Deserialize)]
struct TeamInviteArgs {
display_name: String,
#[serde(default)]
ttl_secs: Option<u64>,
#[serde(default)]
endpoint_id: Option<String>,
}
let service = runtime.clone();
ctx.command("remote.team_invite", move |args| {
let service = service.clone();
async move {
let args: TeamInviteArgs = take_args(args)?;
let workspace = service
.store
.workspace()
.map_err(PluginError::new)?
.ok_or_else(|| PluginError::new("bootstrap the Workspace first"))?;
let member = service
.store
.create_member(
&workspace.id,
MemberId::new(format!("member-{}", uuid::Uuid::new_v4())),
&args.display_name,
WorkspaceRole::Member,
now_millis(),
)
.map_err(PluginError::new)?;
let ttl = std::time::Duration::from_secs(
args.ttl_secs
.unwrap_or(codetwo_server::DEFAULT_PAIRING_TTL.as_secs()),
);
let pairing = service
.member_pairing_link(&member.id, ttl, args.endpoint_id.as_deref())
.map_err(PluginError::new)?;
json(TeamInvite { member, pairing })
}
})?;

let service = runtime.clone();
ctx.command("remote.devices", move |_| {
let service = service.clone();
Expand Down
6 changes: 5 additions & 1 deletion apps/desktop/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2897,6 +2897,9 @@ export default function App() {
let unlisten: (() => void) | null = null;
void (async () => {
unlisten = await onEngineEvent((ev: CoreEvent) => {
// Shared Task clients refetch the revisioned Task snapshot. The production TaskBoard is
// still local in this P0 and must not render this control-plane event as transcript data.
if (ev.event === "task_snapshot_changed") return;
if (ev.event === "session_created") {
const refreshed = refreshSessions();
if (!matchesSessionCreation(ev, awaitingSessionRef.current)) return;
Expand Down Expand Up @@ -8408,7 +8411,7 @@ export default function App() {
type="button"
variant="link"
size="compact"
className="h-auto px-0 py-0 text-inherit decoration-muted-foreground/40 decoration-dotted underline-offset-[7px]"
className="h-auto px-0 py-0 text-inherit [font-size:inherit] [font-weight:inherit] [letter-spacing:inherit] [line-height:inherit] decoration-muted-foreground/40 decoration-dotted underline-offset-[7px]"
title={activeProject ?? undefined}
>
{activeProjectName ?? t("rail.noProject")}
Expand Down Expand Up @@ -8441,6 +8444,7 @@ export default function App() {
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
{" "}
{t("transcript.greetingEnd")}
</h1>
)}
Expand Down
6 changes: 6 additions & 0 deletions apps/desktop/src/bridge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,12 @@ export function describeBlock(b: DocBlock): string {

/// Mirrors core `Event` (tagged by `event`, snake_case).
export type CoreEvent =
| {
event: "task_snapshot_changed";
session: null;
task_id: string;
revision: number;
}
| {
event: "session_created";
session: string;
Expand Down
12 changes: 12 additions & 0 deletions apps/desktop/src/i18n/strings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2021,6 +2021,12 @@ export const en = {
"taskboard.openPullRequestsHeader": "Open PRs",
"taskboard.updatedHeader": "Updated",
"taskboard.taskList": "Task list",
"taskboard.boardView": "Task board view",
"taskboard.viewSwitcher": "Task view",
"taskboard.view.list": "List",
"taskboard.view.board": "Board",
"taskboard.selectTaskCard": "Select task: {title}",
"taskboard.cardPullRequests": "PR {count}",
"taskboard.emptyList": "No tasks yet",
"taskboard.expandTask": "Expand task: {title}",
"taskboard.collapseTask": "Collapse task: {title}",
Expand Down Expand Up @@ -4626,6 +4632,12 @@ export const zhCN: Record<StringKey, string> = {
"taskboard.openPullRequestsHeader": "打开的 PR",
"taskboard.updatedHeader": "更新时间",
"taskboard.taskList": "任务列表",
"taskboard.boardView": "任务看板视图",
"taskboard.viewSwitcher": "任务视图",
"taskboard.view.list": "列表",
"taskboard.view.board": "看板",
"taskboard.selectTaskCard": "选择任务:{title}",
"taskboard.cardPullRequests": "PR {count}",
"taskboard.emptyList": "还没有任务",
"taskboard.expandTask": "展开任务:{title}",
"taskboard.collapseTask": "收起任务:{title}",
Expand Down
Loading