Skip to content

Commit d68a7a5

Browse files
donjorrsi-pr-agent
authored andcommitted
refactor(server): child-work custom-agent seams sit behind fork-owned files
Squashes: - bc5cd78 refactor(server): child-work custom-agent seams sit behind fork-owned files - bbb749f refactor(web): composer custom-agent seams sit behind fork-owned files - 414e9b0 fix(web): agent picker shows the selected agent Fork-Domain: custom-agents Fork-Tier: core Fork-Upstreamable: no
1 parent 697789a commit d68a7a5

4 files changed

Lines changed: 42 additions & 41 deletions

File tree

‎apps/web/src/components/chat/ComposerControlsBar.tsx‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ import {
2525
renderProviderTraitsPicker,
2626
} from "./composerProviderState";
2727
import type { useComposerProviderModel } from "./useComposerProviderModel";
28+
import {
29+
agentRestingBlock,
30+
renderProviderAgentMenuContent,
31+
renderProviderAgentPicker,
32+
} from "./composerProviderState.fork"; // fork-hook: custom-agents/composer-agent-render-import
2833

2934
/**
3035
* The composer footer controls: model picker, traits, mode controls and the overflow menu for
@@ -155,13 +160,16 @@ export function ComposerControlsBar(props: {
155160
planModeEnabled,
156161
isComposerOwned: true,
157162
} satisfies Parameters<typeof renderProviderTraitsPicker>[0];
163+
const providerAgentMenuContent = renderProviderAgentMenuContent(providerTraitsPickerInput); // fork-hook: custom-agents/composer-agent-menu-content
164+
const providerAgentPicker = renderProviderAgentPicker(providerTraitsPickerInput); // fork-hook: custom-agents/composer-agent-picker
158165
const providerTraitsPicker = renderProviderTraitsPicker(providerTraitsPickerInput);
159166
const restingProviderTraitsPicker = renderProviderTraitsPicker({
160167
...providerTraitsPickerInput,
161168
size: composerControlsCollapsed ? "xs" : "sm",
162169
hidden: composerControlsHidden || restingHiddenBlockCount > 1,
163170
});
164171
const restingBlockDefs = [
172+
...agentRestingBlock(providerAgentPicker, composerControlsCollapsed), // fork-hook: custom-agents/composer-agent-resting-block
165173
...(providerTraitsPicker
166174
? [
167175
{
@@ -312,6 +320,9 @@ export function ComposerControlsBar(props: {
312320
size={composerControlsCollapsed ? "xs" : "sm"}
313321
hidden={composerControlsHidden || hiddenRestingBlockIds.length === 0}
314322
showInteractionModeToggle={planModeUiEnabled && hiddenRestingBlockIds.includes("mode")}
323+
agentMenuContent={
324+
hiddenRestingBlockIds.includes("agent") ? providerAgentMenuContent : undefined
325+
} // fork-hook: custom-agents/composer-agent-compact-menu-prop
315326
traitsMenuContent={
316327
hiddenRestingBlockIds.includes("traits") ? providerTraitsMenuContent : undefined
317328
}

‎apps/web/src/components/chat/composerProviderState.fork.test.tsx‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { isValidElement } from "react";
12
import { describe, expect, it } from "vite-plus/test";
23
import {
34
ProviderDriverKind,
@@ -116,13 +117,38 @@ describe("provider traits render guards", () => {
116117
model: MODEL,
117118
models,
118119
modelOptions: selections(["agent", "fable"]),
119-
prompt: "",
120-
onPromptChange: () => {},
120+
promptUltrathink: "none" as const,
121+
onPromptEdit: () => {},
121122
planModeEnabled: false,
122123
};
123124
expect(renderProviderAgentPicker(args)).not.toBeNull();
124125
expect(renderProviderAgentMenuContent(args)).not.toBeNull();
125126
expect(renderProviderTraitsPicker(args)).toBeNull();
126127
expect(renderProviderTraitsMenuContent(args)).toBeNull();
127128
});
129+
130+
// A dropped selection shows every agent as Default and rebuilds the other
131+
// traits from defaults on the next pick.
132+
it("hands the current selections to both agent controls", () => {
133+
const args = {
134+
provider: PROVIDER,
135+
draftId: DraftId.make("draft-agent-selection"),
136+
model: MODEL,
137+
models: modelWith([
138+
selectDescriptor("agent", [
139+
{ id: "default", label: "Default", isDefault: true },
140+
{ id: "fable", label: "fable" },
141+
]),
142+
]),
143+
modelOptions: selections(["agent", "fable"]),
144+
promptUltrathink: "none" as const,
145+
onPromptEdit: () => {},
146+
planModeEnabled: false,
147+
};
148+
for (const control of [renderProviderAgentPicker(args), renderProviderAgentMenuContent(args)]) {
149+
expect(isValidElement<{ modelOptions?: unknown }>(control)).toBe(true);
150+
if (!isValidElement<{ modelOptions?: unknown }>(control)) continue;
151+
expect(control.props.modelOptions).toEqual(args.modelOptions);
152+
}
153+
});
128154
});

‎apps/web/src/components/chat/composerProviderState.fork.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ function renderAgentControl(
3636
{...(threadRef ? { threadRef } : {})}
3737
{...(draftId ? { draftId } : {})}
3838
model={model}
39+
modelOptions={modelOptions}
3940
planModeEnabled={planModeEnabled}
4041
/>
4142
);

‎apps/web/src/components/chat/composerProviderState.tsx‎

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import {
2626
TraitsPicker,
2727
type PromptUltrathink,
2828
} from "./TraitsPicker";
29-
import { AgentMenuContent, AgentPicker, shouldRenderAgentControl } from "./AgentPicker"; // fork-hook: custom-agents/composer-state-agent-import
3029

3130
export type ComposerProviderStateInput = {
3231
provider: ProviderDriverKind;
@@ -284,41 +283,5 @@ export function renderProviderTraitsPicker(input: TraitsRenderInput): ReactNode
284283
return renderTraitsControl(TraitsPicker, input);
285284
}
286285

287-
function renderAgentControl(
288-
Component: typeof AgentMenuContent | typeof AgentPicker,
289-
input: TraitsRenderInput,
290-
): ReactNode {
291-
const { provider, instanceId, threadRef, draftId, model, models, modelOptions, planModeEnabled } =
292-
input;
293-
const hasTarget = threadRef !== undefined || draftId !== undefined;
294-
if (
295-
!hasTarget ||
296-
!shouldRenderAgentControl({
297-
provider,
298-
models,
299-
model,
300-
planModeEnabled,
301-
})
302-
) {
303-
return null;
304-
}
305-
return (
306-
<Component
307-
provider={provider}
308-
{...(instanceId ? { instanceId } : {})}
309-
models={models}
310-
{...(threadRef ? { threadRef } : {})}
311-
{...(draftId ? { draftId } : {})}
312-
model={model}
313-
planModeEnabled={planModeEnabled}
314-
/>
315-
);
316-
}
317-
318-
export function renderProviderAgentMenuContent(input: TraitsRenderInput): ReactNode {
319-
return renderAgentControl(AgentMenuContent, input);
320-
} // fork-hook: custom-agents/composer-state-agent-menu-content
321-
322-
export function renderProviderAgentPicker(input: TraitsRenderInput): ReactNode {
323-
return renderAgentControl(AgentPicker, input);
324-
}
286+
export { renderProviderAgentMenuContent } from "./composerProviderState.fork"; // fork-hook: custom-agents/composer-state-agent-menu-content
287+
export { renderProviderAgentPicker } from "./composerProviderState.fork"; // fork-hook: custom-agents/composer-state-agent-picker

0 commit comments

Comments
 (0)