Skip to content

feat: supports image compressing#6463

Merged
Soulter merged 13 commits intoAstrBotDevs:devfrom
a61995987:feat-新增本地图片预压缩机制并增强图片解析容错
Mar 22, 2026

Hidden character warning

The head ref may contain hidden characters: "feat-\u65b0\u589e\u672c\u5730\u56fe\u7247\u9884\u538b\u7f29\u673a\u5236\u5e76\u589e\u5f3a\u56fe\u7247\u89e3\u6790\u5bb9\u9519"
Merged

feat: supports image compressing#6463
Soulter merged 13 commits intoAstrBotDevs:devfrom
a61995987:feat-新增本地图片预压缩机制并增强图片解析容错

Conversation

@a61995987
Copy link
Copy Markdown
Contributor

@a61995987 a61995987 commented Mar 16, 2026

feat:新增本地图片预压缩机制 避免用户向agent发送手机原图 体积过大造成的413错误
fix:增强 _ensure_img_caption 的容错性避免解析图片失败时造成的框架整体性崩溃

Modifications / 改动点

修改文件:astrbot\core\utils\media_utils.py

  1. 新增compress_image_compress_image_sync函数 用于对传入的本地图片进行压缩 原样返回远程图片url

修改文件:astrbot\core\astr_main_agent.py

  1. _ensure_img_caption函数中引入新增的compress_image压缩函数
  2. _process_quote_message函数中引入新增的compress_image压缩函数
  3. build_main_agent函数中引入新增的compress_image压缩函数

fix: 增强 _ensure_img_caption 的容错性避免解析图片失败时造成的框架整体性崩溃:

  1. 修改_ensure_img_caption函数 增加finally块并清空image_urls 避免处理错误时导致的框架整体性崩溃
  2. 在该函数中原有的except中增加一个图片解析失败的文本组件 用于提醒agent
  • This is NOT a breaking change. / 这不是一个破坏性变更。

Screenshots or Test Results / 运行截图或测试结果


Checklist / 检查清单

  • 😊 If there are new features added in the PR, I have discussed it with the authors through issues/emails, etc.
    / 如果 PR 中有新加入的功能,已经通过 Issue / 邮件等方式和作者讨论过。

  • 👀 My changes have been well-tested, and "Verification Steps" and "Screenshots" have been provided above.
    / 我的更改经过了良好的测试,并已在上方提供了“验证步骤”和“运行截图”

  • 🤓 I have ensured that no new dependencies are introduced, OR if new dependencies are introduced, they have been added to the appropriate locations in requirements.txt and pyproject.toml.
    / 我确保没有引入新依赖库,或者引入了新依赖库的同时将其添加到 requirements.txtpyproject.toml 文件相应位置。

  • 😮 My changes do not introduce malicious code.
    / 我的更改没有引入恶意代码。

Summary by Sourcery

Introduce local image pre-compression and improve robustness of image caption handling to prevent failures from large or unparseable images.

New Features:

  • Add asynchronous local image compression for user-uploaded images to reduce payload size before sending to providers.

Bug Fixes:

  • Harden image caption generation to handle parsing failures gracefully without crashing the framework and inform the agent when image parsing fails.

Enhancements:

  • Apply image compression across image captioning and quoted image handling flows to consistently limit image size before processing.

feat(core): 优化图片压缩功能并替换UUID为时间戳

- 将图片压缩的同步阻塞操作移至线程池执行,提升性能
- 替换uuid依赖为time模块,使用时间戳生成文件名
- 添加异步图片压缩内部函数_do_compress_sync
- 修复图片压缩时的异常处理日志级别
- 在消息附件和回复链中集成图片压缩功能
```
@dosubot dosubot bot added the size:M This PR changes 30-99 lines, ignoring generated files. label Mar 16, 2026
@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

此拉取请求引入了一项新功能,用于对本地图片进行预压缩处理,旨在优化图片上传和处理流程,有效避免因图片文件过大而引发的错误。同时,它还通过改进 _ensure_img_caption 函数的错误处理机制,显著增强了图片解析的容错能力,从而提升了系统的整体稳定性和用户体验。

Highlights

  • 本地图片预压缩机制: 新增了本地图片预压缩机制,以避免用户上传过大图片(尤其是手机原图)导致服务器返回 413 错误,优化了图片处理流程。
  • 增强图片解析容错性: 增强了 _ensure_img_caption 函数的容错性,通过增加 finally 块和错误提示,避免在图片解析失败时导致框架整体崩溃。
Changelog
  • astrbot/core/astr_main_agent.py
    • 新增了 _compress_image_internal 异步函数,用于处理本地图片压缩,并将其应用于 _ensure_img_caption_process_quote_messagebuild_main_agent 等多个图片处理入口。
    • 新增了 _do_compress_sync 函数,负责实际的同步图片压缩逻辑,并通过 asyncio.to_thread 在单独的线程中执行,避免阻塞主事件循环。
    • 增强了 _ensure_img_caption 函数的错误处理,增加了 finally 块以确保在任何情况下都清空 image_urls,并在图片解析失败时添加了用户可见的错误提示。
Activity
  • 目前没有与此拉取请求相关的评论、审查或进度更新。
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Copy Markdown
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey - I've found 3 issues, and left some high level feedback:

  • In _compress_image_internal, ensure that temp_dir exists before writing (e.g., os.makedirs(temp_dir, exist_ok=True)) to avoid runtime errors when the data/temp directory has not been created yet.
  • The repeated calls to _compress_image_internal for the same image path within a single request (e.g., quoting, captions, attachments) can cause duplicate work and extra temp files; consider compressing once per image and reusing the resulting path.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- In `_compress_image_internal`, ensure that `temp_dir` exists before writing (e.g., `os.makedirs(temp_dir, exist_ok=True)`) to avoid runtime errors when the `data/temp` directory has not been created yet.
- The repeated calls to `_compress_image_internal` for the same image path within a single request (e.g., quoting, captions, attachments) can cause duplicate work and extra temp files; consider compressing once per image and reusing the resulting path.

## Individual Comments

### Comment 1
<location path="astrbot/core/astr_main_agent.py" line_range="456" />
<code_context>
             image_caption_provider,
             cfg,
-            req.image_urls,
+            [await _compress_image_internal(url) for url in req.image_urls],
             plugin_context,
         )
</code_context>
<issue_to_address>
**suggestion (performance):** Consider parallelizing image compression calls to avoid sequential awaits on multiple images.

This list comprehension awaits `_compress_image_internal` sequentially for each URL, which can be a bottleneck with many images. Consider using `await asyncio.gather(*(_compress_image_internal(url) for url in req.image_urls))` so compressions run concurrently and reduce total latency.

Suggested implementation:

```python
import asyncio
from PIL import Image as PILImage

from astrbot.core import logger, sp
from astrbot.core.agent.handoff import HandoffTool
from astrbot.core.agent.mcp_client import MCPTool

```

```python
        caption = await _request_img_caption(
            image_caption_provider,
            cfg,
            await asyncio.gather(
                *(_compress_image_internal(url) for url in req.image_urls)
            ),
            plugin_context,
        )

```
</issue_to_address>

### Comment 2
<location path="astrbot/core/astr_main_agent.py" line_range="1195-1196" />
<code_context>
+    if max(img.size) > max_size:
+        img.thumbnail((max_size, max_size), PILImage.Resampling.LANCZOS)
+
+    timestamp = int(time.time() * 1000)
+    save_path = os.path.join(temp_dir, f"compressed_{timestamp}.jpg")
+    img.save(save_path, "JPEG", quality=85, optimize=True)
+    return save_path
</code_context>
<issue_to_address>
**suggestion (bug_risk):** Timestamp-based filenames can collide under concurrency; consider a more robust unique name.

This scheme can overwrite files if two images are processed in the same millisecond. Generate a stronger unique suffix (e.g., `uuid.uuid4().hex`, optionally combined with the timestamp) to avoid collisions when multiple compress operations run concurrently.

Suggested implementation:

```python
import time
import uuid

