Skip to content

Commit f00c86e

Browse files
authored
Add persona and team import polish (#1203)
1 parent 6c60cb5 commit f00c86e

12 files changed

Lines changed: 246 additions & 41 deletions

‎desktop/src/features/agents/ui/BatchImportDialog.tsx‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
DialogHeader,
1919
DialogTitle,
2020
} from "@/shared/ui/dialog";
21+
import { buildBatchImportPersonaInput } from "./batchImportPersonaInput";
2122

2223
type BatchImportDialogProps = {
2324
fileName: string;
@@ -91,13 +92,7 @@ export function BatchImportDialog({
9192
});
9293

9394
try {
94-
await createPersona({
95-
displayName: persona.displayName,
96-
avatarUrl: persona.avatarDataUrl ?? undefined,
97-
systemPrompt: persona.systemPrompt,
98-
runtime: persona.runtime ?? undefined,
99-
model: persona.model ?? undefined,
100-
});
95+
await createPersona(buildBatchImportPersonaInput(persona));
10196
completed += 1;
10297
setImportedCount(completed);
10398
setItemStatuses((prev) => {
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
import assert from "node:assert/strict";
2+
import test from "node:test";
3+
4+
import { buildBatchImportPersonaInput } from "./batchImportPersonaInput.ts";
5+
6+
function persona(overrides = {}) {
7+
return {
8+
displayName: "Imported Agent",
9+
avatarDataUrl: null,
10+
avatarRef: null,
11+
systemPrompt: "Use the imported provider.",
12+
runtime: "goose",
13+
model: "claude-sonnet-4",
14+
provider: "anthropic",
15+
namePool: [],
16+
sourceFile: "agent.persona.md",
17+
...overrides,
18+
};
19+
}
20+
21+
test("buildBatchImportPersonaInput preserves provider from parsed personas", () => {
22+
assert.deepEqual(buildBatchImportPersonaInput(persona()), {
23+
displayName: "Imported Agent",
24+
avatarUrl: undefined,
25+
systemPrompt: "Use the imported provider.",
26+
runtime: "goose",
27+
model: "claude-sonnet-4",
28+
provider: "anthropic",
29+
namePool: undefined,
30+
});
31+
});
32+
33+
test("buildBatchImportPersonaInput carries imported name pools", () => {
34+
assert.deepEqual(
35+
buildBatchImportPersonaInput(persona({ namePool: ["fizz", "buzz"] })),
36+
{
37+
displayName: "Imported Agent",
38+
avatarUrl: undefined,
39+
systemPrompt: "Use the imported provider.",
40+
runtime: "goose",
41+
model: "claude-sonnet-4",
42+
provider: "anthropic",
43+
namePool: ["fizz", "buzz"],
44+
},
45+
);
46+
});
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import type { ParsedPersonaPreview } from "@/shared/api/tauriPersonas";
2+
import type { CreatePersonaInput } from "@/shared/api/types";
3+
4+
export function buildBatchImportPersonaInput(
5+
persona: ParsedPersonaPreview,
6+
): CreatePersonaInput {
7+
return {
8+
displayName: persona.displayName,
9+
avatarUrl: persona.avatarDataUrl ?? undefined,
10+
systemPrompt: persona.systemPrompt,
11+
runtime: persona.runtime ?? undefined,
12+
model: persona.model ?? undefined,
13+
provider: persona.provider ?? undefined,
14+
namePool: persona.namePool.length > 0 ? persona.namePool : undefined,
15+
};
16+
}

‎desktop/src/features/agents/ui/personaImportPlan.test.mjs‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ function createPersona(overrides = {}) {
1414
systemPrompt: "Be helpful.",
1515
runtime: null,
1616
model: null,
17+
provider: null,
1718
namePool: [],
1819
isBuiltIn: false,
1920
isActive: true,
@@ -28,8 +29,10 @@ function createPreview(overrides = {}) {
2829
displayName: "Alice",
2930
systemPrompt: "Be helpful.",
3031
avatarDataUrl: null,
32+
avatarRef: null,
3133
runtime: null,
3234
model: null,
35+
provider: null,
3336
namePool: [],
3437
sourceFile: "alice.persona.json",
3538
...overrides,
@@ -106,6 +109,19 @@ test("buildPersonaImportPlan detects model change", () => {
106109
assert.equal(plan.fields[0]?.label, "Preferred model");
107110
});
108111

112+
test("buildPersonaImportPlan detects provider change", () => {
113+
const plan = buildPersonaImportPlan({
114+
persona: createPersona({ provider: "anthropic" }),
115+
preview: createPreview({ provider: "databricks" }),
116+
});
117+
118+
assert.equal(plan.fields.length, 1);
119+
assert.equal(plan.fields[0]?.field, "provider");
120+
assert.equal(plan.fields[0]?.label, "LLM provider");
121+
assert.equal(plan.fields[0]?.existingValue, "anthropic");
122+
assert.equal(plan.fields[0]?.importedValue, "databricks");
123+
});
124+
109125
test("buildPersonaImportPlan detects name pool change", () => {
110126
const plan = buildPersonaImportPlan({
111127
persona: createPersona({ namePool: ["Birch", "Compass"] }),
@@ -123,17 +139,24 @@ test("buildPersonaImportPlan detects multiple field changes", () => {
123139
displayName: "Alice",
124140
systemPrompt: "Old prompt",
125141
model: "gpt-4o",
142+
provider: "openai",
126143
}),
127144
preview: createPreview({
128145
displayName: "Alicia",
129146
systemPrompt: "New prompt",
130147
model: "claude-sonnet-4-20250514",
148+
provider: "anthropic",
131149
}),
132150
});
133151

134-
assert.equal(plan.fields.length, 3);
152+
assert.equal(plan.fields.length, 4);
135153
const fieldNames = plan.fields.map((f) => f.field);
136-
assert.deepEqual(fieldNames, ["displayName", "systemPrompt", "model"]);
154+
assert.deepEqual(fieldNames, [
155+
"displayName",
156+
"systemPrompt",
157+
"model",
158+
"provider",
159+
]);
137160
});
138161

139162
test("hasAnyPersonaImportChanges returns false for empty plan", () => {

‎desktop/src/features/agents/ui/personaImportPlan.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,18 @@ export function buildPersonaImportPlan({
174174
});
175175
}
176176

177+
const existingProvider = normalizeOptionalText(persona.provider);
178+
const importedProvider = normalizeOptionalText(preview.provider);
179+
if (existingProvider !== importedProvider) {
180+
fields.push({
181+
field: "provider",
182+
label: "LLM provider",
183+
existingValue: existingProvider,
184+
importedValue: importedProvider,
185+
...singleLineChanges(existingProvider, importedProvider),
186+
});
187+
}
188+
177189
const existingNamePool = namePoolToString(persona.namePool);
178190
const importedNamePool = namePoolToString(preview.namePool);
179191
if (existingNamePool !== importedNamePool) {
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
import assert from "node:assert/strict";
2+
import test from "node:test";
3+
4+
import { buildPersonaImportUpdateInput } from "./personaImportUpdateInput.ts";
5+
6+
function createPersona(overrides = {}) {
7+
return {
8+
id: "persona-1",
9+
displayName: "Alice",
10+
avatarUrl: null,
11+
systemPrompt: "Be helpful.",
12+
runtime: "goose",
13+
model: "claude-sonnet-4",
14+
provider: "anthropic",
15+
namePool: [],
16+
isBuiltIn: false,
17+
isActive: true,
18+
envVars: {},
19+
createdAt: "2026-01-01T00:00:00Z",
20+
updatedAt: "2026-01-01T00:00:00Z",
21+
...overrides,
22+
};
23+
}
24+
25+
function createPreview(overrides = {}) {
26+
return {
27+
displayName: "Alice",
28+
systemPrompt: "Be helpful.",
29+
avatarDataUrl: null,
30+
avatarRef: null,
31+
runtime: "goose",
32+
model: "gpt-5",
33+
provider: "databricks",
34+
namePool: [],
35+
sourceFile: "alice.md",
36+
...overrides,
37+
};
38+
}
39+
40+
test("buildPersonaImportUpdateInput applies selected model and provider updates", () => {
41+
const input = buildPersonaImportUpdateInput({
42+
existing: createPersona(),
43+
preview: createPreview(),
44+
selectedFields: ["model", "provider"],
45+
});
46+
47+
assert.equal(input.model, "gpt-5");
48+
assert.equal(input.provider, "databricks");
49+
});
50+
51+
test("buildPersonaImportUpdateInput preserves provider when provider is not selected", () => {
52+
const input = buildPersonaImportUpdateInput({
53+
existing: createPersona(),
54+
preview: createPreview(),
55+
selectedFields: ["model"],
56+
});
57+
58+
assert.equal(input.model, "gpt-5");
59+
assert.equal(input.provider, "anthropic");
60+
});
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import type { ParsedPersonaPreview } from "@/shared/api/tauriPersonas";
2+
import type { AgentPersona, UpdatePersonaInput } from "@/shared/api/types";
3+
4+
type BuildPersonaImportUpdateInputArgs = {
5+
existing: AgentPersona;
6+
preview: ParsedPersonaPreview;
7+
selectedFields: Iterable<string>;
8+
};
9+
10+
export function buildPersonaImportUpdateInput({
11+
existing,
12+
preview,
13+
selectedFields,
14+
}: BuildPersonaImportUpdateInputArgs): UpdatePersonaInput {
15+
const selectedFieldSet = new Set(selectedFields);
16+
17+
return {
18+
id: existing.id,
19+
displayName: selectedFieldSet.has("displayName")
20+
? preview.displayName
21+
: existing.displayName,
22+
systemPrompt: selectedFieldSet.has("systemPrompt")
23+
? preview.systemPrompt
24+
: existing.systemPrompt,
25+
avatarUrl: selectedFieldSet.has("avatarUrl")
26+
? (preview.avatarDataUrl ?? undefined)
27+
: (existing.avatarUrl ?? undefined),
28+
runtime: selectedFieldSet.has("runtime")
29+
? (preview.runtime ?? undefined)
30+
: (existing.runtime ?? undefined),
31+
model: selectedFieldSet.has("model")
32+
? (preview.model ?? undefined)
33+
: (existing.model ?? undefined),
34+
provider: selectedFieldSet.has("provider")
35+
? (preview.provider ?? undefined)
36+
: (existing.provider ?? undefined),
37+
namePool: selectedFieldSet.has("namePool")
38+
? preview.namePool.length > 0
39+
? preview.namePool
40+
: undefined
41+
: existing.namePool.length > 0
42+
? [...existing.namePool]
43+
: undefined,
44+
};
45+
}

‎desktop/src/features/agents/ui/usePersonaActions.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,10 @@ export function usePersonaActions() {
144144
clearFeedback("library");
145145
try {
146146
const result = await parsePersonaFiles(fileBytes, fileName);
147-
if (isSingleItemFile(fileBytes) && result.personas.length === 1) {
147+
if (
148+
isSingleItemFile(fileBytes, fileName) &&
149+
result.personas.length === 1
150+
) {
148151
setShouldLoadAcpRuntimes(true);
149152
setPersonaDialogState(importPersonaDialogState(result.personas[0]));
150153
} else if (result.personas.length > 0) {

‎desktop/src/features/agents/ui/usePersonaImportActions.ts‎

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import {
77
updatePersona as updatePersonaApi,
88
type ParsedPersonaPreview,
99
} from "@/shared/api/tauriPersonas";
10-
import type { AgentPersona, UpdatePersonaInput } from "@/shared/api/types";
10+
import type { AgentPersona } from "@/shared/api/types";
1111
import { buildPersonaImportPlan } from "./personaImportPlan";
12+
import { buildPersonaImportUpdateInput } from "./personaImportUpdateInput";
1213
import {
1314
editPersonaDialogState,
1415
type PersonaDialogState,
@@ -105,41 +106,20 @@ export function usePersonaImportActions(
105106
preview: personaImportTargetPreview.preview,
106107
});
107108

108-
const selectedFieldSet = new Set(selectedFields);
109109
const preview = personaImportTargetPreview.preview;
110110
const existing = personaImportTarget;
111111

112112
try {
113-
const updateInput: UpdatePersonaInput = {
114-
id: existing.id,
115-
displayName: selectedFieldSet.has("displayName")
116-
? preview.displayName
117-
: existing.displayName,
118-
systemPrompt: selectedFieldSet.has("systemPrompt")
119-
? preview.systemPrompt
120-
: existing.systemPrompt,
121-
avatarUrl: selectedFieldSet.has("avatarUrl")
122-
? (preview.avatarDataUrl ?? undefined)
123-
: (existing.avatarUrl ?? undefined),
124-
runtime: selectedFieldSet.has("runtime")
125-
? (preview.runtime ?? undefined)
126-
: (existing.runtime ?? undefined),
127-
model: selectedFieldSet.has("model")
128-
? (preview.model ?? undefined)
129-
: (existing.model ?? undefined),
130-
namePool: selectedFieldSet.has("namePool")
131-
? preview.namePool.length > 0
132-
? preview.namePool
133-
: undefined
134-
: existing.namePool.length > 0
135-
? [...existing.namePool]
136-
: undefined,
137-
};
113+
const updateInput = buildPersonaImportUpdateInput({
114+
existing,
115+
preview,
116+
selectedFields,
117+
});
138118

139119
await updatePersonaApi(updateInput);
140120

141121
const updatedFieldCount = plan.fields.filter((field) =>
142-
selectedFieldSet.has(field.field),
122+
selectedFields.includes(field.field),
143123
).length;
144124

145125
feedback.setPersonaNoticeMessage(

‎desktop/src/features/agents/ui/useTeamActions.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ export function useTeamActions(
226226
queryClient.invalidateQueries({ queryKey: personasQueryKey }),
227227
queryClient.invalidateQueries({ queryKey: managedAgentsQueryKey }),
228228
]);
229+
setTeamDialogState(null);
229230
} catch (err) {
230231
actions.setActionErrorMessage(
231232
err instanceof Error

0 commit comments

Comments
 (0)