Skip to content

Sync zeronsh/zeron main into Kratos - #22

Merged
Gratenes merged 284 commits into
wasimysaid:mainfrom
Gratenes:sync/zeron-main-2026-09-21
Sep 22, 2026
Merged

Gratenes merged 284 commits into
wasimysaid:mainfrom
Gratenes:sync/zeron-main-2026-09-21

Conversation

@Gratenes

Copy link
Copy Markdown
Collaborator

Summary

  • merge zeronsh/zeron:main through 8781f0ea into Kratos main
  • preserve Kratos-specific Tailcat/private-sync behavior, Mimir ACP integration, and the Windows-capable ZUI dependency line
  • integrate upstream project actions, model catalogs, transcript compaction, sidebar improvements, transport reliability, MCP support, and related fixes
  • keep the retired cloud-edge stack removed while retaining compatible upstream functionality

History

This is a merge-based fork sync, not a reset or rebase. Both the existing Kratos history (6d043394) and upstream Zeron history (8781f0ea) are parents of merge commit de0a735d.

Validation

  • cargo fmt --all -- --check
  • cargo check --workspace --all-targets
  • cargo test -p zeron-harness --lib install::tests::manual_commands_and_missing_binary_guidance
  • cargo test -p zeron-mcp --lib
  • cargo test -p zeron-sync --lib
  • cargo test -p zeron-sync --features mock-server --test transport_reliability
  • cargo test -p zeron-engine --test workspace_sync --test device_routing --test relay_delivery

The live-edge workspace sync test remains ignored by its existing environment gate.

jsgrrchg and others added 30 commits September 9, 2026 14:25
…bar-sessions

# Conflicts:
#	crates/ui/src/shell.rs
…bar-sessions

# Conflicts:
#	crates/ui/src/settings.rs
…bar-sessions

# Conflicts:
#	crates/ui/src/shell.rs
…-file-tree

# Conflicts:
#	crates/ui/src/files/mod.rs
#	crates/ui/src/files/preview.rs
#	crates/ui/src/shell.rs
…-file-tree

# Conflicts:
#	crates/ui/src/files/mod.rs
#	crates/ui/src/shell.rs
…bar-sessions

# Conflicts:
#	apps/ios/Zeron/App/AppModel.swift
#	apps/ios/Zeron/Sync/WorkspaceStore.swift
#	crates/ui/src/shell.rs
#	crates/ui/src/shell/spaces.rs
wing-anara and others added 29 commits September 21, 2026 17:01
…bilization

Stabilize Pi, Antigravity, and OpenCode adapters; detection-based Antigravity; OpenCode 2.x; resilient model loading
Toggling the "Worked for" shell used to sync() immediately, so the folded
rows popped in/out at full height instead of folding like every other
transcript expander. Body rows now stay mounted through the 140ms ease-out
tween: each sibling clips to a shared height budget (lerp from the
measured total toward the new target), a prepaint probe keeps row heights
current, and a settle sweep drops the rows once the retention window
elapses. Reversals seed `from` with the budget in flight so mid-tween
toggles continue smoothly, and reduced motion transitions instantly
without retaining the body.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Offer an Install action for every agent that is not installed
Compact mode: fold a turn's work, then settle to Worked for
# Conflicts:
#	.gitignore
#	Cargo.lock
#	Cargo.toml
#	README.md
#	README.zh-CN.md
#	apps/ios/Zeron/App/AppModel.swift
#	apps/ios/Zeron/Sync/DocDisk.swift
#	apps/ios/Zeron/Sync/SessionStore.swift
#	apps/zeron/src/main.rs
#	crates/doc/src/registry.rs
#	crates/engine/src/auth.rs
#	crates/engine/src/doc_host.rs
#	crates/engine/src/lib.rs
#	crates/engine/src/registry.rs
#	crates/engine/src/rpc.rs
#	crates/engine/src/sessions.rs
#	crates/engine/src/workspace_host.rs
#	crates/engine/tests/auth.rs
#	crates/engine/tests/local_first.rs
#	crates/engine/tests/local_import.rs
#	crates/engine/tests/workspace_sync.rs
#	crates/harness/src/acp/mod.rs
#	crates/harness/src/opencode/tests.rs
#	crates/preview/tests/coordinator.rs
#	crates/rpc/src/lib.rs
#	crates/sync/src/chat_client.rs
#	crates/sync/src/chat_client/tests.rs
#	crates/sync/tests/registry_edge.rs
#	crates/ui/src/composer.rs
#	crates/ui/src/pickers.rs
#	crates/ui/src/shell.rs
#	crates/ui/src/transcript.rs
#	edge/src/chat-room.ts
#	edge/src/registry-core.test.ts
#	edge/src/registry-core.ts
#	edge/test/workerd/env.d.ts
#	edge/test/workerd/fixture.ts
#	edge/vitest.workerd.config.ts
@Gratenes
Gratenes merged commit 9c31b48 into wasimysaid:main Sep 22, 2026
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants