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
1 change: 1 addition & 0 deletions apps/server/src/auth/RpcAuthorization.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ export const RPC_REQUIRED_SCOPES = {
[WS_METHODS.serverGetSettings]: AuthOrchestrationReadScope,
[WS_METHODS.peerLinksList]: AuthAccessReadScope,
[WS_METHODS.peerLinksEnvironments]: AuthAccessReadScope,
[WS_METHODS.peerLinksLinkedSidebar]: AuthOrchestrationReadScope,
[WS_METHODS.serverUpdateSettings]: AuthSettingsWriteScope,
[WS_METHODS.serverSearchAcpRegistry]: AuthOrchestrationReadScope,
[WS_METHODS.serverPrepareAcpRegistryAgent]: AuthProvidersManageScope,
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/observability/RpcInstrumentation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ const RPC_AGGREGATES = {
[WS_METHODS.peerLinksUnlink]: "peerLinks",
[WS_METHODS.peerLinksAddToApp]: "peerLinks",
[WS_METHODS.peerLinksEnvironments]: "peerLinks",
[WS_METHODS.peerLinksLinkedSidebar]: "peerLinks",
[WS_METHODS.peerLinksReportAppConnections]: "peerLinks",
[WS_METHODS.peerLinksAnswerRequest]: "peerLinks",
[WS_METHODS.serverGetSettings]: "server",
Expand Down
9 changes: 9 additions & 0 deletions apps/server/src/peer/PeerForwarding.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {
type EnvironmentId,
type LinkedSidebarResult,
OrchestratorMcpFailure,
type OrchestratorMcpEnvironmentLinksResult,
OrchestratorMcpLinkAppPairingResult,
Expand Down Expand Up @@ -29,6 +30,7 @@ import { assertNotLinked } from "../mcp/linkOrigin.ts";
import * as McpInvocationContext from "../mcp/McpInvocationContext.ts";
import { type CallerLimits, readCaller, unavailable } from "../mcp/threadAccess.ts";
import * as ThreadManagement from "../orchestration-v2/ThreadManagementService.ts";
import { readLinkedSidebar } from "./linkedSidebar.ts";
import * as PeerLinks from "./PeerLinks.ts";
import * as PeerMcpClient from "./PeerMcpClient.ts";

Expand Down Expand Up @@ -122,6 +124,9 @@ export class PeerForwarding extends Context.Service<
readonly links: (
scope: Scope,
) => Effect.Effect<OrchestratorMcpEnvironmentLinksResult, OrchestratorMcpFailure>;
readonly linkedSidebar: (input: {
readonly catalogEnvironmentIds?: ReadonlyArray<EnvironmentId> | undefined;
}) => Effect.Effect<LinkedSidebarResult, PeerLinkError>;
}
>()("t3/peer/PeerForwarding") {}

Expand Down Expand Up @@ -442,6 +447,9 @@ const make = Effect.gen(function* () {
},
);

const linkedSidebar: PeerForwarding["Service"]["linkedSidebar"] = (input) =>
readLinkedSidebar({ links, peers, catalogEnvironmentIds: input.catalogEnvironmentIds });

return PeerForwarding.of({
addToApp,
call,
Expand All @@ -450,6 +458,7 @@ const make = Effect.gen(function* () {
interruptThread,
waitForThread,
links: listLinks,
linkedSidebar,
});
});

Expand Down
107 changes: 107 additions & 0 deletions apps/server/src/peer/linkedSidebar.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
import {
EnvironmentId,
makeThreadInbox,
ProjectId,
ProviderInstanceId,
ThreadId,
} from "@t3tools/contracts";
import { expect, it } from "@effect/vitest";
import * as DateTime from "effect/DateTime";
import * as Effect from "effect/Effect";
import * as Option from "effect/Option";

import { collectLinkedSidebar } from "./linkedSidebar.ts";

const laptop = EnvironmentId.make("primary-mac-laptop");
const omarcy = EnvironmentId.make("omarcy-desktop");
const air = EnvironmentId.make("js-macbook-air");
const at = (iso: string) => Option.getOrThrow(DateTime.make(iso));

it.effect("reads a reachable server-only link and skips catalog and unreachable links", () =>
Effect.gen(function* () {
const seen: Array<string> = [];
const now = at("2026-11-20T05:00:00.000Z");
const result = yield* collectLinkedSidebar({
now,
catalogEnvironmentIds: [laptop],
links: [
{
environmentId: laptop,
label: "primary-mac-laptop",
status: "reachable",
expiresAt: at("2026-12-19T00:00:00.000Z"),
},
{
environmentId: air,
label: "JS MacBook Air",
status: "unreachable",
expiresAt: at("2026-12-19T00:00:00.000Z"),
},
{
environmentId: omarcy,
label: "omarcy-desktop",
status: "reachable",
expiresAt: at("2026-12-19T00:00:00.000Z"),
},
],
read: (environmentId, tool) => {
seen.push(`${environmentId}:${tool}`);
if (tool === "t3_project_list") {
return Effect.succeed({
projects: [
{
id: ProjectId.make("project-eval"),
title: "t3code",
workspaceRoot: "/src/t3code",
defaultModelSelection: null,
scripts: [],
createdAt: "2026-11-01T00:00:00.000Z",
updatedAt: "2026-11-20T00:00:00.000Z",
deletedAt: null,
},
],
nextCursor: null,
});
}
return Effect.succeed({
projectId: null,
currentThreadId: null,
nextCursor: null,
total: 1,
threads: [
{
inbox: makeThreadInbox({ actor: { kind: "human", id: "jeff" } }),
threadId: ThreadId.make("thread-eval"),
projectId: ProjectId.make("project-eval"),
title: "10-model copy eval",
createdBy: "user",
creationSource: "web",
status: "idle",
latestRunId: null,
providerInstanceId: ProviderInstanceId.make("codex"),
model: "gpt-5.4",
runtimeMode: "full-access",
interactionMode: "default",
linkedPullRequest: null,
settled: false,
settledAt: null,
snoozed: false,
snoozedUntil: null,
parentThreadId: null,
relationshipToParent: null,
itemCount: 4,
createdAt: "2026-11-19T12:00:00.000Z",
updatedAt: "2026-11-20T04:00:00.000Z",
},
],
});
},
});
expect(seen).toEqual([`${omarcy}:t3_project_list`, `${omarcy}:t3_thread_list`]);
expect(result.environments.map((environment) => environment.label)).toEqual(["omarcy-desktop"]);
expect(result.environments[0]?.threads.map((thread) => thread.title)).toEqual([
"10-model copy eval",
]);
expect(result.environments[0]?.threads[0]?.inbox?.owner).toBe("jeff");
}),
);
185 changes: 185 additions & 0 deletions apps/server/src/peer/linkedSidebar.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
import {
type EnvironmentId,
type LinkedSidebarEnvironment,
type LinkedSidebarResult,
type LinkedSidebarThread,
NonNegativeInt,
OrchestratorMcpFailure,
OrchestratorMcpThreadListResult,
type PeerLinkSummary,
Project,
} from "@t3tools/contracts";
import * as DateTime from "effect/DateTime";
import * as Duration from "effect/Duration";
import * as Effect from "effect/Effect";
import * as Option from "effect/Option";
import * as Schema from "effect/Schema";

import * as PeerLinks from "./PeerLinks.ts";
import * as PeerMcpClient from "./PeerMcpClient.ts";

const THREAD_PAGE_LIMIT = 100;
const MAX_THREAD_PAGES = 8;
const PROJECT_PAGE_LIMIT = 100;
const MAX_PROJECT_PAGES = 3;
const PAGE_BUDGET = Duration.seconds(3);

const READ_LIMITS = {
runtimeMode: "approval-required",
interactionMode: "default",
} as const;

const ProjectPage = Schema.Struct({
projects: Schema.Array(Project),
nextCursor: Schema.NullOr(NonNegativeInt),
});

const decodeProjectPage = Schema.decodeUnknownEffect(ProjectPage);
const decodeThreadPage = Schema.decodeUnknownEffect(OrchestratorMcpThreadListResult);

export interface LinkedSidebarSourceLink {
readonly environmentId: EnvironmentId;
readonly label: string;
readonly status: PeerLinkSummary["status"];
readonly expiresAt: DateTime.Utc;
}

interface Page<A> {
readonly items: ReadonlyArray<A>;
readonly nextCursor: number | null;
}

type PageError = Schema.SchemaError | OrchestratorMcpFailure;

const pageAll = Effect.fn("linkedSidebar.pageAll")(function* <A>(
load: (cursor: number) => Effect.Effect<Page<A>, PageError>,
maxPages: number,
) {
const items: Array<A> = [];
let cursor = 0;
for (let page = 0; page < maxPages; page++) {
const result = yield* Effect.timeoutOption(load(cursor), PAGE_BUDGET).pipe(
Effect.orElseSucceed(() => Option.none<Page<A>>()),
);
if (Option.isNone(result)) return items;
items.push(...result.value.items);
if (result.value.nextCursor === null) return items;
cursor = result.value.nextCursor;
}
return items;
});

const slimThread = (
thread: (typeof OrchestratorMcpThreadListResult.Type.threads)[number],
): LinkedSidebarThread => ({
...(thread.inbox === undefined ? {} : { inbox: thread.inbox }),
threadId: thread.threadId,
projectId: thread.projectId,
title: thread.title,
createdBy: thread.createdBy,
creationSource: thread.creationSource,
status: thread.status,
latestRunId: thread.latestRunId,
providerInstanceId: thread.providerInstanceId,
model: thread.model,
runtimeMode: thread.runtimeMode,
interactionMode: thread.interactionMode,
settled: thread.settled,
settledAt: thread.settledAt,
snoozed: thread.snoozed,
snoozedUntil: thread.snoozedUntil,
...(thread.pinned === undefined ? {} : { pinned: thread.pinned }),
parentThreadId: thread.parentThreadId,
relationshipToParent: thread.relationshipToParent,
itemCount: thread.itemCount,
createdAt: thread.createdAt,
updatedAt: thread.updatedAt,
});

export const collectLinkedSidebar = Effect.fn("linkedSidebar.collect")(function* (input: {
readonly links: ReadonlyArray<LinkedSidebarSourceLink>;
readonly now: DateTime.Utc;
readonly catalogEnvironmentIds: ReadonlyArray<EnvironmentId>;
readonly read: (
environmentId: EnvironmentId,
tool: "t3_project_list" | "t3_thread_list",
args: Record<string, unknown>,
) => Effect.Effect<unknown, PageError>;
}) {
const skip = new Set(input.catalogEnvironmentIds);
const selected = input.links.filter(
(link) =>
link.status === "reachable" &&
!DateTime.isLessThanOrEqualTo(link.expiresAt, input.now) &&
!skip.has(link.environmentId),
);
const environments: Array<LinkedSidebarEnvironment> = yield* Effect.forEach(
selected,
(link) =>
Effect.gen(function* () {
const projects = yield* pageAll(
(cursor) =>
input
.read(link.environmentId, "t3_project_list", {
cursor,
limit: PROJECT_PAGE_LIMIT,
})
.pipe(
Effect.flatMap(decodeProjectPage),
Effect.map((page) => ({
items: page.projects.filter((project) => project.deletedAt === null),
nextCursor: page.nextCursor,
})),
),
MAX_PROJECT_PAGES,
);
const threads = yield* pageAll(
(cursor) =>
input
.read(link.environmentId, "t3_thread_list", {
allProjects: true,
includeSubagents: false,
cursor,
limit: THREAD_PAGE_LIMIT,
})
.pipe(
Effect.flatMap(decodeThreadPage),
Effect.map((page) => ({
items: page.threads.map(slimThread),
nextCursor: page.nextCursor,
})),
),
MAX_THREAD_PAGES,
);
return {
environmentId: link.environmentId,
label: link.label,
projects,
threads,
} satisfies LinkedSidebarEnvironment;
}),
{ concurrency: 2 },
);
return { environments } satisfies LinkedSidebarResult;
});

export const readLinkedSidebar = Effect.fn("linkedSidebar.read")(function* (input: {
readonly links: PeerLinks.PeerLinks["Service"];
readonly peers: PeerMcpClient.PeerMcpClient["Service"];
readonly catalogEnvironmentIds?: ReadonlyArray<EnvironmentId> | undefined;
}) {
const listed = yield* input.links.list;
return yield* collectLinkedSidebar({
links: listed,
now: yield* DateTime.now,
catalogEnvironmentIds: input.catalogEnvironmentIds ?? [],
read: (environmentId, tool, args) =>
input.peers.call({
environmentId,
tool,
arguments: args,
limits: READ_LIMITS,
success: Schema.Unknown,
}),
});
});
4 changes: 4 additions & 0 deletions apps/server/src/ws.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2774,6 +2774,10 @@ export const layerWsRpc = (
peerForwarding.addToApp(environmentId),
[WS_METHODS.peerLinksEnvironments]: (_input) =>
peerLinks.environments.pipe(Effect.map((environments) => ({ environments }))),
[WS_METHODS.peerLinksLinkedSidebar]: (input) =>
peerForwarding.linkedSidebar({
catalogEnvironmentIds: input.catalogEnvironmentIds,
}),
[WS_METHODS.peerLinksReportAppConnections]: ({ connections }) =>
peerLinks.reportAppConnections(currentSessionId, connections),
[WS_METHODS.peerLinksAnswerRequest]: (input) =>
Expand Down
Loading
Loading