```

```python
    unique_suffix = f"{int(time.time() * 1000)}_{uuid.uuid4().hex}"
    save_path = os.path.join(temp_dir, f"compressed_{unique_suffix}.jpg")

```
</issue_to_address>

### Comment 3
<location path="astrbot/core/astr_main_agent.py" line_range="1201" />
<code_context>
+    return save_path
+
+# 压缩用户上传的大体积图片 未来可以提取为通用工具
+async def _compress_image_internal(url_or_path: str) -> str:
+    try:
+        data = None
</code_context>
<issue_to_address>
**issue (complexity):** Consider refactoring the new image compression logic into smaller helpers and flatter call sites to keep behavior while simplifying control flow and dependencies.

You can keep the same behavior but reduce complexity by:

### 1. Split I/O vs CPU-bound logic and flatten branches

Right now `_compress_image_internal` does path classification, file I/O, size checks and dispatch to `_do_compress_sync`. You can keep functionality but make the logic more linear and testable by separating “load bytes” from “compress bytes”:

```python
# keep in this module or move to a utils module later
def _load_image_bytes(path_or_url: str) -> bytes | None:
    if path_or_url.startswith("http"):
        return None  # remote: no compression

    if path_or_url.startswith("data:image"):
        _, encoded = path_or_url.split(",", 1)
        return base64.b64decode(encoded)

    if os.path.exists(path_or_url):
        if os.path.getsize(path_or_path) < 1024 * 1024:
            return None  # small file: no compression
        with open(path_or_path, "rb") as f:
            return f.read()

    return None
```

```python
def _do_compress_sync(data: bytes, temp_dir: str) -> str:
    img = PILImage.open(io.BytesIO(data))
    if img.mode in ("RGBA", "P"):
        img = img.convert("RGB")

    max_size = 1280
    if max(img.size) > max_size:
        img.thumbnail((max_size, max_size), PILImage.Resampling.LANCZOS)

    timestamp = int(time.time() * 1000)
    save_path = os.path.join(temp_dir, f"compressed_{timestamp}.jpg")
    img.save(save_path, "JPEG", quality=85, optimize=True)
    return save_path
```

```python
async def _compress_image_internal(url_or_path: str) -> str:
    try:
        data = _load_image_bytes(url_or_path)
        if data is None:
            return url_or_path

        temp_dir = _get_temp_dir()
        return await asyncio.to_thread(_do_compress_sync, data, temp_dir)
    except Exception as e:
        logger.error("图片压缩失败: %s", e)
        return url_or_path
```

This keeps behavior (same conditions for “return original” vs compress) but removes nested branching and mixed responsibilities in one function.

### 2. Extract temp-dir computation

The inline `os.path.dirname(os.path.dirname(...))` chain makes the compression helper harder to read and change. A small helper removes that noise:

```python
def _get_temp_dir() -> str:
    root_dir = os.path.dirname(
        os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
    )
    return os.path.join(root_dir, "data", "temp")
```

Use `_get_temp_dir()` in `_compress_image_internal` (as above). Behavior is identical.

### 3. Flatten nested `await` call sites

The nested `await` in arguments is hard to scan. You can keep the same semantics while improving readability:

```python
# before
llm_resp = await prov.text_chat(
    prompt=IMAGE_CAPTION_DEFAULT_PROMPT,
    image_urls=[
        await _compress_image_internal(
            await image_seg.convert_to_file_path()
        )
    ],
)

# after
path = await image_seg.convert_to_file_path()
compressed_path = await _compress_image_internal(path)
llm_resp = await prov.text_chat(
    prompt=IMAGE_CAPTION_DEFAULT_PROMPT,
    image_urls=[compressed_path],
)
```

Likewise in the other places:

```python
# before
image_path = await _compress_image_internal(
    await comp.convert_to_file_path()
)

# after
path = await comp.convert_to_file_path()
image_path = await _compress_image_internal(path)
```

and in the quoted reply loop:

```python
path = await reply_comp.convert_to_file_path()
image_path = await _compress_image_internal(path)
```

### 4. Optionally move compression helpers to a dedicated utility

To decouple `astr_main_agent.py` from image-specific concerns without changing behavior, you could move the helpers into e.g. `astrbot.core.utils.image_compression` and keep a single high-level API in this file:

```python
# astr_main_agent.py
from astrbot.core.utils.image_compression import compress_image

# keep local name for clarity with minimal changes to call sites
_compress_image_internal = compress_image
```

This keeps all current call sites working, but moves the PIL/base64/temp-dir details out of the main agent module.
</issue_to_address>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Comment thread astrbot/core/astr_main_agent.py Outdated
Comment thread astrbot/core/astr_main_agent.py Outdated
Comment thread astrbot/core/astr_main_agent.py Outdated
@dosubot dosubot bot added the area:core The bug / feature is about astrbot's core, backend label Mar 16, 2026
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

此拉取请求引入了本地图片预压缩机制,并增强了图片解析的容错性。压缩逻辑在各种图片处理路径中得到了良好且一致的应用。在异步应用中使用 asyncio.to_thread 处理同步图片操作是正确的做法,可以有效避免阻塞事件循环。此外,_ensure_img_caption 函数中改进的错误处理也提高了系统的健壮性。

import json
import os
import time
import zoneinfo
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

为了支持 _do_compress_sync 函数中建议的 uuid.uuid4().hex 用法,需要导入 uuid 模块。

Suggested change
import zoneinfo
import zoneinfo
import uuid


from PIL import Image as PILImage

from astrbot.core import logger, sp
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

为了支持 _compress_image_internal 函数中建议的 get_astrbot_temp_path() 用法,需要从 astrbot.core.utils.astrbot_path 导入此函数。

Suggested change
from astrbot.core import logger, sp
from astrbot.core import logger, sp
from astrbot.core.utils.astrbot_path import get_astrbot_temp_path

Comment thread astrbot/core/astr_main_agent.py Outdated
Comment on lines +1201 to +1226
async def _compress_image_internal(url_or_path: str) -> str:
try:
data = None
# 若为远程图片则直接返回原值 无需压缩
if url_or_path.startswith("http"):
return url_or_path
elif url_or_path.startswith("data:image"):
header, encoded = url_or_path.split(",", 1)
data = base64.b64decode(encoded)
elif os.path.exists(url_or_path):
if os.path.getsize(url_or_path) < 1024 * 1024:
return url_or_path
with open(url_or_path, "rb") as f:
data = f.read()

if not data:
return url_or_path

temp_dir = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))), "data/temp")

# 使用 asyncio.to_thread 将同步阻塞的图片处理任务交给线程池
return await asyncio.to_thread(_do_compress_sync, data, temp_dir)

except Exception as e:
logger.error("图片压缩失败: %s", e)
return url_or_path
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

新创建的压缩图片文件被保存到临时目录 (data/temp),但目前没有明确的清理机制。随着时间的推移,这个目录可能会积累大量文件,导致磁盘空间耗尽,尤其是在处理大量图片时。建议实现一个临时文件清理策略,例如定期清理旧文件、使用上下文管理器确保文件在使用后删除,或者设置临时目录的最大大小限制。

Comment thread astrbot/core/astr_main_agent.py Outdated
Comment thread astrbot/core/astr_main_agent.py Outdated
@LIghtJUNction
Copy link
Copy Markdown
Member

temp_dir = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(file)))), "data/temp")

不要写这种代码,可读性约等于0
要么用函数获取,要么全部都用pathlib的Path路径类来写。

那种写法看起来就清爽多了

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR adds on-the-fly compression for large user-provided images before they’re passed into image-captioning and chat flows, aiming to reduce payload size and improve robustness when handling large image attachments.

Changes:

  • Compresses local images (and data:image... inputs) above a size threshold using Pillow via asyncio.to_thread.
  • Routes image attachments and quoted-image captioning through the new compression helper.
  • Adjusts image-caption failure handling by appending a fallback text part and clearing image_urls.

You can also share your feedback on Copilot code review. Take the survey.

Comment on lines +467 to +468
finally:
req.image_urls = []
Comment thread astrbot/core/astr_main_agent.py Outdated
Comment thread astrbot/core/astr_main_agent.py Outdated
if url_or_path.startswith("http"):
return url_or_path
elif url_or_path.startswith("data:image"):
header, encoded = url_or_path.split(",", 1)
Comment thread astrbot/core/astr_main_agent.py Outdated
Comment thread astrbot/core/astr_main_agent.py Outdated
Comment thread astrbot/core/astr_main_agent.py Outdated
Comment thread astrbot/core/astr_main_agent.py Outdated
Comment on lines +1188 to +1197
img = PILImage.open(io.BytesIO(data))
if img.mode in ("RGBA", "P"):
img = img.convert("RGB")
max_size = 1280
if max(img.size) > max_size:
img.thumbnail((max_size, max_size), PILImage.Resampling.LANCZOS)

timestamp = int(time.time() * 1000)
save_path = os.path.join(temp_dir, f"compressed_{timestamp}.jpg")
img.save(save_path, "JPEG", quality=85, optimize=True)
fix:分离image_path的计算行为 提高可读性
fix:使用uuid来生成压缩后的图片 而非时间戳
@a61995987
Copy link
Copy Markdown
Contributor Author

a61995987 commented Mar 16, 2026

temp_dir = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(file)))), "data/temp")

不要写这种代码,可读性约等于0 要么用函数获取,要么全部都用pathlib的Path路径类来写。

那种写法看起来就清爽多了

感谢检查 已修改:
fix:修改temp_dir指向 现在使用框架内置的get_astrbot_temp_path来获取临时目录
fix:分离image_path的计算行为 提高可读性
fix:使用uuid来生成压缩后的图片 而非时间戳

@a61995987 a61995987 changed the title Feat 新增本地图片预压缩机制并增强图片解析容错 feat:新增本地图片预压缩机制并增强图片解析容错 Mar 16, 2026
@a61995987 a61995987 changed the title feat:新增本地图片预压缩机制并增强图片解析容错 feat: 新增本地图片预压缩机制并增强图片解析容错 Mar 16, 2026
@outlook84
Copy link
Copy Markdown

麻烦给个开关,以后忘记有这茬还想不起来图片为什么被压缩了。

@a61995987
Copy link
Copy Markdown
Contributor Author

麻烦给个开关,以后忘记有这茬还想不起来图片为什么被压缩了。

等PR通过后我会新提交一个前端变更PR 不然这个PR可能会太大

@Soulter
Copy link
Copy Markdown
Member

Soulter commented Mar 17, 2026

压缩相关的代码可以放在 astrbot/core/utils/media_utils.py。减少 mainagent 的代码长度。

@a61995987
Copy link
Copy Markdown
Contributor Author

缩相关的代码可以放在 astrbot/core/utils/media_u

收到 修改后我会重新@您

@a61995987
Copy link
Copy Markdown
Contributor Author

a61995987 commented Mar 17, 2026

@Soulter 已修改 请审查 主要变更如下:
fix: 分离图片压缩相关函数到媒体文件处理工具中(astrbot\core\utils\media_utils.py 323-385行)
fix: 修改原有的列表推导式以提高可读性(astrbot\core\astr_main_agent.py 450-459行)

另外 在图片压缩相关的函数中预留了配置项的读取 请问需要增加独立的前端配置吗?

@LIghtJUNction
Copy link
Copy Markdown
Member

一个小建议:尽量不要用中文作为分支名

@LIghtJUNction
Copy link
Copy Markdown
Member

temp_dir = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(file)))), "data/temp")
不要写这种代码,可读性约等于0 要么用函数获取,要么全部都用pathlib的Path路径类来写。
那种写法看起来就清爽多了

感谢检查 已修改: fix:修改temp_dir指向 现在使用框架内置的get_astrbot_temp_path来获取临时目录 fix:分离image_path的计算行为 提高可读性 fix:使用uuid来生成压缩后的图片 而非时间戳

我更推荐使用pathlib
我在get_astrbot_temp_path所在那个文件里面,放了一个专门用来获取路径的类。
可以用一下。

@a61995987
Copy link
Copy Markdown
Contributor Author

a61995987 commented Mar 17, 2026

temp_dir = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(file)))), "data/temp")
不要写这种代码,可读性约等于0 要么用函数获取,要么全部都用pathlib的Path路径类来写。
那种写法看起来就清爽多了

感谢检查 已修改: fix:修改temp_dir指向 现在使用框架内置的get_astrbot_temp_path来获取临时目录 fix:分离image_path的计算行为 提高可读性 fix:使用uuid来生成压缩后的图片 而非时间戳

我更推荐使用pathlib 我在get_astrbot_temp_path所在那个文件里面,放了一个专门用来获取路径的类。 可以用一下。

收到 已修改 我没有在astrbot\core\utils\astrbot_path.py看到任何类 目前使用Path(get_astrbot_temp_path())方式来获取临时目录路径 并在_compress_image_sync中使用save_path = temp_dir / f"compressed_{new_uuid}.jpg"拼接生成的文件路径 这样可能更直观

另:我会在以后的PR中注意分支名称 这次似乎没法改了。。
@LIghtJUNction

@a61995987 a61995987 closed this Mar 17, 2026
@a61995987 a61995987 deleted the feat-新增本地图片预压缩机制并增强图片解析容错 branch March 17, 2026 13:58
@a61995987 a61995987 restored the feat-新增本地图片预压缩机制并增强图片解析容错 branch March 17, 2026 13:59
@a61995987 a61995987 reopened this Mar 17, 2026
@Soulter Soulter changed the base branch from dev to master March 22, 2026 07:39
@dosubot dosubot bot added size:XXL This PR changes 1000+ lines, ignoring generated files. and removed size:M This PR changes 30-99 lines, ignoring generated files. labels Mar 22, 2026
@Soulter Soulter changed the base branch from master to dev March 22, 2026 07:39
@dosubot dosubot bot added size:M This PR changes 30-99 lines, ignoring generated files. and removed size:XXL This PR changes 1000+ lines, ignoring generated files. labels Mar 22, 2026
@dosubot dosubot bot added size:L This PR changes 100-499 lines, ignoring generated files. and removed size:M This PR changes 30-99 lines, ignoring generated files. labels Mar 22, 2026
@Soulter Soulter changed the title feat: 新增本地图片预压缩机制并增强图片解析容错 feat: supports image compressing Mar 22, 2026
@Soulter Soulter merged commit 02a910f into AstrBotDevs:dev Mar 22, 2026
1 of 2 checks passed
Soulter added a commit that referenced this pull request Mar 22, 2026
Co-authored-by: Soulter <905617992@qq.com>
Soulter added a commit that referenced this pull request Mar 22, 2026
Co-authored-by: Soulter <905617992@qq.com>
Soulter added a commit that referenced this pull request Mar 22, 2026
* feat: supports image compressing (#6463)

Co-authored-by: Soulter <905617992@qq.com>

* feat: 增加图像压缩最大尺寸至1280

* Update astrbot/core/astr_main_agent.py

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* feat: 增强临时文件管理,添加图像压缩路径跟踪与清理功能

* feat: 更新图片压缩功能提示,移除对 chat_completion 提供商的限制说明

---------

Co-authored-by: Chen <42998804+a61995987@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
xkeyC added a commit to xkeyC/AstrBot that referenced this pull request Mar 28, 2026
* perf: onebot, satori docs improvement

* ci: add pr check

* chore: Delete .github/workflows/pr-checklist-check.yml

* feat: localize session management group & interval method texts (AstrBotDevs#6471)

* fix(ui): localize session management group texts

Replace hardcoded Chinese strings in SessionManagementPage with i18n
lookups for group management labels, dialogs, and action feedback.

Add and align translation keys in en-US, ru-RU, and zh-CN for group
management and batch operation messages to ensure consistent multilingual
UI behavior.

* fix(ui): localize interval method hint text

* fix: SQLite 'database is locked' by adding busy timeout (AstrBotDevs#6474)

The async engine is created without a busy timeout, so concurrent
writes (agent responses, metrics, session updates) fail instantly
with 'database is locked' instead of waiting for the lock.

Add connect_args={'timeout': 30} for SQLite engines so the driver
waits up to 30 seconds for the write lock. Combined with the existing
WAL journal mode, this handles the typical concurrent write bursts
from agent + metrics + session operations.

Fixes AstrBotDevs#6443

* fix: parse multiline frontmatter description in SKILL.md (AstrBotDevs#6460)

* fix(skills): support multiline frontmatter descriptions

* fix(skills): 修复多行 frontmatter 描述解析

* style(skills): clean up frontmatter parser follow-ups

---------

Co-authored-by: RhoninSeiei <RhoninSeiei@users.noreply.github.com>

* chore(deps): bump the github-actions group with 2 updates (AstrBotDevs#6461)

Bumps the github-actions group with 2 updates: [ncipollo/release-action](https://github.com/ncipollo/release-action) and [actions/github-script](https://github.com/actions/github-script).


Updates `ncipollo/release-action` from 1.20.0 to 1.21.0
- [Release notes](https://github.com/ncipollo/release-action/releases)
- [Commits](ncipollo/release-action@v1.20.0...v1.21.0)

Updates `actions/github-script` from 7 to 8
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](actions/github-script@v7...v8)

---
updated-dependencies:
- dependency-name: ncipollo/release-action
  dependency-version: 1.21.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-actions
- dependency-name: actions/github-script
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: remove deprecated version field from compose.yml (AstrBotDevs#5495)

The version field is no longer required in Docker Compose v2 and has been deprecated.

* fix: reading skills on Windows (AstrBotDevs#6490)

There is an issue with reading the skill directory on the Windows system, which results in a high probability of files under the skill directory being unrecognizable, now fix it.

* fix: subagent lookup failure when using default persona (AstrBotDevs#5672)

* fix: resolve subagent persona lookup for 'default' and unify resolution logic

- Add PersonaManager.get_persona_v3_by_id() to centralize v3 persona resolution
- Handle 'default' persona_id mapping to DEFAULT_PERSONALITY in subagent orchestrator
- Fix HandoffTool.default_description using agent_name parameter correctly
- Add tests for default persona in subagent config and tool deduplication

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* refactor: simplify get_default_persona_v3 using get_persona_v3_by_id

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

---------

Co-authored-by: whatevertogo <whatevertogo@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com>

* fix: register_agent decorator NameError (AstrBotDevs#5765)

* fix: 修改 register_agent 以避免运行时导入 AstrAgentContext

* test: improve register_agent test robustness

- Add fixture for llm_tools cleanup to avoid test interference
- Use multiple import patterns to make guard more robust to refactors
- Add assertion to verify decorated coroutine is wired as handoff handler

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* 删除测试文件: 移除 register_agent 装饰器的运行时行为测试

---------

Co-authored-by: whatevertogo <whatevertogo@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Co-authored-by: Soulter <905617992@qq.com>

* fix: only pass dimensions when explicitly configured in embedding config (AstrBotDevs#6432)

* fix: only pass dimensions param when explicitly configured

Models like bge-m3 don't support the dimensions parameter in the
embedding API, causing HTTP 400 errors. Previously dimensions was
always sent with a default value of 1024, even when the user never
configured it. Now dimensions is only included in the request when
embedding_dimensions is explicitly set in provider config.

Closes AstrBotDevs#6421

Signed-off-by: JiangNan <1394485448@qq.com>

* fix: handle invalid dimensions config and align get_dim return

- Add try-except around int() conversion in _embedding_kwargs to
  gracefully handle invalid embedding_dimensions config values
- Update get_dim() to return 0 when embedding_dimensions is not
  explicitly configured, so callers know dimensions weren't specified
  and can handle it accordingly
- Both methods now share consistent logic for reading the config

Signed-off-by: JiangNan <1394485448@qq.com>

* fix: improve logging for invalid embedding_dimensions configuration

---------

Signed-off-by: JiangNan <1394485448@qq.com>
Co-authored-by: Soulter <905617992@qq.com>

* perf: Implement Pydantic data models for the KOOK adapter to enhance data retrieval and message schema validation (AstrBotDevs#5719)

* refactor: 给kook适配器添加kook事件数据类

* format: 使用StrEnum替换kook适配器中的(str,enum)

* docs: add aiocqhttp and satori protocol documentation; remove outdated lagrange and napcat guides

* refactor: downgrade StrEnum to (str, Enum) in kook_type for backward compatibility  (AstrBotDevs#6512)

我那时候搓 AstrBotDevs#5719 的时候 AstrBotDevs#5729 已经合并了, 既然ruff的py限制版本里是`3.12`,那我那时候干脆用的StrEnum,现在发现那个pr revert了,那我也降级回旧Enum写法好了

* feat: install plugin using metadata name and validate importable identifiers (AstrBotDevs#6530)

* feat: install plugin using metadata name and validate importable identifiers

* fix: cleanup temporary upload extraction directory on plugin install failure

* Update astrbot/core/star/star_manager.py

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* fix: avoid unnecessary install when repository directory already exists

---------

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* fix: restrict workflows to upstream repo (AstrBotDevs#6531)

* Clarify FileUpload/DownloadTool descriptions to fix LLM tool selection (AstrBotDevs#6527)

Multiple models (Gemini 3, GPT-5.2, Claude Sonnet, Kimi K2.5) consistently
pick FileDownloadTool when they should pick FileUploadTool. The old
descriptions used "upload/download" which is ambiguous from the LLM's
perspective — it doesn't know which side is "local" vs "remote".

Rewrite descriptions to use explicit directional language:
- Upload: "Transfer FROM host INTO sandbox" + "when user sends a file"
- Download: "Transfer FROM sandbox OUT to host" + "ONLY when user asks
  to retrieve/export"

Also improve parameter descriptions with the same directional clarity.

Fixes AstrBotDevs#6497

Co-authored-by: Yufeng He <40085740+universeplayer@users.noreply.github.com>

* perf(dashboard): subset MDI icon font and self-host Google Fonts (AstrBotDevs#6532)

* perf(dashboard): subset MDI icon font and self-host Google Fonts

* perf(dashboard): subset MDI icon font and self-host Google Fonts

* perf(dashboard): subset MDI icon font and self-host Google Fonts

* perf(dashboard): subset MDI icon font cr fix

* chore: update lockfile

* enhance:更改未完成更新的文档用词问题(多处“消息平台”已更名为“机器人”) (AstrBotDevs#6568)

* Update kubernetes.md

* Update discord.md

* Update kubernetes.md

* Update AstrBot setup instructions in Kubernetes doc

* fix: set packaged Windows runtime build env for pip native builds (AstrBotDevs#6575)

* Fix Windows packaged runtime pip build env

* test(pip): cover packaged runtime env injection edges

* refactor(pip): tighten packaged runtime env handling

* test(pip): cover missing runtime build dirs

* fix(pip): build runtime env inside locked section

* test(pip): expand windows path normalization coverage

* refactor(pip): build runtime env from snapshots

* fix(pip): preserve windows env key semantics

* refactor(pip): simplify windows runtime env handling

Keep the in-process pip environment mutation and case-insensitive INCLUDE/LIB handling localized so packaged Windows builds are easier to follow. Add a UNC no-op regression case to guard path normalization.

* refactor(pip): streamline runtime env mutation helpers

Keep packaged Windows pip environment handling easier to follow by reusing a temporary environment context manager, isolating case-insensitive INCLUDE/LIB lookup, and documenting native path normalization behavior.

* feat (doc) : Add doc for shipyard-neo sandbox driver (AstrBotDevs#6590)

* fix(ui): localize session management group texts

Replace hardcoded Chinese strings in SessionManagementPage with i18n
lookups for group management labels, dialogs, and action feedback.

Add and align translation keys in en-US, ru-RU, and zh-CN for group
management and batch operation messages to ensure consistent multilingual
UI behavior.

* fix(ui): localize interval method hint text

* docs(sandbox): document shipyard neo setup

Expand the Chinese sandbox guide to cover Shipyard Neo as the
recommended driver and distinguish it from legacy Shipyard.

Add deployment and configuration guidance for standalone and
compose-based setups, include a full annotated config example,
and clarify profile selection, TTL behavior, workspace paths,
and persistence semantics.

* docs(sandbox): recommend standalone shipyard neo

Clarify that Shipyard Neo is best deployed on a separate,
better-provisioned host for long-term use.

Update the setup steps and AstrBot connection guidance, and
remove the earlier combined Docker Compose deployment flow.

* docs(sandbox): expand shipyard neo guide

Document Shipyard Neo as the recommended sandbox driver and
clarify how it differs from the legacy Shipyard setup.

Add guidance for deployment, performance requirements, Bay
configuration, profile selection, TTL behavior, workspace
persistence, and browser capability support.

Also reorganize the sandbox configuration section and keep the
legacy Shipyard instructions for compatibility.

* docs(sandbox): fix shipyard neo doc links

Update the sandbox guides in English and Chinese to link
directly to the upstream `config.yaml` example.

Replace duplicated TTL and persistence notes with references
to the dedicated sections to keep the guide concise and easier
to maintain.

* docs(sandbox): clarify section references in guides (AstrBotDevs#6591)

* fix: prevent wecom ai bot long connection replies from disappearing (AstrBotDevs#6606)

* fix: prevent empty fallback replies from clearing wecom ai bot output

* fix: 优化消息发送逻辑,避免发送空消息

---------

Co-authored-by: shijianhuai <shijianhuai@simuwang.com>
Co-authored-by: Soulter <905617992@qq.com>

* fix(wecom-aibot): significantly improve streaming readability and speed via add throttling (AstrBotDevs#6610)

* fix(wecom-ai): add 0.5s interval for streaming responses

* fix(wecom-ai): correct event type checking and add spacing in WecomAIBotMessageEvent

* feat: context token counting support for multimodal content (images, audio, and chain-of-thought) (AstrBotDevs#6596)

EstimateTokenCounter 之前只计算 TextPart,完全忽略 ImageURLPart、
AudioURLPart 和 ThinkPart。多模态对话中图片占 500-2000 token,
不被计入会导致 context 压缩触发过晚,API 先报 context_length_exceeded。

改动:
- ImageURLPart 按 765 token 估算(OpenAI vision 低/高分辨率中位数)
- AudioURLPart 按 500 token 估算
- ThinkPart 的文本内容正常计算
- 10 个新测试覆盖各类型单独和混合场景

Co-authored-by: Yufeng He <40085740+universeplayer@users.noreply.github.com>

* fix(openai): Token usage not working when using MoonshotAI official API (AstrBotDevs#6618)

fixes: AstrBotDevs#6614

* fix: update hint for ID whitelist configuration to clarify behavior when empty (AstrBotDevs#6611)

* fix: update hint for ID whitelist configuration to clarify behavior when empty

* fix: update whitelist hint

---------

Co-authored-by: machina <1531829828@qq.com>
Co-authored-by: Soulter <905617992@qq.com>

* fix: 截断器丢失唯一 user 消息导致智谱等 provider 返回 400 (AstrBotDevs#6581)

* fix: 截断器丢失唯一 user 消息导致 API 400

修复 AstrBotDevs#6196

当对话只有一条 user 消息(长 tool chain 场景:system → user → assistant
→ tool → assistant → tool → ...),三个截断方法都会把这条 user 消息丢掉,
导致智谱、Gemini 等要求 user 消息的 provider 返回 400。

改动:
- 提取 `_split_system_rest()` 去掉三个方法里重复的 system/non-system 拆分
- 新增 `_ensure_user_message()`:截断后如果没有 user 了,从原始消息里补回
  第一条 user,避免违反 API 格式要求
- 删掉 `truncate_by_dropping_oldest_turns` 里把没有 user 就清空全部消息的逻辑
- 5 个新测试覆盖单 user + 长 tool chain 场景,3 个旧测试更新断言

* style: format code

---------

Co-authored-by: Yufeng He <40085740+universeplayer@users.noreply.github.com>
Co-authored-by: RC-CHN <1051989940@qq.com>

* fix: prevent truncation logic from removing the only user message in long tool-calling conversations (AstrBotDevs#6198)

* fix: 压缩算法删除 user 消息 Bug 修复

* perf: improve truncate algo

---------

Co-authored-by: Soulter <905617992@qq.com>

* feat: add Kimi Coding Plan provider with Anthropic API compatibility (AstrBotDevs#6559)

* Add Kimi Code provider

* Add icon mapping for Kimi Code provider

* Clarify Kimi CodingPlan provider labeling

* Refine Kimi Code header handling

* modified docker compose

* fix: correct Kimi Coding Plan label and update API base URL

---------

Co-authored-by: Soulter <905617992@qq.com>

* fix(openai): improve logging for proxy and API base configuration (AstrBotDevs#6669)

fix: AstrBotDevs#6558

* fix(dashboard): simplify persona selector layout for mobile screens (AstrBotDevs#5907)

* fix: Follow-up logic persists after /stop trigger (AstrBotDevs#6656)

/stop 设置 agent_stop_requested 标记,但 runner 直到当前工具调用
超时才从 _ACTIVE_AGENT_RUNNERS 注销。在此窗口期内,用户发的新消息
被 try_capture_follow_up() 当作 follow-up 吞掉。

在 follow-up 捕获前检查 stop 标记:一旦用户请求停止,就不再把后续
消息注入到正在终止的 agent 上下文中。

Fixes AstrBotDevs#6626

* fix: auto-restart telegram polling loop on failure (AstrBotDevs#6648)

* fix: auto-restart telegram polling loop on failure (AstrBotDevs#373)

* fix: auto-restart telegram polling loop on failure

* fix: harden telegram polling restart lifecycle

* fix(telegram): 根据建议优化轮询鲁棒性并处理 Token 失效错误

* fix: 补全配置元数据及 i18n

* feat: add xiaomi MiMo TTS & STT providers (AstrBotDevs#6643)

* feat: add mimo tts provider support

* fix: handle empty mimo tts choices

* feat: add mimo stt provider support

* chore: rename "OpenAI" provider to "OpenAI Compatible" (AstrBotDevs#6707)

* fix: prevent accidental removal of MCP external tools due to name collisions with disabled built-in tools (AstrBotDevs#5925)

* fix: 解决 MCP 工具与内置工具重名时的连坐问题

- 修改 get_func 方法:优先返回已激活的工具
- 修改 get_full_tool_set 方法:使用 add_tool 防止同名冲突
- 修改 add_tool 方法:优先保留已激活的工具

Fixes AstrBotDevs#5821

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* refactor: address PR review feedback for tool conflict resolution

- Fix inconsistency: get_func now uses reversed() to match ToolSet.add_tool's
  "last-active-wins" logic, preventing potential "tool hijacking" issues
- Improve readability: replace double negative condition with clearer logic
- Add compatibility: use getattr with default for tools without 'active' attribute
- Remove unnecessary deepcopy: MCPTool runtime objects should not be deep copied
- Update docstring: accurately describe the actual tool resolution behavior

Addresses review comments from sourcery-ai, gemini-code-assist, and Copilot.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* test: add tests for tool conflict resolution (issue AstrBotDevs#5821)

Add comprehensive tests for ToolSet.add_tool, get_func, and get_full_tool_set
to verify the conflict resolution behavior when MCP tools share names with
built-in tools.

Test cases:
- ToolSet.add_tool: active/inactive priority, last-one-wins for same state
- get_func: returns last active tool, fallback to last matching tool
- get_full_tool_set: deduplication logic, no deepcopy, MCP overrides disabled builtin

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* fix: 修复工具冲突处理逻辑,确保未激活工具不被错误移除

---------

Co-authored-by: whatevertogo <whatevertogo@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

* feat: add a toggle to disable thinking mode in Ollama (AstrBotDevs#5941)

* feat: add ollama thinking toggle

* fix: simplify hint for ollama_disable_thinking configuration

---------

Co-authored-by: Gargantua <22532097@zju.edu.cn>
Co-authored-by: Soulter <905617992@qq.com>

* fix: preserve PATHEXT for stdio mcp servers on windows (AstrBotDevs#5822)

* fix: preserve PATHEXT for stdio mcp servers on windows

* chore: delete test_mcp_client.py

---------

Co-authored-by: Soulter <905617992@qq.com>

* fix(core): interrupt subagent tool waits on stop (AstrBotDevs#5850)

* fix(core): interrupt subagent tool waits on stop

* test: relax subagent handoff timeout

* test: cover stop-aware tool interruption

* refactor: unify runner stop state

* refactor: simplify tool executor interruption

* fix: preserve tool interruption propagation

* refactor: tighten interruption helpers

---------

Co-authored-by: idiotsj <idiotsj@users.noreply.github.com>

* fix(agent): reject follow-up messages after stop request (AstrBotDevs#6704)

* fix: reject follow-up messages after stop requested (AstrBotDevs#6626)

Once a user sends /stop, follow-up messages should no longer be
accepted for that runner. Previously, there was a race window where
messages sent after stop could still be queued as follow-ups.

This fix gates the follow_up() method to check both done() and
_stop_requested before accepting a new follow-up message.

Acceptance criteria met:
- After /stop, later follow-up messages return None (rejected)
- Post-stop follow-ups are not added to _pending_follow_ups
- No post-stop text is injected into tool results
- Graceful-stop behavior otherwise unchanged
- Follow-ups submitted before stop retain current behavior

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* test: add regression tests for issue AstrBotDevs#6626 follow-up rejection

Add focused tests that verify the complete tool-result injection path
for follow-up messages after stop is requested:

- test_follow_up_rejected_and_runner_stops_without_execution: Verifies
  that when stop is requested before any execution, follow-ups are
  rejected and the runner stops gracefully without executing tools.

- test_follow_up_merged_into_tool_result_before_stop: Verifies that
  follow-ups queued before stop are properly merged into tool results
  via _merge_follow_up_notice().

- test_follow_up_after_stop_not_merged_into_tool_result: Regression
  test that simulates the race condition from issue AstrBotDevs#6626. Verifies
  that only pre-stop follow-ups are merged into tool results, and
  post-stop follow-ups are rejected at the admission point.

These tests validate the fix in ToolLoopAgentRunner.follow_up() that
checks both self.done() and self._stop_requested before accepting
new follow-up messages.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix(agent): update stop request check in ToolLoopAgentRunner

---------

Co-authored-by: ccsang <ccsang@users.noreply.github.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Soulter <905617992@qq.com>

* fix: skills-like re-query missing extra_user_content_parts causes image_caption not to be injected (AstrBotDevs#6710)

当使用 skills-like tool mode 时,_resolve_tool_exec 的 re-query 调用没有
传递 extra_user_content_parts,导致图片描述等附加内容丢失。

fixes AstrBotDevs#6702

Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com>

* perf(webchat): enhance message handling with proactive saving and streaming completion (AstrBotDevs#6698)

* fix(config): respect disabled system functions in web search tools (AstrBotDevs#6584)

Co-authored-by: BillionClaw <billionclaw@cl OSS.dev>

* fix(agent): pass tool_call_timeout to subagent handsoff, cron and background task execution, and increase default timeout from 60 to 120 (AstrBotDevs#6713)

* fix(agent): pass tool_call_timeout to SubAgent handoff execution

- Add tool_call_timeout parameter to _execute_handoff method
- Pass run_context.tool_call_timeout to ctx.tool_loop_agent
- Add unit test to verify tool_call_timeout is correctly passed
- Fixes AstrBotDevs#6711: SubAgent MCP tool call timeout now respects configured timeout

The SubAgent handoff execution was using the default 60-second timeout
instead of the configured tool_call_timeout from provider settings.
This change ensures that SubAgent MCP tool calls respect the user's
configured timeout settings.

* test: add unit test for tool_call_timeout in SubAgent handoff

* fix: restore deleted test and fix test assertion

- Restore test_collect_handoff_image_urls_filters_extensionless_missing_event_file
- Fix test_collect_handoff_image_urls_keeps_extensionless_existing_event_file assertion
- Keep new test_execute_handoff_passes_tool_call_timeout_to_tool_loop_agent

* refactor: simplify tool_call_timeout passing in _execute_handoff

- Pass run_context.tool_call_timeout directly to ctx.tool_loop_agent
- Remove unnecessary local variable assignment
- Addresses review feedback from Sourcery AI

* fix(config): increase default tool call timeout from 60 to 120 seconds

---------

Co-authored-by: LehaoLin <linlehao@cuhk.edu.cn>
Co-authored-by: Soulter <905617992@qq.com>

* docs: update README.md to add separator in links section

* fix(skills): use actual sandbox path from cache instead of hardcoded workspace root (AstrBotDevs#6331)

* fix(skills): use actual sandbox path from cache instead of hardcoded workspace root

Fixes AstrBotDevs#6273

When using Shipyard booter, the sandbox workspace directory is
`/home/ship_{session_id}/workspace/` instead of the hardcoded `/workspace`.
This caused Agent to fail reading SKILL.md files with 'No such file or directory'.

Changes:
- In build_skills_prompt: prefer skill.path (from sandbox cache) over
  hardcoded SANDBOX_WORKSPACE_ROOT for sandbox_only skills
- In list_skills: always prefer sandbox_cached_paths over hardcoded path
  for sandbox_only skills

The actual path is resolved at sandbox scan time via Path.resolve() in
_build_scan_command, which returns the correct absolute path based on
the sandbox's actual working directory.

* docs: add comment explaining show_sandbox_path behavior for sandbox_only skills

Address Sourcery AI review comment:
- Clarify that show_sandbox_path is implicitly True for sandbox_only skills
- Explain why the flag is effectively ignored (no local path exists)

* refactor: simplify path_str fallback using or operator

Address review feedback: use single-line fallback instead of if-not pattern.

* style: format skill_manager.py with ruff

Fix ruff format-check failure

* fix(skills): sanitize cached sandbox skill paths

Normalize sandbox cache paths before reading or writing them so invalid,
empty, or mismatched entries fall back to a safe default SKILL.md path.

This avoids using malformed cached paths, keeps path rendering
consistent, and ensures sandbox skill listings always point to the
expected workspace location.

---------

Co-authored-by: ccsang <ccsang@users.noreply.github.com>
Co-authored-by: RC-CHN <1051989940@qq.com>

* fix: ensure Gemini array schemas always include items (AstrBotDevs#6051)

Co-authored-by: Stable Genius <259448942+stablegenius49@users.noreply.github.com>

* fix(webchat): render standalone HTML replies as code (AstrBotDevs#6074)

Co-authored-by: Stable Genius <259448942+stablegenius49@users.noreply.github.com>
Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com>

* fix: fall back on Windows skill file encodings (AstrBotDevs#6058)

Co-authored-by: stablegenius49 <185121704+stablegenius49@users.noreply.github.com>

* fix(lark): Defer card creation and renew on tool call break (AstrBotDevs#6743)

* fix(lark): defer streaming card creation and renew card on tool call break

- Defer CardKit streaming card creation until the first text token
  arrives, preventing an empty card from rendering before content.
- Handle `type="break"` signal in send_streaming: close the current
  card and lazily create a new one for post-tool-call text, so the
  new card appears below the tool status message in correct order.
- Only emit "break" signal when show_tool_use is enabled; when tool
  output is hidden, the AI response continues on the same card.

* style: format ruff

* fix: cr bug

* fix: cr

* fix: convert Feishu opus files for Whisper API STT (AstrBotDevs#6078)

* fix: convert lark opus files for whisper api

* chore: ruff format

---------

Co-authored-by: Stable Genius <259448942+stablegenius49@users.noreply.github.com>
Co-authored-by: Soulter <905617992@qq.com>

* fix: skip empty knowledge-base embedding batches (AstrBotDevs#6106)

Co-authored-by: stablegenius49 <185121704+stablegenius49@users.noreply.github.com>

* feat(skill_manager): normalize and rename legacy skill markdown files to `SKILL.md` (AstrBotDevs#6757)

* feat(skill_manager): normalize and rename legacy skill markdown files to `SKILL.md`

* fix(vec_db): format debug log message for empty batch insert

* feat(extension): add category filtering for market plugins and enhance UI components (AstrBotDevs#6762)

* chore: bump version to 4.21.0

* feat: supports weixin personal account (AstrBotDevs#6777)

* feat: supports weixin personal account

* feat(weixin): update documentation for personal WeChat integration and add QR code image

* feat(weixin): refactor send method to streamline message handling

* fix(weixin): correct AES key encoding in media payload construction

* feat(weixin): update weixin_oc_base_url description for clarity in config metadata

* feat(weixin): enhance WeChat integration with QR code support and configuration updates

* feat(weixin): implement WeixinOCClient for improved media handling and API requests

* feat(platform): update platform status refresh interval to 5 seconds

* fix(platform.tg_adapter): import Forbidden instead of deprecated Unauthorized (AstrBotDevs#6765) (AstrBotDevs#6769)

* feat: skip search when the entire knowledge base is empty (AstrBotDevs#6750)

* feat:增加知识库全为空时的跳过检索

* apply bot suggestions

* style:reformat code

* feat: fix preserve escaped newlines in frontmatter & update tests & ci workflows (AstrBotDevs#6783)

* Feat(webui): support pinning and dragging for installed plugins (AstrBotDevs#6649) (AstrBotDevs#6776)

* refactor(persona): replace local folder components with shared folder components

* feat(webui): implement draggable reordering with animation for pinned plugins

* refactor(webui): extract PinnedPluginItem into a standalone component

* fix: handle potential None values for token usage metrics in OpenAI provider (AstrBotDevs#6788)

Such as: unsupported operand type(s) for -: 'int' and 'NoneType'

fixes: AstrBotDevs#6772

* feat: supports image compressing (AstrBotDevs#6794)

* feat: supports image compressing (AstrBotDevs#6463)

Co-authored-by: Soulter <905617992@qq.com>

* feat: 增加图像压缩最大尺寸至1280

* Update astrbot/core/astr_main_agent.py

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* feat: 增强临时文件管理,添加图像压缩路径跟踪与清理功能

* feat: 更新图片压缩功能提示,移除对 chat_completion 提供商的限制说明

---------

Co-authored-by: Chen <42998804+a61995987@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* fix: keep all CallToolResult content items (AstrBotDevs#6149)

Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com>

* chore: bump version to 4.22.0

* docs: update wechat app version requirements for WeChat adapter and add instructions for profile photo/remark modifications

* chore: gitignore .env warker.js

* fix: remove privacy data from test case (AstrBotDevs#6803)

Co-authored-by: whatevertogo <whatevertogo@users.noreply.github.com>

* fix: align mimo tts style payload with official docs (AstrBotDevs#6814)

* feat(dashboard): add log and cache cleanup in settings (AstrBotDevs#6822)

* feat(dashboard): add log and cache cleanup in settings

* refactor: simplify storage cleaner log config handling

* fix: Repair abnormal indentation

* fix(storage): harden cleanup config handling

Use typed config value access to avoid treating invalid values as
enabled flags or log paths during storage cleanup.

Also stop exposing raw backend exceptions in the dashboard storage
status API and direct users to server logs for details.

---------

Co-authored-by: RC-CHN <1051989940@qq.com>

* fix(t2i): sync active template across all configs (AstrBotDevs#6824)

* fix(t2i): sync active template across all configs

apply template activation and reset to every config profile instead of only
the default one, and reload each pipeline scheduler so changes take effect
consistently in multi-config setups

add a dashboard test that creates extra configs and verifies active template
updates and scheduler reload coverage across all config ids

* fix(t2i): reload all schedulers on template changes

extract a shared helper to reload pipeline schedulers for every config.
when syncing or resetting the active template, persist each config and
then reload all schedulers to keep mappings consistent.

also reload all schedulers when updating the currently active template,
and add dashboard tests to verify cross-config sync and scheduler
replacement behavior.

* fix: cannot use tools in siliconflow provider (AstrBotDevs#6829)

* fix: cannot use tools in siliconflow provider

* fix: handle empty choices in ChatCompletionStreamState

* fix: correct voice message support status in WeChat adapter documentation

* feat(lark): add collapsible reasoning panel support and enhance message handling (AstrBotDevs#6831)

* feat(lark): add collapsible reasoning panel support and enhance message handling

* feat(lark): refactor collapsible panel creation for improved readability and maintainability

* chore: ruff format

* perf: validate config_path before checking existence (AstrBotDevs#6722)

Add a check for empty config_path in check_exist method

* chore(deps): bump pnpm/action-setup in the github-actions group (AstrBotDevs#6862)

Bumps the github-actions group with 1 update: [pnpm/action-setup](https://github.com/pnpm/action-setup).


Updates `pnpm/action-setup` from 4.4.0 to 5.0.0
- [Release notes](https://github.com/pnpm/action-setup/releases)
- [Commits](pnpm/action-setup@v4.4.0...v5.0.0)

---
updated-dependencies:
- dependency-name: pnpm/action-setup
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: wrong index in ObjectEditor updateKey causing false 'key exists' error

* fix: wrong index in ObjectEditor updateKey causing false 'key exists' error

* fix: same index mismatch issue in updateJSON

* fix(ui): stabilize ObjectEditor pair keys

Use generated ids for key-value pairs instead of array indexes to
prevent mismatch issues during editing and rendering.

Also replace duplicate-key alerts with toast warnings for a more
consistent UI experience.

---------

Co-authored-by: RC-CHN <1051989940@qq.com>

* feat(api): add GET file endpoint and update file route to support multiple methods (AstrBotDevs#6874)

* fix(openapi): rename route view function

* fix(ui): include vuetify radiobox icons (AstrBotDevs#6892)

Add the radiobox icons used indirectly by Vuetify internals
to the required MDI subset so they are kept during font
generation.

Regenerate the subset CSS and font files to prevent missing
radio button icons at runtime.

* fix(tests): update scanUsedIcons tests to include required radio icons (AstrBotDevs#6894)

* doc: Update docs/zh/platform/lark.md (AstrBotDevs#6897)

* 补充飞书配置群聊机器人的部分

- 移除了 im:message:send 权限,因为似乎飞书已经移除了该权限
- 新增关于飞书群聊如何配置权限的部分

* Update docs/zh/platform/lark.md

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

---------

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* Feat(webui): show plugin author on cards & pinned item (AstrBotDevs#5802) (AstrBotDevs#6875)

* feat: 为卡片视图增加作者信息

* feat:置顶列表面板新增作者名称与插件名称

* docs(compshare): correct typos (AstrBotDevs#6878)

* Fix(WebUi): allow batch resetting provider config to "follow" (iss#6749) (AstrBotDevs#6825)

* feat(webui): use explicit 'follow' status for provider settings and improve batch operation logic

* fix: allow batch resetting provider config to "follow config"

* fix(AstrBotDevs#6749): use a unique constant for 'follow' status to avoid collisions with provider IDs

* fix: remove config.use_reloader = True

* refactor(ui): extract follow config sentinel constant

---------

Co-authored-by: RC-CHN <1051989940@qq.com>

* fix: keep weixin_oc polling after inbound timeouts (AstrBotDevs#6915)

* fix: keep weixin_oc polling after inbound timeouts

* Delete tests/test_weixin_oc_adapter.py

---------

Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com>

* fix(i18n): update OpenAI embedding hint for better compatibility guidance

fixes: AstrBotDevs#6855

* feat: auto-append /v1 to embedding_api_base in OpenAI embedding provider (AstrBotDevs#6863)

* fix: auto-append /v1 to embedding_api_base in OpenAI embedding provider (AstrBotDevs#6855)

When users configure `embedding_api_base` without the `/v1` suffix,
the OpenAI SDK does not auto-complete it, causing request path errors.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix: ensure API base URL for OpenAI embedding ends with /v1 or /v4

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Soulter <905617992@qq.com>

* Fix payload handling for msg_id in QQ API (AstrBotDevs#6604)

Remove msg_id from payload to prevent errors with proactive tool-call path and avoid permission issues.

Co-authored-by: Naer <88199249+V-YOP@users.noreply.github.com>

* fix(provider): add missing index field to streaming tool_call deltas (AstrBotDevs#6661) (AstrBotDevs#6692)

* fix(provider): add missing index field to streaming tool_call deltas

- Fix AstrBotDevs#6661: Streaming tool_call arguments lost when OpenAI-compatible proxy omits index field
- Gemini and some proxies (e.g. Continue) don't include index field in tool_call deltas
- Add default index=0 when missing to prevent ChatCompletionStreamState.handle_chunk() from rejecting chunks

Fixes AstrBotDevs#6661

* fix(provider): use enumerate for multi-tool-call index assignment

- Use enumerate() to assign correct index based on list position
- Iterate over all choices (not just the first) for completeness
- Addresses review feedback from sourcery-ai and gemini-code-assist

---------

Co-authored-by: Yaohua-Leo <3067173925@qq.com>
Co-authored-by: Soulter <905617992@qq.com>

* feat(skills): enhance skill installation to support multiple top-level folders and add duplicate handling, and Chinese skill name support (AstrBotDevs#6952)

* feat(skills): enhance skill installation to support multiple top-level folders and add duplicate handling

closes: AstrBotDevs#6949

* refactor(skill_manager): streamline skill name normalization and validation logic

* fix(skill_manager): update skill name regex to allow underscores in skill names

* fix(skill_manager): improve skill name normalization and validation logic

* chore: bump version to 4.22.1

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: JiangNan <1394485448@qq.com>
Co-authored-by: Soulter <905617992@qq.com>
Co-authored-by: LIghtJUNction <lightjunction.me@gmail.com>
Co-authored-by: Ruochen Pan <1051989940@qq.com>
Co-authored-by: Yufeng He <40085740+he-yufeng@users.noreply.github.com>
Co-authored-by: Rhonin Wang <33801807+RhoninSeiei@users.noreply.github.com>
Co-authored-by: RhoninSeiei <RhoninSeiei@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: YYMa <118096301+YuanyuanMa03@users.noreply.github.com>
Co-authored-by: linzhengtian <907305684@qq.com>
Co-authored-by: whatevertogo <149563971+whatevertogo@users.noreply.github.com>
Co-authored-by: whatevertogo <whatevertogo@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com>
Co-authored-by: jnMetaCode <1394485448@qq.com>
Co-authored-by: shuiping233 <49360196+shuiping233@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: 鸦羽 <Raven95676@gmail.com>
Co-authored-by: Yufeng He <40085740+universeplayer@users.noreply.github.com>
Co-authored-by: camera-2018 <40380042+camera-2018@users.noreply.github.com>
Co-authored-by: 糯米茨 <143102889+nuomicici@users.noreply.github.com>
Co-authored-by: エイカク <1259085392z@gmail.com>
Co-authored-by: Ruochen Pan <sorainygreen@gmail.com>
Co-authored-by: Scofield <59475095+shijianhuai@users.noreply.github.com>
Co-authored-by: shijianhuai <shijianhuai@simuwang.com>
Co-authored-by: machina <53079908+machinad@users.noreply.github.com>
Co-authored-by: machina <1531829828@qq.com>
Co-authored-by: leonforcode <leonbeyourside01@gmail.com>
Co-authored-by: daniel5u <danielsuuuuuu@gmail.com>
Co-authored-by: letr <123731298+letr007@users.noreply.github.com>
Co-authored-by: Helian Nuits <sxp20061207@163.com>
Co-authored-by: RichardLiu <97330937+RichardLiuda@users.noreply.github.com>
Co-authored-by: _Kerman <kermanx@qq.com>
Co-authored-by: Gargantua <124801228+catDforD@users.noreply.github.com>
Co-authored-by: Gargantua <22532097@zju.edu.cn>
Co-authored-by: 晴空 <3103908461@qq.com>
Co-authored-by: SJ <idiotgyz@gmail.com>
Co-authored-by: idiotsj <idiotsj@users.noreply.github.com>
Co-authored-by: qingyun <codingtsunami@gmail.com>
Co-authored-by: ccsang <ccsang@users.noreply.github.com>
Co-authored-by: BillionToken <hydr0codone@proton.me>
Co-authored-by: BillionClaw <billionclaw@cl OSS.dev>
Co-authored-by: LIU Yaohua <12531035@mail.sustech.edu.cn>
Co-authored-by: LehaoLin <linlehao@cuhk.edu.cn>
Co-authored-by: Stable Genius <stablegenius043@gmail.com>
Co-authored-by: Stable Genius <259448942+stablegenius49@users.noreply.github.com>
Co-authored-by: stablegenius49 <185121704+stablegenius49@users.noreply.github.com>
Co-authored-by: Lockinwize Lolite <mzwing@mzwing.eu.org>
Co-authored-by: Waterwzy <2916963017@qq.com>
Co-authored-by: M1LKT <144798909+M1LKT@users.noreply.github.com>
Co-authored-by: Chen <42998804+a61995987@users.noreply.github.com>
Co-authored-by: Frank <97429702+tsubasakong@users.noreply.github.com>
Co-authored-by: bread <104435263+bread-ovO@users.noreply.github.com>
Co-authored-by: Stardust <1441308506a@gmail.com>
Co-authored-by: Vorest <147138388+Vorest3679@users.noreply.github.com>
Co-authored-by: GH <BoneAsh@iCloud.com>
Co-authored-by: Zeng Qingwen <143274079+fishwww-ww@users.noreply.github.com>
Co-authored-by: Rainor_da! <51012640+1zzxy1@users.noreply.github.com>
Co-authored-by: Izayoi9 <105905446+Izayoi9@users.noreply.github.com>
Co-authored-by: naer-lily <88199249+naer-lily@users.noreply.github.com>
Co-authored-by: Naer <88199249+V-YOP@users.noreply.github.com>
Co-authored-by: Yaohua-Leo <3067173925@qq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:core The bug / feature is about astrbot's core, backend size:L This PR changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants