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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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