githubnext/ace2Public

Ace: a collaborative coding environment on the team's own machines

Merge remote-tracking branch 'origin/main' into codex/desktop-menu-command

# Conflicts:
#	apps/desktop/native/patches/README.md
#	apps/desktop/scripts/helper.ts
#	packages/channel/src/desktop.ts
IAiamnbutler authored
b7297d6Patch
17 files changed+558-133
StackedSplit
apps/app/src/app.tsx+94 −27
apps/desktop/native/patches/README.md+13 −3
apps/desktop/native/patches/peekaboo-open.patch+19 −0
apps/desktop/native/sources/client/client.swift+3 −0
apps/desktop/native/sources/client/launch.swift+68 −29
apps/desktop/scripts/helper.ts+1 −0
apps/host/src/desktop.ts+56 −16
docs/architecture.md+13 −1
docs/data.md+13 −0
docs/desktop-tools.md+19 −3
packages/channel/src/changes.ts+41 −10
packages/channel/src/channel.ts+10 −5
packages/channel/src/desktop.ts+37 −11
packages/channel/src/git.ts+11 −6
packages/channel/src/lanes.ts+135 −16
packages/channel/src/protocol.ts+3 −2
packages/ui/src/components/session-sidebar/session-sidebar.tsx+22 −4