Skip to content

Commit 3b8e0e2

Browse files
committed
Merge remote-tracking branch 'origin/main' into kennylopez-mobile-reconnect-shimmer
Signed-off-by: kenny lopez <[email protected]> # Conflicts: # mobile/test/features/channels/channel_detail_page_test.dart
2 parents 6898e71 + d98da73 commit 3b8e0e2

42 files changed

Lines changed: 3675 additions & 1475 deletions

Some content is hidden

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

‎desktop/playwright.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ export default defineConfig({
122122
"**/mesh-compute.spec.ts",
123123
"**/observer-archive-policy.spec.ts",
124124
"**/harness-management.spec.ts",
125+
"**/harness-catalog-screenshots.spec.ts",
125126
],
126127
use: {
127128
...devices["Desktop Chrome"],

‎desktop/public/harness-logos/CREDITS.md‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,25 @@ license permits redistribution.
1515
| `kimi.png` | [MoonshotAI/kimi-cli](https://github.com/MoonshotAI/kimi-cli) | `4a550effdfcb29a25a5d325bf935296cc50cd417` | Apache-2.0; NOTICE: Kimi Code CLI © 2025 Moonshot AI | `web/public/logo.png` | None |
1616
| `grok.svg` | [SpaceXAI brand guidelines](https://x.ai/legal/brand-guidelines) | Retrieved 2026-07-25 | xAI Brand Guidelines: marks may be used to accurately refer to xAI or its services; logos must be used exactly as provided | `SpaceXAI_Grok_Assets.zip` → `Grok_Logomark_Dark.svg` | None |
1717

18+
## Inline SVG marks (`RUNTIME_MARKS`)
19+
20+
Monochrome marks inlined as `currentColor` paths in
21+
`desktop/src/features/onboarding/ui/HarnessMarks.tsx` (no files under
22+
`public/`), so they adapt to dark/light themes without bitmap filters.
23+
24+
| Mark | Upstream | Version/Commit | License | Source path | Modifications |
25+
|---|---|---|---|---|---|
26+
| Goose | [block/goose](https://github.com/block/goose) | `305849b71709b95b86ed9f11bd3bc939899c0aab` | Apache-2.0 © Block, Inc. | `documentation/static/img/goose.svg` | `fill="#101010"` → `currentColor`; dropped the redundant clipPath wrapper |
27+
| Cursor | [simple-icons](https://github.com/simple-icons/simple-icons) | `16.27.1` (slug `cursor`) | CC0-1.0 (path data); nominative use of the Cursor mark to identify Cursor's harness | `icons/cursor.svg` | `fill` → `currentColor` |
28+
29+
Codex deliberately has **no** bundled mark: the OpenAI blossom was removed
30+
from simple-icons in v16 at the vendor's request, so we do not ship it —
31+
Codex renders `RuntimeIcon`'s neutral terminal-glyph fallback instead.
32+
1833
`amp.png` and `opencode.svg` predate this file; their provenance was not
19-
recorded when they were added. Cursor intentionally uses the generic terminal
20-
fallback: Cursor's official brand page offers downloadable assets, but neither
21-
that page nor its Terms of Service grants third parties permission to
22-
redistribute them. The previous unproven `cursor.png` was removed.
34+
recorded when they were added. Cursor previously used the generic terminal
35+
fallback because Cursor's own brand page does not grant redistribution; the
36+
CC0-licensed simple-icons path (above) resolves that, mirroring the grok
37+
nominative-use precedent. The previous unproven `cursor.png` was removed, as
38+
were the unproven `chatgpt.png` and `goose.png` builtin-runtime bitmaps
39+
(replaced by the inline marks above).
-14.3 KB
Binary file not shown.

‎desktop/public/runtime-icons/goose.svg‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎desktop/scripts/check-file-sizes.mjs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ const rules = [
5050
// Do not add to this list; split the file instead. Remove each entry as its
5151
// file is broken up. Tracked as a follow-up.
5252
const overrides = new Map([
53+
// Inherited from origin/main: #2630 (agent emoji picker search) grew this
54+
// file to 1026 lines with no override; this branch does not touch the file.
55+
// Narrow ratchet so unrelated branches stay green; queued to split upstream.
56+
["src/features/agents/ui/AgentCreationPreview.tsx", 1026],
5357
// Native Builderlab auth/community commands add a small registration surface
5458
// to the existing Tauri composition root. The implementation lives in
5559
// builderlab.rs; this narrowly ratchets the command wiring while lib.rs is
@@ -191,9 +195,11 @@ const overrides = new Map([
191195
// runtime.rs re-entered the list after the #1968 merge: main's
192196
// definition-authoritative resolver comments grew it to 982, and the BYOH
193197
// typed harness-descriptor resolution in spawn_agent_child landed on top at
194-
// 1020. This PR's session-title env write in spawn_agent_child adds 12.
198+
// 1020. The session-title env write in spawn_agent_child adds 12.
195199
// Queued to shrink with the next runtime split pass (#2974 follow-up).
196-
["src-tauri/src/managed_agents/runtime.rs", 1032],
200+
// +1: #3023 credential-helper slash normalization (MinGW bash treats
201+
// backslashes as escapes).
202+
["src-tauri/src/managed_agents/runtime.rs", 1033],
197203
// applyWorkspace reposDir parameter plus the validateReposDir binding,
198204
// threaded through Tauri invokes for configurable repos_dir, plus the
199205
// harness-persona-sync `harnessOverride` create-input bit — load-bearing

‎desktop/src-tauri/src/commands/project_git_exec.rs‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,23 @@ fn configure_git_auth(command: &mut Command, auth: &GitAuthConfig, needs_credent
173173
return apply_git_config(command, &entries);
174174
};
175175
command.env("NOSTR_PRIVATE_KEY", &auth.nsec);
176-
entries.push(("credential.helper", cred_helper.display().to_string()));
176+
entries.push((
177+
"credential.helper",
178+
credential_helper_config_value(cred_helper),
179+
));
177180
entries.push(("credential.useHttpPath", "true".to_string()));
178181
}
179182
apply_git_config(command, &entries);
180183
}
181184

185+
/// Format a path for git `credential.helper`.
186+
///
187+
/// Git for Windows invokes helpers via MinGW bash, which treats `\` as
188+
/// escapes. Forward slashes work on every platform git supports.
189+
fn credential_helper_config_value(path: &std::path::Path) -> String {
190+
path.to_string_lossy().replace('\\', "/")
191+
}
192+
182193
fn apply_git_config(command: &mut Command, entries: &[(&str, String)]) {
183194
command.env("GIT_CONFIG_COUNT", entries.len().to_string());
184195
for (index, (key, value)) in entries.iter().enumerate() {
@@ -316,10 +327,20 @@ fn validate_clone_url_against_relay(clone_url: &str, relay_base: &str) -> Result
316327
#[cfg(test)]
317328
mod tests {
318329
use super::{
319-
clean_branch, clean_target_ref, git_needs_credentials, git_subcommand, validate_clone_url,
320-
validate_clone_url_against_relay,
330+
clean_branch, clean_target_ref, credential_helper_config_value, git_needs_credentials,
331+
git_subcommand, validate_clone_url, validate_clone_url_against_relay,
321332
};
322333

334+
#[test]
335+
fn credential_helper_config_value_uses_forward_slashes() {
336+
let path =
337+
std::path::PathBuf::from(r"C:\Users\x\AppData\Local\Buzz\git-credential-nostr.exe");
338+
assert_eq!(
339+
credential_helper_config_value(&path),
340+
"C:/Users/x/AppData/Local/Buzz/git-credential-nostr.exe",
341+
);
342+
}
343+
323344
#[test]
324345
fn git_subcommand_skips_global_config_options() {
325346
assert_eq!(

‎desktop/src-tauri/src/managed_agents/discovery.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ const KNOWN_ACP_RUNTIMES: &[KnownAcpRuntime] = &[
8080
adapter_install_commands: &[],
8181
cli_install_instructions_url: "https://goose-docs.ai/docs/getting-started/installation/",
8282
adapter_install_instructions_url: "",
83-
cli_install_hint: "Buzz requires the Goose CLI; the desktop app alone is not enough.",
83+
cli_install_hint: "Buzz talks to Goose through the Goose CLI.",
8484
adapter_install_hint: "",
8585
skill_dir: Some(".goose/skills"),
8686
supports_acp_model_switching: false,
@@ -112,8 +112,8 @@ const KNOWN_ACP_RUNTIMES: &[KnownAcpRuntime] = &[
112112
adapter_install_commands: &["npm install -g @agentclientprotocol/claude-agent-acp"],
113113
cli_install_instructions_url: "https://code.claude.com/docs/en/getting-started",
114114
adapter_install_instructions_url: "https://github.com/agentclientprotocol/claude-agent-acp",
115-
cli_install_hint: "Buzz requires the Claude Code CLI; the desktop app alone is not enough.",
116-
adapter_install_hint: "Install the Claude Code ACP adapter via npm.",
115+
cli_install_hint: "Buzz talks to Claude Code through the Claude Code CLI.",
116+
adapter_install_hint: "Buzz talks to the Claude Code CLI through an ACP adapter. Install it with: npm install -g @agentclientprotocol/claude-agent-acp.",
117117
skill_dir: Some(".claude/skills"),
118118
supports_acp_model_switching: false,
119119
model_env_var: None,
@@ -144,8 +144,8 @@ const KNOWN_ACP_RUNTIMES: &[KnownAcpRuntime] = &[
144144
adapter_install_commands: &["npm install -g @agentclientprotocol/codex-acp"],
145145
cli_install_instructions_url: "https://developers.openai.com/codex/cli/",
146146
adapter_install_instructions_url: "https://github.com/agentclientprotocol/codex-acp",
147-
cli_install_hint: "Buzz requires the Codex CLI; the desktop app alone is not enough.",
148-
adapter_install_hint: "Install the Codex ACP adapter via npm.",
147+
cli_install_hint: "Buzz talks to Codex through the Codex CLI.",
148+
adapter_install_hint: "Buzz talks to the Codex CLI through an ACP adapter. Install it with: npm install -g @agentclientprotocol/codex-acp.",
149149
skill_dir: Some(".codex/skills"),
150150
supports_acp_model_switching: false,
151151
model_env_var: None,
@@ -1519,7 +1519,7 @@ const PRESET_HARNESSES: &[PresetHarness] = &[
15191519
command: "cursor-agent",
15201520
args: &["acp"],
15211521
install_instructions_url: "https://cursor.com/downloads",
1522-
install_hint: "Install Cursor from cursor.com/downloads.",
1522+
install_hint: "Buzz talks to Cursor through the cursor-agent CLI's ACP mode.",
15231523
underlying_cli: None,
15241524
},
15251525
PresetHarness {
@@ -1528,7 +1528,7 @@ const PRESET_HARNESSES: &[PresetHarness] = &[
15281528
command: "omp",
15291529
args: &["acp"],
15301530
install_instructions_url: "https://github.com/can1357/oh-my-pi",
1531-
install_hint: "Install Oh My Pi from github.com/can1357/oh-my-pi.",
1531+
install_hint: "Buzz talks to Oh My Pi through its CLI's ACP mode (omp acp).",
15321532
underlying_cli: None,
15331533
},
15341534
PresetHarness {
@@ -1537,7 +1537,7 @@ const PRESET_HARNESSES: &[PresetHarness] = &[
15371537
command: "grok",
15381538
args: &["agent", "--always-approve", "stdio"],
15391539
install_instructions_url: "https://build.x.ai/docs",
1540-
install_hint: "Install Grok Build from build.x.ai.",
1540+
install_hint: "Buzz talks to Grok Build through its CLI's agent stdio mode.",
15411541
underlying_cli: None,
15421542
},
15431543
PresetHarness {
@@ -1546,7 +1546,7 @@ const PRESET_HARNESSES: &[PresetHarness] = &[
15461546
command: "opencode",
15471547
args: &["acp"],
15481548
install_instructions_url: "https://opencode.ai/docs",
1549-
install_hint: "Install OpenCode from opencode.ai/docs.",
1549+
install_hint: "Buzz talks to OpenCode through its CLI's ACP mode (opencode acp).",
15501550
underlying_cli: None,
15511551
},
15521552
PresetHarness {
@@ -1555,7 +1555,7 @@ const PRESET_HARNESSES: &[PresetHarness] = &[
15551555
command: "kimi",
15561556
args: &["acp"],
15571557
install_instructions_url: "https://kimi.ai/download",
1558-
install_hint: "Install Kimi Code from kimi.ai/download.",
1558+
install_hint: "Buzz talks to Kimi Code through its CLI's ACP mode (kimi acp).",
15591559
underlying_cli: None,
15601560
},
15611561
PresetHarness {
@@ -1564,7 +1564,7 @@ const PRESET_HARNESSES: &[PresetHarness] = &[
15641564
command: "amp-acp",
15651565
args: &[],
15661566
install_instructions_url: "https://github.com/tao12345666333/amp-acp",
1567-
install_hint: "Install the amp-acp npm adapter: npm install -g amp-acp.",
1567+
install_hint: "Buzz talks to the Amp CLI through the amp-acp adapter. Follow the setup guide to install the adapter so the amp-acp command is on your PATH.",
15681568
underlying_cli: Some("amp"),
15691569
},
15701570
PresetHarness {
@@ -1573,7 +1573,7 @@ const PRESET_HARNESSES: &[PresetHarness] = &[
15731573
command: "hermes-acp",
15741574
args: &[],
15751575
install_instructions_url: "https://hermes-agent.nousresearch.com",
1576-
install_hint: "Install Hermes Agent from hermes-agent.nousresearch.com.",
1576+
install_hint: "Buzz talks to Hermes Agent through its hermes-acp command.",
15771577
underlying_cli: None,
15781578
},
15791579
PresetHarness {
@@ -1582,7 +1582,7 @@ const PRESET_HARNESSES: &[PresetHarness] = &[
15821582
command: "openclaw",
15831583
args: &["acp"],
15841584
install_instructions_url: "https://docs.openclaw.ai/start/getting-started",
1585-
install_hint: "Install OpenClaw: npm install -g openclaw@latest.\n\n\
1585+
install_hint: "Buzz talks to OpenClaw through its ACP mode (openclaw acp), which relies on the OpenClaw Gateway daemon. Follow the setup guide to install both.\n\n\
15861586
⚠️ Execution-locus note: `openclaw acp` runs tools inside the \
15871587
OpenClaw Gateway daemon, not in the Desktop process. \
15881588
Desktop-injected BUZZ_* env vars are visible to the `openclaw` \

‎desktop/src-tauri/src/managed_agents/discovery/runtime_metadata.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ mod tests {
9393
"https://goose-docs.ai/docs/getting-started/installation/"
9494
);
9595
assert!(goose.adapter_install_instructions_url.is_empty());
96-
assert!(goose.cli_install_hint.contains("desktop app alone"));
96+
assert!(goose.cli_install_hint.contains("Goose CLI"));
9797
assert!(goose
9898
.cli_install_commands_windows
9999
.iter()
@@ -111,14 +111,14 @@ mod tests {
111111
assert!(claude
112112
.adapter_install_instructions_url
113113
.contains("claude-agent-acp"));
114-
assert!(claude.cli_install_hint.contains("desktop app alone"));
114+
assert!(claude.cli_install_hint.contains("Claude Code CLI"));
115115

116116
let codex = known_acp_runtime_exact("codex").unwrap();
117117
assert_eq!(
118118
codex.cli_install_instructions_url,
119119
"https://developers.openai.com/codex/cli/"
120120
);
121121
assert!(codex.adapter_install_instructions_url.contains("codex-acp"));
122-
assert!(codex.cli_install_hint.contains("desktop app alone"));
122+
assert!(codex.cli_install_hint.contains("Codex CLI"));
123123
}
124124
}

‎desktop/src-tauri/src/managed_agents/runtime.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,8 @@ pub fn spawn_agent_child(
835835
"GIT_CONFIG_KEY_0",
836836
format!("credential.{relay_http_url}/git.helper"),
837837
);
838-
command.env("GIT_CONFIG_VALUE_0", cred_helper.display().to_string());
838+
let helper = cred_helper.to_string_lossy().replace('\\', "/");
839+
command.env("GIT_CONFIG_VALUE_0", helper);
839840
command.env(
840841
"GIT_CONFIG_KEY_1",
841842
format!("credential.{relay_http_url}/git.useHttpPath"),

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ function entry(overrides) {
1616
modelEnvVar: null,
1717
providerEnvVar: null,
1818
thinkingEnvVar: null,
19-
installHint: "Install the amp-acp npm adapter: npm install -g amp-acp.",
19+
installHint:
20+
"Buzz talks to the Amp CLI through the amp-acp adapter. Follow the setup guide to install the adapter so the amp-acp command is on your PATH.",
2021
installInstructionsUrl: "https://example.com",
2122
canAutoInstall: false,
2223
requiresExternalCli: false,
@@ -43,7 +44,7 @@ test("not-installed warning includes the install hint", () => {
4344
const warning = runtimeAvailabilityWarning(entry({}));
4445
assert.equal(
4546
warning,
46-
"Amp is not installed. Install the amp-acp npm adapter: npm install -g amp-acp.",
47+
"Amp is not installed. Buzz talks to the Amp CLI through the amp-acp adapter. Follow the setup guide to install the adapter so the amp-acp command is on your PATH.",
4748
);
4849
});
4950

@@ -62,7 +63,7 @@ test("adapter-missing warning names the adapter and includes the hint", () => {
6263
warning ?? "",
6364
/CLI is installed but the ACP adapter is missing/,
6465
);
65-
assert.match(warning ?? "", /npm install -g amp-acp/);
66+
assert.match(warning ?? "", /amp-acp command is on your PATH/);
6667
});
6768

6869
test("cli-missing external-CLI warning keeps the hint", () => {

0 commit comments

Comments
 (0)