Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7966f20
fix(antigravity): pre-approve T3 MCP tools in Auto and Auto-accept ed…
charlesbine Nov 22, 2026
ad1b1f9
fix(server): Antigravity keeps Auto in the mode picker after a restar…
juliusmarminge Nov 22, 2026
11224f6
fix(client-runtime): a new thread's first message and a queued send-n…
Tgoh Nov 22, 2026
02ea261
fix(server): long webhook prompts in the delivery log no longer end i…
tiliakoos Nov 22, 2026
426b5a6
fix(server): a released ACP session no longer leaves its run stuck ru…
juliusmarminge Nov 22, 2026
cd3a57a
feat(web): sidebar thread rows show the environment instead of the br…
juliusmarminge Nov 22, 2026
6f49071
fix: a failed checkpoint capture keeps Edit from here for conversatio…
juliusmarminge Nov 22, 2026
15a3daa
docs(claude): mobile shows the compact chip too (#40755)
juliusmarminge Nov 22, 2026
e3f9db2
fix(server): TanStack Source pull requests open from every client, an…
juliusmarminge Nov 22, 2026
976aca3
fix: include delegated threads in CLI listing (#40738)
dajiaohuang Nov 22, 2026
bcace07
fix(pi): turn token usage counts cached tokens as input and stays per…
juliusmarminge Nov 22, 2026
4c3d83f
fix(mobile): usage account detail keeps even pace current while open …
juliusmarminge Nov 22, 2026
7f125d8
fix(server): Resume sends pending context to providers without native…
juliusmarminge Nov 22, 2026
90a8ac0
fix(server): a failed or cancelled clone no longer blocks re-cloning …
amanthanvi Nov 22, 2026
70b5e48
fix: retain pull request metadata in thread show (#40744)
dajiaohuang Nov 22, 2026
c3a330d
fix(web): show Queue for running sessions that cannot steer (#40767)
iiijiashu Nov 22, 2026
c198f73
fix(web): a click outside the project action editor no longer discard…
AymanKhan9 Nov 22, 2026
6da64ec
Merge upstream/main (c198f73b37) into the fork
radys-s Nov 22, 2026
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
12 changes: 12 additions & 0 deletions apps/mobile/src/features/pull-requests/PullRequestListRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ export const PullRequestListRow = memo(
),
item.title,
status.label,
item.visibility === "private" ? gt("Private") : null,
conflict ? conflict.label.toLowerCase() : null,
gt("by {author}", { author: item.author?.login ?? gt("unknown author") }),
review ? review.accessibleLabel : null,
Expand Down Expand Up @@ -178,6 +179,17 @@ export const PullRequestListRow = memo(
<Text className={cn("min-w-0 flex-1 text-xs", mutedForeground)} numberOfLines={1}>
{item.repository} <Text className={tertiaryForeground}>#{item.number}</Text>
</Text>
{item.visibility === "private" ? (
<View>
<SymbolView
name={PullRequestGlyph.private}
size={11}
tintColorClassName={
props.sidebar ? "accent-drawer-foreground-muted" : "accent-foreground-muted"
}
/>
</View>
) : null}
{item.stack ? (
<View className="flex-row items-center gap-1">
<SymbolView
Expand Down
11 changes: 11 additions & 0 deletions apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ import { useAndroidWorkspaceBack } from "../layout/workspace/useAndroidWorkspace
import { EmptyState } from "../../components/ui/EmptyState";
import { SegmentedControl } from "../../components/ui/SegmentedControl";
import { SymbolView } from "../../components/ui/AppSymbol";
import { PullRequestGlyph } from "./pullRequestGlyphs";
import { ScreenContent } from "../../components/ui/ScreenContent";
import { RelativeTime } from "../../components/RelativeTime";
import { usePullRequestConnected } from "./usePullRequestConnected";
Expand Down Expand Up @@ -228,6 +229,16 @@ function PullRequestIdentity(props: {
<Text className={`text-xs font-t3-medium ${status.text}`}>{status.label}</Text>
</View>
)}
{"visibility" in pr && pr.visibility === "private" ? (
<View className="flex-row items-center gap-1">
<SymbolView
name={PullRequestGlyph.private}
size={12}
tintColorClassName="accent-icon-muted"
/>
<Text className="text-xs font-t3-medium text-foreground-muted">{gt("Private")}</Text>
</View>
) : null}
<PullRequestDiffStats additions={pr.additions ?? 0} deletions={pr.deletions ?? 0} compact />
{"changedFiles" in pr && pr.changedFiles !== undefined ? (
<Text className="text-2xs text-foreground-muted">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ export const PullRequestGlyph = {
merged: "arrow.triangle.merge",
stack: "square.3.layers.3d",
conflicting: "exclamationmark.triangle",
private: { ios: "lock.fill", android: "lock" },
} as const satisfies Record<string, AppSymbolName>;
1 change: 1 addition & 0 deletions apps/mobile/src/features/pull-requests/pullRequestList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ export function pullRequestListRowsAreEqual(
previous.title === next.title &&
previous.url === next.url &&
previous.state === next.state &&
previous.visibility === next.visibility &&
previous.isDraft === next.isDraft &&
previous.mergeability === next.mergeability &&
previous.baseBranch === next.baseBranch &&
Expand Down
6 changes: 3 additions & 3 deletions apps/mobile/src/features/usage/UsageLimitsPooled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
import { msg, T, useGT, useMessages, Var } from "gt-react-native";
import { Fragment, type ReactNode, useId, useState } from "react";
import { Pressable, View } from "react-native";
import { useNowMinuteMs } from "../../lib/clock";
import { tryOpenExternalUrl } from "../../lib/openExternalUrl";
import { ScreenScrollView as ScrollView } from "../../components/ui/ScreenScrollView";
import { Defs, Path, Pattern, Rect, Svg } from "react-native-svg";
Expand Down Expand Up @@ -201,7 +202,6 @@ function PoolWindowCard({
windowId: pool.id,
windowKind: pool.kind,
environmentIds,
now,
});
const summary = (
<>
Expand Down Expand Up @@ -590,13 +590,13 @@ type AccountScreenProps = StaticScreenProps<{
windowId: string;
windowKind: LimitPoolWindow["kind"];
environmentIds: readonly string[] | null;
now: number;
}>;

export function UsageLimitAccountScreen({ route }: AccountScreenProps) {
const insets = useSafeAreaInsets();
const presentations = useAtomValue(environmentPresentations.presentationsWithProvidersAtom);
const { accountKey, windowId, windowKind, environmentIds, now } = route.params;
const { accountKey, windowId, windowKind, environmentIds } = route.params;
const now = useNowMinuteMs();
const selectedIds =
environmentIds === null ? null : new Set(environmentIds.map((id) => EnvironmentId.make(id)));
const selected =
Expand Down
1 change: 1 addition & 0 deletions apps/mobile/src/i18n/translations/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -2851,6 +2851,7 @@
"f9d3c8aa453829ce": "Tippe auf eine Person, um ein Review anzufordern. Tippe auf einen angefragten Reviewer, um die Anfrage zu entfernen. Änderungen werden beim Schließen dieses Fensters gesendet.",
"8d3770f150f0bcb4": "Angefragt",
"fff1c3d17603f394": "Dieser Anbieter akzeptiert eine Reviewer-ID, kann aber keine Kandidaten auflisten.",
"bbb7d40a7ad7ab71": "Privat",
"85ae9979ad3b0c1e": "Basis-Branch {branch} kopieren",
"06a684782801e8f7": "Head-Branch {branch} kopieren",
"8e4f3c862193b8a5": "Bearbeiten",
Expand Down
1 change: 1 addition & 0 deletions apps/mobile/src/i18n/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -2851,6 +2851,7 @@
"f9d3c8aa453829ce": "Tap someone to request a review. Tap a requested reviewer to remove the request. Changes are sent when you close this sheet.",
"8d3770f150f0bcb4": "Requested",
"fff1c3d17603f394": "This provider accepts a reviewer ID but cannot list candidates.",
"bbb7d40a7ad7ab71": "Private",
"85ae9979ad3b0c1e": "Copy base branch {branch}",
"06a684782801e8f7": "Copy head branch {branch}",
"8e4f3c862193b8a5": "Edit",
Expand Down
1 change: 1 addition & 0 deletions apps/mobile/src/i18n/translations/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -2847,6 +2847,7 @@
"f9d3c8aa453829ce": "Toca a alguien para solicitarle una revisión. Toca a un revisor solicitado para quitar la solicitud. Los cambios se envían al cerrar esta hoja.",
"8d3770f150f0bcb4": "Solicitado",
"fff1c3d17603f394": "Este proveedor acepta un ID de revisor, pero no puede listar candidatos.",
"bbb7d40a7ad7ab71": "Privado",
"85ae9979ad3b0c1e": "Copiar la rama base {branch}",
"06a684782801e8f7": "Copiar la rama head {branch}",
"8e4f3c862193b8a5": "Editar",
Expand Down
1 change: 1 addition & 0 deletions apps/mobile/src/i18n/translations/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -2847,6 +2847,7 @@
"f9d3c8aa453829ce": "Touchez une personne pour lui demander une revue. Touchez un relecteur sollicité pour retirer la demande. Les modifications sont envoyées à la fermeture de ce panneau.",
"8d3770f150f0bcb4": "Sollicité",
"fff1c3d17603f394": "Ce fournisseur accepte un ID de relecteur mais ne peut pas lister les candidats.",
"bbb7d40a7ad7ab71": "Privé",
"85ae9979ad3b0c1e": "Copier la branche de base {branch}",
"06a684782801e8f7": "Copier la branche de tête {branch}",
"8e4f3c862193b8a5": "Modifier",
Expand Down
1 change: 1 addition & 0 deletions apps/mobile/src/i18n/translations/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -2844,6 +2844,7 @@
"f9d3c8aa453829ce": "ユーザーをタップするとレビューをリクエストします。リクエスト済みのレビュアーをタップするとリクエストを削除します。変更はこのシートを閉じたときに送信されます。",
"8d3770f150f0bcb4": "リクエスト済み",
"fff1c3d17603f394": "このプロバイダーはレビュアー ID を受け付けますが、候補を一覧表示できません。",
"bbb7d40a7ad7ab71": "プライベート",
"85ae9979ad3b0c1e": "ベースブランチ {branch} をコピー",
"06a684782801e8f7": "ヘッドブランチ {branch} をコピー",
"8e4f3c862193b8a5": "編集",
Expand Down
1 change: 1 addition & 0 deletions apps/mobile/src/i18n/translations/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -2848,6 +2848,7 @@
"f9d3c8aa453829ce": "검토를 요청하려면 사람을 탭하세요. 요청을 제거하려면 요청된 검토자를 탭하세요. 변경 사항은 이 시트를 닫을 때 전송됩니다.",
"8d3770f150f0bcb4": "요청됨",
"fff1c3d17603f394": "이 제공자는 검토자 ID를 받지만 후보를 나열할 수 없습니다.",
"bbb7d40a7ad7ab71": "비공개",
"85ae9979ad3b0c1e": "기준 브랜치 {branch} 복사",
"06a684782801e8f7": "헤드 브랜치 {branch} 복사",
"8e4f3c862193b8a5": "편집",
Expand Down
1 change: 1 addition & 0 deletions apps/mobile/src/i18n/translations/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -2847,6 +2847,7 @@
"f9d3c8aa453829ce": "Toque em alguém para solicitar uma revisão. Toque em um revisor solicitado para remover a solicitação. As alterações são enviadas quando você fecha esta folha.",
"8d3770f150f0bcb4": "Solicitado",
"fff1c3d17603f394": "Este provedor aceita um ID de revisor, mas não consegue listar candidatos.",
"bbb7d40a7ad7ab71": "Privado",
"85ae9979ad3b0c1e": "Copiar branch base {branch}",
"06a684782801e8f7": "Copiar branch head {branch}",
"8e4f3c862193b8a5": "Editar",
Expand Down
1 change: 1 addition & 0 deletions apps/mobile/src/i18n/translations/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -2899,6 +2899,7 @@
"f9d3c8aa453829ce": "Нажмите на человека, чтобы запросить ревью. Нажмите на запрошенного ревьюера, чтобы отменить запрос. Изменения отправляются при закрытии этой панели.",
"8d3770f150f0bcb4": "Запрошен",
"fff1c3d17603f394": "Этот провайдер принимает ID ревьюера, но не может показать список кандидатов.",
"bbb7d40a7ad7ab71": "Приватный",
"85ae9979ad3b0c1e": "Копировать базовую ветку {branch}",
"06a684782801e8f7": "Копировать head-ветку {branch}",
"8e4f3c862193b8a5": "Изменить",
Expand Down
1 change: 1 addition & 0 deletions apps/mobile/src/i18n/translations/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -2851,6 +2851,7 @@
"f9d3c8aa453829ce": "Tryck på någon för att begära en granskning. Tryck på en begärd granskare för att ta bort begäran. Ändringarna skickas när du stänger det här bladet.",
"8d3770f150f0bcb4": "Begärd",
"fff1c3d17603f394": "Leverantören accepterar ett granskar-id men kan inte lista kandidater.",
"bbb7d40a7ad7ab71": "Privat",
"85ae9979ad3b0c1e": "Kopiera basgrenen {branch}",
"06a684782801e8f7": "Kopiera huvudgrenen {branch}",
"8e4f3c862193b8a5": "Redigera",
Expand Down
1 change: 1 addition & 0 deletions apps/mobile/src/i18n/translations/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -2848,6 +2848,7 @@
"f9d3c8aa453829ce": "轻点某人以请求审查。轻点已请求的审查者以移除请求。关闭此面板时会发送更改。",
"8d3770f150f0bcb4": "已请求",
"fff1c3d17603f394": "此提供方接受审查者 ID,但无法列出候选人。",
"bbb7d40a7ad7ab71": "私有",
"85ae9979ad3b0c1e": "复制基础分支 {branch}",
"06a684782801e8f7": "复制头部分支 {branch}",
"8e4f3c862193b8a5": "编辑",
Expand Down
131 changes: 131 additions & 0 deletions apps/server/src/cli/thread.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,103 @@ vi.mock("../auth/EnvironmentAuth.ts", async (importOriginal) => {
const threadId = ThreadId.make("thread-1");
const runId = RunId.make("run-1");

it.effect("list includes delegated threads across pages and still leaves out subagents", () =>
Effect.gen(function* () {
const fs = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
const baseDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-thread-list-" });
yield* persistServerRuntimeState({
path: path.join(baseDir, "userdata", "server-runtime.json"),
state: yield* makePersistedServerRuntimeState({
config: { host: "127.0.0.1", devUrl: undefined },
port: 3_773,
}),
});
const projectId = ProjectId.make("project-1");
const item = (id: string) => ({
threadId: id,
projectId,
title: id,
createdBy: "user",
creationSource: "web",
status: "idle",
latestRunId: null,
providerInstanceId: "codex",
model: "test",
runtimeMode: "full-access",
interactionMode: "default",
linkedPullRequest: null,
settled: false,
settledAt: null,
snoozed: false,
snoozedUntil: null,
parentThreadId: null,
relationshipToParent: null,
itemCount: 0,
createdAt: "2026-01-01T00:00:00.000Z",
updatedAt: "2026-01-01T00:00:00.000Z",
});
const root = item("root");
const delegated = {
...item("delegated"),
delegatedFrom: { environmentId: "env-1", threadId: "remote", title: "Remote" },
};
const subagent = { ...item("child"), parentThreadId: "root", relationshipToParent: "subagent" };
using _session = vi.spyOn(McpBridge, "mcpToolSession").mockReturnValue(
Effect.succeed({
call: (tool, args) => {
if (tool === "t3_project_list")
return Effect.succeed({
structuredContent: {
projects: [{ id: projectId, title: "Project", workspaceRoot: baseDir }],
nextCursor: null,
},
});
if (tool === "t3_thread_list") {
const all = args.includeSubagents ? [root, subagent, delegated] : [root];
const cursor = Number(args.cursor);
return Effect.succeed({
structuredContent: {
projectId,
currentThreadId: null,
threads: all.slice(cursor, cursor + 2),
nextCursor: cursor + 2 < all.length ? cursor + 2 : null,
total: all.length,
},
});
}
return Effect.die(`unexpected ${tool} call`);
},
}),
);
yield* Command.runWith(threadCommand, { version: "0.0.0" })([
"list",
"--project",
projectId,
"--json",
"--base-dir",
baseDir,
]);
const listed = JSON.parse(String((yield* TestConsole.logLines).at(-1))) as Array<{
threadId: string;
}>;
assert.deepStrictEqual(
listed.map((entry) => entry.threadId),
["root", "delegated"],
);
}).pipe(
Effect.scoped,
Effect.provide(
Layer.mergeAll(
NodeServices.layer,
NodeCrypto.layer,
NetService.layer,
ConfigProvider.layer(ConfigProvider.fromEnv({ env: { T3CODE_PORT: "3773" } })),
),
),
),
);

it.effect(
"start resolves home-relative project paths while preserving ids and relative paths",
() =>
Expand Down Expand Up @@ -461,6 +558,40 @@ const timelineTools = (types: ReadonlyArray<string>) => {

const tail = (tools: number) => [...Array<string>(tools).fill("tool_call"), "assistant_message"];

it.effect("show retains pull request metadata when reading a later message window", () =>
Effect.gen(function* () {
const link = {
host: "github.com",
repository: "owner/repo",
number: 1,
url: "https://github.com/owner/repo/pull/1",
source: "manual",
state: "open",
watching: false,
watchStartedAt: null,
} as const;
const call = ((_tool: string, input: unknown) => {
const args = input as { afterPosition?: number; limit: number };
const first = args.afterPosition === undefined && args.limit === 1;
return Effect.succeed({
thread: {
itemCount: 200,
status: first ? "running" : "completed",
pullRequestCount: 1,
...(first ? { pullRequests: [link], openPullRequestCount: 1 } : {}),
},
items: first ? [] : [{ position: 199, itemId: "message", type: "assistant_message" }],
nextPosition: 199,
hasMore: false,
});
}) as ThreadTools["call"];
const { thread } = yield* readLatestMessages({ call }, threadId, 1);
assert.strictEqual(thread.status, "completed");
assert.deepStrictEqual(thread.pullRequests, [link]);
assert.strictEqual(thread.openPullRequestCount, 1);
}),
);

it.effect("show reads the end of a long thread, not its whole history", () =>
Effect.gen(function* () {
const { tools, served, latest } = timelineTools([
Expand Down
9 changes: 6 additions & 3 deletions apps/server/src/cli/thread.ts
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,8 @@ export const readLatestMessages = Effect.fn("cli.thread.readLatestMessages")(fun
);
afterPosition = page.nextPosition ?? Number.POSITIVE_INFINITY;
} while (page.hasMore && afterPosition < (end ?? Number.POSITIVE_INFINITY) - 1);
thread = page.thread;
// Only the first read carries pull request previews; later pages omit them.
thread = Object.assign({}, thread, page.thread);
// A window can hold the whole --messages count, too many to spread as arguments.
messages = window.concat(messages);
before = start;
Expand Down Expand Up @@ -850,10 +851,12 @@ const threadListCommand = Command.make("list", {
while (cursor !== null) {
const page: OrchestratorMcpThreadListResult = yield* tools.call(
"t3_thread_list",
{ projectId: project.id, includeSubagents: false, limit: 100, cursor },
{ projectId: project.id, includeSubagents: true, limit: 100, cursor },
OrchestratorMcpThreadListResult,
);
threads.push(...page.threads);
threads.push(
...page.threads.filter((thread) => thread.relationshipToParent !== "subagent"),
);
cursor = page.nextCursor;
}
if (flags.json) {
Expand Down
Loading
Loading