Skip to content

Commit 6facbfe

Browse files
Merge origin/main into factory/issue-24390
Picks up main's lowered agent context budget. Co-Authored-By: Claude Opus 5.5 <[email protected]>
2 parents 72db875 + b5c0ee5 commit 6facbfe

46 files changed

Lines changed: 1435 additions & 166 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/desktop/src/app/DesktopCliShim.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const fakeAppImage = (canMount = true, app = REPORTER) => {
5656
`echo $$ >'${root}/mounter.pid'`,
5757
canMount ? `echo '${image}'` : 'echo "Cannot mount AppImage"; exit 1',
5858
// Like the FUSE runtime, any of these unmounts. fd 3 reports to the test when it is open.
59-
`trap 'echo unmounted >&3 2>/dev/null; touch "${root}/unmounted"; exit 0' TERM HUP INT`,
59+
"trap 'echo unmounted >&3 2>/dev/null; exit 0' TERM HUP INT",
6060
"trap 'echo mounted >&3 2>/dev/null' WINCH",
6161
"while :; do sleep 0.05; done",
6262
"",

‎apps/mobile/src/features/layout/workspace/WorkspaceRootScreen.android.tsx‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import { WorkspaceAppBarScope } from "../../../components/ui/WorkspaceAppBar.and
2424
import { usePaneRole } from "../../../components/ui/Pane";
2525
import { AndroidWorkspaceSidebar } from "./AndroidWorkspaceSidebar.android";
2626
import type { WorkspaceTab } from "./workspace-tabs-state";
27+
import { useSelectWorkspaceTab } from "./useSelectWorkspaceTab";
28+
import { useHardwareBack } from "../../../lib/backHandler";
2729

2830
const TABS: readonly WorkspaceTab[] = NAVIGATION_TAB_ORDER;
2931

@@ -49,6 +51,18 @@ function WorkspaceRoot() {
4951
: 16,
5052
};
5153
const tab = workspace.state.selectedTab;
54+
const selectTab = useSelectWorkspaceTab();
55+
// Tabs are panes of Home, not routes, so Back has nothing to pop and would leave the app.
56+
// An open search keeps Back for itself.
57+
useHardwareBack(
58+
tab !== "threads" &&
59+
enabled.includes("threads") &&
60+
workspace.state.tabs[tab].searchMode === "resting",
61+
() => {
62+
selectTab("threads");
63+
return true;
64+
},
65+
);
5266

5367
return (
5468
<WorkspaceTabsContext value={context}>

‎apps/mobile/src/features/layout/workspace/workspace-tabs-state.test.ts‎

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import {
1111
workspaceSearchBottomClearance,
1212
workspaceDockBottomClearance,
1313
workspaceUsesColumns,
14+
type WorkspaceTab,
15+
type WorkspaceTabsState,
1416
} from "./workspace-tabs-state";
1517

1618
describe("compact list clearance", () => {
@@ -179,12 +181,25 @@ describe("workspace root navigation", () => {
179181
});
180182
});
181183

182-
const mocks = vi.hoisted(() => ({ split: false, floating: false }));
184+
const mocks = vi.hoisted(() => ({
185+
split: false,
186+
floating: false,
187+
state: undefined as WorkspaceTabsState | undefined,
188+
openWorkspaceTab: (_tab: string) => {},
189+
backListeners: new Set<() => boolean>(),
190+
}));
183191

184192
vi.mock("../../settings/appearance/AppearancePreferencesProvider", () => ({
185193
useAndroidFloatingTabs: () => mocks.floating,
186194
}));
187195
vi.mock("react-native", () => ({
196+
BackHandler: {
197+
addEventListener: (_event: string, listener: () => boolean) => {
198+
mocks.backListeners.add(listener);
199+
return { remove: () => mocks.backListeners.delete(listener) };
200+
},
201+
},
202+
Keyboard: { dismiss: () => undefined },
188203
useWindowDimensions: () => ({ width: 400, height: 800 }),
189204
View: ({ children }: { children: ReactNode }) => createElement("div", null, children),
190205
}));
@@ -198,12 +213,16 @@ vi.mock("../AdaptiveWorkspaceLayout", () => ({
198213
startNewTask: () => undefined,
199214
}),
200215
}));
216+
vi.mock("@react-navigation/native", () => ({ useIsFocused: () => true }));
217+
vi.mock("../adaptive-workspace-context", () => ({
218+
useAdaptiveWorkspaceLayout: () => ({ openWorkspaceTab: mocks.openWorkspaceTab }),
219+
}));
201220
vi.mock("./navigation-tabs", () => ({
202221
useEnabledNavigationTabs: () => ["threads", "pullRequests", "usage"],
203222
}));
204223
vi.mock("./WorkspaceTabsContext", () => ({
205224
WorkspaceTabsContext: createContext(null),
206-
useWorkspaceTabs: () => ({ state: { selectedTab: "usage" } }),
225+
useWorkspaceTabs: () => ({ state: mocks.state, dispatch: () => undefined }),
207226
}));
208227
vi.mock("./WorkspaceExtraTab", () => ({
209228
WorkspaceExtraTab: function UsageProbe() {
@@ -238,13 +257,37 @@ vi.mock("../../../components/ui/WorkspaceAppBar.android", () => ({
238257
WorkspaceAppBarScope: ({ children }: { children: ReactNode }) => children,
239258
}));
240259

241-
function setup(split: boolean, floating: boolean) {
260+
function setup(split: boolean, floating: boolean, state = selected("usage")) {
242261
mocks.split = split;
243262
mocks.floating = floating;
263+
mocks.state = state;
264+
mocks.openWorkspaceTab = () => undefined;
265+
mocks.backListeners.clear();
244266
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
245267
return { [Symbol.dispose]: () => vi.unstubAllGlobals() };
246268
}
247269

270+
function selected(tab: WorkspaceTab) {
271+
return workspaceTabsReducer(initialWorkspaceTabsState(), { type: "select", tab });
272+
}
273+
274+
/** Android calls the newest listener first and stops at the first that handles Back. */
275+
function pressBack() {
276+
return [...mocks.backListeners].reverse().some((listener) => listener());
277+
}
278+
279+
it("Back from the Pulls tab returns to Threads instead of leaving the app", async () => {
280+
using _actEnvironment = setup(false, false, selected("pullRequests"));
281+
const opened: string[] = [];
282+
mocks.openWorkspaceTab = (tab) => opened.push(tab);
283+
const root = createRoot(document.createElement("div"));
284+
using _root = { [Symbol.dispose]: () => act(() => root.unmount()) };
285+
await act(async () => root.render(createElement(WorkspaceRootScreen)));
286+
287+
expect(pressBack()).toBe(true);
288+
expect(opened).toEqual(["threads"]);
289+
});
290+
248291
it.each([
249292
[false, false],
250293
[true, false],

‎apps/server/src/environment/ServerEnvironment.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ export const make = Effect.gen(function* () {
274274
projectCloneTracking: true,
275275
projectOrganization: true,
276276
ignoredFileListing: true,
277+
ignoredFileSearch: true,
277278
triage: true,
278279
oneTimeSchedules: true,
279280
freshContext: true,

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ import * as ClaudeAdapterV2 from "./ClaudeAdapterV2.ts";
109109
import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
110110
import * as ProviderInstallationGate from "../../provider/ProviderInstallationGate.ts";
111111
import { ClaudeOrchestratorReplayHarness } from "./ClaudeAdapterV2.testkit.ts";
112+
import { withInlineContext } from "../ContextHandoffDelivery.ts";
112113
import { provideDeterministicTestRuntime } from "../testkit/DeterministicRuntime.ts";
113114
import { runOrchestratorV2Scenario } from "../testkit/OrchestratorScenario.ts";
114115
import { layerProviderReplay } from "../testkit/ProviderReplayHarness.ts";
@@ -5483,6 +5484,55 @@ describe("ClaudeAdapterV2 background wake turns", () => {
54835484
),
54845485
);
54855486

5487+
// regression: #34393 a provider switch replayed a $skill from the handoff history
5488+
it.effect("dispatches only skills from the user's text, not from inline handoff history", () =>
5489+
Effect.gen(function* () {
5490+
const fs = yield* FileSystem.FileSystem;
5491+
const path = yield* Path.Path;
5492+
const homePath = yield* fs.makeTempDirectoryScoped({ prefix: "t3-claude-skill-handoff-" });
5493+
const directory = path.join(homePath, "skills", "review");
5494+
yield* fs.makeDirectory(directory, { recursive: true });
5495+
yield* fs.writeFileString(
5496+
path.join(directory, "SKILL.md"),
5497+
"---\nname: review\n---\nFollow the review instructions.\n",
5498+
);
5499+
const harness = yield* makeWakeHarnessWithOptions({
5500+
settings: { ...DEFAULT_CLAUDE_SETTINGS, homePath },
5501+
});
5502+
const history = "Context handoff:\n[Historical user; user_message]\n$review the diff";
5503+
const text = withInlineContext(history, "continue");
5504+
yield* harness.runtime.startTurn({
5505+
...makeClaudeTestTurnInput({
5506+
threadId: harness.threadId,
5507+
providerThread: harness.providerThread,
5508+
now: yield* DateTime.now,
5509+
attemptId: RunAttemptId.make("skill-handoff"),
5510+
text,
5511+
attachments: [],
5512+
runtimePolicy: { ...CLAUDE_TEST_RUNTIME_POLICY, cwd: homePath },
5513+
}),
5514+
inlineContextLength: text.length - "continue".length,
5515+
});
5516+
5517+
const content = harness.offeredMessages[0]?.message.content;
5518+
const blocks =
5519+
typeof content === "string"
5520+
? [content]
5521+
: (content ?? []).map((block) => (block.type === "text" ? block.text : ""));
5522+
assert.isFalse(blocks.some((text) => text.startsWith("/review")));
5523+
assert.include(blocks.join("\n"), "$review the diff");
5524+
}).pipe(
5525+
Effect.provide(
5526+
Layer.mergeAll(
5527+
IdAllocator.layer,
5528+
McpProviderSessions.layer,
5529+
NodeServices.layer,
5530+
NodeCrypto.layer,
5531+
),
5532+
),
5533+
),
5534+
);
5535+
54865536
// regression: #15475 MCP title arriving after the tool starts must survive to completion
54875537
it.effect.each([
54885538
{ isError: false, title: "Check weather" },

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2631,12 +2631,15 @@ export function makeClaudeUserMessage(input: {
26312631
readonly text: string;
26322632
readonly priority?: SDKUserMessage["priority"];
26332633
readonly skills?: ReadonlyMap<string, ClaudeSkillTarget>;
2634+
readonly skillMentionsFrom?: number;
26342635
readonly uuid?: SDKUserMessage["uuid"];
26352636
}): SDKUserMessage {
26362637
// Claude expands a skill only when `/name` starts the last text block.
26372638
// Keep the whole request before that block; see ClaudeSkillDispatch.
26382639
const dispatch =
2639-
input.skills === undefined ? undefined : planClaudeSkillDispatch(input.text, input.skills);
2640+
input.skills === undefined
2641+
? undefined
2642+
: planClaudeSkillDispatch(input.text, input.skills, input.skillMentionsFrom);
26402643
// Claude runs `/goal` only when it opens the prompt, so a goal stays one block.
26412644
const isGoalCommand = parseGoalCommand({ text: input.text }) !== null;
26422645
return {
@@ -2801,11 +2804,15 @@ const makeClaudeUserMessageWithAttachments = Effect.fnUntraced(function* (input:
28012804
readonly fileSystem: FileSystem.FileSystem;
28022805
readonly pdfReservation: Effect.Success<ReturnType<typeof reserveClaudePdfBudget>>;
28032806
readonly skills?: ReadonlyMap<string, ClaudeSkillTarget>;
2807+
readonly skillMentionsFrom?: number;
28042808
}) {
28052809
if (input.attachments.length === 0) {
28062810
const message = makeClaudeUserMessage({
28072811
text: input.text,
28082812
...(input.skills === undefined ? {} : { skills: input.skills }),
2813+
...(input.skillMentionsFrom === undefined
2814+
? {}
2815+
: { skillMentionsFrom: input.skillMentionsFrom }),
28092816
...(input.priority === undefined ? {} : { priority: input.priority }),
28102817
...(input.uuid === undefined ? {} : { uuid: input.uuid }),
28112818
});
@@ -2829,7 +2836,7 @@ const makeClaudeUserMessageWithAttachments = Effect.fnUntraced(function* (input:
28292836
const dispatch =
28302837
input.skills === undefined
28312838
? undefined
2832-
: planClaudeSkillDispatch(textWithAttachmentPaths, input.skills);
2839+
: planClaudeSkillDispatch(textWithAttachmentPaths, input.skills, input.skillMentionsFrom);
28332840
const content: Array<ClaudeUserContentBlock> = [];
28342841
// Base64 adds a third to the payload. Leave room below Anthropic's 32 MB
28352842
// request limit for text, instructions, and SDK framing. The SDK does not
@@ -12422,15 +12429,24 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1242212429
pdfBudgets.get(nativeThreadId)!,
1242312430
persistAttachmentBudget(nativeThreadId),
1242412431
);
12432+
const promptText = applyClaudePromptEffortPrefix(
12433+
turnInput.message.text,
12434+
compileClaudeModelSelection(turnInput.modelSelection, modelCatalog).promptEffort,
12435+
);
1242512436
const userMessage =
1242612437
promptUuid === null
1242712438
? null
1242812439
: yield* makeClaudeUserMessageWithAttachments({
12429-
text: applyClaudePromptEffortPrefix(
12430-
turnInput.message.text,
12431-
compileClaudeModelSelection(turnInput.modelSelection, modelCatalog)
12432-
.promptEffort,
12433-
),
12440+
text: promptText,
12441+
// Mentions in inline handoff history are history, not this turn's skill.
12442+
...(turnInput.inlineContextLength === undefined
12443+
? {}
12444+
: {
12445+
skillMentionsFrom:
12446+
promptText.length -
12447+
turnInput.message.text.slice(turnInput.inlineContextLength).trimEnd()
12448+
.length,
12449+
}),
1243412450
attachments: turnInput.message.attachments,
1243512451
attachmentsDir,
1243612452
fileSystem,

‎apps/server/src/orchestration-v2/ProviderTurnStartService.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1639,12 +1639,11 @@ export const layer: Layer.Layer<
16391639
.filter((part) => part !== "")
16401640
.join("\n\n");
16411641
const { restartContinuationOfRunId: _resumedRunId, ...promptedInput } = turnInput;
1642+
const text = goalCommand ? userText : withInlineContext(context, userText);
16421643
yield* start({
16431644
...(noteContinuation ? promptedInput : turnInput),
1644-
message: {
1645-
...turnInput.message,
1646-
text: goalCommand ? userText : withInlineContext(context, userText),
1647-
},
1645+
message: { ...turnInput.message, text },
1646+
...(text === userText ? {} : { inlineContextLength: text.length - userText.length }),
16481647
}).pipe(
16491648
// Clear pending handoff markers for refused prompts so the next turn retains the native session.
16501649
Effect.tapError((error) =>

‎apps/server/src/preview/PreviewBrowser.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,31 +25,31 @@ import { openZipArchive } from "../zipArchive.ts";
2525
// https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json
2626
// Never pin below 156.0.8078.70: the shell has no CRLSet and older SPKI blocklists trust
2727
// compromised eMudhra intermediates (crrev.com/c/8627687).
28-
const VERSION = "157.0.8103.38";
28+
const VERSION = "157.0.8103.78";
2929
const ARCHIVES = {
3030
linux64: {
31-
bytes: 128_168_542,
32-
sha256: "deafffa74660b34853a4119c361fd427ac8c9fcb62db51ddb8a797cd83a4ba2d",
31+
bytes: 127_965_683,
32+
sha256: "f90329720fb61e5a76da9b6b509b6ad12a484c9c5df0359403e935177c6d153a",
3333
},
3434
"linux-arm64": {
35-
bytes: 128_171_139,
36-
sha256: "b9b910a57b2a15eb3e55000a2339f93a973934a413ebfc6e585a50ec6c42fd6c",
35+
bytes: 128_047_138,
36+
sha256: "912fbf877e53de34d7b3cca5104f3b95607d41bd35412ccc6cd2a599ff0c0dbf",
3737
},
3838
"mac-arm64": {
39-
bytes: 104_773_711,
40-
sha256: "e6a6b13551aa12f951d0891d79282606b13742837c8fa0505e1272bae116ce82",
39+
bytes: 104_822_985,
40+
sha256: "17bf66d53c1b1104dcb641c5b331cd4ac5d200c778f5feed0934a0b92deaf8d6",
4141
},
4242
"mac-x64": {
43-
bytes: 110_442_262,
44-
sha256: "79821745d0a72d2ba752d981284ed0a9e6fa320dad133596941a17dba6186de3",
43+
bytes: 110_132_547,
44+
sha256: "f1a6a9561eaf1f409849538de663695d36d72fbf1ebca4d42e47c7b5f2a157f3",
4545
},
4646
win32: {
47-
bytes: 120_390_416,
48-
sha256: "35e0d45c0136448f7b587f6fb7195a0686127a4dfdc23ef3b0e04b5e9ffe16cd",
47+
bytes: 120_403_126,
48+
sha256: "d9829c59dcc79d9e6e920f8ab841f2a9a055dcf54229d756ac0b42dfec303910",
4949
},
5050
win64: {
51-
bytes: 126_513_060,
52-
sha256: "1ff4540855478ba0848e03f1ef8d455f77d058b38285df91bc34273788a73446",
51+
bytes: 126_047_001,
52+
sha256: "2138c1583d25d6f3abec5269943b2f430207d87a539895aa9e90cc4697ec0e1f",
5353
},
5454
} as const;
5555

0 commit comments

Comments
 (0)