Merge remote-tracking branch 'origin/master' into pr/Raven95676/8189

# Conflicts:
#	dashboard/src/assets/mdi-subset/materialdesignicons-subset.css
#	dashboard/src/assets/mdi-subset/materialdesignicons-webfont-subset.woff
#	dashboard/src/assets/mdi-subset/materialdesignicons-webfont-subset.woff2

Author: Raven95676

.github/workflows/build-docs.yml

@@ -13,7 +13,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v6
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.7
+        uses: pnpm/action-setup@v6.0.8
         with:
           version: 10.28.2
       - name: Setup Node.js

.github/workflows/dashboard_ci.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.7
+        uses: pnpm/action-setup@v6.0.8
         with:
           version: 10.28.2
 

.github/workflows/release.yml

@@ -51,7 +51,7 @@ jobs:
           echo "tag=$tag" >> "$GITHUB_OUTPUT"
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.7
+        uses: pnpm/action-setup@v6.0.8
         with:
           version: 10.28.2
 

AGENTS.md

@@ -52,3 +52,10 @@ ruff check .
 
 1. Title format: use conventional commit messages
 2. Use English to write PR title and descriptions.
+
+## Release versions
+
+1. Replace current version name to specific version name.
+2. Write changelog in `changelogs/`, you can refer to the full commit messages between the latest tag to the latest commit.
+3. Make and push a commit into master branch with message format like: `chore: bump version to 4.25.0`
+4. Create a tag and push the tag. For example: `git tag v4.25.0 && git push origin v4.25.0`

astrbot/builtin_stars/astrbot/main.py

@@ -1,5 +1,6 @@
 import copy
 import traceback
+from collections.abc import Iterable
 from sys import maxsize
 
 import astrbot.api.message_components as Comp
@@ -19,6 +20,13 @@
 from .long_term_memory import LongTermMemory
 
 
+def _iter_message_components(event: AstrMessageEvent):
+    messages = getattr(getattr(event, "message_obj", None), "message", None)
+    if not isinstance(messages, Iterable) or isinstance(messages, (str, bytes)):
+        return ()
+    return tuple(messages)
+
+
 class Main(star.Star):
     def __init__(self, context: star.Context) -> None:
         self.context = context
@@ -134,8 +142,9 @@ def ltm_enabled(self, event: AstrMessageEvent):
     @filter.platform_adapter_type(filter.PlatformAdapterType.ALL)
     async def on_message(self, event: AstrMessageEvent):
         """群聊记忆增强"""
+        message_components = _iter_message_components(event)
         has_image_or_plain = False
-        for comp in event.message_obj.message:
+        for comp in message_components:
             if isinstance(comp, Plain) or isinstance(comp, Image):
                 has_image_or_plain = True
                 break
@@ -167,7 +176,7 @@ async def on_message(self, event: AstrMessageEvent):
 
                     if not session_curr_cid:
                         logger.error(
-                            "当前未处于对话状态，无法主动回复，请确保 平台设置->会话隔离(unique_session) 未开启，并使用 /switch 序号 切换或者 /new 创建一个会话。",
+                            "当前未处于对话状态，无法主动回复，请确保 平台设置->会话隔离(unique_session) 未开启，并使用 /new 创建一个会话。",
                         )
                         return
 
@@ -177,6 +186,13 @@ async def on_message(self, event: AstrMessageEvent):
                     )
 
                     prompt = event.message_str
+                    image_urls = []
+                    for comp in message_components:
+                        if isinstance(comp, Image):
+                            try:
+                                image_urls.append(await comp.convert_to_file_path())
+                            except Exception:
+                                logger.exception("主动回复处理图片失败")
 
                     if not conv:
                         logger.error("未找到对话，无法主动回复")
@@ -185,6 +201,7 @@ async def on_message(self, event: AstrMessageEvent):
                     yield event.request_llm(
                         prompt=prompt,
                         session_id=event.session_id,
+                        image_urls=image_urls,
                         conversation=conv,
                     )
                 except BaseException as e:

astrbot/cli/__init__.py

@@ -1 +1 @@
-__version__ = "4.24.5"
+__version__ = "4.25.1"

astrbot/cli/__main__.py

@@ -5,7 +5,7 @@
 import click
 
 from . import __version__
-from .commands import conf, init, plug, run
+from .commands import conf, init, password, plug, run
 
 logo_tmpl = r"""
      ___           _______.___________..______      .______     ______   .___________.
@@ -54,6 +54,7 @@ def help(command_name: str | None) -> None:
 cli.add_command(help)
 cli.add_command(plug)
 cli.add_command(conf)
+cli.add_command(password)
 
 if __name__ == "__main__":
     cli()

astrbot/cli/commands/__init__.py

@@ -1,6 +1,7 @@
 from .cmd_conf import conf
 from .cmd_init import init
+from .cmd_password import password
 from .cmd_plug import plug
 from .cmd_run import run
 
-__all__ = ["conf", "init", "plug", "run"]
+__all__ = ["conf", "init", "password", "plug", "run"]

astrbot/cli/commands/cmd_conf.py

@@ -137,6 +137,22 @@ def _get_nested_item(obj: dict[str, Any], path: str) -> Any:
     return obj
 
 
+def _set_dashboard_password(config: dict[str, Any], raw_password: str) -> None:
+    """Set dashboard password hashes and clear password migration flags."""
+    _set_nested_item(
+        config,
+        "dashboard.pbkdf2_password",
+        hash_dashboard_password(raw_password),
+    )
+    _set_nested_item(
+        config,
+        "dashboard.password",
+        hash_legacy_dashboard_password(raw_password),
+    )
+    _set_nested_item(config, "dashboard.password_storage_upgraded", True)
+    _set_nested_item(config, "dashboard.password_change_required", False)
+
+
 @click.group(name="conf")
 def conf() -> None:
     """Configuration management commands
@@ -171,16 +187,7 @@ def set_config(key: str, value: str) -> None:
         old_value = _get_nested_item(config, key)
         validated_value = CONFIG_VALIDATORS[key](value)
         if key == "dashboard.password":
-            _set_nested_item(
-                config,
-                "dashboard.pbkdf2_password",
-                hash_dashboard_password(validated_value),
-            )
-            _set_nested_item(
-                config,
-                "dashboard.password",
-                hash_legacy_dashboard_password(validated_value),
-            )
+            _set_dashboard_password(config, validated_value)
         else:
             _set_nested_item(config, key, validated_value)
         _save_config(config)

astrbot/cli/commands/cmd_password.py

@@ -0,0 +1,38 @@
+import click
+
+from .cmd_conf import (
+    _load_config,
+    _save_config,
+    _set_dashboard_password,
+    _set_nested_item,
+    _validate_dashboard_password,
+    _validate_dashboard_username,
+)
+
+
+@click.command(name="password")
+@click.option(
+    "--username",
+    help="Optional dashboard username to set together with the new password.",
+)
+def password(username: str | None) -> None:
+    """Change the AstrBot dashboard password."""
+    config = _load_config()
+
+    new_password = click.prompt(
+        "New dashboard password",
+        hide_input=True,
+        confirmation_prompt=True,
+    )
+    validated_password = _validate_dashboard_password(new_password)
+
+    if username is not None:
+        validated_username = _validate_dashboard_username(username.strip())
+        _set_nested_item(config, "dashboard.username", validated_username)
+
+    _set_dashboard_password(config, validated_password)
+    _save_config(config)
+
+    click.echo("Dashboard password updated.")
+    if username is not None:
+        click.echo(f"Dashboard username updated: {validated_username}")