Skip to content

Commit ff18a4c

Browse files
loganjLarry
andcommitted
fix: integrate ACP fixtures with current persona configuration
Co-authored-by: Larry <627498bd4bd1f281a16431e3c6cce3b5c25b6692798c78672298aefbf2f8f8b5@buzz.block.builderlab.xyz> Signed-off-by: Logan Johnson <[email protected]>
1 parent ca1587c commit ff18a4c

4 files changed

Lines changed: 25 additions & 28 deletions

File tree

‎desktop/src-tauri/src/managed_agents/config_bridge/effort_tests.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ fn env(pairs: &[(&str, &str)]) -> BTreeMap<String, String> {
9898

9999
fn persona(id: &str, env_vars: BTreeMap<String, String>) -> AgentDefinition {
100100
AgentDefinition {
101+
acp_command: None,
101102
session_policy: Default::default(),
102103
id: id.to_string(),
103104
display_name: "P".to_string(),

‎desktop/src-tauri/src/managed_agents/persona_events/tests.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,6 @@ fn persona_content_hash_is_deterministic() {
613613
avatar_url: None,
614614
system_prompt: Some("Hello".to_string()),
615615
acp_command: None,
616-
acp_command: None,
617616
runtime: None,
618617
model: None,
619618
provider: None,
@@ -637,7 +636,6 @@ fn persona_content_hash_changes_on_edit() {
637636
avatar_url: None,
638637
system_prompt: Some("Hello".to_string()),
639638
acp_command: None,
640-
acp_command: None,
641639
runtime: None,
642640
model: None,
643641
provider: None,

‎desktop/src/features/agents/AGENTS.md‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,28 @@ with a TypeScript lookup table or an id comparison in a component.
308308

309309
17. **Databricks model discovery has one shared catalog authority.** Desktop and ACP call the shared `buzz-agent` discovery library; Desktop passes the effective merged `DATABRICKS_MODEL_FILTER` explicitly, and the library applies it to raw workspace endpoint IDs and Unity Catalog model-service FQNs after the additive union. A successful filtered-empty catalog is authoritative: it stays empty, disables switching, and never falls through to configured or known-model fallback. UC FQNs retain neutral effort capabilities. A boundary-matched GPT-5-or-newer family in the service-name component selects OpenAI Responses so tools can coexist with reasoning; other FQNs use MLflow Chat Completions. Catalog/schema components never influence routing. Keep this route-only rule identical in the Rust and TypeScript capability interpreters. Global Defaults preserves the discovered model ID as the selected value while its closed trigger renders the provider-scoped display label; do not force the raw persisted ID over that label.
310310

311+
18. **ACP transport is persona-owned before deployment.** Select `acp_command` in the persona create/edit form beside the harness. Deployment inherits that value; linked instances do not expose a competing post-deploy override. Legacy definitions without the field use `buzz-acp`; definition-less agents retain their stored command. Switching a linked definition back to stock resets the instance transport on the next spawn. Shared persona events and restart snapshots carry the field so edits apply on the next spawn.
312+
313+
19. **ACP command selection is convention-based.** The editor always offers
314+
stock `buzz-acp` and installed executable `buzz-*-acp` aliases discovered
315+
from normal executable search directories. It does not offer arbitrary
316+
command entry. A persisted value outside that set remains visible as an
317+
unavailable compatibility option but is not editable; selecting a conventional
318+
option replaces it. Discovery returns the path produced by the same resolver
319+
used at spawn, so a duplicate alias must never advertise one executable and
320+
later launch another. Keep these transitions in the pure
321+
`ui/acpCommandPicker.ts` helper and preserve persisted values across loading,
322+
failed discovery, and late candidate arrival. ACP-only selections must mark
323+
the form dirty, including catalog-update and embedded discard protection.
324+
Catalog and portable agent/team snapshots carry only stock or conventional
325+
aliases (ASCII letters, digits, hyphens, and underscores in the middle).
326+
Foreign artifacts with other command values are rejected; exports omit
327+
legacy machine-local commands. Owner-native and owner-device synchronization
328+
retain custom-command compatibility and are not an execution sandbox.
329+
Shared persona heads redact nonportable commands and emit explicit stock
330+
for resets; owner replay of a redacted head preserves only a nonportable
331+
local override. That local path is not synchronized through catalog heads.
332+
311333
## Channel-only runtime controls
312334

313335
Desktop observer controls identify a channel, not a thread session. The harness
@@ -333,28 +355,6 @@ buzz messages send --channel <channel-id> --reply-to <thread-root-id> \
333355
--mention <agent-pubkey> --content '!cancel'
334356
```
335357

336-
16. **ACP transport is persona-owned before deployment.** Select `acp_command` in the persona create/edit form beside the harness. Deployment inherits that value; linked instances do not expose a competing post-deploy override. Legacy definitions without the field use `buzz-acp`; definition-less agents retain their stored command. Switching a linked definition back to stock resets the instance transport on the next spawn. Shared persona events and restart snapshots carry the field so edits apply on the next spawn.
337-
338-
17. **ACP command selection is convention-based.** The editor always offers
339-
stock `buzz-acp` and installed executable `buzz-*-acp` aliases discovered
340-
from normal executable search directories. It does not offer arbitrary
341-
command entry. A persisted value outside that set remains visible as an
342-
unavailable compatibility option but is not editable; selecting a conventional
343-
option replaces it. Discovery returns the path produced by the same resolver
344-
used at spawn, so a duplicate alias must never advertise one executable and
345-
later launch another. Keep these transitions in the pure
346-
`ui/acpCommandPicker.ts` helper and preserve persisted values across loading,
347-
failed discovery, and late candidate arrival. ACP-only selections must mark
348-
the form dirty, including catalog-update and embedded discard protection.
349-
Catalog and portable agent/team snapshots carry only stock or conventional
350-
aliases (ASCII letters, digits, hyphens, and underscores in the middle).
351-
Foreign artifacts with other command values are rejected; exports omit
352-
legacy machine-local commands. Owner-native and owner-device synchronization
353-
retain custom-command compatibility and are not an execution sandbox.
354-
Shared persona heads redact nonportable commands and emit explicit stock
355-
for resets; owner replay of a redacted head preserves only a nonportable
356-
local override. That local path is not synchronized through catalog heads.
357-
358358
## The tests that enforce this
359359

360360
- `lib/agentConfigCore.test.mjs` — field model per harness × scope, clearing

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,9 @@ export function AgentInstanceEditDialog({
117117
const updateMutation = useUpdateManagedAgentMutation();
118118
const startMutation = useStartManagedAgentMutation();
119119
const queryClient = useQueryClient();
120-
// Spans the COMPLETE Save sequence (locked update + standalone setters).
121-
// Every gate must key off this, not updateMutation.isPending alone.
120+
// Gate the full Save sequence, including standalone setters, with isSaving.
122121
const [isSaving, setIsSaving] = React.useState(false);
123-
// Surfaces a standalone-setter failure (auto-restart or effort) that React
124-
// Query does not track — keeps the dialog open so the user can retry Save.
122+
// Keep standalone-setter failures visible so the user can retry Save.
125123
const [setterError, setSetterError] = React.useState<Error | null>(null);
126124
const runtimesQuery = useAcpRuntimesQuery({ enabled: open });
127125
const acpCommandsQuery = useAcpCommandsQuery({ enabled: open });

0 commit comments

Comments
 (0)