github/CherryHQ-cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2026-07-07 07:03:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,441 Commits 385 Branches 308 Tags
refactor/code-cli
Commit Graph

3 Commits

Author SHA1 Message Date
槑囿脑袋
2dbf32e372 refactor(file-processing-settings): migrate settings to v2 data (#14991) 
Co-authored-by: SuYao <sy20010504@gmail.com>
Co-authored-by: fullex <106392080+0xfullex@users.noreply.github.com>
Signed-off-by: eeee0717 <chentao020717Work@outlook.com>
 2026-05-11 23:15:35 +08:00
SuYao
7afabbdf20 fix(agents): set Cherry Assistant default avatar to 🍒 (#14333) 
### What this PR does

Before this PR:

Cherry Assistant's
`resources/builtin-agents/cherry-assistant/agent.json` had no
`configuration.avatar` field. The Agent rendering path falls back to a
generic `⭐️` when no avatar is set (see
`src/renderer/src/pages/settings/AgentSettings/components/NameSetting.tsx:27`
and `shared.tsx:98`), so users saw an off-brand star icon for the
built-in Cherry Assistant.

After this PR:

Sets `configuration.avatar` to `🍒` in `cherry-assistant/agent.json`,
matching Cherry Studio's brand. The value is consumed by the existing
`agent?.configuration?.avatar || '⭐️'` fallback, so no renderer changes
are needed.

Partially addresses #14253.

### Why we need it and why it was done in this way

`#14253` reports that both built-in agents ship with the wrong icons:
1. **Cherry Assistant** — should be `🍒`, currently renders as `⭐️` (user
called it 🌟 in the issue).
2. **Cherry Claw** — should be a custom lobster/claw SVG/PNG asset,
currently renders as `🦞` (hard-coded in `AgentService.ts:327`).

This PR only addresses (1) because it is a pure data change (one JSON
field). Fixing (2) requires shipping a design-delivered raster/vector
asset and changing the avatar rendering path to support non-emoji
avatars; that is out of scope for a `main`-branch hotfix and will be
handled in a separate PR once the asset is provided.

The following tradeoffs were made:

- Chose the same emoji delivery mechanism (`configuration.avatar`) used
by `Cherry Claw`, instead of introducing an image asset, to keep the
change minimal and consistent with existing built-in agent conventions.

The following alternatives were considered:

- Bundling both Cherry Assistant and Cherry Claw fixes in one PR.
Rejected because the Claw fix needs a new design asset and an
avatar-rendering change.

Links to places where the discussion took place: N/A

### Breaking changes

None. JSON schema is unchanged; `avatar` is an existing optional field
already consumed by the renderer.

### Special notes for your reviewer

- After merge, only new installations will pick up the avatar. Existing
users who already have the seeded Cherry Assistant agent will need
either a reset or a one-time migration to see the new avatar. This
matches how `Cherry Claw`'s avatar is delivered (hard-coded at seed
time, no migration), so no new upgrade-path code is introduced here.
- Cherry Claw's `🦞` → custom lobster asset is intentionally not fixed in
this PR.

### Checklist

- [x] PR: The PR description is expressive enough and will help future
contributors
- [x] Code: [Write code that humans can
understand](https://en.wikiquote.org/wiki/Martin_Fowler#code-for-humans)
and [Keep it simple](https://en.wikipedia.org/wiki/KISS_principle)
- [x] Refactor: You have [left the code cleaner than you found it (Boy
Scout
Rule)](https://learning.oreilly.com/library/view/97-things-every/9780596809515/ch08.html)
- [x] Upgrade: Impact of this change on upgrade flows was considered and
addressed if required
- [x] Documentation: A [user-guide update](https://docs.cherry-ai.com)
was considered and is present (link) or not required. Check this only
when the PR introduces or changes a user-facing feature or behavior.
- [x] Self-review: I have reviewed my own code (e.g., via
[`/gh-pr-review`](/.claude/skills/gh-pr-review/SKILL.md), `gh pr diff`,
or GitHub UI) before requesting review from others

### Release note

```release-note
fix: Cherry Assistant built-in agent now displays the 🍒 avatar instead of the generic ⭐️ fallback
```

Signed-off-by: suyao <sy20010504@gmail.com>
 2026-04-17 21:15:11 +08:00
LiuVaayne
a4f5191e42 feat(agents): add CherryClaw autonomous agent type (#13359) 
### What this PR does

Before this PR:
Cherry Studio only supports `claude-code` as an agent type. Agents have
no autonomous scheduling, no IM channel integration, and no
soul/personality system.

After this PR:
Introduces **CherryClaw** — a new autonomous agent type with:
- **Soul-driven personality**: Markdown-based soul files with
mtime-cached reading
- **Task-based scheduler**: Poll-loop scheduler with drift-resistant
interval computation, tasks as first-class DB entities
(nanoclaw-inspired)
- **Internal claw MCP server**: `cron` tool (add/list/remove)
auto-injected into CherryClaw sessions for autonomous task management
- **Channel abstraction layer**: Pluggable adapter pattern with Telegram
as the first implementation (grammY, long polling, streaming drafts,
typing indicators)
- **Headless message persistence**: Channel and scheduler messages now
persist to the agent SQLite DB
- **Basic sandbox mode**: PreToolUse hook path enforcement + OS-level
sandbox toggle
- **Full UI**: Agent creation modal with type selector, settings tabs
(soul, tasks, channels, advanced), task management CRUD, channel catalog
with inline config
- **53 unit tests** across 8 test files covering all new services

<!-- Fixes # -->

### Why we need it and why it was done in this way

CherryClaw enables Cherry Studio agents to operate autonomously —
executing scheduled tasks and responding to IM messages without user
interaction. This is the foundation for "always-on" AI assistants.

The following tradeoffs were made:
- **Poll-loop scheduler over timer-based**: DB is the source of truth;
no timer state to restore on restart. Simpler, more robust at the cost
of up to 60s latency.
- **AgentServiceRegistry pattern**: Replaced hardcoded
`ClaudeCodeService` in `SessionMessageService` with a registry mapping
`AgentType` → service. Extensible for future agent types.
- **Internal MCP server for cron**: Rather than extending the SDK's tool
system, the `cron` tool is served as a standard MCP server at
`/v1/claw/:agentId/claw-mcp`. This lets the agent discover and use it
naturally.
- **Channel abstraction over direct Telegram integration**:
`ChannelAdapter` + factory registration enables future Discord/Slack
adapters without touching core routing logic.
- **Basic sandbox (not security boundary)**: PreToolUse hook + OS
sandbox provides best-effort restriction for well-behaved agents. Known
bypass vectors documented; hardening deferred.

The following alternatives were considered:
- cron-based OS scheduling (rejected: harder to manage lifecycle, no DB
integration)
- Direct Telegram bot API calls (rejected: grammY provides typed API,
connection management, and middleware)
- Modifying SDK builtin tools (rejected: internal MCP server is cleaner
separation)

### Breaking changes

None. This is a new agent type (`cherry-claw`) alongside the existing
`claude-code` type. No existing behavior is modified.

### Special notes for your reviewer

- **New DB migration**: `0003_wise_meltdown.sql` adds `scheduled_tasks`
and `task_run_logs` tables (agents DB only, not IndexedDB)
- **New dependencies**: `cron-parser` ^5.5.0, `grammy` ^1.41
- **Placeholder avatar**: `cherry-claw.png` is currently a copy of
`claude.png` — needs a proper distinct image
- **74 files changed, ~7400 lines added** — large PR, recommend
reviewing by phase (type system → backend services → MCP → channels → UI
→ tests)
- **Sandbox is basic only**: The PreToolUse path checking has known
bypasses (relative paths, variable expansion). Documented in handoff.md.
Hardening is follow-up work.
- The `handoff.md` file in the repo root contains full architectural
context and decisions

### Checklist

- [x] PR: The PR description is expressive enough and will help future
contributors
- [x] Code: [Write code that humans can
understand](https://en.wikiquote.org/wiki/Martin_Fowler#code-for-humans)
and [Keep it simple](https://en.wikipedia.org/wiki/KISS_principle)
- [x] Refactor: You have [left the code cleaner than you found it (Boy
Scout
Rule)](https://learning.oreilly.com/library/view/97-things-every/9780596809515/ch08.html)
- [ ] Upgrade: Impact of this change on upgrade flows was considered and
addressed if required
- [ ] Documentation: A [user-guide update](https://docs.cherry-ai.com)
was considered and is present (link) or not required. Check this only
when the PR introduces or changes a user-facing feature or behavior.
- [ ] Self-review: I have reviewed my own code (e.g., via
[`/gh-pr-review`](/.claude/skills/gh-pr-review/SKILL.md), `gh pr diff`,
or GitHub UI) before requesting review from others

### Release note

```release-note
New CherryClaw agent type: autonomous agents with soul-driven personality, task-based scheduling (cron/interval/one-time), internal cron MCP tool for self-managed tasks, Telegram channel integration with streaming responses, and basic sandbox mode for filesystem restriction.
```

---------

Signed-off-by: Vaayne <liu.vaayne@gmail.com>
Signed-off-by: suyao <sy20010504@gmail.com>
Signed-off-by: Siin Xu <31815270+SiinXu@users.noreply.github.com>
Signed-off-by: zhangjiadi225 <625013594@qq.com>
Signed-off-by: greycheng255 <greycheng255@gmail.com>
Co-authored-by: kangfenmao <kangfenmao@qq.com>
Co-authored-by: suyao <sy20010504@gmail.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Co-authored-by: Siin Xu <31815270+SiinXu@users.noreply.github.com>
Co-authored-by: fullex <106392080+0xfullex@users.noreply.github.com>
Co-authored-by: zhangjiadi225 <625013594@qq.com>
 2026-04-03 14:18:02 +08:00